added another scenario for custom dex loading

Author: borisf

ClassySharkWS/src/com/google/classyshark/silverghost/translator/apk/ApkTranslator.java

@@ -22,7 +22,6 @@
 import com.google.classyshark.silverghost.translator.apk.dashboard.ClassesDexDataEntry;
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -58,12 +57,7 @@ public void apply() {
         ELEMENT element = new ELEMENT("\n                  ~ APK DASHBOARD ~\n" , TAG.IDENTIFIER);
         elements.add(element);
 
-
-        Iterator<ClassesDexDataEntry> dexesIter = apkDashboard.iterator();
-
-        while (dexesIter.hasNext()) {
-
-            ClassesDexDataEntry dexEntry = dexesIter.next();
+        for (ClassesDexDataEntry dexEntry : apkDashboard.getAllDexEntries()) {
 
             element = new ELEMENT("\n" + dexEntry.getName(), TAG.MODIFIER);
             elements.add(element);
@@ -113,25 +107,6 @@ public void apply() {
                     + "\n", TAG.DOCUMENT);
             elements.add(element);
         }
-
-        dexesIter = apkDashboard.iterator();
-
-        while (dexesIter.hasNext()) {
-
-            ClassesDexDataEntry dexEntry = dexesIter.next();
-
-            element = new ELEMENT("\n" + dexEntry.getName(), TAG.MODIFIER);
-            elements.add(element);
-
-            element = new ELEMENT(
-                    "\nSyntheticAccessors \n", TAG.MODIFIER);
-            elements.add(element);
-
-            element = new ELEMENT(
-                    "\n" + dexEntry.syntheticAccessors.toString()
-                            + "\n", TAG.DOCUMENT);
-            elements.add(element);
-        }
     }
 
     @Override

ClassySharkWS/src/com/google/classyshark/silverghost/translator/apk/dashboard/ApkDashboard.java

@@ -23,7 +23,6 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -34,7 +33,7 @@
 import org.ow2.asmdex.ApplicationVisitor;
 import org.ow2.asmdex.Opcodes;
 
-public class ApkDashboard implements Iterable<ClassesDexDataEntry> {
+public class ApkDashboard {
 
     public ArrayList<ClassesDexDataEntry> classesDexEntries = new ArrayList<>();
     public ArrayList<ClassesDexDataEntry> customClassesDexEntries = new ArrayList<>();
@@ -51,10 +50,16 @@ public ApkDashboard(File apkFile) {
     public void inspect() {
         // TODO add exception for not calling inspect
         MultidexReader.fillApkDashboard(apkFile, this);
+
+        System.out.println("Done inspecting");
     }
 
-    public Iterator<ClassesDexDataEntry> iterator() {
-        return new ClassesDexIterator();
+    public List<ClassesDexDataEntry> getAllDexEntries() {
+        ArrayList<ClassesDexDataEntry> result = new ArrayList<>();
+        result.addAll(classesDexEntries);
+        result.addAll(customClassesDexEntries);
+
+        return result;
     }
 
     public List<String> getNativeErrors() {
@@ -124,6 +129,7 @@ public List<String> getJavaInternalAPIsErrors() {
     public static ClassesDexDataEntry fillAnalysisPerClassesDexIndex(int dexIndex, File classesDex) {
         ClassesDexDataEntry dexData = new ClassesDexDataEntry(dexIndex);
 
+
         try {
             InputStream is = new FileInputStream(classesDex);
             ApplicationVisitor av = new ApkNativeMethodsVisitor(dexData);
@@ -140,11 +146,12 @@ public static ClassesDexDataEntry fillAnalysisPerClassesDexIndex(int dexIndex, F
             DexBackedDexFile dataPack = (DexBackedDexFile) dxFile;
             dexData.allMethods = dataPack.getMethodCount();
 
-            dexData.syntheticAccessors =
-                    new SyntheticAccessorsInspector(dxFile).getSyntheticAccessors();
+            //dexData.syntheticAccessors =
+            //        new SyntheticAccessorsInspector(dxFile).getSyntheticAccessors();
 
         } catch (Exception e) {
             e.printStackTrace();
+            System.out.println("here " + e);
         }
 
         return dexData;
@@ -167,54 +174,4 @@ private static List<String> extractLibNamesFromFullPaths(List<String> nativeLibs
 
         return result;
     }
-
-    private class ClassesDexIterator implements Iterator<ClassesDexDataEntry> {
-        private int currentClassesDex;
-        private int currentCustomClassesDex;
-
-        public ClassesDexIterator() {
-            currentClassesDex = 0;
-            currentCustomClassesDex = 0;
-        }
-
-        public boolean hasNext() {
-            return currentClassesDex < classesDexEntries.size() || currentCustomClassesDex < customClassesDexEntries.size();
-        }
-
-        public ClassesDexDataEntry next() {
-            ClassesDexDataEntry result = new ClassesDexDataEntry(0);
-
-            if (currentClassesDex < classesDexEntries.size()) {
-                for (ClassesDexDataEntry classesDex : classesDexEntries) {
-                    int dexIndex = currentToDexIndex(currentClassesDex);
-                    if (dexIndex == classesDex.index) {
-                        result = classesDex;
-                        currentClassesDex++;
-                        break;
-                    }
-                }
-            } else {
-                currentCustomClassesDex++;
-                result = customClassesDexEntries.get(0);
-            }
-
-            return result;
-        }
-
-        public void remove() {
-
-        }
-
-        private int currentToDexIndex(int current) {
-            /*
-              0 --> classes.dex
-              1 --> classes2.dex
-              2 --> classes3.dex
-             */
-
-            if (current == 0) return 0;
-
-            return ++current;
-        }
-    }
 }

ClassySharkWS/src/com/google/classyshark/silverghost/translator/java/dex/MultidexReader.java

@@ -45,6 +45,9 @@ public static void fillApkDashboard(File binaryArchiveFile, ApkDashboard to)  {
 
             ZipEntry zipEntry;
 
+
+            int customDexIndex = 0;
+
             while (true) {
                 zipEntry = zipFile.getNextEntry();
 
@@ -54,12 +57,14 @@ public static void fillApkDashboard(File binaryArchiveFile, ApkDashboard to)  {
 
                 if (zipEntry.getName().endsWith(".dex")) {
 
-                    String fName = "ANALYZER_classes";
+                    customDexIndex++;
+
+                    String fName = customDexIndex + "ANALYZER_classes";
 
                     int dexIndex = Character.getNumericValue(zipEntry.getName().charAt(zipEntry.getName().length() - 5));
 
                     if (dexIndex != 28 /* classes.dex*/) {
-                        fName = "ANALYZER_classes" + dexIndex;
+                        fName = fName + dexIndex;
                     } else {
 
                         dexIndex = 0;
@@ -70,7 +75,13 @@ public static void fillApkDashboard(File binaryArchiveFile, ApkDashboard to)  {
                     File file = SherlockHash.INSTANCE.getFileFromZipStream(binaryArchiveFile,
                             zipFile, fName, ext);
 
-                    to.classesDexEntries.add(fillAnalysisPerClassesDexIndex(dexIndex, file));
+
+                    if(zipEntry.getName().equals("classes.dex") || (zipEntry.getName().startsWith("classes") &&
+                            zipEntry.getName().endsWith(".dex"))) {
+                        to.classesDexEntries.add(fillAnalysisPerClassesDexIndex(dexIndex, file));
+                    } else {
+                        to.customClassesDexEntries.add(fillAnalysisPerClassesDexIndex(999, file));
+                    }
 
                 } else if (zipEntry.getName().endsWith("jar") || zipEntry.getName().endsWith("zip")) {
 
@@ -121,6 +132,7 @@ public static void fillApkDashboard(File binaryArchiveFile, ApkDashboard to)  {
                     to.nativeLibs.add(zipEntry.getName() + "\n");
                 }
             }
+
             zipFile.close();
 
         } catch (Exception e) {