httpsgithu · pull · Sep 26, 2024 · Sep 26, 2024 · Sep 26, 2024 · Sep 26, 2024
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,24 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+tab_width = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.java]
+max_line_length = 120
+ij_java_class_brace_style = next_line
+ij_java_method_brace_style = next_line
+ij_java_block_brace_style = next_line
+
+[*.xml]
+indent_size = 4
+tab_width = 4
+
+[*.properties]
+indent_size = 4
+tab_width = 4
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -7,31 +7,33 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
+  workflow_dispatch:
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11', '17-ea' ] # LTS versions
+        java: [ '8', '11', '17', '21', '25' ] # LTS versions
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
         distribution: 'temurin'
+        cache: maven
     - name: Build with Maven
       run: mvn -B package --file pom.xml
     - name: Extract Maven project version
-      run: echo ::set-output name=version::$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+      run: echo "bcv_version=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
       id: project
     - name: 'Upload Artifact'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: ${{ matrix.java == '8' }}
       with:
-        name: Bytecode-Viewer-${{ steps.project.outputs.version }}-SNAPSHOT
-        path: target/Bytecode-Viewer-${{ steps.project.outputs.version }}.jar
+        name: Bytecode-Viewer-${{ env.bcv_version }}-SNAPSHOT
+        path: target/Bytecode-Viewer-${{ env.bcv_version }}.jar
         retention-days: 90
diff --git a/LICENSE b/LICENSE
@@ -645,30 +645,4 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    Bytecode Viewer(BCV)  Copyright (C) 2014  Kalen "Konloch" Kinloch - http://bytecodeviewer.com - http://the.bytecode.club
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/README.md b/README.md
@@ -3,23 +3,21 @@
 Bytecode Viewer - a lightweight user-friendly Java/Android Bytecode Viewer, Decompiler & More.
 
 #### New Features
-* Dark mode with multiple themes
+* Jump to Declaration
+* Draggable tabs
+* Patched [CVE-2022-21675](https://github.com/Konloch/bytecode-viewer/security/advisories/GHSA-3wq9-j4fc-4wmc) (Make sure to upgrade to v2.11.X)
+* Dark mode by default with multiple themes
 * Translated into over 30 languages including: Arabic, German, Japanese, Mandarin, Russian, Spanish
 * Plugin Writer - create and edit external plugins from within BCV
 * Fixed Java & Bytecode editing/compiling
 * Tabbed plugin console
 * Right-click menus on the resource and search panels
 * Javap disassembler
 * XAPK support
-* Updated nearly all dependencies (incl. decompilers like CFR, JD-GUI etc.)
-* Updated ASM library to version 9.1
+* Latest dependencies (incl. decompilers like CFR, JD-GUI etc.)
 * Added support to Java files compiled using JDK > 13
 * Migrated to Maven
 
-#### v2.10.x Notes
-* The rewrite/refactoring process is currently ongoing so please report any bugs you find
-* If you're encountering any issues try using [v2.9.22](https://github.com/Konloch/bytecode-viewer/releases/tag/v2.9.22)
-
 #### Links
 * [BCV Discord](https://discord.gg/aexsYpfMEf)
 * [Website](https://bytecodeviewer.com)
@@ -34,7 +32,7 @@ Bytecode Viewer - a lightweight user-friendly Java/Android Bytecode Viewer, Deco
 
 #### Key Features
 * Simply drag and drop to decompile and search Java Jars & Android APKs
-* File format support for: Class, Jar, XAPK, APK, DEX, WAR, JSP, Image Resources, Text Resources & More
+* File format support for: Class, Jar, APK, DEX, XAPK, APKM, WAR, JSP, Image Resources, Text Resources & More
 * 6 Built-in Java decompilers: Krakatau, CFR, Procyon, FernFlower, JADX, JD-GUI
 * 3 Built-in Bytecode disassemblers, including 2 assemblers: Krakatau and Smali/BakSmali
 * APK/DEX Support from Dex2Jar and Enjarify
@@ -77,7 +75,7 @@ Download the latest version from https://github.com/konloch/bytecode-viewer/rele
 You may need to execute it via command line ```java -jar Bytecode-Viewer-2.10.x.jar``` (replace the X with the current minor version)
 
 ## How can I use BCV?
-* Starting with a Jar, Zip, ClassFile or Android file (APK, DEX, XAPK, etc) drag it into BCV. It will start the decoding process automatically.
+* Starting with a Jar, Zip, ClassFile or Android file (APK, DEX, XAPK, APKM, etc) drag it into BCV. It will start the decoding process automatically.
 * From here you can select the decompilers you would like to use by selecting the View Pane>View 1, View 2, View 3, etc.
 * The view panes are-used to display up to 3 decompilers side by side, you can also toggle edibility here.
 * Select the resource you would like to open by navigating using the resource list, BCV will do its best to display it (Decompiling, Disassembling, etc).
@@ -98,6 +96,9 @@ Just clone this repo and run ``mvn package``. It's that simple!
 
 Open the Maven project (e.g. in IntelliJ, open the ``pom.xml`` as a project file).
 
+## UI Is Lagging
+Change the theme to your systems. Go into `View->Visual Settings->Window Theme` and select `System Theme`.
+
 ## Java Heap Space Issues (java.lang.OutOfMemoryError)
 Start BCV with more RAM, e.g. `java -Xmx3G -jar BCV.jar`
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,9 @@
+# Security Policy
+
+## Supported Versions
+
+All versions of BCV are actively supported for security patches & updates.
+
+## Reporting a Vulnerability
+
+E-Mail konloch@gmail.com if you find any issues.
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+  "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+  "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<!--
+  Checkstyle configuration customized for my code style preferences.
+
+  This configuration enforces the following:
+    - Proper indentation (4 spaces)
+    - No unnecessary trailing spaces
+    - Maximum line length of 120 characters
+    - Consistent brace style (Allman)
+    - Proper whitespace usage
+    - Enforcement of basic Java best practices without adhering strictly to official conventions.
+-->
+
+<module name="Checker">
+
+  <module name="SuppressionFilter">
+    <property name="file" value="checkstyle_suppression.xml" />
+  </module>
+
+  <property name="severity" value="error"/>
+  <property name="fileExtensions" value="java, properties, xml"/>
+
+  <!-- Exclude module-info.java files as they are not needed for validation -->
+  <module name="BeforeExecutionExclusionFileFilter">
+    <property name="fileNamePattern" value="module-info\.java$"/>
+  </module>
+
+  <!-- Ensure files end with a newline -->
+  <module name="NewlineAtEndOfFile"/>
+
+  <!-- Enforce maximum file length -->
+  <module name="FileLength"/>
+
+  <!-- Maximum line length set to 150 characters -->
+  <module name="LineLength">
+    <property name="max" value="150"/>
+  </module>
+
+  <!-- Disallow tab characters, enforce 4-space indentation -->
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+
+  <module name="TreeWalker">
+    <!-- Enforce brace style (K&R), which starts a block on the same line as the control statement -->
+    <module name="LeftCurly">
+      <property name="option" value="nl"/>
+    </module>
+    <module name="RightCurly">
+      <property name="option" value="alone"/>
+    </module>
+
+    <!-- Enforce indentation -->
+    <module name="Indentation">
+      <property name="basicOffset" value="4"/>
+      <property name="braceAdjustment" value="0"/>
+      <property name="caseIndent" value="4"/>
+      <property name="throwsIndent" value="4"/>
+      <property name="lineWrappingIndentation" value="4"/>
+      <property name="arrayInitIndent" value="4"/>
+    </module>
+
+    <!-- Enforce no empty blocks without comments -->
+    <module name="EmptyBlock">
+      <property name="option" value="TEXT"/>
+      <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+    </module>
+
+    <!-- Suppression via comments -->
+    <module name="SuppressionCommentFilter"/>
+
+    <!-- No unused imports -->
+    <module name="UnusedImports"/>
+
+    <!-- Checks for naming conventions -->
+    <module name="ConstantName"/>
+    <module name="LocalFinalVariableName"/>
+    <module name="LocalVariableName"/>
+    <module name="MemberName"/>
+    <module name="MethodName"/>
+    <module name="PackageName"/>
+    <module name="ParameterName"/>
+    <module name="StaticVariableName"/>
+    <module name="TypeName"/>
+
+    <!-- Enforce spacing around operators -->
+    <module name="WhitespaceAround">
+      <property name="allowEmptyConstructors" value="true"/>
+      <property name="allowEmptyMethods" value="true"/>
+      <property name="allowEmptyTypes" value="true"/>
+      <property name="allowEmptyLoops" value="true"/>
+      <property name="allowEmptyLambdas" value="true"/>
+    </module>
+
+    <!-- Additional whitespace rules to avoid inconsistent formatting -->
+    <module name="WhitespaceAfter"/>
+    <module name="NoWhitespaceBefore"/>
+    <module name="ParenPad"/>
+
+    <!-- Ensure a blank line exists between class definitions and members -->
+    <module name="EmptyLineSeparator">
+      <property name="allowNoEmptyLineBetweenFields" value="true"/>
+    </module>
+
+    <!-- No multiple variable declarations in a single line -->
+    <module name="MultipleVariableDeclarations"/>
+
+    <!-- Ensure proper method design and code clarity -->
+    <module name="FinalClass"/>
+  </module>
+</module>
diff --git a/checkstyle_suppression.xml b/checkstyle_suppression.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+  "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+  "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+
+<suppressions>
+  <suppress files="JavaBytecodeTokenMaker\.java" checks="[a-zA-Z0-9]*"/>
+</suppressions>
diff --git a/install/launch4j_config.xml b/install/launch4j_config.xml
@@ -14,35 +14,35 @@
   <lib>w32api/libshell32.a</lib>
   <jar>H:\Repo\BCV\bytecode-viewer\BytecodeViewer 2.9.8.jar</jar>
   <outfile>H:\Repo\BCV\bytecode-viewer\BytecodeViewer.exe</outfile>
-  <errTitle></errTitle>
-  <cmdLine></cmdLine>
+  <errTitle/>
+  <cmdLine/>
   <chdir>.</chdir>
   <priority>normal</priority>
-  <downloadUrl>http://java.com/download</downloadUrl>
-  <supportUrl></supportUrl>
+  <downloadUrl>https://java.com/de/download/</downloadUrl>
+  <supportUrl/>
   <stayAlive>false</stayAlive>
   <restartOnCrash>false</restartOnCrash>
-  <manifest></manifest>
+  <manifest/>
   <icon>H:\Repo\BCV\bytecode-viewer\BCV Icon.ico</icon>
   <jre>
-    <path></path>
+    <path/>
     <bundledJre64Bit>false</bundledJre64Bit>
     <bundledJreAsFallback>false</bundledJreAsFallback>
     <minVersion>1.7.0_00</minVersion>
-    <maxVersion></maxVersion>
+    <maxVersion/>
     <jdkPreference>preferJre</jdkPreference>
     <runtimeBits>64/32</runtimeBits>
   </jre>
   <versionInfo>
     <fileVersion>0.2.9.7</fileVersion>
-    <txtFileVersion>http://the.bytecode.club</txtFileVersion>
+    <txtFileVersion>https://the.bytecode.club/</txtFileVersion>
     <fileDescription>Bytecode Viewer</fileDescription>
-    <copyright>http://bytecodeviewer.com</copyright>
+    <copyright>https://bytecodeviewer.com/</copyright>
     <productVersion>0.2.9.6</productVersion>
-    <txtProductVersion>http://the.bytecode.club</txtProductVersion>
+    <txtProductVersion>https://the.bytecode.club/</txtProductVersion>
     <productName>Bytecode Viewer</productName>
-    <companyName></companyName>
+    <companyName/>
     <internalName>BCV</internalName>
     <originalFilename>Bytecode_Viewer.exe</originalFilename>
   </versionInfo>
-</launch4jConfig>
+</launch4jConfig>
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/plugins/Skeleton.gy b/plugins/Skeleton.gy