From baad99940a0bfa2e4c27a9cbc0f478e94b6d20ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Mon, 19 May 2014 17:44:25 +0200 Subject: Copy necessary activities and fragments. Now we need to decide what's our relationship with LogWindow and LaunchVPN, refactor its classes and fix ours so that we use the currently supported methods. --- build.gradle | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 4e853f4f..a0895556 100644 --- a/build.gradle +++ b/build.gradle @@ -44,6 +44,9 @@ task copyIcsOpenVPNClasses( type: Copy ) { include '**/*.java' include '**/*.aidl' include '**/strings.xml' + exclude '**/activities/' + exclude '**/fragments/' + exclude '**/views/' rename 'strings.xml', 'strings-icsopenvpn.xml' filter { @@ -64,6 +67,26 @@ task copyIcsOpenVPNClasses( type: Copy ) { include '**/ic_stat_vpn_outline.png' include '**/ic_stat_vpn_empty_halo.png' } into 'app' + + from ('ics-openvpn/main') { + include '**/DisconnectVPN.java' + include '**/LogWindow.java' + include '**/LogFragment.java' + include '**/log_window.xml' + filter { + line -> line.replaceAll('de.blinkt.openvpn.R', 'se.leap.bitmaskclient.R') + } + filter { + line -> line.replaceAll('de.blinkt.openvpn.BuildConfig', 'se.leap.bitmaskclient.BuildConfig') + } + filter { + line -> line.replace('package de.blinkt.openvpn;', 'package de.blinkt.openvpn;\n\nimport se.leap.bitmaskclient.R;') + } + filter { + line -> line.replace('package de.blinkt.openvpn.fragments;', 'package de.blinkt.openvpn.fragments;\n\nimport se.leap.bitmaskclient.R;') + } + + } into 'app' } def processFileInplace(file, Closure processText) { -- cgit v1.2.3