refactor(dexkit): Use DexKitCacheBridge for caching and optimize the cache retrieval method

Author: lingqiqi5211

app/src/main/java/com/sevtinge/hyperceiler/settings/development/DevelopmentFragment.java

@@ -35,6 +35,7 @@
 import com.sevtinge.hyperceiler.libhook.utils.hookapi.dexkit.DexKit;
 import com.sevtinge.hyperceiler.provision.activity.DefaultActivity;
 import com.sevtinge.hyperceiler.utils.DialogHelper;
+import com.sevtinge.hyperceiler.utils.ScopeManager;
 
 import fan.appcompat.app.AlertDialog;
 import fan.provision.OobeUtils;
@@ -74,7 +75,7 @@ public boolean onPreferenceClick(@NonNull Preference preference) {
                     showInDialog(command -> showOutDialog(rootExecCmd(command)));
             case "prefs_key_development_delete_all_dexkit_cache" ->
                     DialogHelper.showDialog(getActivity(), com.sevtinge.hyperceiler.core.R.string.warn, R.string.delete_all_dexkit_cache_desc, (dialog, which) -> {
-                        DexKit.deleteAllCache(requireActivity());
+                        DexKit.deleteAllCache(requireActivity(), ScopeManager.getScopeSync());
                         Toast.makeText(getActivity(), R.string.delete_all_dexkit_cache_success, Toast.LENGTH_LONG).show();
                     });
             case "prefs_key_development_fix_lsposed_log" -> {

gradle/libs.versions.toml

@@ -20,7 +20,7 @@ miuix = "1.0.12.5"
 # Xposed & Hooks
 xposed-api = "101.0.0"
 xposed-service = "101.0.0"
-dexkit = "2.0.7"
+dexkit = "2.1.0"
 ezxhelper = "3.1.1-rc1"
 hiddenapibypass = "6.1"
 

library/libhook/src/main/java/com/sevtinge/hyperceiler/libhook/base/BaseHook.java

@@ -134,9 +134,13 @@ private void ensureDexKitInitPhase(String apiName) {
         }
     }
 
+    private String namespacedDexKitKey(@NonNull String key) {
+        return getClass().getSimpleName() + "#" + key;
+    }
+
     protected final <T> T requiredMember(@NonNull String key, @NonNull IDexKit finder) {
         ensureDexKitInitPhase("requiredMember");
-        T member = DexKit.findMember(key, finder);
+        T member = DexKit.findMember(namespacedDexKitKey(key), finder);
         if (member == null) {
             throw new IllegalStateException(TAG + ": required DexKit member not found: " + key);
         }
@@ -145,7 +149,7 @@ protected final <T> T requiredMember(@NonNull String key, @NonNull IDexKit finde
 
     protected final <T> List<T> requiredMemberList(@NonNull String key, @NonNull IDexKitList finder) {
         ensureDexKitInitPhase("requiredMemberList");
-        List<T> members = DexKit.findMemberList(key, finder);
+        List<T> members = DexKit.findMemberList(namespacedDexKitKey(key), finder);
         if (members == null || members.isEmpty()) {
             throw new IllegalStateException(TAG + ": required DexKit member list not found: " + key);
         }
@@ -156,7 +160,7 @@ protected final <T> List<T> requiredMemberList(@NonNull String key, @NonNull IDe
     protected final <T> T optionalMember(@NonNull String key, @NonNull IDexKit finder) {
         ensureDexKitInitPhase("optionalMember");
         try {
-            return DexKit.findMember(key, finder);
+            return DexKit.findMember(namespacedDexKitKey(key), finder);
         } catch (Throwable t) {
             XposedLog.w(TAG, getPackageName(), "Optional DexKit member failed: " + key, t);
             return null;
@@ -167,7 +171,7 @@ protected final <T> T optionalMember(@NonNull String key, @NonNull IDexKit finde
     protected final <T> List<T> optionalMemberList(@NonNull String key, @NonNull IDexKitList finder) {
         ensureDexKitInitPhase("optionalMemberList");
         try {
-            List<T> members = DexKit.findMemberList(key, finder);
+            List<T> members = DexKit.findMemberList(namespacedDexKitKey(key), finder);
             return members != null ? members : Collections.emptyList();
         } catch (Throwable t) {
             XposedLog.w(TAG, getPackageName(), "Optional DexKit member list failed: " + key, t);