fix start on boot to be more reliable

- no need to check if network is available - no need to check if first time is complete, as on boot won't be sent unless user has run the app once
guardianproject · Apr 7, 2023 · bcc8446 · bcc8446
1 parent a74d551
commit bcc8446
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -111,14 +111,11 @@
             android:name=".core.OnBootReceiver"
             android:enabled="true"
             android:exported="true"
-            android:directBootAware="true">
-
+            android:permission="android.permission.RECEIVE_BOOT_COMPLETED"
+            android:directBootAware="false">
             <intent-filter>
-                <action android:name="android.net.wifi.STATE_CHANGE" />
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
-                <action android:name="android.intent.action.REBOOT" />
             </intent-filter>
         </receiver>
 

diff --git a/appcore/src/main/java/org/torproject/android/core/OnBootReceiver.kt b/appcore/src/main/java/org/torproject/android/core/OnBootReceiver.kt
@@ -12,11 +12,11 @@ import org.torproject.android.service.util.Prefs
 
 class OnBootReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
-        if (!Prefs.onboardPending() && Prefs.startOnBoot() && !sReceivedBoot) {
-            if (isNetworkAvailable(context)) {
+        if (Prefs.startOnBoot() && !sReceivedBoot) {
+         //   if (isNetworkAvailable(context)) {
                 startService(OrbotConstants.ACTION_START, context)
                 sReceivedBoot = true
-            }
+           // }
         }
     }
 

diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
@@ -220,7 +220,4 @@ public static boolean isPowerUserMode() {
         return prefs.getBoolean(PREF_POWER_USER_MODE, false);
     }
 
-    public static boolean onboardPending() {
-        return prefs.getBoolean("connect_first_time", true);
-    }
 }