From 5c80c2982ebb55b817e2855de8ab77ae269bd31b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 17 Dec 2013 12:06:38 +0100
Subject: Concordant AndroidManifest.

---
 AndroidManifest.xml | 77 +----------------------------------------------------
 1 file changed, 1 insertion(+), 76 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2b7ce4a5..25b78bd6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,7 +22,6 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <!-- if you want to run the unit test for Dashboard you will need that you uncomment the following line --> 
     <!--   <uses-permission android:name="android.permission.WRITE_SETTINGS" />  -->  
     
@@ -33,29 +32,11 @@
         android:minSdkVersion="14"
         android:targetSdkVersion="17" />
 
-    <permission
-        android:name="se.leap.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:icon="@drawable/icon"
         android:logo="@drawable/icon"
         android:label="@string/app" >
-        <activity android:name="se.leap.openvpn.AboutFragment" />
-        <activity
-            android:name="se.leap.openvpn.VPNPreferences"
-            android:windowSoftInputMode="stateHidden" />
-        <activity
-            android:name="se.leap.openvpn.LogWindow"
-            android:label="@string/openvpn_log" />
-        <activity android:name="se.leap.openvpn.SendDumpActivity" />
-        <activity android:name="se.leap.openvpn.FileSelect" />
-        <activity android:name="se.leap.openvpn.MainActivity" >
-        </activity>
 
         <service
             android:name="se.leap.openvpn.OpenVpnService"
@@ -64,67 +45,11 @@
                 <action android:name="android.net.VpnService" />
             </intent-filter>
         </service>
-        <service
-            android:name="se.leap.openvpn.api.ExternalOpenVPNService"
-            android:permission="se.leap.openvpn.REMOTE_API" >
-            <intent-filter>
-                <action android:name="se.leap.openvpn.api.IOpenVPNAPIService" />
-            </intent-filter>
-        </service>
-		<service android:name="se.leap.bitmaskclient.ProviderAPI" android:enabled="true"/>
+	<service android:name="se.leap.bitmaskclient.ProviderAPI" android:enabled="true"/>
 		
-        <activity
-            android:name="se.leap.openvpn.api.GrantPermissionsActivity"
-            android:permission="se.leap.openvpn.REMOTE_API" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-        </activity>
-
-        <receiver android:name="se.leap.openvpn.OnBootReceiver" >
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-
-        <activity
-            android:name="se.leap.openvpn.ConfigConverter"
-            android:label="Convert Config File" >
-            <intent-filter android:label="@string/import_config" >
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:mimeType="application/x-openvpn-profile" />
-            </intent-filter>
-            <intent-filter android:label="@string/import_config" >
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:mimeType="application/ovpn" />
-            </intent-filter>
-            <intent-filter android:label="@string/import_config" >
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data
-                    android:pathPattern=".*\\.ovpn"
-                    android:scheme="content" />
-            </intent-filter>
-        </activity>
         <activity
             android:name="se.leap.openvpn.LaunchVPN"
             android:label="@string/vpn_launch_title" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
         </activity>
 
         <activity
-- 
cgit v1.2.3