[tor-commits] [orbot/master] go back to one manifest will all perms

[n8fr8@xxxxxxxxxxxxxx]

commit be1f73ee9ab67c5a574cf31b442a889266f2678e
Author: n8fr8 <nathan@xxxxxxxxxxx>
Date:   Fri May 11 23:01:54 2018 -0400

    go back to one manifest will all perms
---
 app/src/main/AndroidManifest.xml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 813afabf..71e64e1a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,10 +7,14 @@
     <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.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <!-- Some Chromebooks don't support touch. Although not essential,
-            it's a good idea to explicitly include this declaration. -->
+         it's a good idea to explicitly include this declaration. -->
     <uses-feature android:name="android.hardware.touchscreen"
         android:required="false" />
+
     <application
         android:name=".OrbotApp"
         android:allowBackup="false"
@@ -21,7 +25,8 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/DefaultTheme"
-        tools:replace="android:allowBackup">
+        tools:replace="android:allowBackup"
+        >
         <activity
             android:name=".OrbotMainActivity"
             android:excludeFromRecents="true"
@@ -51,7 +56,7 @@
             </intent-filter>
         </activity>
 
-        <!-- This is for ensuring the background service still runs when/if the app is swiped away -->
+        <!--         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"
@@ -79,7 +84,7 @@
             android:name=".service.TorService"
             android:enabled="true"
             android:permission="android.permission.BIND_VPN_SERVICE"
-            android:stopWithTask="false" />
+            android:stopWithTask="false"></service>
         <service
             android:name=".service.vpn.TorVpnService"
             android:enabled="true"
@@ -153,12 +158,6 @@
             android:name=".ui.hiddenservices.providers.CookieContentProvider"
             android:authorities="org.torproject.android.ui.hiddenservices.providers.cookie"
             android:exported="false" />
-
-        <activity android:name=".ui.onboarding.OnboardingActivity" />
-        <activity
-            android:name=".ui.onboarding.BridgeWizardActivity"
-            android:label="@string/title_activity_bridge_wizard"
-            android:theme="@style/DefaultTheme"/>
     </application>
 
 </manifest>
\ No newline at end of file



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits