Merge branch 'master' into gui_fixes

# Conflicts: # src/main/java/the/bytecode/club/bytecodeviewer/searching/impl/LDCSearch.java # src/main/java/the/bytecode/club/bytecodeviewer/searching/impl/MemberWithAnnotationSearch.java # src/main/java/the/bytecode/club/bytecodeviewer/searching/impl/MethodCallSearch.java # src/main/java/the/bytecode/club/bytecodeviewer/searching/impl/RegexSearch.java
Konloch · Apr 17, 2022 · eded177 · eded177
2 parents b52c194 + 35359d1
commit eded177
Show file tree

Hide file tree

Showing 70 changed files with 10,766 additions and 7,802 deletions.
diff --git a/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar
diff --git a/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar.md5 b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar.md5
diff --git a/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar.sha1 b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar.sha1
diff --git a/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom
diff --git a/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom.md5 b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom.md5
diff --git a/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom.sha1 b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom.sha1
diff --git a/libs/org/apktool/apktool-cli/maven-metadata.xml b/libs/org/apktool/apktool-cli/maven-metadata.xml
diff --git a/libs/org/apktool/apktool-cli/maven-metadata.xml.md5 b/libs/org/apktool/apktool-cli/maven-metadata.xml.md5
diff --git a/libs/org/apktool/apktool-cli/maven-metadata.xml.sha1 b/libs/org/apktool/apktool-cli/maven-metadata.xml.sha1
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>the.bytecode.club</groupId>
     <artifactId>Bytecode-Viewer</artifactId>
-    <version>2.11.1</version>
+    <version>2.11.2</version>
 
     <properties>
         <!-- Project settings -->
@@ -15,8 +15,8 @@
         <!-- Dependency versions -->
         <annotations.version>23.0.0</annotations.version>
         <antlr4.version>4.9.3</antlr4.version>
-        <apktool.version>2.6.0</apktool.version>
-        <asm.version>9.2</asm.version>
+        <apktool.version>2.6.1</apktool.version>
+        <asm.version>9.3</asm.version>
         <bined.version>0.2.0</bined.version>
         <byteanalysis.version>1.0bcv</byteanalysis.version>
         <cfr.version>0.152</cfr.version>
@@ -31,12 +31,12 @@
         <darklaf.version>2.7.3</darklaf.version>
         <darklaf-extensions-rsta.version>0.3.4</darklaf-extensions-rsta.version>
         <decompiler-fernflower.version>5.2.1.Final</decompiler-fernflower.version>
-        <dex2jar.version>v46</dex2jar.version>
-        <fernflower.version>5a2b2cc</fernflower.version>
+        <dex2jar.version>v49</dex2jar.version>
+        <fernflower.version>4281855</fernflower.version>
         <gson.version>2.9.0</gson.version>
-        <guava.version>31.0.1-jre</guava.version>
+        <guava.version>31.1-jre</guava.version>
         <imgscalr-lib.version>4.2</imgscalr-lib.version>
-        <jadx.version>1.3.3</jadx.version>
+        <jadx.version>1.3.4</jadx.version>
         <janino.version>3.1.6</janino.version>
         <jd-gui.version>1.6.6bcv</jd-gui.version>
         <jgraphx.version>3.4.1.3</jgraphx.version>
@@ -409,7 +409,7 @@
                         <filter>
                             <artifact>*:*</artifact>
                             <excludes>
-                                <exclude>module-info.class</exclude>
+                                <exclude>**/module-info.class</exclude>
                                 <exclude>META-INF/*.SF</exclude>
                                 <exclude>META-INF/*.DSA</exclude>
                                 <exclude>META-INF/*.RSA</exclude>

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java b/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java
@@ -178,10 +178,16 @@ public static void main(String[] args)
 
         System.out.println(" - Created by @Konloch");
         System.out.println("https://bytecodeviewer.com - https://the.bytecode.club");
-
-        //set the security manager
-        System.setSecurityManager(sm);
-
+
+        // Set the security manager
+        try {
+            System.setSecurityManager(sm);
+        } catch (Throwable t) {
+            System.err.println("Cannot set security manager! Are you on Java 18+ and have not enabled support for it?");
+            System.err.println("Because of this, you may be susceptible to some exploits!");
+            System.err.println("Either deal with it or allow it using the -Djava.security.manager=allow parameter.");
+        }
+
         try
         {
             //precache settings file

diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/SettingsSerializer.java b/src/main/java/the/bytecode/club/bytecodeviewer/SettingsSerializer.java
@@ -200,6 +200,7 @@ else if (BytecodeViewer.viewer.apkConversionGroup.isSelected(BytecodeViewer.view
             save(Configuration.python2Extra);
             save(Configuration.python3Extra);
             save(BytecodeViewer.viewer.getMinSdkVersion());
+            save(BytecodeViewer.viewer.printLineNumbers.isSelected());
         } catch (Exception e) {
             BytecodeViewer.handleException(e);
         }
@@ -397,6 +398,7 @@ public static void loadSettings()
             Configuration.python2Extra = asBoolean(139);
             Configuration.python3Extra = asBoolean(140);
             BytecodeViewer.viewer.minSdkVersionSpinner.setValue(asInt(141));
+            BytecodeViewer.viewer.printLineNumbers.setSelected(asBoolean(142));
         }
         catch (IndexOutOfBoundsException e)
         {