From a7f8db4fdb308f2fcd1cc1c5013ac930cc063ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 19 May 2014 16:51:48 +0200
Subject: bitmaskclient.R in de.blinkt.openvpn top level

---
 app/src/main/java/de/blinkt/openvpn/FileProvider.java   | 2 ++
 app/src/main/java/de/blinkt/openvpn/LaunchVPN.java      | 2 ++
 app/src/main/java/de/blinkt/openvpn/OnBootReceiver.java | 2 ++
 app/src/main/java/de/blinkt/openvpn/VpnProfile.java     | 2 ++
 build.gradle                                            | 5 ++++-
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/de/blinkt/openvpn/FileProvider.java b/app/src/main/java/de/blinkt/openvpn/FileProvider.java
index 9ffd6545..f9fedd02 100644
--- a/app/src/main/java/de/blinkt/openvpn/FileProvider.java
+++ b/app/src/main/java/de/blinkt/openvpn/FileProvider.java
@@ -1,5 +1,7 @@
 package de.blinkt.openvpn;
 
+import se.leap.bitmaskclient.R;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java
index 7aed4e4a..cfd0efb0 100644
--- a/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java
+++ b/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java
@@ -1,5 +1,7 @@
 package de.blinkt.openvpn;
 
+import se.leap.bitmaskclient.R;
+
 import java.io.IOException;
 
 import android.app.Activity;
diff --git a/app/src/main/java/de/blinkt/openvpn/OnBootReceiver.java b/app/src/main/java/de/blinkt/openvpn/OnBootReceiver.java
index 32d14b1b..129d8d1c 100644
--- a/app/src/main/java/de/blinkt/openvpn/OnBootReceiver.java
+++ b/app/src/main/java/de/blinkt/openvpn/OnBootReceiver.java
@@ -1,5 +1,7 @@
 package de.blinkt.openvpn;
 
+import se.leap.bitmaskclient.R;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
diff --git a/app/src/main/java/de/blinkt/openvpn/VpnProfile.java b/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
index 601fb2df..afa70100 100644
--- a/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
+++ b/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
@@ -1,5 +1,7 @@
 package de.blinkt.openvpn;
 
+import se.leap.bitmaskclient.R;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
diff --git a/build.gradle b/build.gradle
index 29ceb2f2..4e853f4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,10 @@ task copyIcsOpenVPNClasses( type: Copy ) {
     }
     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;')
+    }
   } into 'app'
 
   from ('ics-openvpn/main') {
-- 
cgit v1.2.3