From 383c519222d1e7e9d76bd520d3334a15348c324e Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 23 Jul 2013 13:07:29 +0200
Subject: Require permission when calling activities too...

---
 AndroidManifest.xml |  4 ++++
 build.gradle        |  2 +-
 icsopenvpn.iml      | 16 ++++++++--------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index abf2f3b3..31a5de36 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,6 +16,8 @@
         android:minSdkVersion="14"
         android:targetSdkVersion="17" />
 
+    <!-- Copy the <permission> block to your app when using the REMOTE API. Otherwise OpenVPN for
+        Android needs to be installed first -->
     <permission
         android:name="de.blinkt.openvpn.REMOTE_API"
         android:description="@string/permission_description"
@@ -65,12 +67,14 @@
         </service>
 
         <activity
+            android:permission="de.blinkt.openvpn.REMOTE_API"
             android:name=".api.GrantPermissionsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
         <activity
+            android:permission="de.blinkt.openvpn.REMOTE_API"
             android:name=".api.ConfirmDialog" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/build.gradle b/build.gradle
index ef7c1c77..8b3affea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,7 @@ android {
             assets.srcDirs = ['assets']
         }
 
-        instrumentTest.setRoot('tests')
+
     }
 
 
diff --git a/icsopenvpn.iml b/icsopenvpn.iml
index 08c7e87a..49de8ccb 100644
--- a/icsopenvpn.iml
+++ b/icsopenvpn.iml
@@ -3,7 +3,7 @@
   <component name="FacetManager">
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_BUILD_VARIANT" value="Debug" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleTest" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -40,13 +40,13 @@
       <sourceFolder url="file://$MODULE_DIR$/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/res" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/tests/assets" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/tests/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/tests/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/tests/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/tests/res" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/tests/resources" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/.hg" />
       <excludeFolder url="file://$MODULE_DIR$/.hgcheck" />
-- 
cgit v1.2.3