Cynosphere/bcv-vf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

v2.9.19 changes

Browse source
This commit is contained in:
Konloch 2019-05-05 18:22:31 -06:00
parent 7f227ca7e7
commit 9f3302f7a9
7 changed files with 53 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.gitignore vendored
View file

@ -1,7 +1,8 @@
/bin/
.bin/
.idea/
.out/
.gradle/
.classpath
.project
*.iml
.idea/
out/
.DS_Store
.DS_Store
*.iml

4
CREDITS.md
View file

@ -6,13 +6,15 @@
* ASM by OW2
* FernFlower by Stiver
* Procyon by Mstrobel
* Luyten by DeathMarine
* CFR by Lee Benfield
* CFIDE by Bibl
* Smali by JesusFreke
* Dex2Jar by pxb1988
* Dex2Jar by pxb1988 & Lanchon
* Krakatau by Storyyeller
* JD GUI/JD Core by The Java-Decompiler Team
* Enjarify by Storyyeller
* JADX by Skylot
## Contributors
* Konloch

4
README.md
View file

@ -3,12 +3,14 @@
Bytecode Viewer - a lightweight user friendly Java Bytecode Viewer.
#### New Features
* WAR & JSP Loading
* JADX-Core Decompiler
* Fixed APK & dex loading
* Fixed Java 10+ classfiles
* Better visual feedback due to the new busy icon system
* Synchronized viewing pane option & quick method selection
* Updated most libraries to their 2019 version
* Tons of bug fixes and general improvements
* Updated most libraries to their 2019 versions (still a WIP)
#### Links

13
src/the/bytecode/club/bootloader/Boot.java
View file

