June 2017 - tor-commits - lists.torproject.org

[orbot/master] update CHANGELOG for v15.4.2
by n8fr8＠torproject.org 09 Jun '17

09 Jun '17

commit df29aaad8d281f9d6d7c08eff4486b43a11f1a44 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 9 07:54:02 2017 -0400 update CHANGELOG for v15.4.2 --- CHANGELOG | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 20dc8eb..d33399f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,61 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ + +/** v15.4.2 / 9 June 2017 / e18a7937d271d7482d5eaac9900e1c06b4b48b89 **/ + +* Update Tor +e18a793 update tor version string to 0.3.0.8-openssl1.0.2k-1 +ad1bcb8 update tor repo to 0.3.0.8 +c0d082e remove bridge logic from activity (now in service) +4af61b6 update logic for bridge selection +301ef39 add version display to sidebar +11c6abf update default built in bridges +ea40bb4 update gradle build settings +b8aaa2c update obfs4 bridges to match latest from tor browser +6496cb1 Update to briges thanks to David Fifield https://lists.mayfirst.org/pipermail/guardian-dev/2017-March/005209.html https +7eb7a76 update pluto library +44ab128 update to OpenSSL_1_0_2k +1953962 cache circuits by circId +c9fc49a we want to only look up iptables once per run + +* Only enable new HS features on SDK 23+ +78984bd don't show new features that require new perms on < SDK 23 +028f76e add "minimal permission" build for SDK 16 to 22 devices - these platforms don't allow for runtime permissions requests + +* Builds, Flavors and Manifests +c874e70 don't build jni/ndk inside of this project +b1ff4d5 use this as the base manifest +fe491b0 don't need specialized menu for this flavor +34043f9 remove version from manifests +674f8ff add min and full perm build flavors +67cb36e new release for minimal perms SDK up to 23 +2403e8c improve reliability of starting and stopping + +* Hidden Service Improvements +a5744d7 small chnage to only check for sys iptables once +970710d Merge branch 'fixiptables' of https://github.com/Unpublished/orbot into Unpublished-fixiptables +41ebcc5 Deal with Doze in the less painful way +2aa2b4c New feature added: HidServAuth manager and QR share +4f7271b feature added: temporarily disable a hidden service +8d5df9c better cookie dialog +2d0437a return auth cookie at intent service +4d0fe27 adds optional HiddenServiceAuthorizeClient option for each hidden service +1060c69 intent api: restore key +0818b0c isolate hidden services configuration dirs +7600b4c menu entry for restore backup +8c7b897 isolated permission request +d048cd6 request permissions +5edfc34 create zip backup from itent +4fea84c allow managed backups field +e152dd3 update new onions +3f384c0 wait for hostname +e776e12 Update UI for onion port +ebc736b option for map a local port to different onion port number +3f7435c Hidden Service dialog +26d9381 New hidden services management screen and database +ff61d66 make sure tor network is re-enabled when user tries to restart + + /** 15.2.0 RC 8 / 7 November 2016 / 34079c7a159a94eb738c0410b4642394d712c44e **/ 540db0f revert back to NDK toolchain 4.8 since it is more stable

1 0

[orbot/master] update tor repo to 0.3.0.8
by n8fr8＠torproject.org 09 Jun '17

09 Jun '17

commit ad1bcb8d5dc0aa1863f316f055329bfce834a0c5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 9 01:36:58 2017 -0400 update tor repo to 0.3.0.8 --- external/tor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/tor b/external/tor index cfd9c1b..802d30d 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit cfd9c1bdc05826567a91ff89fd59c0cb70a436b2 +Subproject commit 802d30d9b71a6d54ef5fd1278ab4858b2e76e750

1 0

[orbot/master] improve reliability of starting and stopping
by n8fr8＠torproject.org 09 Jun '17

09 Jun '17

