diff --git a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/config/SandHookProvider.java b/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/config/SandHookProvider.java index 9cfc9a6f..87e3b743 100644 --- a/edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/config/SandHookProvider.java +++ b/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) { - PrebuiltMethodsDeopter.deoptMethods(packageName, classLoader); + 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 diff --git a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/config/WhaleHookProvider.java b/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/config/WhaleHookProvider.java index 6c2dea0d..79303fe3 100644 --- a/edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/config/WhaleHookProvider.java +++ b/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); - } } diff --git a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/YahfaHookProvider.java b/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/YahfaHookProvider.java index 90b693b9..4cbd0a37 100644 --- a/edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/YahfaHookProvider.java +++ b/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();