Magic-Mirror/dex2jar
1
0
Fork 0
mirror of https://github.com/pxb1988/dex2jar.git synced 2024-11-23 13:19:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move the change to V3InnerClzGather

Browse Source 
--HG--
branch : 0.0.9.x
This commit is contained in:
Panxiaobo 2012-10-22 19:51:04 +08:00
parent 8939611267
commit 9e983b3f54
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dex-translator/src/main/java/com/googlecode/dex2jar/v3/V3ClassAdapter.java
View File

@ -101,10 +101,7 @@ public class V3ClassAdapter implements DexClassVisitor {
Clz clz = this.clz;
// the abstract or interface is in class_flags not in Innerclass
final int x = (Opcodes.ACC_INTERFACE | Opcodes.ACC_ABSTRACT);
int access = (clz.access & ~x) | (access_flags & x);
int access = clz.access;
boolean isInnerClass = clz.enclosingClass != null || clz.enclosingMethod != null;
int accessInClass = clearClassAccess(isInnerClass, access);
String[] nInterfaceNames = null;

8
dex-translator/src/main/java/com/googlecode/dex2jar/v3/V3InnerClzGather.java
View File

@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
import com.googlecode.dex2jar.Annotation;
@ -104,6 +105,8 @@ public class V3InnerClzGather implements DexFileVisitor {
return classes;
}
private static final int ACC_INTERFACE_ABSTRACT = (Opcodes.ACC_INTERFACE | Opcodes.ACC_ABSTRACT);
/*
* (non-Javadoc)
*
@ -114,7 +117,8 @@ public class V3InnerClzGather implements DexFileVisitor {
public DexClassVisitor visit(int access_flags, final String className, String superClass, String[] interfaceNames) {
final Clz clz = get(className);
clz.access |= access_flags;
clz.access = (clz.access & ~ACC_INTERFACE_ABSTRACT) | access_flags;
return new EmptyVisitor() {
protected List<Annotation> anns = new ArrayList<Annotation>();
@ -150,7 +154,7 @@ public class V3InnerClzGather implements DexFileVisitor {
} else if ("Ldalvik/annotation/InnerClass;".equals(ann.type)) {
for (Item it : ann.items) {
if ("accessFlags".equals(it.name)) {
clz.access |= (Integer) it.value;
clz.access |= (Integer) it.value & ~ACC_INTERFACE_ABSTRACT;
} else if ("name".equals(it.name)) {
clz.innerName = (String) it.value;
}