summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-11-20 16:33:40 +0100
committerArne Schwabe <arne@rfc2549.org>2014-11-20 16:33:40 +0100
commit1f04e4412e520b773a3aa749b15f28eaaeda23aa (patch)
tree0113e0025aa1fdffece1b8b5a624c9a9cdac2118
parente065a37e614507e18d7eaa3191c69fed4baec5d9 (diff)
Remove the custom permission since it makes too much trouble with android 5.0 and the apps requires the user to acknowledge the external API anyway (closes issue #299)
--HG-- extra : rebase_source : c34d165c2c953a8ccda329465a20a7284f73d8f0
-rw-r--r--main/src/main/AndroidManifest.xml14
-rw-r--r--remoteExample/src/main/AndroidManifest.xml7
-rw-r--r--remoteExample/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl3
3 files changed, 4 insertions, 20 deletions
diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
index 4e6ca126..8f478bcc 100644
--- a/main/src/main/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
@@ -17,15 +17,6 @@
<!-- <uses-permission android:name="com.android.vending.BILLING" /> -->
- <!-- 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"
- android:label="Control OpenVPN"
- android:permissionGroup="android.permission-group.NETWORK"
- android:protectionLevel="dangerous" />
-
<application
android:allowBackup="true"
android:theme="@style/blinkt"
@@ -69,22 +60,19 @@
</intent-filter>
</service>
<service
- android:name=".api.ExternalOpenVPNService"
- android:permission="de.blinkt.openvpn.REMOTE_API" >
+ android:name=".api.ExternalOpenVPNService">
<intent-filter>
<action android:name="de.blinkt.openvpn.api.IOpenVPNAPIService" />
</intent-filter>
</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/remoteExample/src/main/AndroidManifest.xml b/remoteExample/src/main/AndroidManifest.xml
index 1d76db58..abd7b621 100644
--- a/remoteExample/src/main/AndroidManifest.xml
+++ b/remoteExample/src/main/AndroidManifest.xml
@@ -2,15 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.blinkt.openvpn.remote" >
- <permission
- android:name="de.blinkt.openvpn.REMOTE_API"
- android:description="@string/permission_description"
- android:label="Control OpenVPN"
- android:permissionGroup="android.permission-group.NETWORK"
- android:protectionLevel="dangerous" />
<uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="de.blinkt.openvpn.REMOTE_API" />
<application
android:allowBackup="true"
diff --git a/remoteExample/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl b/remoteExample/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl
index 794e3aad..06545bd7 100644
--- a/remoteExample/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl
+++ b/remoteExample/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl
@@ -46,5 +46,8 @@ interface IOpenVPNAPIService {
* Remove a previously registered callback interface.
*/
void unregisterStatusCallback(IOpenVPNStatusCallback cb);
+
+ /** Remove a profile by UUID */
+ void removeProfile (String profileUUID);
} \ No newline at end of file