Remove AppUtils

Brendan-lewis · Mar 24, 2019 · e25ce63 · e25ce63
1 parent 162eeaa
commit e25ce63
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 61 deletions.
diff --git a/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java b/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
@@ -12,7 +12,6 @@
 import com.topjohnwu.magisk.tasks.UpdateRepos;
 import com.topjohnwu.magisk.uicomponents.Notifications;
 import com.topjohnwu.magisk.uicomponents.Shortcuts;
-import com.topjohnwu.magisk.utils.AppUtils;
 import com.topjohnwu.magisk.utils.LocaleManager;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.net.Networking;
@@ -63,7 +62,7 @@ private void initAndStart() {
         Notifications.setup(this);
 
         // Schedule periodic update checks
-        AppUtils.scheduleUpdateCheck();
+        Utils.scheduleUpdateCheck();
 
         // Setup shortcuts
         Shortcuts.setup(this);

diff --git a/app/src/main/java/com/topjohnwu/magisk/dialogs/MagiskInstallDialog.java b/app/src/main/java/com/topjohnwu/magisk/dialogs/MagiskInstallDialog.java
@@ -7,7 +7,6 @@
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.uicomponents.MarkDownWindow;
-import com.topjohnwu.magisk.utils.AppUtils;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.ShellUtils;
@@ -40,7 +39,7 @@ public MagiskInstallDialog(BaseActivity a) {
             setNeutralButton(R.string.release_notes, (d, i) -> {
                 if (Config.magiskNoteLink.contains("forum.xda-developers")) {
                     // Open forum links in browser
-                    AppUtils.openLink(a, Uri.parse(Config.magiskNoteLink));
+                    Utils.openLink(a, Uri.parse(Config.magiskNoteLink));
                 } else {
                     MarkDownWindow.show(a, null, Config.magiskNoteLink);
                 }

diff --git a/app/src/main/java/com/topjohnwu/magisk/fragments/MagiskFragment.java b/app/src/main/java/com/topjohnwu/magisk/fragments/MagiskFragment.java
@@ -37,8 +37,8 @@
 import com.topjohnwu.magisk.uicomponents.MarkDownWindow;
 import com.topjohnwu.magisk.uicomponents.SafetyNet;
 import com.topjohnwu.magisk.uicomponents.UpdateCardHolder;
-import com.topjohnwu.magisk.utils.AppUtils;
 import com.topjohnwu.magisk.utils.Event;
+import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.net.Networking;
 import com.topjohnwu.superuser.Shell;
 
@@ -89,7 +89,7 @@ private void managerInstall(View v) {
     }
 
     private void openLink(String url) {
-        AppUtils.openLink(requireActivity(), Uri.parse(url));
+        Utils.openLink(requireActivity(), Uri.parse(url));
     }
 
     @OnClick(R.id.paypal)

diff --git a/app/src/main/java/com/topjohnwu/magisk/fragments/SettingsFragment.java b/app/src/main/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
@@ -22,7 +22,6 @@
 import com.topjohnwu.magisk.components.BasePreferenceFragment;
 import com.topjohnwu.magisk.dialogs.FingerprintAuthDialog;
 import com.topjohnwu.magisk.tasks.CheckUpdates;
-import com.topjohnwu.magisk.utils.AppUtils;
 import com.topjohnwu.magisk.utils.DownloadApp;
 import com.topjohnwu.magisk.utils.Event;
 import com.topjohnwu.magisk.utils.FingerprintHelper;
@@ -215,7 +214,7 @@ public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
                 CheckUpdates.check();
                 break;
             case Config.Key.CHECK_UPDATES:
-                AppUtils.scheduleUpdateCheck();
+                Utils.scheduleUpdateCheck();
                 break;
         }
         setSummary(key);

diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/AppUtils.java b/app/src/main/java/com/topjohnwu/magisk/utils/AppUtils.java
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
@@ -1,6 +1,7 @@
 package com.topjohnwu.magisk.utils;
 
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -11,19 +12,30 @@
 import android.provider.OpenableColumns;
 import android.widget.Toast;
 
+import androidx.work.Constraints;
+import androidx.work.ExistingPeriodicWorkPolicy;
+import androidx.work.NetworkType;
+import androidx.work.PeriodicWorkRequest;
+import androidx.work.WorkManager;
+
 import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.ClassMap;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.components.UpdateCheckService;
 import com.topjohnwu.magisk.container.Module;
 import com.topjohnwu.magisk.container.ValueSortedMap;
+import com.topjohnwu.magisk.tasks.CheckUpdates;
 import com.topjohnwu.net.Networking;
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.internal.UiThreadHandler;
 import com.topjohnwu.superuser.io.SuFile;
 
 import java.util.Locale;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 public class Utils {
 
@@ -131,4 +143,32 @@ public static void reboot() {
     public static boolean isCanary() {
         return BuildConfig.VERSION_NAME.contains("-");
     }
+
+    public static void scheduleUpdateCheck() {
+        if (Config.get(Config.Key.CHECK_UPDATES)) {
+            Constraints constraints = new Constraints.Builder()
+                    .setRequiredNetworkType(NetworkType.CONNECTED)
+                    .build();
+            PeriodicWorkRequest request = new PeriodicWorkRequest
+                    .Builder(ClassMap.get(UpdateCheckService.class), 12, TimeUnit.HOURS)
+                    .setConstraints(constraints)
+                    .build();
+            WorkManager.getInstance().enqueueUniquePeriodicWork(
+                    Const.ID.CHECK_MAGISK_UPDATE_WORKER_ID,
+                    ExistingPeriodicWorkPolicy.REPLACE, request);
+        } else {
+            WorkManager.getInstance().cancelUniqueWork(Const.ID.CHECK_MAGISK_UPDATE_WORKER_ID);
+            CheckUpdates.check();
+        }
+    }
+
+    public static void openLink(Context context, Uri link) {
+        Intent intent = new Intent(Intent.ACTION_VIEW, link);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if (intent.resolveActivity(context.getPackageManager()) != null) {
+            context.startActivity(intent);
+        } else {
+            toast(R.string.open_link_failed_toast, Toast.LENGTH_SHORT);
+        }
+    }
 }