Run update check service only in background

terrence1991 · Apr 8, 2019 · f187213 · f187213
1 parent fc0df84
commit f187213
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java b/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
@@ -9,6 +9,7 @@
 
 import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.database.RepoDatabaseHelper;
+import com.topjohnwu.magisk.tasks.CheckUpdates;
 import com.topjohnwu.magisk.tasks.UpdateRepos;
 import com.topjohnwu.magisk.uicomponents.Notifications;
 import com.topjohnwu.magisk.uicomponents.Shortcuts;
@@ -63,6 +64,7 @@ private void initAndStart() {
 
         // Schedule periodic update checks
         Utils.scheduleUpdateCheck();
+        CheckUpdates.check();
 
         // Setup shortcuts
         Shortcuts.setup(this);

diff --git a/app/src/main/java/com/topjohnwu/magisk/components/UpdateCheckService.java b/app/src/main/java/com/topjohnwu/magisk/components/UpdateCheckService.java
@@ -3,6 +3,7 @@
 import androidx.annotation.NonNull;
 import androidx.work.ListenableWorker;
 
+import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.BuildConfig;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.tasks.CheckUpdates;
@@ -14,8 +15,10 @@ public class UpdateCheckService extends DelegateWorker {
     @NonNull
     @Override
     public ListenableWorker.Result doWork() {
-        Shell.getShell();
-        CheckUpdates.check(this::onCheckDone);
+        if (App.self.foreground == null) {
+            Shell.getShell();
+            CheckUpdates.check(this::onCheckDone);
+        }
         return ListenableWorker.Result.success();
     }
 

diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
@@ -158,7 +158,6 @@ public static void scheduleUpdateCheck() {
                     ExistingPeriodicWorkPolicy.REPLACE, request);
         } else {
             WorkManager.getInstance().cancelUniqueWork(Const.ID.CHECK_MAGISK_UPDATE_WORKER_ID);
-            CheckUpdates.check();
         }
     }