unhook classloader

hosizoraru · Aug 15, 2023 · 7446b62 · 7446b62
1 parent c9242e4
commit 7446b62
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/app/src/main/kotlin/star/sky/voyager/utils/voyager/PluginClassLoader.kt b/app/src/main/kotlin/star/sky/voyager/utils/voyager/PluginClassLoader.kt
@@ -1,9 +1,10 @@
 package star.sky.voyager.utils.voyager
 
 import android.content.pm.ApplicationInfo
-import com.github.kyuubiran.ezxhelper.ClassUtils
+import com.github.kyuubiran.ezxhelper.ClassUtils.loadClass
 import com.github.kyuubiran.ezxhelper.HookFactory.`-Static`.createHook
 import com.github.kyuubiran.ezxhelper.finders.MethodFinder.`-Static`.methodFinder
+import de.robv.android.xposed.XC_MethodHook
 
 object PluginClassLoader {
     /**
@@ -19,10 +20,11 @@ object PluginClassLoader {
      * @author Voyager
      * @return appInfo & classLoaderP
      */
+    var hook: XC_MethodHook.Unhook? = null
     fun hookPluginClassLoader(onGetClassLoader: (appInfo: ApplicationInfo, classLoader: ClassLoader) -> Unit) {
         val classLoaderClass =
-            ClassUtils.loadClass("com.android.systemui.shared.plugins.PluginInstance\$Factory")
-        classLoaderClass.methodFinder().first {
+            loadClass("com.android.systemui.shared.plugins.PluginInstance\$Factory")
+        hook = classLoaderClass.methodFinder().first {
             name == "getClassLoader"
                     && parameterCount == 2
                     && parameterTypes[0] == ApplicationInfo::class.java
@@ -35,6 +37,7 @@ object PluginClassLoader {
                 if (appInfo.packageName == "miui.systemui.plugin") {
                     onGetClassLoader(appInfo, classLoaderP)
                 }
+                hook?.unhook()
             }
         }
     }