diff --git a/app/src/main/java/io/github/lsposed/manager/adapters/AppHelper.java b/app/src/main/java/io/github/lsposed/manager/adapters/AppHelper.java index 18a0246b..fcffb5df 100644 --- a/app/src/main/java/io/github/lsposed/manager/adapters/AppHelper.java +++ b/app/src/main/java/io/github/lsposed/manager/adapters/AppHelper.java @@ -26,7 +26,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; -import io.github.lsposed.manager.App; import io.github.lsposed.manager.Constants; import io.github.lsposed.manager.R; import io.github.lsposed.manager.util.CompileUtil; @@ -38,8 +37,6 @@ public class AppHelper { private static final String BASE_PATH = Constants.getBaseDir(); private static final String SCOPE_LIST_PATH = "conf/%s.conf"; - public static List forceWhiteList = new ArrayList<>(); - private static final HashMap> scopeList = new HashMap<>(); public static void showMenu(@NonNull Context context, diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java index 5c29a569..b13e4d40 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java @@ -26,7 +26,6 @@ import io.github.lsposed.manager.Constants; import io.github.lsposed.manager.R; import io.github.lsposed.manager.databinding.ActivitySettingsBinding; import io.github.lsposed.manager.ui.widget.IntegerListPreference; -import io.github.lsposed.manager.util.ModuleUtil; public class SettingsActivity extends BaseActivity { private static final String KEY_PREFIX = SettingsActivity.class.getName() + '.'; @@ -110,14 +109,6 @@ public class SettingsActivity extends BaseActivity { public void onCreatePreferencesFix(Bundle savedInstanceState, String rootKey) { addPreferencesFromResource(R.xml.prefs); - SwitchPreferenceCompat prefHookModules = findPreference("hook_modules"); - if (prefHookModules != null) { - prefHookModules.setOnPreferenceChangeListener((preference, newValue) -> { - ModuleUtil.getInstance().reloadInstalledModules((Boolean) newValue); - return true; - }); - } - SwitchPreferenceCompat prefVerboseLogs = findPreference("disable_verbose_log"); if (prefVerboseLogs != null) { prefVerboseLogs.setChecked(Files.exists(disableVerboseLogsFlag)); diff --git a/app/src/main/java/io/github/lsposed/manager/util/ModuleUtil.java b/app/src/main/java/io/github/lsposed/manager/util/ModuleUtil.java index dc730b0c..951347d0 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/ModuleUtil.java +++ b/app/src/main/java/io/github/lsposed/manager/util/ModuleUtil.java @@ -14,11 +14,6 @@ import androidx.annotation.NonNull; import com.google.android.material.snackbar.Snackbar; -import io.github.lsposed.manager.App; -import io.github.lsposed.manager.Constants; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.adapters.AppHelper; - import java.io.IOException; import java.io.PrintWriter; import java.util.HashMap; @@ -28,6 +23,11 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; +import io.github.lsposed.manager.App; +import io.github.lsposed.manager.Constants; +import io.github.lsposed.manager.R; +import io.github.lsposed.manager.adapters.AppHelper; + public final class ModuleUtil { // xposedminversion below this public static int MIN_MODULE_VERSION = 2; // reject modules with @@ -68,11 +68,6 @@ public final class ModuleUtil { } public void reloadInstalledModules() { - reloadInstalledModules(prefs.getBoolean("hook_modules", true)); - } - - @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") - public void reloadInstalledModules(boolean hookModules) { synchronized (this) { if (isReloading) return; @@ -80,7 +75,6 @@ public final class ModuleUtil { } Map modules = new HashMap<>(); - AppHelper.forceWhiteList.clear(); for (PackageInfo pkg : pm.getInstalledPackages(PackageManager.GET_META_DATA)) { ApplicationInfo app = pkg.applicationInfo; if (!app.enabled) @@ -89,7 +83,6 @@ public final class ModuleUtil { if (app.metaData != null && app.metaData.containsKey("xposedmodule")) { InstalledModule installed = new InstalledModule(pkg, false); modules.put(pkg.packageName, installed); - if (hookModules) AppHelper.forceWhiteList.add(pkg.packageName); } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5330289c..3e7501c7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -162,4 +162,6 @@ Sorting… Enable module You did not select any app. Continue? + Games + Modules diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml index c227025c..e728cc42 100644 --- a/app/src/main/res/xml/prefs.xml +++ b/app/src/main/res/xml/prefs.xml @@ -11,13 +11,6 @@ android:summary="@string/skip_xposedminversion_check_summ" android:title="@string/skip_xposedminversion_check" app:iconSpaceReserved="false" /> - -