Merge pull request #1 from Numzskull/master

Added Dark Theme and Updated Decompilers.
apkreader · Feb 14, 2021 · 450514f · 450514f
2 parents 40389f6 + e0edeb5
commit 450514f
Show file tree

Hide file tree

Showing 50 changed files with 394 additions and 130 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,198 @@
-/target/
-/bin/
-.DS_Store
-.classpath
-.project
-.settings/org.eclipse.jdt.core.prefs
-.settings/org.eclipse.core.resources.prefs
+
+# Created by https://www.toptal.com/developers/gitignore/api/eclipse,intellij+all,maven,java
+# Edit at https://www.toptal.com/developers/gitignore?templates=eclipse,intellij+all,maven,java
+
+### Eclipse ###
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# CDT- autotools
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+.apt_generated_test/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+# Uncomment this line if you wish to ignore the project description file.
+# Typically, this file would be tracked if it contains build/dependency configurations:
+#.project
+
+### Eclipse Patch ###
+# Spring Boot Tooling
+.sts4-cache/
+
+### Intellij+all ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Intellij+all Patch ###
+# Ignores the whole .idea folder and all .iml files
+# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
+
+.idea/
+
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+*.iml
+modules.xml
+.idea/misc.xml
+*.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Maven ###
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+# https://github.com/takari/maven-wrapper#usage-without-binary-jar
+.mvn/wrapper/maven-wrapper.jar
+
+# End of https://www.toptal.com/developers/gitignore/api/eclipse,intellij+all,maven,java
diff --git a/lib/attach-1.7.jar b/lib/attach-1.7.jar
diff --git a/lib/weblaf-complete-1.29-fixed.jar b/lib/weblaf-complete-1.29-fixed.jar
diff --git a/pom.xml b/pom.xml
@@ -14,6 +14,47 @@
 	</properties>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<version>2.5.2</version>
+				<executions>
+					<execution>
+						<id>install-attach</id>
+						<phase>clean</phase>
+						<configuration>
+							<file>${basedir}/lib/attach-1.7.jar</file>
+							<repositoryLayout>default</repositoryLayout>
+							<groupId>com.sun</groupId>
+							<artifactId>attach</artifactId>
+							<version>1.7</version>
+							<packaging>jar</packaging>
+							<generatePom>true</generatePom>
+						</configuration>
+						<goals>
+							<goal>install-file</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>install-weblaf</id>
+						<phase>clean</phase>
+						<configuration>
+							<file>${basedir}/lib/weblaf-complete-1.29-fixed.jar</file>
+							<repositoryLayout>default</repositoryLayout>
+							<groupId>com.weblaf</groupId>
+							<artifactId>weblaf</artifactId>
+							<version>1.2.9</version>
+							<packaging>jar</packaging>
+							<generatePom>true</generatePom>
+						</configuration>
+						<goals>
+							<goal>install-file</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
@@ -89,6 +130,11 @@
 			<url>https://jcenter.bintray.com</url>
 			<name>jcenter-bintray</name>
 		</repository>
+		<repository>
+			<id>oss-sonatype-snapshots</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+			<name>oss-sonatype</name>
+		</repository>
 	</repositories>
 
 
@@ -108,25 +154,30 @@
 			<artifactId>java-discord-rpc</artifactId>
 			<version>2.0.2</version>
 		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.bitbucket.mstrobel</groupId>-->
+<!--			<artifactId>procyon-core</artifactId>-->
+<!--			<version>0.5.36</version>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.bitbucket.mstrobel</groupId>
 			<artifactId>procyon-core</artifactId>
-			<version>0.5.36</version>
+			<version>1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.bitbucket.mstrobel</groupId>
 			<artifactId>procyon-expressions</artifactId>
-			<version>0.5.36</version>
+			<version>1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.bitbucket.mstrobel</groupId>
 			<artifactId>procyon-reflection</artifactId>
-			<version>0.5.36</version>
+			<version>1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.bitbucket.mstrobel</groupId>
 			<artifactId>procyon-compilertools</artifactId>
-			<version>0.5.36</version>
+			<version>1.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
@@ -145,16 +196,25 @@
 			<groupId>com.weblaf</groupId>
 			<artifactId>weblaf</artifactId>
 			<version>1.2.9</version>
+<!--			<systemPath>${basedir}/lib/weblaf-complete-1.29-fixed.jar</systemPath>-->
+<!--			<scope>system</scope>-->
+		</dependency>
+		<dependency>
+			<groupId>com.formdev</groupId>
+			<artifactId>flatlaf</artifactId>
+			<version>1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.benf</groupId>
 			<artifactId>cfr</artifactId>
