Fixed start on boot regression reported in #1502, added checks in on boot receiver for intent action to restrict what can start orbotservice to legit boot events

Author: bitmold

app/src/main/java/org/torproject/android/receivers/OnBootReceiver.kt

@@ -13,6 +13,10 @@ import java.lang.RuntimeException
 class OnBootReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         try {
+            if (intent.action != "android.intent.action.QUICKBOOT_POWERON" &&
+                intent.action != "android.intent.action.BOOT_COMPLETED")
+                return
+
             if (Build.FINGERPRINT.contains("sdk_gphone")) {
                 // on pixels emulated in new android studio on boot
                 // gets launched every time you click run. this is annoying
@@ -38,7 +42,7 @@ class OnBootReceiver : BroadcastReceiver() {
             else {
                 context.startService(intent)
             }
-        } catch (re: RuntimeException) {
+        } catch (_: RuntimeException) {
             //catch this to avoid malicious launches as document Cure53 Audit: ORB-01-009 WP1/2: Orbot DoS via exported activity (High)
         }
     }

app/src/main/java/org/torproject/android/service/OrbotService.java

@@ -651,7 +651,7 @@ public void run() {
                     transport.start(OrbotService.this);
                     startTor();
                     replyWithStatus(mIntent);
-                    if (!Prefs.useVpn()) {
+                    if (Prefs.useVpn()) {
                         if (mVpnManager != null && !mVpnManager.isStarted()) { // start VPN here
                             Intent vpnIntent = VpnService.prepare(OrbotService.this);
                             if (vpnIntent == null) { //then we can run the VPN