From 97f74d8b2e53815a1463192a3182c6285984e09b Mon Sep 17 00:00:00 2001 From: Howard Wu Date: Mon, 6 Mar 2023 22:13:52 +0800 Subject: [PATCH] Make isParasitic final (#2426) --- app/src/main/java/org/lsposed/manager/App.java | 8 +++----- .../org/lsposed/manager/ui/activity/MainActivity.java | 4 ++-- .../java/org/lsposed/manager/ui/dialog/WelcomeDialog.java | 2 +- .../org/lsposed/manager/ui/fragment/SettingsFragment.java | 6 +++--- .../main/java/org/lsposed/manager/util/ShortcutUtil.java | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/lsposed/manager/App.java b/app/src/main/java/org/lsposed/manager/App.java index e0f27180..9765c4d3 100644 --- a/app/src/main/java/org/lsposed/manager/App.java +++ b/app/src/main/java/org/lsposed/manager/App.java @@ -141,9 +141,7 @@ public class App extends Application { return executorService; } - public static boolean isParasitic() { - return !Process.isApplicationUid(Process.myUid()); - } + public static final boolean isParasitic = !Process.isApplicationUid(Process.myUid()); public static Handler getMainHandler() { return MainHandler; @@ -154,7 +152,7 @@ public class App extends Application { super.attachBaseContext(base); Telemetry.start(this); var map = new HashMap(1); - map.put("isParasitic", String.valueOf(isParasitic())); + map.put("isParasitic", String.valueOf(isParasitic)); Telemetry.trackEvent("App start", map); var am = getSystemService(ActivityManager.class); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { @@ -200,7 +198,7 @@ public class App extends Application { @Override public void onCreate() { super.onCreate(); - if (!BuildConfig.DEBUG && !isParasitic()) { + if (!BuildConfig.DEBUG && !isParasitic) { setCrashReport(); } diff --git a/app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java index f58c169d..c44667ff 100644 --- a/app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java +++ b/app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java @@ -154,7 +154,7 @@ public class MainActivity extends BaseActivity implements RepoLoader.RepoListene } public void restart() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S || App.isParasitic()) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S || App.isParasitic) { recreate(); } else { try { @@ -263,7 +263,7 @@ public class MainActivity extends BaseActivity implements RepoLoader.RepoListene } } } - if(App.isParasitic()){ + if(App.isParasitic){ ShortcutUtil.updateShortcut(); } } diff --git a/app/src/main/java/org/lsposed/manager/ui/dialog/WelcomeDialog.java b/app/src/main/java/org/lsposed/manager/ui/dialog/WelcomeDialog.java index 43fa31c6..6ed3c63c 100644 --- a/app/src/main/java/org/lsposed/manager/ui/dialog/WelcomeDialog.java +++ b/app/src/main/java/org/lsposed/manager/ui/dialog/WelcomeDialog.java @@ -73,7 +73,7 @@ public class WelcomeDialog extends DialogFragment { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { var builder = new BlurBehindDialogBuilder(requireContext(), R.style.ThemeOverlay_MaterialAlertDialog_Centered_FullWidthButtons); - if (App.isParasitic()) { + if (App.isParasitic) { return parasiticDialog(builder); } else { return appDialog(builder); diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java index a4896456..a222be42 100644 --- a/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java @@ -160,7 +160,7 @@ public class SettingsFragment extends BaseFragment { MaterialSwitchPreference notification = findPreference("enable_status_notification"); if (notification != null) { - if (App.isParasitic() && !ShortcutUtil.isLaunchShortcutPinned()) { + if (App.isParasitic && !ShortcutUtil.isLaunchShortcutPinned()) { var s = notification.getContext().getString(R.string.disable_status_notification_error); notification.setSummaryOn(notification.getSummary() + "\n" + s); if (ConfigManager.enableStatusNotification()) notification.setEnabled(false); @@ -168,7 +168,7 @@ public class SettingsFragment extends BaseFragment { notification.setVisible(installed); notification.setChecked(installed && ConfigManager.enableStatusNotification()); notification.setOnPreferenceChangeListener((p, v) -> { - if ((boolean) v && App.isParasitic() && !ShortcutUtil.isLaunchShortcutPinned()) { + if ((boolean) v && App.isParasitic && !ShortcutUtil.isLaunchShortcutPinned()) { p.setEnabled(false); } return ConfigManager.setEnableStatusNotification((boolean) v); @@ -177,7 +177,7 @@ public class SettingsFragment extends BaseFragment { Preference shortcut = findPreference("add_shortcut"); if (shortcut != null) { - shortcut.setVisible(App.isParasitic()); + shortcut.setVisible(App.isParasitic); if (ShortcutUtil.isLaunchShortcutPinned()) { shortcut.setEnabled(false); shortcut.setSummary(R.string.settings_created_shortcut_summary); diff --git a/app/src/main/java/org/lsposed/manager/util/ShortcutUtil.java b/app/src/main/java/org/lsposed/manager/util/ShortcutUtil.java index e6996750..627e79a7 100644 --- a/app/src/main/java/org/lsposed/manager/util/ShortcutUtil.java +++ b/app/src/main/java/org/lsposed/manager/util/ShortcutUtil.java @@ -150,7 +150,7 @@ public class ShortcutUtil { } public static boolean requestPinLaunchShortcut(Runnable afterPinned) { - if (!App.isParasitic()) throw new RuntimeException(); + if (!App.isParasitic) throw new RuntimeException(); var context = App.getInstance(); var sm = context.getSystemService(ShortcutManager.class); if (!sm.isRequestPinShortcutSupported()) return false;