diff --git a/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java b/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java index 0f8bdcf6c..e47cf01ee 100644 --- 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.database.RepoDatabaseHelper; 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 @@ public class SplashActivity extends BaseActivity { 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 index 3c3d69dd8..cc45c25a4 100644 --- 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.Config; 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 class MagiskInstallDialog extends CustomAlertDialog { 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 index bb8d11b2f..fd0043ad5 100644 --- 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.ExpandableViewHolder; 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 @@ public class MagiskFragment extends BaseFragment implements SwipeRefreshLayout.O } 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 index 94a2000bb..d0e7a793a 100644 --- 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.R; 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 class SettingsFragment extends BasePreferenceFragment { 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 deleted file mode 100644 index 8e4d3c7bb..000000000 --- a/app/src/main/java/com/topjohnwu/magisk/utils/AppUtils.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.topjohnwu.magisk.utils; - -import android.content.Context; -import android.content.Intent; -import android.net.Uri; -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.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.tasks.CheckUpdates; - -import java.util.concurrent.TimeUnit; - -public class AppUtils { - - 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 { - Utils.toast(R.string.open_link_failed_toast, Toast.LENGTH_SHORT); - } - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java index 4d3c8653b..0705ae4c1 100644 --- 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,12 +12,22 @@ import android.net.Uri; 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; @@ -24,6 +35,7 @@ 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 class Utils { 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); + } + } }