[DEX] Overhaul, minimise new runtime object creation

Author: REAndroid

src/main/java/com/reandroid/dex/common/IdUsageIterator.java

@@ -30,7 +30,7 @@ default Iterator<Key> usedKeys(){
             @SuppressWarnings("unchecked")
             @Override
             public Iterator<Key> iterator(IdItem element) {
-                return (Iterator<Key>) element.getKey().mentionedKeys();
+                return (Iterator<Key>) element.getKey().contents();
             }
         };
     }

src/main/java/com/reandroid/dex/common/SectionItem.java

@@ -6,6 +6,7 @@
 import com.reandroid.dex.key.Key;
 import com.reandroid.dex.sections.SectionList;
 import com.reandroid.dex.sections.SectionType;
+import com.reandroid.utils.ObjectsUtil;
 
 public class SectionItem extends BlockItem implements EditableItem, SectionTool, UsageMarker {
 
@@ -66,15 +67,17 @@ public boolean isRemoved(){
     public void onRemovedInternal() {
     }
 
-    @SuppressWarnings("unchecked")
     protected <T1 extends Key> T1 checkKey(T1 newKey){
-        Key lastKey = this.mLastKey;
+        T1 lastKey = getLastKey();
         if(lastKey == null || !lastKey.equals(newKey)){
             this.mLastKey = newKey;
             keyChanged(lastKey);
             lastKey = newKey;
         }
-        return (T1) lastKey;
+        return lastKey;
+    }
+    protected <T1 extends Key> T1 getLastKey() {
+        return ObjectsUtil.cast(mLastKey);
     }
     protected void keyChanged(Key oldKey){
         if(oldKey == null){
@@ -126,29 +129,6 @@ public void editInternal(Block user) {
     public void removeSelf(){
         throw new RuntimeException("Not implemented");
     }
-    public boolean equalsKey(SectionItem sectionItem){
-        if(sectionItem == this){
-            return true;
-        }
-        if(sectionItem == null || getSectionType() != sectionItem.getSectionType()){
-            return false;
-        }
-        Key key = getKey();
-        if(key == null){
-            return false;
-        }
-        return key.equals(sectionItem.getKey());
-    }
-    public boolean equalsKey(Key key){
-        if(key == null){
-            return false;
-        }
-        Key myKey = getKey();
-        if(myKey == null){
-            return false;
-        }
-        return myKey.equals(key);
-    }
     public boolean isBlank() {
         return isRemoved();
     }

src/main/java/com/reandroid/dex/dalvik/DalvikEnclosingClass.java

@@ -16,7 +16,11 @@
 package com.reandroid.dex.dalvik;
 
 import com.reandroid.dex.common.AnnotationVisibility;
-import com.reandroid.dex.key.*;
+import com.reandroid.dex.key.AnnotationElementKey;
+import com.reandroid.dex.key.AnnotationItemKey;
+import com.reandroid.dex.key.Key;
+import com.reandroid.dex.key.NullValueKey;
+import com.reandroid.dex.key.TypeKey;
 import com.reandroid.dex.program.AnnotatedProgram;
 import com.reandroid.dex.program.ClassProgram;
 
@@ -34,10 +38,11 @@ public static DalvikEnclosingClass of(AnnotatedProgram annotatedProgram) {
     }
     public static DalvikEnclosingClass getOrCreate(AnnotatedProgram annotatedProgram) {
         if (!annotatedProgram.hasAnnotation(TypeKey.DALVIK_EnclosingClass)) {
-            Key key;
+            Key key = null;
             if (annotatedProgram instanceof ClassProgram) {
-                key = ((ClassProgram) annotatedProgram).getKey();
-            } else {
+                key = ((ClassProgram) annotatedProgram).getKey().getEnclosingClass();
+            }
+            if (key == null) {
                 key = NullValueKey.INSTANCE;
             }
             annotatedProgram.addAnnotation(AnnotationItemKey.create(

src/main/java/com/reandroid/dex/dalvik/DalvikInnerClass.java

@@ -26,6 +26,7 @@
 import com.reandroid.dex.key.TypeKey;
 import com.reandroid.dex.program.AccessibleItem;
 import com.reandroid.dex.program.AnnotatedProgram;
+import com.reandroid.dex.program.ClassProgram;
 
 import java.lang.annotation.ElementType;
 
@@ -81,11 +82,21 @@ public static DalvikInnerClass of(AnnotatedProgram annotatedProgram) {
     }
     public static DalvikInnerClass getOrCreate(AnnotatedProgram annotatedProgram) {
         if (!annotatedProgram.hasAnnotation(TypeKey.DALVIK_InnerClass)) {
+            Key name = null;
+            int accessFlags = 0;
+            if (annotatedProgram instanceof ClassProgram) {
+                ClassProgram classProgram = (ClassProgram) annotatedProgram;
+                name = StringKey.create(classProgram.getKey().getSimpleInnerName());
+                accessFlags = classProgram.getAccessFlagsValue();
+            }
+            if (name == null) {
+                name = NullValueKey.INSTANCE;
+            }
             annotatedProgram.addAnnotation(AnnotationItemKey.create(
                     AnnotationVisibility.SYSTEM,
                     TypeKey.DALVIK_InnerClass,
-                    AnnotationElementKey.create(Key.DALVIK_accessFlags, PrimitiveKey.of(0)),
-                    AnnotationElementKey.create(Key.DALVIK_name, NullValueKey.INSTANCE)
+                    AnnotationElementKey.create(Key.DALVIK_accessFlags, PrimitiveKey.of(accessFlags)),
+                    AnnotationElementKey.create(Key.DALVIK_name, name)
                     )
             );
         }

src/main/java/com/reandroid/dex/dalvik/DalvikSignature.java

@@ -84,4 +84,11 @@ public static DalvikSignature getOrCreate(AnnotatedProgram annotatedProgram) {
         }
         return of(annotatedProgram);
     }
+    public static DalvikSignatureKey getSignature(AnnotatedProgram annotatedProgram) {
+        DalvikSignature dalvikSignature = DalvikSignature.of(annotatedProgram);
+        if (dalvikSignature != null) {
+            return dalvikSignature.getSignature();
+        }
+        return null;
+    }
 }