commit 2403e8c33320c431e2a10bdb14d61cdcc23df0ba Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 1 16:32:02 2017 -0400 improve reliability of starting and stopping --- .../java/org/torproject/android/OrbotMainActivity.java | 2 +- .../java/org/torproject/android/service/TorService.java | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 8e34467..8f34e48 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -197,7 +197,7 @@ public class OrbotMainActivity extends AppCompatActivity private void stopTor() { - requestTorStatus(); +// requestTorStatus(); Intent torService = new Intent(OrbotMainActivity.this, TorService.class); stopService(torService); diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 83de202..17000a9 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -439,8 +439,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon @Override public void onDestroy() { + stopTor(); - unregisterReceiver(mNetworkStateReceiver); try { @@ -456,13 +456,13 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private void stopTor () { - exec(new Runnable () + new Thread(new Runnable () { public void run () { stopTorAsync(); } - }); + }).start(); } @@ -491,6 +491,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } clearNotifications(); sendCallbackStatus(STATUS_OFF); + + try { + unregisterReceiver(mNetworkStateReceiver); + } + catch (IllegalArgumentException iae) + { + //not registered yet + } } private void killAllDaemons() throws Exception { @@ -856,7 +864,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon showToolbarNotification( getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); - stopTor(); + //stopTor(); } }

1 0

[orbot/master] don't need specialized menu for this flavor
by n8fr8＠torproject.org 09 Jun '17

09 Jun '17

commit fe491b0ec59d8417f136c2cec33394766551fad1 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 9 04:20:14 2017 -0400 don't need specialized menu for this flavor --- app/src/minimalperm/res/menu/orbot_main.xml | 80 ----------------------------- 1 file changed, 80 deletions(-) diff --git a/app/src/minimalperm/res/menu/orbot_main.xml b/app/src/minimalperm/res/menu/orbot_main.xml deleted file mode 100644 index 6685baa..0000000 --- a/app/src/minimalperm/res/menu/orbot_main.xml +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:yourapp="http://schemas.android.com/apk/res-auto" - > - - <item android:id="@+id/menu_settings" - android:title="@string/menu_settings" - android:icon="@drawable/ic_action_settings" - yourapp:showAsAction="never" - /> - - <item - android:title="@string/menu_qr" - yourapp:showAsAction="never" - > - <menu> - <item android:id="@+id/menu_scan" - android:title="@string/menu_scan" - yourapp:showAsAction="never" - /> - - <item android:id="@+id/menu_share_bridge" - android:title="@string/menu_share_bridge" - yourapp:showAsAction="never" - /> - </menu> - </item> - -  - - <item android:id="@+id/menu_about" - android:title="@string/menu_about" - android:icon="@drawable/ic_menu_about" - yourapp:showAsAction="never" - - /> - - <item android:id="@+id/menu_exit" - android:title="@string/menu_exit" - android:icon="@drawable/ic_menu_exit" - yourapp:showAsAction="never" - - /> - -</menu>

1 0

[orbot/master] add "minimal permission" build for SDK 16 to 22 devices
by n8fr8＠torproject.org 09 Jun '17

09 Jun '17

commit 028f76e62ea31f44c68846ce6ec5296aae96823b Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 9 02:01:42 2017 -0400 add "minimal permission" build for SDK 16 to 22 devices - these platforms don't allow for runtime permissions requests and the new permissions we are asking for can be alarming - we will disable the advanced hidden service features on these devices --- app/build.gradle | 13 ++- app/src/minimalperm/AndroidManifest.xml | 165 ++++++++++++++++++++++++++++ app/src/minimalperm/res/menu/orbot_main.xml | 80 ++++++++++++++ 3 files changed, 254 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 38f2169..e21a302 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,26 +3,31 @@ apply plugin: 'com.android.application' android { compileSdkVersion 25 buildToolsVersion "25" - defaultConfig { applicationId "org.torproject.android" - minSdkVersion 16 + minSdkVersion 23 targetSdkVersion 25 } - lintOptions { checkReleaseBuilds false // Or, if you prefer, you can continue to check for errors in release builds, // but continue the build even when errors are found: abortOnError false } - buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } + productFlavors { + minimalperm { + minSdkVersion 16 + applicationId 'org.torproject.android' + targetSdkVersion 22 + maxSdkVersion 22 + } + } } dependencies { diff --git a/app/src/minimalperm/AndroidManifest.xml b/app/src/minimalperm/AndroidManifest.xml new file mode 100644 index 0000000..523938a --- /dev/null +++ b/app/src/minimalperm/AndroidManifest.xml @@ -0,0 +1,165 @@ +<?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="15410000" + android:versionName="15.4.1-RC-1-multi"> + + <uses-sdk + android:minSdkVersion="16" + android:maxSdkVersion="22" + android:targetSdkVersion="22" /> + + <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" /> + + <application + android:name=".OrbotApp" + android:allowBackup="false" + android:allowClearUserData="true" + android:configChanges="locale|orientation|screenSize" + android:description="@string/app_description" + android:hardwareAccelerated="false" + android:icon="@drawable/ic_launcher" + android:label="@string/app_name" + android:largeHeap="false" + android:theme="@style/DefaultTheme"> + <activity + android:name=".OrbotMainActivity" + android:excludeFromRecents="true" + android:launchMode="singleTop"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + + <category android:name="android.intent.category.LAUNCHER" /> + </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" /> + + <action android:name="org.torproject.android.REQUEST_HS_PORT" /> + </intent-filter> + <intent-filter> + <category android:name="android.intent.category.DEFAULT" /> + + <action android:name="org.torproject.android.START_TOR" /> + </intent-filter> + </activity> + +  + <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" /> + + <service + android:name=".service.TorService" + android:enabled="true" + android:permission="android.permission.BIND_VPN_SERVICE" + 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> + </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" + android:label="@string/title_activity_hidden_services" + android:theme="@style/DefaultTheme"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value=".OrbotMainActivity" /> + </activity> + + <provider + android:name=".ui.hiddenservices.providers.HSContentProvider" + android:authorities="org.torproject.android.ui.hiddenservices.providers" + android:exported="false" /> + <provider + android:name="android.support.v4.content.FileProvider" + android:authorities="org.torproject.android.ui.hiddenservices.storage" + android:exported="false" + android:grantUriPermissions="true"> + <meta-data + android:name="android.support.FILE_PROVIDER_PATHS" + android:resource="@xml/hidden_services_paths" /> + </provider> + + <activity + android:name=".ui.hiddenservices.ClientCookiesActivity" + android:label="@string/client_cookies" + android:theme="@style/DefaultTheme"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value=".OrbotMainActivity" /> + </activity> + + <provider + android:name=".ui.hiddenservices.providers.CookieContentProvider" + android:authorities="org.torproject.android.ui.hiddenservices.providers.cookie" + android:exported="false" /> + </application> + +</manifest> diff --git a/app/src/minimalperm/res/menu/orbot_main.xml b/app/src/minimalperm/res/menu/orbot_main.xml new file mode 100644 index 0000000..6685baa --- /dev/null +++ b/app/src/minimalperm/res/menu/orbot_main.xml @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="utf-8"?> + +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:yourapp="http://schemas.android.com/apk/res-auto" + > + + <item android:id="@+id/menu_settings" + android:title="@string/menu_settings" + android:icon="@drawable/ic_action_settings" + yourapp:showAsAction="never" + /> + + <item + android:title="@string/menu_qr" + yourapp:showAsAction="never" + > + <menu> + <item android:id="@+id/menu_scan" + android:title="@string/menu_scan" + yourapp:showAsAction="never" + /> + + <item android:id="@+id/menu_share_bridge" + android:title="@string/menu_share_bridge" + yourapp:showAsAction="never" + /> + </menu> + </item> + +  + + <item android:id="@+id/menu_about" + android:title="@string/menu_about" + android:icon="@drawable/ic_menu_about" + yourapp:showAsAction="never" + + /> + + <item android:id="@+id/menu_exit" + android:title="@string/menu_exit" + android:icon="@drawable/ic_menu_exit" + yourapp:showAsAction="never" + + /> + +</menu>

1 0

[orbot/master] don't show new features that require new perms on < SDK 23
by n8fr8＠torproject.org 09 Jun '17

09 Jun '17

commit 78984bd344b92003c6f391865584cede8c2fe96b Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 9 03:59:50 2017 -0400 don't show new features that require new perms on < SDK 23 --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 5 +++++ app/src/main/res/menu/orbot_main.xml | 1 + 2 files changed, 6 insertions(+) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 8f34e48..0e9e2f7 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -449,6 +449,11 @@ public class OrbotMainActivity extends AppCompatActivity MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.orbot_main, menu); + //We don't support these on per SDK 23 + if (BuildConfig.FLAVOR.equals("minimalperm")) { + menu.findItem(R.id.menu_hidden_services_main).setVisible(false); + } + return true; } diff --git a/app/src/main/res/menu/orbot_main.xml b/app/src/main/res/menu/orbot_main.xml index e556b76..deed1a6 100644 --- a/app/src/main/res/menu/orbot_main.xml +++ b/app/src/main/res/menu/orbot_main.xml @@ -47,6 +47,7 @@ <item android:title="@string/menu_hidden_services" yourapp:showAsAction="never" + android:id="@+id/menu_hidden_services_main" > <menu> <item android:id="@+id/menu_hidden_services"

