ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-14 21:27:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

More default method vtable fixes

Browse Source
This commit is contained in:
Ben Gruver 2016-09-24 18:16:55 -07:00
parent 8081311d30
commit a54523e080
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dexlib2/src/main/java/org/jf/dexlib2/analysis/ClassProto.java
View File

@ -934,9 +934,14 @@ public class ClassProto implements TypeProto {
for (ClassDef interfaceDef: interfaces) { for (ClassDef interfaceDef: interfaces) {
for (Method interfaceMethod : interfaceDef.getVirtualMethods()) { for (Method interfaceMethod : interfaceDef.getVirtualMethods()) {
int methodIndex = findMethodIndexInVtable(vtable, interfaceMethod);
if (methodIndex < 0) { int vtableIndex = findMethodIndexInVtable(vtable, interfaceMethod);
if (vtableIndex >= 0) {
if (interfaceMethodOverrides(interfaceMethod, vtable.get(vtableIndex))) {
vtable.set(vtableIndex, interfaceMethod);
}
} else {
int defaultMethodIndex = findMethodIndexInVtable(defaultMethods, interfaceMethod); int defaultMethodIndex = findMethodIndexInVtable(defaultMethods, interfaceMethod);
if (defaultMethodIndex >= 0) { if (defaultMethodIndex >= 0) {
@ -963,10 +968,18 @@ public class ClassProto implements TypeProto {
if (mirandaMethodIndex >= 0) { if (mirandaMethodIndex >= 0) {
if (!AccessFlags.ABSTRACT.isSet(interfaceMethod.getAccessFlags())) { if (!AccessFlags.ABSTRACT.isSet(interfaceMethod.getAccessFlags())) {
Method removedMethod = mirandaMethods.remove(mirandaMethodIndex);
defaultMethods.add(removedMethod); ClassProto existingInterface = (ClassProto)classPath.getClass(
mirandaMethods.get(mirandaMethodIndex).getDefiningClass());
if (!existingInterface.implementsInterface(interfaceMethod.getDefiningClass())) {
Method oldMethod = mirandaMethods.remove(mirandaMethodIndex);
int methodOrderValue = methodOrder.get(oldMethod);
methodOrder.put(interfaceMethod, methodOrderValue);
defaultMethods.add(interfaceMethod);
} }
} }
continue;
}
if (!AccessFlags.ABSTRACT.isSet(interfaceMethod.getAccessFlags())) { if (!AccessFlags.ABSTRACT.isSet(interfaceMethod.getAccessFlags())) {
defaultMethods.add(interfaceMethod); defaultMethods.add(interfaceMethod);
@ -1034,6 +1047,26 @@ public class ClassProto implements TypeProto {
} }
} }
/**
* Checks if the interface method overrides the virtual or interface method2
* @param method A Method from an interface
* @param method2 A Method from an interface or a class
* @return true if the interface method overrides the virtual or interface method2
*/
private boolean interfaceMethodOverrides(@Nonnull Method method, @Nonnull Method method2) {
ClassProto classProto = (ClassProto)classPath.getClass(method2.getDefiningClass());
if (classProto.isInterface()) {
ClassProto targetClassProto = (ClassProto)classPath.getClass(method.getDefiningClass());
if (targetClassProto.implementsInterface(method2.getDefiningClass())) {
return true;
}
return false;
} else {
return false;
}
}
static class ReparentedMethod extends BaseMethodReference implements Method { static class ReparentedMethod extends BaseMethodReference implements Method {
private final Method method; private final Method method;
private final String definingClass; private final String definingClass;