WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[core] Support interface default method (#420)

This commit is contained in:
LoveSy 2021-03-27 20:31:06 +08:00 committed by GitHub
parent 0facfb958a
commit 833eef49ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/de/robv/android/xposed/XposedBridge.java
View File

@ -169,9 +169,12 @@ public final class XposedBridge {
public static XC_MethodHook.Unhook hookMethod(Member hookMethod, XC_MethodHook callback) { public static XC_MethodHook.Unhook hookMethod(Member hookMethod, XC_MethodHook callback) {
if (!(hookMethod instanceof Executable)) { if (!(hookMethod instanceof Executable)) {
throw new IllegalArgumentException("Only methods and constructors can be hooked: " + hookMethod.toString()); throw new IllegalArgumentException("Only methods and constructors can be hooked: " + hookMethod.toString());
} else if (hookMethod.getDeclaringClass().isInterface()) { }
// No check interface because there may be default methods
/*else if (hookMethod.getDeclaringClass().isInterface()) {
throw new IllegalArgumentException("Cannot hook interfaces: " + hookMethod.toString()); throw new IllegalArgumentException("Cannot hook interfaces: " + hookMethod.toString());
} else if (Modifier.isAbstract(hookMethod.getModifiers())) { }*/
else if (Modifier.isAbstract(hookMethod.getModifiers())) {
throw new IllegalArgumentException("Cannot hook abstract methods: " + hookMethod.toString()); throw new IllegalArgumentException("Cannot hook abstract methods: " + hookMethod.toString());
} }
@ -196,7 +199,7 @@ public final class XposedBridge {
if (newMethod) { if (newMethod) {
AdditionalHookInfo additionalInfo = new AdditionalHookInfo(callbacks); AdditionalHookInfo additionalInfo = new AdditionalHookInfo(callbacks);
if (!YahfaHooker.shouldDelayHook(targetMethod)) { if (!YahfaHooker.shouldDelayHook(targetMethod)) {
DynamicBridge.hookMethod(targetMethod, (AdditionalHookInfo) additionalInfo); YahfaHooker.hookMethod(targetMethod, additionalInfo);
} else { } else {
PendingHooks.recordPendingMethod((Method)hookMethod, additionalInfo); PendingHooks.recordPendingMethod((Method)hookMethod, additionalInfo);
} }

15
core/src/main/java/org/lsposed/lspd/yahfa/dexmaker/DynamicBridge.java
View File

@ -28,6 +28,7 @@ import java.util.concurrent.ConcurrentHashMap;
import de.robv.android.xposed.LspHooker; import de.robv.android.xposed.LspHooker;
import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.XposedBridge;
import org.lsposed.lspd.util.Logger; import org.lsposed.lspd.util.Logger;
public final class DynamicBridge { public final class DynamicBridge {
@ -36,9 +37,6 @@ public final class DynamicBridge {
public static synchronized void hookMethod(Executable hookMethod, XposedBridge.AdditionalHookInfo additionalHookInfo) { public static synchronized void hookMethod(Executable hookMethod, XposedBridge.AdditionalHookInfo additionalHookInfo) {
Logger.d("hooking " + hookMethod); Logger.d("hooking " + hookMethod);
if (!checkMember(hookMethod)) {
return;
}
if (hookedInfo.containsKey(hookMethod)) { if (hookedInfo.containsKey(hookMethod)) {
Logger.w("already hook method:" + hookMethod.toString()); Logger.w("already hook method:" + hookMethod.toString());
@ -55,17 +53,6 @@ public final class DynamicBridge {
} }
} }
private static boolean checkMember(Executable member) {
if (member.getDeclaringClass().isInterface()) {
Logger.e("Cannot hook interfaces: " + member.toString());
return false;
} else if (Modifier.isAbstract(member.getModifiers())) {
Logger.e("Cannot hook abstract methods: " + member.toString());
return false;
}
return true;
}
public static Object invokeOriginalMethod(Member method, Object thisObject, Object[] args) public static Object invokeOriginalMethod(Member method, Object thisObject, Object[] args)
throws InvocationTargetException, IllegalAccessException { throws InvocationTargetException, IllegalAccessException {
LspHooker hooker = hookedInfo.get(method); LspHooker hooker = hookedInfo.get(method);

5
core/src/main/java/org/lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java
View File

@ -63,11 +63,6 @@ public class HookerDexMaker {
public void start(Executable member, XposedBridge.AdditionalHookInfo hookInfo, public void start(Executable member, XposedBridge.AdditionalHookInfo hookInfo,
ClassLoader appClassLoader) throws Exception { ClassLoader appClassLoader) throws Exception {
if (member.getDeclaringClass().isInterface()) {
throw new IllegalArgumentException("Cannot hook interfaces: " + member.toString());
} else if (Modifier.isAbstract(member.getModifiers())) {
throw new IllegalArgumentException("Cannot hook abstract methods: " + member.toString());
}
if (member instanceof Method) { if (member instanceof Method) {
Method method = (Method) member; Method method = (Method) member;
mReturnType = method.getReturnType(); mReturnType = method.getReturnType();