fixed RetroLambda support and added case for manually stripped APK

Author: borisf

ClassySharkWS/src/com/google/classyshark/gui/panel/tree/FilesTree.java

@@ -132,6 +132,12 @@ private TreeNode createJTreeModelAndroid(String fileName,
                 }
             }
         }
+
+        // hack for manually stripped APKs with one flat package
+        if (packageNode != null && currentClassesDex.isLeaf()) {
+           currentClassesDex.add(packageNode);
+        }
+
         for (DefaultMutableTreeNode node : noPkgNodes) {
             currentClassesDex.add(node);
         }

ClassySharkWS/src/com/google/classyshark/silverghost/contentreader/clazz/ClassNameVisitor.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2016 Google, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.classyshark.silverghost.contentreader.clazz;
+
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.Opcodes;
+
+public class ClassNameVisitor extends ClassVisitor {
+
+    private String name;
+
+    public ClassNameVisitor() {
+        super(Opcodes.ASM5);
+    }
+
+    public void visit(int version, int access, String name,
+                      String signature, String superName,
+                      String[] interfaces) {
+        this.name = name.replaceAll("/", "\\.");
+    }
+
+    public String getName() {
+        return name;
+    }
+}

ClassySharkWS/src/com/google/classyshark/silverghost/contentreader/clazz/ClazzLoader.java

@@ -18,10 +18,14 @@
 
 import com.google.classyshark.silverghost.contentreader.BinaryContentReader;
 import com.google.classyshark.silverghost.contentreader.ContentReader;
-
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import org.objectweb.asm.ClassReader;
 
 public class ClazzReader implements BinaryContentReader {
 
@@ -34,7 +38,21 @@ public ClazzReader(File binaryArchive) {
 
     @Override
     public void read() {
-        allClassNames.add(ClazzLoader.loadClassFromClassFile(binaryArchive).getName());
+        try {
+
+            Path path = Paths.get(binaryArchive.getAbsolutePath());
+            byte[] bytes = Files.readAllBytes(path);
+
+            ClassNameVisitor classNameVisitor = new ClassNameVisitor();
+            ClassReader cr = new ClassReader(bytes);
+            cr.accept(classNameVisitor, 0);
+
+            String className = classNameVisitor.getName();
+            allClassNames.add(className);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 
     @Override

ClassySharkWS/src/com/google/classyshark/silverghost/contentreader/clazz/ClazzReader.java

@@ -67,4 +67,14 @@ public static List<String> readClassNamesFromDex(File binaryArchiveFile) throws
         Collections.sort(result);
         return result;
     }
+
+    public static void main(String[] args) {
+        DexReader dxr =
+                new DexReader(new File("//Users//bfarber//Desktop//classes.dex"));
+
+        dxr.read();
+
+        System.out.println(dxr.getClassNames());
+
+    }
 }

ClassySharkWS/src/com/google/classyshark/silverghost/contentreader/dex/DexReader.java

@@ -35,7 +35,8 @@
 /**
  * Translator for the classes.dex entry
  */
-public class DexInfoTranslator implements Translator {
+public class
+DexInfoTranslator implements Translator {
     private File apkfile;
     private String dexFileName;
     private int index;

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

@@ -352,7 +352,7 @@ public static void testSystemClass() {
     }
 
     public static void testCustomClass() {
-        final File testFile = new File(System.getProperty("user.home") + "/Desktop/Scenarios/3 Class/Reducer.class");
+        final File testFile = new File(System.getProperty("user.home") + "/Desktop/Scenarios/2 Class/Reducer.class");
         String textClass = "com.google.classyshark.gui.panel.reducer.Reducer.class";
         Translator translator = TranslatorFactory.createTranslator(textClass, testFile);
         translator.apply();
@@ -361,7 +361,7 @@ public static void testCustomClass() {
     }
 
     public static void testInnerClass() {
-        final File testFile = new File(System.getProperty("user.home") + "/Desktop/Scenarios/3 Class/Reducer$1.class");
+        final File testFile = new File(System.getProperty("user.home") + "/Desktop/Scenarios/2 Class/Reducer$1.class");
         String textClass = "com.google.classyshark.gui.panel.reducer.Reducer$1.class";
         Translator translator = TranslatorFactory.createTranslator(textClass, testFile);
         translator.apply();