Merge pull request #79 from google/proguard-integ

merge fixes + clean interfaces to SilverGhost

Author: borisf

ClassySharkAndroid/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.1.0-beta1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

ClassySharkWS/src/com/google/classyshark/cli/CliMode.java

@@ -28,7 +28,6 @@
 import com.google.classyshark.silverghost.translator.apk.ApkTranslator;
 
 import java.io.File;
-import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.util.List;
 
@@ -37,6 +36,9 @@
  */
 public class CliMode {
 
+    // TODO fix the message with packages dump
+    // TODO introduce SilverGhost api
+
     private static final String ERROR_MESSAGE = "Usage: java -jar ClassyShark.jar [-options] <archive> [args...]\n" +
             "           (to execute a ClassyShark on binary archive jar/apk/dex/class)\n" +
             "where options include:\n" +
@@ -111,7 +113,7 @@ private static void exportClassFromApk(List<String> args) {
         }
 
         try {
-            Exporter.writeCurrentClass(translator);
+            Exporter.writeCurrentClass(translator.getClassName(), translator.toString());
         } catch (Exception e) {
             System.err.println("Internal error - couldn't write file" + "\n\n\n" + ERROR_MESSAGE);
         }
@@ -152,4 +154,4 @@ private static void inspectPackages(List<String> args) {
         ClassNode rootNode = rootBuilder.fillClassesWithMethods(fileName);
         methodCountExporter.exportMethodCounts(rootNode);
     }
-}
+}

ClassySharkWS/src/com/google/classyshark/gui/panel/ClassySharkPanel.java

@@ -19,20 +19,28 @@
 import com.google.classyshark.gui.panel.chart.RingChartPanel;
 import com.google.classyshark.gui.panel.displayarea.DisplayArea;
 import com.google.classyshark.gui.panel.io.CurrentFolderConfig;
-import com.google.classyshark.silverghost.exporter.Exporter;
 import com.google.classyshark.gui.panel.io.FileChooserUtils;
 import com.google.classyshark.gui.panel.io.RecentArchivesConfig;
 import com.google.classyshark.gui.panel.methodscount.MethodsCountPanel;
-import com.google.classyshark.gui.panel.reducer.Reducer;
 import com.google.classyshark.gui.panel.toolbar.KeyUtils;
 import com.google.classyshark.gui.panel.toolbar.Toolbar;
 import com.google.classyshark.gui.panel.toolbar.ToolbarController;
 import com.google.classyshark.gui.panel.tree.FilesTree;
-import com.google.classyshark.silverghost.contentreader.ContentReader;
+import com.google.classyshark.silverghost.SilverGhost;
+import com.google.classyshark.silverghost.exporter.Exporter;
 import com.google.classyshark.silverghost.methodscounter.ClassNode;
+import com.google.classyshark.silverghost.tokensmapper.ProguardMapper;
 import com.google.classyshark.silverghost.translator.Translator;
-import com.google.classyshark.silverghost.translator.TranslatorFactory;
-
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Insets;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
@@ -44,16 +52,6 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.filechooser.FileFilter;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Insets;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * App controller, general app structure MVM ==> Model - View - Mediator (this class)
@@ -71,22 +69,21 @@ public class ClassySharkPanel extends JPanel
     private int dividerLocation = 0;
     private DisplayArea displayArea;
     private FilesTree filesTree;
-
-    private Reducer reducer;
-    private Translator translator;
-    private boolean isDataLoaded = false;
-    private File binaryArchive;
-    private List<String> allClassNamesInArchive;
     private RingChartPanel ringChartPanel;
