Skip to content

Commit cbb642d

Browse files
KonlochKonloch
committed
apktool 2.3 test
1 parent 04874b3 commit cbb642d

5 files changed

Lines changed: 9 additions & 36 deletions

File tree

‎libs/apktool_2.0.1_obf-2.jar‎

-4.89 MB
Binary file not shown.

‎libs/apktool_2.3.0.jar‎

5.55 MB
Binary file not shown.

‎src/the/bytecode/club/bytecodeviewer/BytecodeViewer.java‎

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
public class BytecodeViewer
123123
{
124124
/*per version*/
125-
public static String version = "2.9.13";
125+
public static String version = "2.9.14";
126126
public static boolean previewCopy = false;
127127
public static boolean fatJar = true; //could be automatic by checking if it's loaded a class named whatever for a library
128128
/*the rest*/
@@ -491,30 +491,6 @@ public void run() {
491491
}
492492
};
493493

494-
public static void pingback() {
495-
JOptionPane pane = new JOptionPane(
496-
"Would you like to 'pingback' to https://bytecodeviewer.com to be counted in the global users for BCV?");
497-
Object[] options = new String[]{"Yes", "No"};
498-
pane.setOptions(options);
499-
JDialog dialog = pane.createDialog(BytecodeViewer.viewer,
500-
"Bytecode Viewer - Optional Pingback");
501-
dialog.setVisible(true);
502-
Object obj = pane.getValue();
503-
int result = -1;
504-
for (int k = 0; k < options.length; k++)
505-
if (options[k].equals(obj))
506-
result = k;
507-
508-
if (result == 0) {
509-
try {
510-
if (!PingBack.isAlive())
511-
PingBack.start();
512-
} catch (Exception e) {
513-
new the.bytecode.club.bytecodeviewer.api.ExceptionUI(e);
514-
}
515-
}
516-
}
517-
518494
/**
519495
* Grab the byte array from the loaded Class object
520496
*
@@ -1387,6 +1363,11 @@ public static void dumpTempFile()
13871363
krakatauTempJar = null;
13881364
}*/
13891365

1366+
if(krakatauTempJar != null && !krakatauTempJar.exists())
1367+
{
1368+
needsReDump = true;
1369+
}
1370+
13901371
if(needsReDump && krakatauTempJar != null)
13911372
{
13921373
krakatauTempDir.delete();

‎src/the/bytecode/club/bytecodeviewer/Settings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ else if (decompiler == 9)
394394
BytecodeViewer.viewer.panel3Fern_E.setSelected(Boolean.parseBoolean(DiskReader.loadString(BytecodeViewer.settingsName, 103, false)));
395395
BytecodeViewer.viewer.panel3Krakatau_E.setSelected(Boolean.parseBoolean(DiskReader.loadString(BytecodeViewer.settingsName, 104, false)));
396396
BytecodeViewer.viewer.panel3Smali_E.setSelected(Boolean.parseBoolean(DiskReader.loadString(BytecodeViewer.settingsName, 105, false)));
397-
// BytecodeViewer.viewer.decodeAPKResources.setSelected(Boolean.parseBoolean(DiskReader.loadString(BytecodeViewer.settingsName, 106, false)));
397+
BytecodeViewer.viewer.decodeAPKResources.setSelected(Boolean.parseBoolean(DiskReader.loadString(BytecodeViewer.settingsName, 106, false)));
398398
BytecodeViewer.library = DiskReader.loadString(BytecodeViewer.settingsName, 107, false);
399399
BytecodeViewer.pingback = Boolean.parseBoolean(DiskReader.loadString(BytecodeViewer.settingsName, 108, false));
400400
BytecodeViewer.viewer.panel1JDGUI_E.setSelected(Boolean.parseBoolean(DiskReader.loadString(BytecodeViewer.settingsName, 109, false)));

‎src/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,6 @@ public void run() {
607607
public final ButtonGroup panelGroup2 = new ButtonGroup();
608608
public final ButtonGroup panelGroup3 = new ButtonGroup();
609609
private final JMenuItem mntmSetOpitonalLibrary = new JMenuItem("Set Optional Library Folder");
610-
private final JMenuItem mntmPingback = new JMenuItem("Pingback");
611610
private final JMenu mnJdgui = new JMenu("JD-GUI");
612611
public final JRadioButtonMenuItem panel3JDGUI = new JRadioButtonMenuItem("Java");
613612
private final JSeparator separator_33 = new JSeparator();
@@ -1403,14 +1402,7 @@ public void actionPerformed(ActionEvent arg0) {
14031402
}
14041403
}
14051404
});
1406-
mntmPingback.addActionListener(new ActionListener() {
1407-
@Override
1408-
public void actionPerformed(ActionEvent arg0) {
1409-
BytecodeViewer.pingback();
1410-
}
1411-
});
14121405

1413-
mnNewMenu.add(mntmPingback);
14141406
mnNewMenu.add(mntmExit);
14151407

14161408
menuBar.add(mnNewMenu_6);
@@ -1619,8 +1611,8 @@ public void actionPerformed(ActionEvent arg0) {
16191611
mnSettings.add(refreshOnChange);
16201612

16211613
mnSettings.add(separator_38);
1622-
decodeAPKResources.setSelected(false);
1623-
decodeAPKResources.setEnabled(false);
1614+
decodeAPKResources.setSelected(true);
1615+
//decodeAPKResources.setEnabled(false);
16241616

16251617
mnSettings.add(decodeAPKResources);
16261618

0 commit comments

Comments
 (0)