1 0

[orbot/master] remove version from manifests
by n8fr8＠torproject.org 09 Jun '17

09 Jun '17

commit 34043f9ef4e66eae0c1b2b0780993a13cbf910df Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 9 04:12:51 2017 -0400 remove version from manifests --- app/src/main/AndroidManifest.xml | 4 +--- app/src/minimalperm/AndroidManifest.xml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f2503b4..4389408 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,9 +1,7 @@ <?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="15410000" - android:versionName="15.4.1-RC-1-multi"> + android:installLocation="auto"> <uses-sdk android:minSdkVersion="16" diff --git a/app/src/minimalperm/AndroidManifest.xml b/app/src/minimalperm/AndroidManifest.xml index c475b96..d21aa11 100644 --- a/app/src/minimalperm/AndroidManifest.xml +++ b/app/src/minimalperm/AndroidManifest.xml @@ -1,9 +1,7 @@ <?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="15420000" - android:versionName="15.4.2-RC-1-multi-SDK23"> + android:installLocation="auto"> <uses-sdk android:minSdkVersion="16"

1 0

[orbot/master] new release for minimal perms SDK up to 23
by n8fr8＠torproject.org 09 Jun '17

09 Jun '17

commit 67cb36ef632b61ea073df664d6f361a0c07a9d17 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 9 04:00:10 2017 -0400 new release for minimal perms SDK up to 23 --- app/src/minimalperm/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/minimalperm/AndroidManifest.xml b/app/src/minimalperm/AndroidManifest.xml index 523938a..c475b96 100644 --- a/app/src/minimalperm/AndroidManifest.xml +++ b/app/src/minimalperm/AndroidManifest.xml @@ -2,8 +2,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" android:installLocation="auto" - android:versionCode="15410000" - android:versionName="15.4.1-RC-1-multi"> + android:versionCode="15420000" + android:versionName="15.4.2-RC-1-multi-SDK23"> <uses-sdk android:minSdkVersion="16"

