BootBroadcastReceiver: fix crash on Android 8+

PeratX · PeratX · commit 2067ef5d07da · 2019-11-20T13:21:32.000+08:00
diff --git a/app/src/main/java/org/itxtech/daedalus/Daedalus.java b/app/src/main/java/org/itxtech/daedalus/Daedalus.java
@@ -210,9 +210,13 @@ public static boolean prepareAndActivateService(Context context) {
     }
 
     public static void activateService(Context context) {
+        activateService(context, false);
+    }
+
+    public static void activateService(Context context, boolean forceForeground) {
         DaedalusVpnService.primaryServer = (AbstractDnsServer) DnsServerHelper.getServerById(DnsServerHelper.getPrimary()).clone();
         DaedalusVpnService.secondaryServer = (AbstractDnsServer) DnsServerHelper.getServerById(DnsServerHelper.getSecondary()).clone();
-        if (getInstance().prefs.getBoolean("settings_foreground", false)
+        if ((getInstance().prefs.getBoolean("settings_foreground", false) || forceForeground)
                 && Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
             Logger.info("Starting foreground service");
             context.startForegroundService(Daedalus.getServiceIntent(context).setAction(DaedalusVpnService.ACTION_ACTIVATE));
diff --git a/app/src/main/java/org/itxtech/daedalus/receiver/BootBroadcastReceiver.java b/app/src/main/java/org/itxtech/daedalus/receiver/BootBroadcastReceiver.java
@@ -21,7 +21,7 @@ public class BootBroadcastReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         if (Daedalus.getPrefs().getBoolean("settings_boot", false)) {
-            Daedalus.activateService(context);
+            Daedalus.activateService(context, true);
             Logger.info("Triggered boot receiver");
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class BootBroadcastReceiver extends BroadcastReceiver {`
`21`	`21`	`@Override`
`22`	`22`	`public void onReceive(Context context, Intent intent) {`
`23`	`23`	`if (Daedalus.getPrefs().getBoolean("settings_boot", false)) {`
`24`		`- Daedalus.activateService(context);`
	`24`	`+ Daedalus.activateService(context, true);`
`25`	`25`	`Logger.info("Triggered boot receiver");`
`26`	`26`	`}`
`27`	`27`	`}`