@ -320,15 +320,18 @@ public class Boot {
public static void dropKrakatau()
{
File temp = new File(BytecodeViewer.getBCVDirectory() + BytecodeViewer.fs + "krakatau_" + BytecodeViewer.krakatauVersion + ".zip");
File krakatauDirectory = new File(BytecodeViewer.krakatauWorkingDirectory);
BytecodeViewer.krakatauWorkingDirectory = BytecodeViewer.krakatauWorkingDirectory + BytecodeViewer.fs + "Krakatau-master";
if (!krakatauDirectory.exists())
if (!krakatauDirectory.exists() || temp.exists())
{
if(temp.exists())
temp.delete();
setState("Bytecode Viewer Boot Screen - Extracting Krakatau");
System.out.println("Extracting Krakatau");
try
{
File temp = new File(BytecodeViewer.getBCVDirectory() + BytecodeViewer.fs + "krakatau_" + BytecodeViewer.krakatauVersion + ".zip");
while (temp.exists())
temp.delete();
@ -358,15 +361,17 @@ public class Boot {
public static void dropEnjarify()
{
File temp = new File(BytecodeViewer.getBCVDirectory() + BytecodeViewer.fs + "enjarify" + BytecodeViewer.enjarifyVersion + ".zip");
File enjarifyDirectory = new File(BytecodeViewer.enjarifyWorkingDirectory);
BytecodeViewer.enjarifyWorkingDirectory = BytecodeViewer.enjarifyWorkingDirectory + BytecodeViewer.fs + "enjarify-master";
if (!enjarifyDirectory.exists())
if (!enjarifyDirectory.exists() || temp.exists())
{
if(temp.exists())
temp.delete();
setState("Bytecode Viewer Boot Screen - Extracting Enjarify");
System.out.println("Extracting Enjarify");
try
{
File temp = new File(BytecodeViewer.getBCVDirectory() + BytecodeViewer.fs + "enjarify" + BytecodeViewer.enjarifyVersion + ".zip");
while (temp.exists())
temp.delete();

36
src/the/bytecode/club/bytecodeviewer/BytecodeViewer.java
View file

@ -97,7 +97,6 @@ import the.bytecode.club.bytecodeviewer.util.*;
* http://the.bytecode.club
*
* TODO:
* Update fernflower for it's 2019 version
* Finish dragging code
* Finish right-click tab menu detection
* make it use that global last used inside of export as jar
@ -119,7 +118,7 @@ import the.bytecode.club.bytecodeviewer.util.*;
public class BytecodeViewer
{
/*per version*/
public static final String VERSION = "2.9.18";
public static final String VERSION = "2.9.19";
public static String krakatauVersion = "12";
public static String enjarifyVersion = "4";
public static final boolean BLOCK_TAB_MENU = true;
@ -746,8 +745,15 @@ public class BytecodeViewer
String smaliText = (String) smali[1];
byte[] smaliCompiled = the.bytecode.club.bytecodeviewer.compilers.Compiler.smali.compile(smaliText, origNode.name);
if (smaliCompiled != null) {
ClassNode newNode = JarUtils.getNode(smaliCompiled);
BytecodeViewer.updateNode(origNode, newNode);
try
{
ClassNode newNode = JarUtils.getNode(smaliCompiled);
BytecodeViewer.updateNode(origNode, newNode);
}
catch(Exception e)
{
e.printStackTrace();
}
} else {
BytecodeViewer.showMessage("There has been an error with assembling your Smali code, please check this. Class: " + origNode.name);
BytecodeViewer.viewer.setIcon(false);
@ -767,8 +773,15 @@ public class BytecodeViewer
String krakatauText = (String) krakatau[1];
byte[] krakatauCompiled = the.bytecode.club.bytecodeviewer.compilers.Compiler.krakatau.compile(krakatauText, origNode.name);
if (krakatauCompiled != null) {
ClassNode newNode = JarUtils.getNode(krakatauCompiled);
BytecodeViewer.updateNode(origNode, newNode);
try
{
ClassNode newNode = JarUtils.getNode(krakatauCompiled);
BytecodeViewer.updateNode(origNode, newNode);
}
catch(Exception e)
{
e.printStackTrace();
}
} else {
BytecodeViewer.showMessage("There has been an error with assembling your Krakatau Bytecode, please check this. Class: " + origNode.name);
BytecodeViewer.viewer.setIcon(false);
@ -791,8 +804,15 @@ public class BytecodeViewer
byte[] javaCompiled = the.bytecode.club.bytecodeviewer.compilers.Compiler.java.compile(javaText, origNode.name);
if (javaCompiled != null) {
ClassNode newNode = JarUtils.getNode(javaCompiled);
BytecodeViewer.updateNode(origNode, newNode);
try
{
ClassNode newNode = JarUtils.getNode(javaCompiled);
BytecodeViewer.updateNode(origNode, newNode);
}
catch(Exception e)
{
e.printStackTrace();
}
errConsole.finished();
} else {
errConsole.pretty();

2
src/the/bytecode/club/bytecodeviewer/gui/FileNavigationPane.java
View file

@ -639,7 +639,7 @@ public class FileNavigationPane extends VisibleComponent implements
setIcon(Resources.textIcon);
} else if (name.equals("decoded resources")) {
setIcon(Resources.decodedIcon);
} else if (name.endsWith(".properties") || name.endsWith(".xml") || name.endsWith(".mf") || name.endsWith(".config") || name.endsWith(".cfg")) {
} else if (name.endsWith(".properties") || name.endsWith(".xml") || name.endsWith(".jsp") || name.endsWith(".mf") || name.endsWith(".config") || name.endsWith(".cfg")) {
setIcon(Resources.configIcon);
} else if (node.getChildCount() <= 0) { //random file
setIcon(Resources.fileIcon);

5
src/the/bytecode/club/bytecodeviewer/util/JarUtils.java
View file

@ -75,6 +75,7 @@ public class JarUtils {
final ClassNode cn = getNode(bytes);
container.classes.add(cn);
} catch (Exception e) {
System.err.println("Skipping: " + name);
e.printStackTrace();
}
} else {
@ -255,7 +256,7 @@ public class JarUtils {
* @param bytez the class file's byte[]
* @return the ClassNode instance
*/
public static ClassNode getNode(final byte[] bytez) {
public static ClassNode getNode(final byte[] bytez) throws Exception {
ClassReader cr = new ClassReader(bytez);
ClassNode cn = new ClassNode();
try {
@ -264,7 +265,7 @@ public class JarUtils {
try {
cr.accept(cn, ClassReader.SKIP_FRAMES);
} catch (Exception e2) {
e2.printStackTrace(); //just skip it
throw e2;
}
}
cr = null;