1 0

[orbot/master] where the full permission manifest is defined
by n8fr8＠torproject.org 09 Jun '17

09 Jun '17

commit fb7eea9560a32992c2a9c2242652e519283f2d4a Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 9 06:07:27 2017 -0400 where the full permission manifest is defined --- app/src/fullperm/AndroidManifest.xml | 173 +++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/app/src/fullperm/AndroidManifest.xml b/app/src/fullperm/AndroidManifest.xml new file mode 100644 index 0000000..4389408 --- /dev/null +++ b/app/src/fullperm/AndroidManifest.xml @@ -0,0 +1,173 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="org.torproject.android" + android:installLocation="auto"> + + <uses-sdk + android:minSdkVersion="16" + android:targetSdkVersion="25" /> +  + <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.WRITE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" /> + <uses-permission android:name="android.permission.READ_PHONE_STATE" /> + + <application + android:name=".OrbotApp" + android:allowBackup="false" + android:allowClearUserData="true" + android:configChanges="locale|orientation|screenSize" + android:description="@string/app_description" + android:hardwareAccelerated="false" + android:icon="@drawable/ic_launcher" + android:label="@string/app_name" + android:largeHeap="false" + android:theme="@style/DefaultTheme"> + <activity + android:name=".OrbotMainActivity" + android:excludeFromRecents="true" + android:launchMode="singleTop"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + + <category android:name="android.intent.category.LAUNCHER" /> + </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" /> + + <action android:name="org.torproject.android.REQUEST_HS_PORT" /> + </intent-filter> + <intent-filter> + <category android:name="android.intent.category.DEFAULT" /> + + <action android:name="org.torproject.android.START_TOR" /> + </intent-filter> + </activity> + +  + <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" /> + + <service + android:name=".service.TorService" + android:enabled="true" + android:permission="android.permission.BIND_VPN_SERVICE" + 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> + </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" + android:label="@string/title_activity_hidden_services" + android:theme="@style/DefaultTheme"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value=".OrbotMainActivity" /> + </activity> + + <provider + android:name=".ui.hiddenservices.providers.HSContentProvider" + android:authorities="org.torproject.android.ui.hiddenservices.providers" + android:exported="false" /> + <provider + android:name="android.support.v4.content.FileProvider" + android:authorities="org.torproject.android.ui.hiddenservices.storage" + android:exported="false" + android:grantUriPermissions="true"> + <meta-data + android:name="android.support.FILE_PROVIDER_PATHS" + android:resource="@xml/hidden_services_paths" /> + </provider> + + <activity + android:name=".ui.hiddenservices.ClientCookiesActivity" + android:label="@string/client_cookies" + android:theme="@style/DefaultTheme"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value=".OrbotMainActivity" /> + </activity> + + <provider + android:name=".ui.hiddenservices.providers.CookieContentProvider" + android:authorities="org.torproject.android.ui.hiddenservices.providers.cookie" + android:exported="false" /> + </application> + +</manifest> \ No newline at end of file

1 0

[orbot/master] add min and full perm build flavors
by n8fr8＠torproject.org 09 Jun '17

09 Jun '17

commit 674f8ff4aaf9b564fe1878488bb62655df0d499e Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 9 04:12:40 2017 -0400 add min and full perm build flavors --- app/build.gradle | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index e21a302..883eafa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "25" defaultConfig { applicationId "org.torproject.android" - minSdkVersion 23 + minSdkVersion 16 targetSdkVersion 25 } lintOptions { @@ -26,6 +26,15 @@ android { applicationId 'org.torproject.android' targetSdkVersion 22 maxSdkVersion 22 + versionCode 15420000 + versionName '15.4.2-RC-1-multi-SDK16' + } + fullperm { + minSdkVersion 23 + applicationId 'org.torproject.android' + targetSdkVersion 25 + versionCode 15420001 + versionName '15.4.2-RC-1-multi-SDK23' } } }

1 0