do not startForegroundService() if persistNotifications is false

guardianproject · Oct 28, 2019 · 2a5eec5 · 2a5eec5
1 parent 4d0a834
commit 2a5eec5
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java b/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java
@@ -21,13 +21,12 @@ public void onReceive(Context context, Intent intent) {
             if (Prefs.allowBackgroundStarts()) {
                 Intent startTorIntent = new Intent(context, TorService.class);
                 startTorIntent.setAction(action);
-                if (packageName != null)
-                    startTorIntent.putExtra(EXTRA_PACKAGE_NAME, packageName);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    context.startForegroundService(startTorIntent);
+                if (packageName != null) {
+                    startTorIntent.putExtra(TorService.EXTRA_PACKAGE_NAME, packageName);
                 }
-                else
-                {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && Prefs.persistNotifications()) {
+                    context.startForegroundService(startTorIntent);
+                } else {
                     context.startService(startTorIntent);
                 }
             } else if (!TextUtils.isEmpty(packageName)) {