-			<version>0.150</version>
+			<version>0.151</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun</groupId>
 			<artifactId>attach</artifactId>
 			<version>1.7</version>
+<!--			<systemPath>${basedir}/lib/attach-1.7.jar</systemPath>-->
+<!--			<scope>system</scope>-->
 		</dependency>
 		<dependency>
 			<groupId>commons-cli</groupId>

diff --git a/src/main/java/de/xbrowniecodez/jbytemod/securitymanager/CustomSecurityManager.java b/src/main/java/de/xbrowniecodez/jbytemod/securitymanager/CustomSecurityManager.java
@@ -18,7 +18,7 @@ public void enable() {
 
 	@Override
 	public void checkConnect(String host, int port) {
-		JByteMod.LOGGER.log("[Security Manager] Blocked connection");
+		JByteMod.LOGGER.log(String.format("[Security Manager] Blocked a connection to %s:%s", host, port));
 		SneakyThrow.sneakyThrow(new SocketTimeoutException("[SecurityManager] Connection blocked."));
 
 

diff --git a/src/main/java/me/grax/jbytemod/JByteMod.java b/src/main/java/me/grax/jbytemod/JByteMod.java
@@ -1,7 +1,6 @@
 package me.grax.jbytemod;
 
 import com.sun.tools.attach.VirtualMachine;
-
 import de.xbrowniecodez.jbytemod.securitymanager.CustomSecurityManager;
 import de.xbrowniecodez.jbytemod.utils.UpdateChecker;
 import me.grax.jbytemod.discord.Discord;
@@ -10,7 +9,6 @@
 import me.grax.jbytemod.plugin.PluginManager;
 import me.grax.jbytemod.res.LanguageRes;
 import me.grax.jbytemod.res.Options;
-import me.grax.jbytemod.scanner.ScannerThread;
 import me.grax.jbytemod.ui.*;
 import me.grax.jbytemod.ui.graph.ControlFlowPanel;
 import me.grax.jbytemod.ui.lists.LVPList;
@@ -44,14 +42,12 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.File;
-import java.io.IOException;
 import java.lang.instrument.Instrumentation;
 import java.lang.reflect.Field;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
-import java.util.Properties;
 
 public class JByteMod extends JFrame {
 	public final static String version = "2.1.3";

diff --git a/src/main/java/me/grax/jbytemod/analysis/obfuscation/ObfuscationAnalyzer.java b/src/main/java/me/grax/jbytemod/analysis/obfuscation/ObfuscationAnalyzer.java
@@ -23,10 +23,10 @@ public class ObfuscationAnalyzer implements Opcodes {
     private static final String ZKM8 = "ZKM8";
     private static final String ZKM5 = "ZKM5";
     private static final List<String> keywords = Arrays
-            .asList(new String[]{"abstract", "assert", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "default", "do",
+            .asList("abstract", "assert", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "default", "do",
                     "double", "else", "enum", "extends", "for", "final", "finally", "float", "goto", "if", "implements", "import", "instanceof", "int",
                     "interface", "long", "native", "new", "package", "private", "protected", "public", "return", "short", "static", "strictfp", "super",
-                    "switch", "synchronized", "this", "throw", "throws", "transient", "try", "void", "volatile", "while", "true", "false", "null"});
+                    "switch", "synchronized", "this", "throw", "throws", "transient", "try", "void", "volatile", "while", "true", "false", "null");
     private static final List<String> windir = Arrays.asList(new String[]{"con", "nul", "aux", "prn"});
     private static CharsetEncoder asciiEncoder = Charset.forName("US-ASCII").newEncoder();
     private Map<String, ClassNode> classes;

diff --git a/src/main/java/me/grax/jbytemod/decompiler/Decompilers.java b/src/main/java/me/grax/jbytemod/decompiler/Decompilers.java
@@ -1,7 +1,7 @@
 package me.grax.jbytemod.decompiler;
 
 public enum Decompilers {
-    CFR("CFR", "1.50"), PROCYON("Procyon", "0.5.36"), FERNFLOWER("Fernflower", ""), KRAKATAU("Krakatau", "502");
+    CFR("CFR", "1.51"), PROCYON("Procyon", "1.0-SNAPSHOT"), FERNFLOWER("Fernflower", ""), KRAKATAU("Krakatau", "502");
     private String version;
     private String name;