updated some libs & disabled the decode resource option

Konloch · Apr 13, 2019 · 2d493c1 · 2d493c1
1 parent 242466d
commit 2d493c1
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 5 deletions.
diff --git a/libs/Krakatau-10.zip → libs/Krakatau-11.zip b/libs/Krakatau-10.zip → libs/Krakatau-11.zip
diff --git a/libs/cfr-0.142.jar b/libs/cfr-0.142.jar
diff --git a/libs/cfr_0_125.jar b/libs/cfr_0_125.jar
diff --git a/libs/procyon-decompiler-0.5.30.jar b/libs/procyon-decompiler-0.5.30.jar
diff --git a/libs/procyon-decompiler-0.5.34.jar b/libs/procyon-decompiler-0.5.34.jar
diff --git a/src/the/bytecode/club/bootloader/Boot.java b/src/the/bytecode/club/bootloader/Boot.java
@@ -450,6 +450,7 @@ public static void checkKrakatau() {
         File krakatauZip = null;
         for (File f : new File(BytecodeViewer.libsDirectory).listFiles()) {
             if (f.getName().toLowerCase().startsWith("krakatau-")) {
+                //System.out.println(f.getName());
                 BytecodeViewer.krakatauVersion = f.getName().split("-")[1].split("\\.")[0];
                 krakatauZip = f;
             }
@@ -467,7 +468,8 @@ public static void checkKrakatau() {
             }
         }
 
-        BytecodeViewer.krakatauWorkingDirectory = BytecodeViewer.getBCVDirectory() + BytecodeViewer.fs + "krakatau_" + BytecodeViewer.krakatauVersion + BytecodeViewer.fs + "Krakatau-master";
+        BytecodeViewer.krakatauWorkingDirectory = BytecodeViewer.getBCVDirectory() + BytecodeViewer.fs + "krakatau_" +
+                BytecodeViewer.krakatauVersion + BytecodeViewer.fs + "Krakatau-master";
         File krakatauDirectory = new File(BytecodeViewer.getBCVDirectory() + BytecodeViewer.fs + "krakatau_" + BytecodeViewer.krakatauVersion);
         if (!krakatauDirectory.exists()) {
             try {

diff --git a/src/the/bytecode/club/bytecodeviewer/BytecodeViewer.java b/src/the/bytecode/club/bytecodeviewer/BytecodeViewer.java
@@ -130,7 +130,7 @@
 public class BytecodeViewer {
 
     /*per version*/
-    public static String version = "2.9.11";
+    public static String version = "2.9.12";
     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*/

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/decompilers/ProcyonDecompiler.java b/src/the/bytecode/club/bytecodeviewer/decompilers/ProcyonDecompiler.java
@@ -95,7 +95,7 @@ public DecompilerSettings getDecompilerSettings() {
                 .isSelected());
         settings.setUnicodeOutputEnabled(BytecodeViewer.viewer.chckbxmntmNewCheckItem_1
                 .isSelected());
-        settings.setFormattingOptions(JavaFormattingOptions.createDefault());
+        settings.setJavaFormattingOptions(JavaFormattingOptions.createDefault());
         return settings;
     }
 

diff --git a/src/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java b/src/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java
@@ -1619,7 +1619,7 @@ public void actionPerformed(ActionEvent arg0) {
         mnSettings.add(refreshOnChange);
 
         mnSettings.add(separator_38);
-        decodeAPKResources.setSelected(true);
+        decodeAPKResources.setSelected(false);
 
         mnSettings.add(decodeAPKResources);