dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

a better isolation of my changes

This commit is contained in:
arrase 2016-11-29 20:33:34 +01:00
parent ed5e8aca9c
commit 07532bb04c
1 changed files with 83 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
app/src/main/AndroidManifest.xml
View File

@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.torproject.android" package="org.torproject.android"
android:installLocation="auto" android:versionName="15.2.0-RC-8-multi"
android:versionCode="15208000" android:versionCode="15208000"
android:versionName="15.2.0-RC-8-multi"> android:installLocation="auto"
>
<uses-sdk <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>
android:minSdkVersion="16"
android:targetSdkVersion="23" />
<!-- <!--
<permission android:name="org.torproject.android.MANAGE_TOR" <permission android:name="org.torproject.android.MANAGE_TOR"
android:label="@string/permission_manage_tor_label" android:label="@string/permission_manage_tor_label"
@ -15,16 +13,15 @@
android:protectionLevel="signature"/> android:protectionLevel="signature"/>
<uses-permission android:name="org.torproject.android.MANAGE_TOR"/> <uses-permission android:name="org.torproject.android.MANAGE_TOR"/>
--> -->
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.ACCESS_SUPERUSER" /> <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
<android:uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<android:uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<android:uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<application <application
android:name=".OrbotApp" android:name=".OrbotApp"
@ -41,100 +38,103 @@
android:name=".OrbotMainActivity" android:name=".OrbotMainActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:launchMode="singleTop"> android:launchMode="singleTop"
>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="bridge" /> <data android:scheme="bridge" />
</intent-filter> </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" /> <action android:name="org.torproject.android.REQUEST_HS_PORT" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<action android:name="org.torproject.android.START_TOR" /> <action android:name="org.torproject.android.START_TOR" />
</intent-filter> </intent-filter>
</activity> </activity>
<!-- This is for ensuring the background service still runs when/if the app is swiped away --> <!--
<activity This is for ensuring the background service still runs when/if the app is swiped away
android:name=".service.util.DummyActivity" -->
android:allowTaskReparenting="true" <activity
android:alwaysRetainTaskState="false" android:name=".service.util.DummyActivity"
android:clearTaskOnLaunch="true" android:theme="@android:style/Theme.Translucent"
android:enabled="true" android:enabled="true"
android:excludeFromRecents="true" android:allowTaskReparenting="true"
android:finishOnTaskLaunch="true" android:noHistory="true"
android:noHistory="true" android:excludeFromRecents="true"
android:stateNotNeeded="true" android:alwaysRetainTaskState="false"
android:theme="@android:style/Theme.Translucent" /> android:stateNotNeeded="true"
<activity android:clearTaskOnLaunch="true"
android:name=".vpn.VPNEnableActivity" android:finishOnTaskLaunch="true"
android:exported="false"
android:label="@string/app_name" /> />
<activity
android:name=".ui.PromoAppsActivity" <activity
android:exported="false" /> android:name=".vpn.VPNEnableActivity" android:label="@string/app_name" android:exported="false"
<activity />
android:name=".settings.SettingsPreferences"
android:label="@string/app_name" />
<activity <activity android:name="org.torproject.android.ui.PromoAppsActivity" android:exported="false"/>
android:name=".ui.AppManager"
android:label="@string/app_name"
android:theme="@style/Theme.AppCompat" /> <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 <service
android:name=".service.TorService" android:name=".service.TorService"
android:enabled="true" android:enabled="true"
android:permission="android.permission.BIND_VPN_SERVICE" android:permission="android.permission.BIND_VPN_SERVICE"
android:stopWithTask="false" /> 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>
</service> </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 <receiver
android:name=".service.StartTorReceiver" android:name=".service.StartTorReceiver"
android:exported="true"> android:exported="true">
<intent-filter> <intent-filter>
<action android:name="org.torproject.android.intent.action.START" /> <action android:name="org.torproject.android.intent.action.START" />
</intent-filter> </intent-filter>
</receiver> </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" /> <receiver android:name=".OnBootReceiver"
</intent-filter> android:enabled="true" android:exported="true"
<intent-filter>
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
<category android:name="android.intent.category.HOME" /> >
</intent-filter> <intent-filter>
<intent-filter> <action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.MEDIA_MOUNTED" /> <category android:name="android.intent.category.HOME" />
</intent-filter>
<category android:name="android.intent.category.HOME" /> <intent-filter>
</intent-filter> <action android:name="android.intent.action.QUICKBOOT_POWERON" />
</receiver> <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 <activity
android:name=".ui.hiddenservices.HiddenServicesActivity" android:name=".ui.hiddenservices.HiddenServicesActivity"
@ -159,6 +159,6 @@
android:name="android.support.FILE_PROVIDER_PATHS" android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/hidden_services_paths"/> android:resource="@xml/hidden_services_paths"/>
</provider> </provider>
</application>
</application>
</manifest> </manifest>