[orbot/master] small changes to ensure handling of auto start on boot - tor-commits

23 Dec 2020

commit 50ee0d6f050ca11b1c4d72e1dd952b8044569a3c
Author: n8fr8 nathan@guardianproject.info
Date:   Wed Nov 11 12:11:11 2020 -0500
small changes to ensure handling of auto start on boot
---
 app-mini/src/debug/AndroidManifest.xml    | 132 ------------------------------
 app/src/main/AndroidManifest.xml          |  18 +---
 orbotservice/src/main/AndroidManifest.xml |   2 +
 3 files changed, 6 insertions(+), 146 deletions(-)

diff --git a/app-mini/src/debug/AndroidManifest.xml b/app-mini/src/debug/AndroidManifest.xml
deleted file mode 100644
index a06b3fe8..00000000
--- a/app-mini/src/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.torproject.android.mini"
-    android:installLocation="internalOnly">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <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. -->
-    <uses-feature android:name="android.hardware.touchscreen"
-        android:required="false" />
-
-    <application
-        android:name=".OrbotMiniApp"
-        android:allowBackup="false"
-        android:allowClearUserData="true"
-        android:configChanges="locale|orientation|screenSize"
-        android:description="@string/app_description"
-        android:hardwareAccelerated="false"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/DefaultTheme"
-        tools:replace="android:allowBackup"
-        >
-        <activity
-            android:name=".MiniMainActivity"
-            android:excludeFromRecents="false"
-            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>
-
-        <!--         This is for ensuring the background service still runs when/if the app is swiped away -->
-        <activity
-            android:name="org.torproject.android.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=".settings.SettingsPreferencesActivity"
-            android:label="@string/app_name" />
-        <activity
-            android:name=".ui.AppManagerActivity"
-            android:label="@string/app_name"
-
-            android:theme="@style/Theme.AppCompat.Light"
-            />
-
-        <service
-            android:name="org.torproject.android.service.OrbotService"
-            android:enabled="true"
-            android:permission="android.permission.BIND_VPN_SERVICE"
-            android:stopWithTask="false"></service>
-        <service
-            android:name="org.torproject.android.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="org.torproject.android.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.onboarding.OnboardingActivity"/>
-
-
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index af7f1d97..14482981 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,8 +17,7 @@
     <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"
-        android:maxSdkVersion="18" />
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<application
@@ -148,20 +147,11 @@
             android:name=".core.OnBootReceiver"
             android:enabled="true"
             android:exported="true">
-            <intent-filter>
+            <intent-filter android:directBootAware="true">
                 <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.LOCKED_BOOT_COMPLETED" />
                 <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" />
+                <action android:name="android.intent.action.REBOOT"/>
             </intent-filter>
         </receiver>
diff --git a/orbotservice/src/main/AndroidManifest.xml b/orbotservice/src/main/AndroidManifest.xml
index 801a9c18..589ee334 100644
--- a/orbotservice/src/main/AndroidManifest.xml
+++ b/orbotservice/src/main/AndroidManifest.xml
@@ -1,4 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.torproject.android.service">
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+
 </manifest>

    