apktool 2.3 test

Konloch · Apr 13, 2019 · cbb642d · cbb642d
1 parent 04874b3
commit cbb642d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 36 deletions.
diff --git a/libs/apktool_2.0.1_obf-2.jar b/libs/apktool_2.0.1_obf-2.jar
diff --git a/libs/apktool_2.3.0.jar b/libs/apktool_2.3.0.jar
diff --git a/src/the/bytecode/club/bytecodeviewer/BytecodeViewer.java b/src/the/bytecode/club/bytecodeviewer/BytecodeViewer.java
@@ -122,7 +122,7 @@
 public class BytecodeViewer
 {
     /*per version*/
-    public static String version = "2.9.13";
+    public static String version = "2.9.14";
     public static boolean previewCopy = false;
     public static boolean fatJar = true; //could be automatic by checking if it's loaded a class named whatever for a library
     /*the rest*/
@@ -491,30 +491,6 @@ public void run() {
         }
     };
 
-    public static void pingback() {
-        JOptionPane pane = new JOptionPane(
-                "Would you like to 'pingback' to https://bytecodeviewer.com to be counted in the global users for BCV?");
-        Object[] options = new String[]{"Yes", "No"};
-        pane.setOptions(options);
-        JDialog dialog = pane.createDialog(BytecodeViewer.viewer,
-                "Bytecode Viewer - Optional Pingback");
-        dialog.setVisible(true);
-        Object obj = pane.getValue();
-        int result = -1;
-        for (int k = 0; k < options.length; k++)
-            if (options[k].equals(obj))
-                result = k;
-
-        if (result == 0) {
-            try {
-                if (!PingBack.isAlive())
-                    PingBack.start();
-            } catch (Exception e) {
-                new the.bytecode.club.bytecodeviewer.api.ExceptionUI(e);
-            }
-        }
-    }
-
     /**
      * Grab the byte array from the loaded Class object
      *
@@ -1387,6 +1363,11 @@ public static void dumpTempFile()
             krakatauTempJar = null;
         }*/
 
+        if(krakatauTempJar != null && !krakatauTempJar.exists())
+        {
+            needsReDump = true;
+        }
+
         if(needsReDump && krakatauTempJar != null)
         {
             krakatauTempDir.delete();

diff --git a/src/the/bytecode/club/bytecodeviewer/Settings.java b/src/the/bytecode/club/bytecodeviewer/Settings.java
@@ -394,7 +394,7 @@ else if (decompiler == 9)
             BytecodeViewer.viewer.panel3Fern_E.setSelected(Boolean.parseBoolean(DiskReader.loadString(BytecodeViewer.settingsName, 103, false)));
             BytecodeViewer.viewer.panel3Krakatau_E.setSelected(Boolean.parseBoolean(DiskReader.loadString(BytecodeViewer.settingsName, 104, false)));
             BytecodeViewer.viewer.panel3Smali_E.setSelected(Boolean.parseBoolean(DiskReader.loadString(BytecodeViewer.settingsName, 105, false)));
-           // BytecodeViewer.viewer.decodeAPKResources.setSelected(Boolean.parseBoolean(DiskReader.loadString(BytecodeViewer.settingsName, 106, false)));
+            BytecodeViewer.viewer.decodeAPKResources.setSelected(Boolean.parseBoolean(DiskReader.loadString(BytecodeViewer.settingsName, 106, false)));
             BytecodeViewer.library = DiskReader.loadString(BytecodeViewer.settingsName, 107, false);
             BytecodeViewer.pingback = Boolean.parseBoolean(DiskReader.loadString(BytecodeViewer.settingsName, 108, false));
             BytecodeViewer.viewer.panel1JDGUI_E.setSelected(Boolean.parseBoolean(DiskReader.loadString(BytecodeViewer.settingsName, 109, false)));

diff --git a/src/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java b/src/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java
@@ -607,7 +607,6 @@ public void run() {
     public final ButtonGroup panelGroup2 = new ButtonGroup();
     public final ButtonGroup panelGroup3 = new ButtonGroup();
     private final JMenuItem mntmSetOpitonalLibrary = new JMenuItem("Set Optional Library Folder");
-    private final JMenuItem mntmPingback = new JMenuItem("Pingback");
     private final JMenu mnJdgui = new JMenu("JD-GUI");
     public final JRadioButtonMenuItem panel3JDGUI = new JRadioButtonMenuItem("Java");
     private final JSeparator separator_33 = new JSeparator();
@@ -1403,14 +1402,7 @@ public void actionPerformed(ActionEvent arg0) {
                 }
             }
         });
-        mntmPingback.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent arg0) {
-                BytecodeViewer.pingback();
-            }
-        });
 
-        mnNewMenu.add(mntmPingback);
         mnNewMenu.add(mntmExit);
 
         menuBar.add(mnNewMenu_6);
@@ -1619,8 +1611,8 @@ public void actionPerformed(ActionEvent arg0) {
         mnSettings.add(refreshOnChange);
 
         mnSettings.add(separator_38);
-        decodeAPKResources.setSelected(false);
-        decodeAPKResources.setEnabled(false);
+        decodeAPKResources.setSelected(true);
+        //decodeAPKResources.setEnabled(false);
 
         mnSettings.add(decodeAPKResources);