+    private boolean isDataLoaded = false;
+
+    private SilverGhost silverGhost = new SilverGhost();
 
     public ClassySharkPanel(JFrame frame, File archive, String fullClassName) {
         this(frame);
-        updateUiAfterArchiveReadAndLoadClass(archive, fullClassName);
+        silverGhost.setBinaryArchive(archive);
+        updateUiAfterArchiveReadAndLoadClass(fullClassName);
     }
 
     public ClassySharkPanel(JFrame frame, File archive) {
         this(frame);
-        displayArchive(archive);
+        silverGhost.setBinaryArchive(archive);
+        displayArchive(silverGhost.getBinaryArchive());
     }
 
     public ClassySharkPanel(JFrame frame) {
@@ -98,14 +95,14 @@ public ClassySharkPanel(JFrame frame) {
 
     @Override
     public void onSelectedTypeClassFromMouseClick(String selectedClass) {
-        for (String clazz : translator.getDependencies()) {
+        for (String clazz : silverGhost.getImportsForCurrentClass()) {
             if (clazz.contains(selectedClass)) {
                 onSelectedImportFromMouseClick(clazz);
                 return;
             }
         }
 
-        for (String clazz : reducer.getAllClassNames()) {
+        for (String clazz : silverGhost.getAllClassNames()) {
             if (clazz.contains(selectedClass)) {
                 onSelectedImportFromMouseClick(clazz);
                 return;
@@ -115,7 +112,7 @@ public void onSelectedTypeClassFromMouseClick(String selectedClass) {
 
     @Override
     public void onSelectedImportFromMouseClick(String className) {
-        if (reducer.getAllClassNames().contains(className)) {
+        if (silverGhost.getAllClassNames().contains(className)) {
             onSelectedClassName(className);
         }
     }
@@ -155,9 +152,9 @@ public String getDescription() {
 
     @Override
     public void onGoBackPressed() {
-        displayArea.displayAllClassesNames(allClassNamesInArchive);
+        displayArea.displayAllClassesNames(silverGhost.getAllClassNames());
         toolbar.setText("");
-        reducer.reduce("");
+        silverGhost.initClassNameFiltering();
     }
 
     @Override
@@ -172,13 +169,40 @@ public void onChangedTextFromTypingArea(String selectedLine) {
         fillDisplayArea(selectedLine, !VIEW_TOP_CLASS, !IS_CLASSNAME_FROM_MOUSE_CLICK);
     }
 
+    @Override
+    public void onMappingsButtonPressed() {
+        final JFileChooser fc = new JFileChooser();
+        fc.setFileFilter(new FileFilter() {
+            @Override
+            public boolean accept(File f) {
+                return true;
+            }
+
+            @Override
+            public String getDescription() {
+                return "";
+            }
+        });
+
+        fc.setCurrentDirectory(CurrentFolderConfig.INSTANCE.getCurrentDirectory());
+
+        int returnVal = fc.showOpenDialog(this);
+        toolbar.setText("");
+        if (returnVal == JFileChooser.APPROVE_OPTION) {
+            File resultFile = fc.getSelectedFile();
+            readMappingFile(resultFile);
+        }
+    }
+
     @Override
     public void onExportButtonPressed() {
         SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
             @Override
             protected Void doInBackground() throws Exception {
-                Exporter.writeCurrentClass(translator);
-                Exporter.writeArchive(binaryArchive, reducer.getAllClassNames());
+                Exporter.writeCurrentClass(silverGhost.getCurrentClassName(),
+                        silverGhost.getCurrentClassContent());
+                Exporter.writeArchive(silverGhost.getBinaryArchive(),
+                        silverGhost.getAllClassNames());
                 return null;
             }
 
@@ -202,15 +226,16 @@ public void onChangeLeftPaneVisibility(boolean visible) {
 
     @Override
     public void displayArchive(File binaryArchive) {
+        silverGhost.setBinaryArchive(binaryArchive);
+
         if (parentFrame != null) {
-            parentFrame.setTitle(binaryArchive.getName());
+            parentFrame.setTitle(silverGhost.getBinaryArchive().getName());
         }
 
-        loadAndFillDisplayArea(binaryArchive, null);
-        isDataLoaded = true;
+        readArchiveAndFillDisplayArea(null);
         toolbar.activateNavigationButtons();
         filesTree.setVisibleRoot();
-        methodsCountPanel.loadFile(binaryArchive);
+        methodsCountPanel.loadFile(silverGhost.getBinaryArchive());
     }
 
     @Override
@@ -289,7 +314,7 @@ private void buildUI() {
             @Override
             public void stateChanged(ChangeEvent e) {
                 int dividerLocation1 = jSplitPane.getDividerLocation();
-                JTabbedPane jTabbedPane1 = (JTabbedPane)e.getSource();
+                JTabbedPane jTabbedPane1 = (JTabbedPane) e.getSource();
                 if (jTabbedPane1.getSelectedIndex() == 0) {
                     jSplitPane.setRightComponent(rightScrollPane);
                 } else {
@@ -311,60 +336,45 @@ public void stateChanged(ChangeEvent e) {
         add(jSplitPane, BorderLayout.CENTER);
     }
 
-    private void updateUiAfterArchiveReadAndLoadClass(File binaryArchive, String className) {
+    private void updateUiAfterArchiveReadAndLoadClass(String className) {
         if (parentFrame != null) {
-            parentFrame.setTitle(binaryArchive.getName());
+            parentFrame.setTitle(silverGhost.getBinaryArchive().getName());
         }
 
-        loadAndFillDisplayArea(binaryArchive, className);
-        isDataLoaded = true;
+        readArchiveAndFillDisplayArea(className);
         toolbar.activateNavigationButtons();
         filesTree.setVisibleRoot();
-        methodsCountPanel.loadFile(binaryArchive);
+        methodsCountPanel.loadFile(silverGhost.getBinaryArchive());
     }
 
-    private void loadAndFillDisplayArea(final File binaryArchive,
-                                        final String className) {
-        this.binaryArchive = binaryArchive;
-        final ContentReader loader = new ContentReader(this.binaryArchive);
+    private void readArchiveAndFillDisplayArea(final String className) {
 
         SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
             @Override
             protected Void doInBackground() throws Exception {
-                long start = System.currentTimeMillis();
-                loader.load();
-                allClassNamesInArchive = loader.getAllClassNames();
-                reducer = new Reducer(allClassNamesInArchive);
-                System.out.println("Archive Reading "
-                        + (System.currentTimeMillis() - start) + " ms ");
+                silverGhost.readContents();
                 return null;
             }
 
             @Override
             protected void done() {
-                if (isArchiveError()) {
-                    filesTree.fillArchive(new File("ERROR"), new ArrayList<String>(), loader.getAllComponents());
+                if (silverGhost.isArchiveError()) {
+                    filesTree.fillArchive(new File("ERROR"), new ArrayList<String>(),
+                            silverGhost.getComponents());
                     displayArea.displayError();
                     return;
                 }
 
-                filesTree.fillArchive(ClassySharkPanel.this.binaryArchive,
-                        allClassNamesInArchive,
-                        loader.getAllComponents());
+                filesTree.fillArchive(silverGhost.getBinaryArchive(),
+                        silverGhost.getAllClassNames(),
+                        silverGhost.getComponents());
 
                 if (className != null) {
                     onSelectedClassName(className);
                 } else {
                     displayArea.displaySharkey();
                 }
-            }
-
-            private boolean isArchiveError() {
-                boolean noJavaClasses = allClassNamesInArchive.isEmpty();
-                boolean noAndroidClasses = allClassNamesInArchive.size() == 1
-                        && allClassNamesInArchive.contains("AndroidManifest.xml");
-
-                return noJavaClasses || noAndroidClasses;
+                isDataLoaded = true;
             }
         };
 
@@ -378,22 +388,24 @@ private void fillDisplayArea(final String textFromTypingArea,
 
         SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
             private List<Translator.ELEMENT> displayedClassTokens;
-            private List<String> reducedClassNames;
+            private List<String> filteredClassNames;
             private String className = "";
 
             @Override
             protected Void doInBackground() throws Exception {
                 if (viewMouseClickedClass) {
                     className = textFromTypingArea;
-                    displayedClassTokens = translateClass(className);
+                    silverGhost.translateArchiveElement(className);
+                    displayedClassTokens = silverGhost.getArchiveElementTokens();
                 } else if (viewTopClass) {
-                    className = reducer.getAutocompleteClassName();
-                    displayedClassTokens = translateClass(className);
+                    className = silverGhost.getAutoCompleteClassName();
+                    silverGhost.translateArchiveElement(className);
+                    displayedClassTokens = silverGhost.getArchiveElementTokens();
                 } else {
-                    reducedClassNames = reducer.reduce(textFromTypingArea);
-                    if (reducedClassNames.size() == 1) {
-                        displayedClassTokens =
-                                translateClass(reducedClassNames.get(0));
+                    filteredClassNames = silverGhost.filter(textFromTypingArea);
+                    if (filteredClassNames.size() == 1) {
+                        silverGhost.translateArchiveElement(filteredClassNames.get(0));
+                        displayedClassTokens = silverGhost.getArchiveElementTokens();
                     }
                 }
                 return null;
@@ -405,23 +417,33 @@ protected void done() {
                     toolbar.setText(className);
                     displayArea.displayClass(displayedClassTokens);
                 } else {
-                    if (reducedClassNames.size() == 1) {
+                    if (filteredClassNames.size() == 1) {
                         displayArea.displayClass(displayedClassTokens);
-                    } else if (reducedClassNames.size() == 0) {
+                    } else if (filteredClassNames.size() == 0) {
                         displayArea.displayError();
                     } else {
-                        displayArea.displayReducedClassNames(reducedClassNames,
+                        displayArea.displayReducedClassNames(filteredClassNames,
                                 textFromTypingArea);
                     }
                 }
             }
+        };
+
+        worker.execute();
+    }
+
+    private void readMappingFile(final File resultFile) {
+        SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
+            private ProguardMapper reverseMappings;
+
+            @Override
+            protected Void doInBackground() throws Exception {
+                reverseMappings = SilverGhost.readMappingFile(resultFile);
+                return null;
+            }
 
-            private List<Translator.ELEMENT> translateClass(String name) {
-                translator =
-                        TranslatorFactory.createTranslator(
-                                name, binaryArchive, reducer.getAllClassNames());
-                translator.apply();
-                return translator.getElementsList();
+            protected void done() {
+                silverGhost.addMappings(reverseMappings);
             }
         };
 

ClassySharkWS/src/com/google/classyshark/gui/panel/IconSchemes.java

@@ -3,7 +3,7 @@
 
 public class IconSchemes {
 
-    private static final String ROOT_PATH = "resources/";
+    private static final String ROOT_PATH = "/resources/";
     private static final String EXTENSION = ".png";
 
     public static final String TOGGLE_ICON_PATH = ROOT_PATH + "ic_menu" + EXTENSION;