From e279c87ab53e71727d27613dc3e4c1cb0aa78f8c Mon Sep 17 00:00:00 2001 From: NekoInverter <42698724+NekoInverter@users.noreply.github.com> Date: Tue, 7 Apr 2020 17:12:45 +0800 Subject: [PATCH] Fix --- .../java/de/robv/android/xposed/installer/XposedApp.java | 4 ++++ .../java/org/meowcat/edxposed/manager/SettingsActivity.java | 2 +- .../meowcat/edxposed/manager/StatusInstallerFragment.java | 6 +----- .../org/meowcat/edxposed/manager/adapters/AppHelper.java | 2 +- .../org/meowcat/edxposed/manager/xposed/Enhancement.java | 3 ++- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/de/robv/android/xposed/installer/XposedApp.java b/app/src/main/java/de/robv/android/xposed/installer/XposedApp.java index 3c3a897a..a6ae1719 100644 --- a/app/src/main/java/de/robv/android/xposed/installer/XposedApp.java +++ b/app/src/main/java/de/robv/android/xposed/installer/XposedApp.java @@ -19,6 +19,10 @@ public class XposedApp extends Application { private static XposedApp instance = null; public InstallZipUtil.XposedProp mXposedProp; + public static boolean isEnhancementEnabled() { + return false; + } + public static XposedApp getInstance() { return instance; } diff --git a/app/src/main/java/org/meowcat/edxposed/manager/SettingsActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/SettingsActivity.java index f42cc0fa..5392fb4a 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/SettingsActivity.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/SettingsActivity.java @@ -494,7 +494,7 @@ public class SettingsActivity extends BaseActivity { updatePreference(!md2.isChecked()); Preference enhancement_status = findPreference("enhancement_status"); - Objects.requireNonNull(enhancement_status).setSummary(StatusInstallerFragment.isEnhancementEnabled() ? R.string.settings_summary_enhancement_enabled : R.string.settings_summary_enhancement); + Objects.requireNonNull(enhancement_status).setSummary(XposedApp.isEnhancementEnabled() ? R.string.settings_summary_enhancement_enabled : R.string.settings_summary_enhancement); SwitchPreferenceCompat prefPretendXposedInstaller = findPreference("pretend_xposed_installer"); Objects.requireNonNull(prefPretendXposedInstaller).setChecked(pretendXposedInstallerFlag.exists()); diff --git a/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java b/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java index 64a02d8d..9d67a887 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/StatusInstallerFragment.java @@ -44,10 +44,6 @@ public class StatusInstallerFragment extends Fragment { .setNegativeButton(R.string.later, null).show()); } - public static boolean isEnhancementEnabled() { - return false; - } - private static void update(Context context) { Uri uri = Uri.parse(updateLink); Intent intent = new Intent(Intent.ACTION_VIEW, uri); @@ -108,7 +104,7 @@ public class StatusInstallerFragment extends Fragment { } String mAppVer; - if (isEnhancementEnabled()) { + if (XposedApp.isEnhancementEnabled()) { mAppVer = String.format("v%s (%s) (%s)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, getString(R.string.status_enhancement)); } else { mAppVer = String.format("v%s (%s)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE); diff --git a/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppHelper.java b/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppHelper.java index c36622c9..15a3e459 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppHelper.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/adapters/AppHelper.java @@ -46,7 +46,7 @@ public class AppHelper { private static final String WHITE_LIST_MODE = "conf/usewhitelist"; private static final String BLACK_LIST_MODE = "conf/blackwhitelist"; - private static final List FORCE_WHITE_LIST = new ArrayList<>(StatusInstallerFragment.isEnhancementEnabled() ? Arrays.asList(BuildConfig.APPLICATION_ID, "android") : Collections.singletonList(BuildConfig.APPLICATION_ID)); + private static final List FORCE_WHITE_LIST = new ArrayList<>(XposedApp.isEnhancementEnabled() ? Arrays.asList(BuildConfig.APPLICATION_ID, "android") : Collections.singletonList(BuildConfig.APPLICATION_ID)); public static List FORCE_WHITE_LIST_MODULE = new ArrayList<>(FORCE_WHITE_LIST); @SuppressWarnings("OctalInteger") diff --git a/app/src/main/java/org/meowcat/edxposed/manager/xposed/Enhancement.java b/app/src/main/java/org/meowcat/edxposed/manager/xposed/Enhancement.java index 4a99bd3c..88d525bb 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/xposed/Enhancement.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/xposed/Enhancement.java @@ -21,6 +21,7 @@ import de.robv.android.xposed.XC_MethodReplacement; import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.XposedHelpers; import de.robv.android.xposed.callbacks.XC_LoadPackage; +import de.robv.android.xposed.installer.XposedApp; import static de.robv.android.xposed.XposedHelpers.findAndHookMethod; import static org.meowcat.edxposed.manager.BuildConfig.APPLICATION_ID; @@ -300,7 +301,7 @@ public class Enhancement implements IXposedHookLoadPackage { } } else if (lpparam.packageName.equals(APPLICATION_ID)) { // Make sure Xposed work - XposedHelpers.findAndHookMethod(StatusInstallerFragment.class.getName(), lpparam.classLoader, "isEnhancementEnabled", XC_MethodReplacement.returnConstant(true)); + XposedHelpers.findAndHookMethod(XposedApp.class.getName(), lpparam.classLoader, "isEnhancementEnabled", XC_MethodReplacement.returnConstant(true)); // XposedHelpers.findAndHookMethod(StatusInstallerFragment.class.getName(), lpparam.classLoader, "isSELinuxEnforced", XC_MethodReplacement.returnConstant(SELinuxHelper.isSELinuxEnforced())); } }