Merge branch 'master' into resources-hook

# Conflicts:
#	edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/config/WhaleHookProvider.java
#	edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/YahfaHookProvider.java

edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/config/SandHookProvider.java

@@ -6,7 +6,6 @@ import android.util.Log;
 
 import com.elderdrivers.riru.edxp.Main;
 import com.elderdrivers.riru.edxp.config.BaseHookProvider;
-import com.elderdrivers.riru.edxp.deopt.PrebuiltMethodsDeopter;
 import com.elderdrivers.riru.edxp.sandhook.dexmaker.DynamicBridge;
 import com.swift.sandhook.xposedcompat.XposedCompat;
 import com.swift.sandhook.xposedcompat.methodgen.SandHookXposedBridge;
@@ -48,8 +47,13 @@ public class SandHookProvider extends BaseHookProvider {
     }
 
     @Override
-    public void deoptMethods(String packageName, ClassLoader classLoader) {
+    public Object findMethodNative(Class clazz, String methodName, String methodSig) {
-        PrebuiltMethodsDeopter.deoptMethods(packageName, classLoader);
+        return Main.findMethodNative(clazz, methodName, methodSig);
+    }
+
+    @Override
+    public void deoptMethodNative(Object method) {
+        Main.deoptMethodNative(method);
     }
 
     @Override

edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/config/WhaleHookProvider.java

@@ -43,6 +43,16 @@ public class WhaleHookProvider extends BaseHookProvider {
         return hookMethod;
     }
 
+    @Override
+    public Object findMethodNative(Class clazz, String methodName, String methodSig) {
+        return Main.findMethodNative(clazz, methodName, methodSig);
+    }
+
+    @Override
+    public void deoptMethodNative(Object method) {
+        Main.deoptMethodNative(method);
+    }
+
     @Override
     public long getMethodId(Member member) {
         return WhaleRuntime.getMethodSlot(member);
@@ -57,14 +67,4 @@ public class WhaleHookProvider extends BaseHookProvider {
     public void rewriteXmlReferencesNative(long parserPtr, XResources origRes, Resources repRes) {
         Main.rewriteXmlReferencesNative(parserPtr, origRes, repRes);
     }
-
-    @Override
-    public boolean initXResourcesNative() {
-        return Main.initXResourcesNative();
-    }
-
-    @Override
-    public void rewriteXmlReferencesNative(long parserPtr, XResources origRes, Resources repRes) {
-        Main.rewriteXmlReferencesNative(parserPtr, origRes, repRes);
-    }
 }

edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/YahfaHookProvider.java

@@ -29,6 +29,16 @@ public class YahfaHookProvider extends BaseHookProvider {
         return DexMakerUtils.findMethodNative(hookMethod);
     }
 
+    @Override
+    public Object findMethodNative(Class clazz, String methodName, String methodSig) {
+        return Main.findMethodNative(clazz, methodName, methodSig);
+    }
+
+    @Override
+    public void deoptMethodNative(Object method) {
+        Main.deoptMethodNative(method);
+    }
+
     @Override
     public boolean initXResourcesNative() {
         return Main.initXResourcesNative();