[tor-commits] [orbot/master] a better isolation of my changes
n8fr8 at torproject.org
n8fr8 at torproject.org
Thu Mar 2 04:10:21 UTC 2017
commit 07532bb04c787be0914e5a1f68da87998f087c18
Author: arrase <arrase at gmail.com>
Date: Tue Nov 29 20:33:34 2016 +0100
a better isolation of my changes
---
app/src/main/AndroidManifest.xml | 168 +++++++++++++++++++--------------------
1 file changed, 84 insertions(+), 84 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1704c70..826ce67 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,30 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.torproject.android"
- android:installLocation="auto"
- android:versionCode="15208000"
- android:versionName="15.2.0-RC-8-multi">
-
- <uses-sdk
- android:minSdkVersion="16"
- android:targetSdkVersion="23" />
- <!--
+ package="org.torproject.android"
+ android:versionName="15.2.0-RC-8-multi"
+ android:versionCode="15208000"
+ android:installLocation="auto"
+ >
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>
+ <!--
<permission android:name="org.torproject.android.MANAGE_TOR"
android:label="@string/permission_manage_tor_label"
android:description="@string/permission_manage_tor_description"
android:protectionLevel="signature"/>
<uses-permission android:name="org.torproject.android.MANAGE_TOR"/>
- -->
+ -->
- <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" />
- <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
+ <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" />
+ <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
- <android:uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <android:uses-permission android:name="android.permission.READ_PHONE_STATE" />
- <android:uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<application
android:name=".OrbotApp"
@@ -41,100 +38,103 @@
android:name=".OrbotMainActivity"
android:configChanges="orientation|screenSize"
android:excludeFromRecents="true"
- android:launchMode="singleTop">
+ android:launchMode="singleTop"
+ >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
-
<category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
+ </intent-filter>
+
<intent-filter>
<action android:name="android.intent.action.VIEW" />
-
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
-
<data android:scheme="bridge" />
</intent-filter>
- <intent-filter>
- <category android:name="android.intent.category.DEFAULT" />
+ <intent-filter>
+ <category android:name="android.intent.category.DEFAULT" />
<action android:name="org.torproject.android.REQUEST_HS_PORT" />
</intent-filter>
- <intent-filter>
+ <intent-filter>
<category android:name="android.intent.category.DEFAULT" />
-
<action android:name="org.torproject.android.START_TOR" />
</intent-filter>
+
</activity>
- <!-- This is for ensuring the background service still runs when/if the app is swiped away -->
- <activity
- android:name=".service.util.DummyActivity"
- android:allowTaskReparenting="true"
- android:alwaysRetainTaskState="false"
- android:clearTaskOnLaunch="true"
- android:enabled="true"
- android:excludeFromRecents="true"
- android:finishOnTaskLaunch="true"
- android:noHistory="true"
- android:stateNotNeeded="true"
- android:theme="@android:style/Theme.Translucent" />
- <activity
- android:name=".vpn.VPNEnableActivity"
- android:exported="false"
- android:label="@string/app_name" />
- <activity
- android:name=".ui.PromoAppsActivity"
- android:exported="false" />
- <activity
- android:name=".settings.SettingsPreferences"
- android:label="@string/app_name" />
- <activity
- android:name=".ui.AppManager"
- android:label="@string/app_name"
- android:theme="@style/Theme.AppCompat" />
+ <!--
+ This is for ensuring the background service still runs when/if the app is swiped away
+ -->
+ <activity
+ android:name=".service.util.DummyActivity"
+ android:theme="@android:style/Theme.Translucent"
+ android:enabled="true"
+ android:allowTaskReparenting="true"
+ android:noHistory="true"
+ android:excludeFromRecents="true"
+ android:alwaysRetainTaskState="false"
+ android:stateNotNeeded="true"
+ android:clearTaskOnLaunch="true"
+ android:finishOnTaskLaunch="true"
+
+ />
+
+ <activity
+ android:name=".vpn.VPNEnableActivity" android:label="@string/app_name" android:exported="false"
+ />
+
+
+ <activity android:name="org.torproject.android.ui.PromoAppsActivity" android:exported="false"/>
+
+
+ <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/>
+ <activity android:name=".ui.AppManager" android:label="@string/app_name"
+ android:theme="@style/Theme.AppCompat"
+ />
<service
android:name=".service.TorService"
android:enabled="true"
android:permission="android.permission.BIND_VPN_SERVICE"
- android:stopWithTask="false" />
- <service
- android:name=".service.vpn.TorVpnService"
- android:enabled="true"
- android:permission="android.permission.BIND_VPN_SERVICE">
- <intent-filter>
- <action android:name="android.net.VpnService" />
- </intent-filter>
+ android:stopWithTask="false" >
</service>
+
+ <service
+ android:name=".service.vpn.TorVpnService"
+ android:enabled="true"
+ android:permission="android.permission.BIND_VPN_SERVICE" >
+ <intent-filter>
+ <action android:name="android.net.VpnService"/>
+ </intent-filter>
+ </service>
+
<receiver
android:name=".service.StartTorReceiver"
android:exported="true">
- <intent-filter>
- <action android:name="org.torproject.android.intent.action.START" />
- </intent-filter>
+ <intent-filter>
+ <action android:name="org.torproject.android.intent.action.START" />
+ </intent-filter>
</receiver>
- <receiver
- android:name=".OnBootReceiver"
- android:enabled="true"
- android:exported="true">
- <intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED" />
-
- <category android:name="android.intent.category.HOME" />
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.QUICKBOOT_POWERON" />
- <category android:name="android.intent.category.HOME" />
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.MEDIA_MOUNTED" />
-
- <category android:name="android.intent.category.HOME" />
- </intent-filter>
- </receiver>
+ <receiver android:name=".OnBootReceiver"
+ android:enabled="true" android:exported="true"
+
+ >
+ <intent-filter>
+ <action android:name="android.intent.action.BOOT_COMPLETED" />
+ <category android:name="android.intent.category.HOME" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+ <category android:name="android.intent.category.HOME" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.MEDIA_MOUNTED"/>
+ <category android:name="android.intent.category.HOME" />
+ </intent-filter>
+ </receiver>
<activity
android:name=".ui.hiddenservices.HiddenServicesActivity"
@@ -159,6 +159,6 @@
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/hidden_services_paths"/>
</provider>
- </application>
-</manifest>
\ No newline at end of file
+</application>
+</manifest>
More information about the tor-commits
mailing list