diff --git a/libs/Krakatau-10.zip b/libs/Krakatau-11.zip similarity index 62% rename from libs/Krakatau-10.zip rename to libs/Krakatau-11.zip index 369646504..47cee1236 100644 Binary files a/libs/Krakatau-10.zip and b/libs/Krakatau-11.zip differ diff --git a/libs/cfr-0.142.jar b/libs/cfr-0.142.jar new file mode 100644 index 000000000..89285d5e8 Binary files /dev/null and b/libs/cfr-0.142.jar differ diff --git a/libs/cfr_0_125.jar b/libs/cfr_0_125.jar deleted file mode 100644 index a4651fa6c..000000000 Binary files a/libs/cfr_0_125.jar and /dev/null differ diff --git a/libs/procyon-decompiler-0.5.30.jar b/libs/procyon-decompiler-0.5.30.jar deleted file mode 100644 index 5dc8b1dd7..000000000 Binary files a/libs/procyon-decompiler-0.5.30.jar and /dev/null differ diff --git a/libs/procyon-decompiler-0.5.34.jar b/libs/procyon-decompiler-0.5.34.jar new file mode 100644 index 000000000..a2acbd97f Binary files /dev/null and b/libs/procyon-decompiler-0.5.34.jar differ diff --git a/src/the/bytecode/club/bootloader/Boot.java b/src/the/bytecode/club/bootloader/Boot.java index cd69948b5..d5267da6a 100644 --- 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 index a9f9daa3c..33cdbd64c 100644 --- 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 index 192809df7..d913630fc 100644 --- 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 index bb5576e46..e3ff45b33 100644 --- 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 index 0b99322a2..4f80ac947 100644 --- 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);