update version to 1.7.0

tp7309 · Sep 24, 2023 · 310d048 · 310d048
1 parent 1cd9483
commit 310d048
Show file tree

Hide file tree

Showing 54 changed files with 17 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -6,13 +6,13 @@ README i18n: [中文说明](https://github.com/tp7309/TTDeDroid/blob/master/READ
 
 The tool for quickly decompile **apk/aar/dex/jar**, will be updated depending on the update of libs.
 
-> - update at 2023-03-19
+> - update at 2023-09-24
 >
-> - jadx=1.4.6
+> - jadx=1.4.7
 > - Storyyeller/enjarify(build by source)
 > - dex2jar(build by source)
-> - fernflower=222.4345.14(IntelliJ IDEA official decompiler)
-> - apktool=2.7.0
+> - fernflower=232.9921.47(IntelliJ IDEA official decompiler)
+> - apktool=2.8.1
 
 # Requirements
 No need to install python environment.

diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -5,13 +5,14 @@
 
 一键反编译 **apk/aar/dex/jar**，没什么技术含量，只是调调工具命令，处理些兼容性问题，会视反编译库的更新情况更新工具版本。
 
-> - update at 2023-03-19
+> - update at 2023-09-24
 >
-> - jadx=1.4.6
+> - jadx=1.4.7
 > - Storyyeller/enjarify(build by source)
 > - dex2jar(build by source)
-> - fernflower=222.4345.14(IntelliJ IDEA official decompiler)
-> - apktool=2.7.0
+> - fernflower=232.9921.47(IntelliJ IDEA official decompiler)
+> - apktool=2.8.1
+
 
 # 使用要求
 只是使用的话**不需要**手动安装python环境。

diff --git a/bin/showjar.exe b/bin/showjar.exe
diff --git a/libs/apktool/apktool_2.7.0.jar → libs/apktool/apktool_2.8.1.jar b/libs/apktool/apktool_2.7.0.jar → libs/apktool/apktool_2.8.1.jar
diff --git a/libs/dex2jar/bin/dex-tools b/libs/dex2jar/bin/dex-tools
@@ -80,7 +80,7 @@ case "`uname`" in
     ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/dex-tools-2.2-SNAPSHOT.jar:$APP_HOME/lib/dex-translator-2.2-SNAPSHOT.jar:$APP_HOME/lib/dx-27.0.3.jar:$APP_HOME/lib/d2j-smali-2.2-SNAPSHOT.jar:$APP_HOME/lib/d2j-jasmin-2.2-SNAPSHOT.jar:$APP_HOME/lib/dex-writer-2.2-SNAPSHOT.jar:$APP_HOME/lib/d2j-base-cmd-2.2-SNAPSHOT.jar:$APP_HOME/lib/dex-reader-2.2-SNAPSHOT.jar:$APP_HOME/lib/dex-ir-2.2-SNAPSHOT.jar:$APP_HOME/lib/asm-debug-all-5.0.3.jar:$APP_HOME/lib/antlr4-4.5.jar:$APP_HOME/lib/antlr4-runtime-4.5.jar:$APP_HOME/lib/antlr-3.5.2.jar:$APP_HOME/lib/ST4-4.0.8.jar:$APP_HOME/lib/antlr-runtime-3.5.2.jar:$APP_HOME/lib/dex-reader-api-2.2-SNAPSHOT.jar:$APP_HOME/lib/org.abego.treelayout.core-1.0.1.jar
+CLASSPATH=$APP_HOME/lib/dex-tools-2.2-SNAPSHOT.jar:$APP_HOME/lib/dex-translator-2.2-SNAPSHOT.jar:$APP_HOME/lib/dx-30.0.2.jar:$APP_HOME/lib/d2j-smali-2.2-SNAPSHOT.jar:$APP_HOME/lib/d2j-jasmin-2.2-SNAPSHOT.jar:$APP_HOME/lib/dex-writer-2.2-SNAPSHOT.jar:$APP_HOME/lib/d2j-base-cmd-2.2-SNAPSHOT.jar:$APP_HOME/lib/asm-util-9.5.jar:$APP_HOME/lib/asm-commons-9.5.jar:$APP_HOME/lib/asm-analysis-9.5.jar:$APP_HOME/lib/asm-tree-9.5.jar:$APP_HOME/lib/dex-reader-2.2-SNAPSHOT.jar:$APP_HOME/lib/dex-ir-2.2-SNAPSHOT.jar:$APP_HOME/lib/antlr4-4.9.3.jar:$APP_HOME/lib/antlr4-runtime-4.9.3.jar:$APP_HOME/lib/antlr-3.5.2.jar:$APP_HOME/lib/ST4-4.3.1.jar:$APP_HOME/lib/antlr-runtime-3.5.2.jar:$APP_HOME/lib/dex-reader-api-2.2-SNAPSHOT.jar:$APP_HOME/lib/asm-9.5.jar:$APP_HOME/lib/org.abego.treelayout.core-1.0.3.jar:$APP_HOME/lib/javax.json-1.0.4.jar:$APP_HOME/lib/icu4j-69.1.jar
 
 
 # Determine the Java command to use to start the JVM.

diff --git a/libs/dex2jar/bin/dex-tools.bat b/libs/dex2jar/bin/dex-tools.bat
@@ -67,7 +67,7 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\lib\dex-tools-2.2-SNAPSHOT.jar;%APP_HOME%\lib\dex-translator-2.2-SNAPSHOT.jar;%APP_HOME%\lib\dx-27.0.3.jar;%APP_HOME%\lib\d2j-smali-2.2-SNAPSHOT.jar;%APP_HOME%\lib\d2j-jasmin-2.2-SNAPSHOT.jar;%APP_HOME%\lib\dex-writer-2.2-SNAPSHOT.jar;%APP_HOME%\lib\d2j-base-cmd-2.2-SNAPSHOT.jar;%APP_HOME%\lib\dex-reader-2.2-SNAPSHOT.jar;%APP_HOME%\lib\dex-ir-2.2-SNAPSHOT.jar;%APP_HOME%\lib\asm-debug-all-5.0.3.jar;%APP_HOME%\lib\antlr4-4.5.jar;%APP_HOME%\lib\antlr4-runtime-4.5.jar;%APP_HOME%\lib\antlr-3.5.2.jar;%APP_HOME%\lib\ST4-4.0.8.jar;%APP_HOME%\lib\antlr-runtime-3.5.2.jar;%APP_HOME%\lib\dex-reader-api-2.2-SNAPSHOT.jar;%APP_HOME%\lib\org.abego.treelayout.core-1.0.1.jar
+set CLASSPATH=%APP_HOME%\lib\dex-tools-2.2-SNAPSHOT.jar;%APP_HOME%\lib\dex-translator-2.2-SNAPSHOT.jar;%APP_HOME%\lib\dx-30.0.2.jar;%APP_HOME%\lib\d2j-smali-2.2-SNAPSHOT.jar;%APP_HOME%\lib\d2j-jasmin-2.2-SNAPSHOT.jar;%APP_HOME%\lib\dex-writer-2.2-SNAPSHOT.jar;%APP_HOME%\lib\d2j-base-cmd-2.2-SNAPSHOT.jar;%APP_HOME%\lib\asm-util-9.5.jar;%APP_HOME%\lib\asm-commons-9.5.jar;%APP_HOME%\lib\asm-analysis-9.5.jar;%APP_HOME%\lib\asm-tree-9.5.jar;%APP_HOME%\lib\dex-reader-2.2-SNAPSHOT.jar;%APP_HOME%\lib\dex-ir-2.2-SNAPSHOT.jar;%APP_HOME%\lib\antlr4-4.9.3.jar;%APP_HOME%\lib\antlr4-runtime-4.9.3.jar;%APP_HOME%\lib\antlr-3.5.2.jar;%APP_HOME%\lib\ST4-4.3.1.jar;%APP_HOME%\lib\antlr-runtime-3.5.2.jar;%APP_HOME%\lib\dex-reader-api-2.2-SNAPSHOT.jar;%APP_HOME%\lib\asm-9.5.jar;%APP_HOME%\lib\org.abego.treelayout.core-1.0.3.jar;%APP_HOME%\lib\javax.json-1.0.4.jar;%APP_HOME%\lib\icu4j-69.1.jar
 
 
 @rem Execute dex-tools

diff --git a/libs/dex2jar/lib/ST4-4.0.8.jar b/libs/dex2jar/lib/ST4-4.0.8.jar
diff --git a/libs/dex2jar/lib/ST4-4.3.1.jar b/libs/dex2jar/lib/ST4-4.3.1.jar
diff --git a/libs/dex2jar/lib/antlr4-4.5.jar b/libs/dex2jar/lib/antlr4-4.5.jar
diff --git a/libs/dex2jar/lib/antlr4-4.9.3.jar b/libs/dex2jar/lib/antlr4-4.9.3.jar
diff --git a/libs/dex2jar/lib/antlr4-runtime-4.5.jar b/libs/dex2jar/lib/antlr4-runtime-4.5.jar
diff --git a/libs/dex2jar/lib/antlr4-runtime-4.9.3.jar b/libs/dex2jar/lib/antlr4-runtime-4.9.3.jar
diff --git a/libs/dex2jar/lib/asm-9.5.jar b/libs/dex2jar/lib/asm-9.5.jar
diff --git a/libs/dex2jar/lib/asm-analysis-9.5.jar b/libs/dex2jar/lib/asm-analysis-9.5.jar
diff --git a/libs/dex2jar/lib/asm-commons-9.5.jar b/libs/dex2jar/lib/asm-commons-9.5.jar
diff --git a/libs/dex2jar/lib/asm-tree-9.5.jar b/libs/dex2jar/lib/asm-tree-9.5.jar
diff --git a/libs/dex2jar/lib/asm-util-9.5.jar b/libs/dex2jar/lib/asm-util-9.5.jar
diff --git a/libs/dex2jar/lib/d2j-base-cmd-2.1-SNAPSHOT.jar b/libs/dex2jar/lib/d2j-base-cmd-2.1-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/d2j-base-cmd-2.2-SNAPSHOT.jar b/libs/dex2jar/lib/d2j-base-cmd-2.2-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/d2j-jasmin-2.1-SNAPSHOT.jar b/libs/dex2jar/lib/d2j-jasmin-2.1-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/d2j-jasmin-2.2-SNAPSHOT.jar b/libs/dex2jar/lib/d2j-jasmin-2.2-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/d2j-smali-2.1-SNAPSHOT.jar b/libs/dex2jar/lib/d2j-smali-2.1-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/d2j-smali-2.2-SNAPSHOT.jar b/libs/dex2jar/lib/d2j-smali-2.2-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/dex-ir-2.1-SNAPSHOT.jar b/libs/dex2jar/lib/dex-ir-2.1-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/dex-ir-2.2-SNAPSHOT.jar b/libs/dex2jar/lib/dex-ir-2.2-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/dex-reader-2.1-SNAPSHOT.jar b/libs/dex2jar/lib/dex-reader-2.1-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/dex-reader-2.2-SNAPSHOT.jar b/libs/dex2jar/lib/dex-reader-2.2-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/dex-reader-api-2.1-SNAPSHOT.jar b/libs/dex2jar/lib/dex-reader-api-2.1-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/dex-reader-api-2.2-SNAPSHOT.jar b/libs/dex2jar/lib/dex-reader-api-2.2-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/dex-tools-2.1-SNAPSHOT.jar b/libs/dex2jar/lib/dex-tools-2.1-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/dex-tools-2.2-SNAPSHOT.jar b/libs/dex2jar/lib/dex-tools-2.2-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/dex-translator-2.1-SNAPSHOT.jar b/libs/dex2jar/lib/dex-translator-2.1-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/dex-translator-2.2-SNAPSHOT.jar b/libs/dex2jar/lib/dex-translator-2.2-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/dex-writer-2.1-SNAPSHOT.jar b/libs/dex2jar/lib/dex-writer-2.1-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/dex-writer-2.2-SNAPSHOT.jar b/libs/dex2jar/lib/dex-writer-2.2-SNAPSHOT.jar
diff --git a/libs/dex2jar/lib/dx-27.0.3.jar b/libs/dex2jar/lib/dx-27.0.3.jar
diff --git a/libs/dex2jar/lib/dx-30.0.2.jar b/libs/dex2jar/lib/dx-30.0.2.jar
diff --git a/libs/dex2jar/lib/icu4j-69.1.jar b/libs/dex2jar/lib/icu4j-69.1.jar
diff --git a/libs/dex2jar/lib/javax.json-1.0.4.jar b/libs/dex2jar/lib/javax.json-1.0.4.jar
diff --git a/libs/dex2jar/lib/org.abego.treelayout.core-1.0.1.jar b/libs/dex2jar/lib/org.abego.treelayout.core-1.0.1.jar
diff --git a/libs/dex2jar/lib/org.abego.treelayout.core-1.0.3.jar b/libs/dex2jar/lib/org.abego.treelayout.core-1.0.3.jar
diff --git a/libs/jadx/bin/jadx b/libs/jadx/bin/jadx
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/jadx-cli-1.4.6.jar:$APP_HOME/lib/jadx-core-1.4.6.jar:$APP_HOME/lib/logback-classic-1.3.5.jar:$APP_HOME/lib/jadx-java-convert-1.4.6.jar:$APP_HOME/lib/jadx-smali-input-1.4.6.jar:$APP_HOME/lib/jadx-dex-input-1.4.6.jar:$APP_HOME/lib/jadx-java-input-1.4.6.jar:$APP_HOME/lib/jadx-plugins-api-1.4.6.jar:$APP_HOME/lib/raung-disasm-0.0.3.jar:$APP_HOME/lib/raung-common-0.0.3.jar:$APP_HOME/lib/slf4j-api-2.0.6.jar:$APP_HOME/lib/baksmali-2.5.2.jar:$APP_HOME/lib/smali-2.5.2.jar:$APP_HOME/lib/util-2.5.2.jar:$APP_HOME/lib/jcommander-1.82.jar:$APP_HOME/lib/gson-2.10.1.jar:$APP_HOME/lib/aapt2-proto-7.3.1-8691043.jar:$APP_HOME/lib/protobuf-java-3.21.12.jar:$APP_HOME/lib/logback-core-1.3.5.jar:$APP_HOME/lib/dexlib2-2.5.2.jar:$APP_HOME/lib/guava-30.1.1-jre.jar:$APP_HOME/lib/dalvik-dx-11.0.0_r3.jar:$APP_HOME/lib/r8-4.0.48.jar:$APP_HOME/lib/asm-9.4.jar:$APP_HOME/lib/antlr-3.5.2.jar:$APP_HOME/lib/ST4-4.0.8.jar:$APP_HOME/lib/antlr-runtime-3.5.2.jar:$APP_HOME/lib/stringtemplate-3.2.1.jar:$APP_HOME/lib/jsr305-3.0.2.jar:$APP_HOME/lib/failureaccess-1.0.1.jar:$APP_HOME/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:$APP_HOME/lib/checker-qual-3.8.0.jar:$APP_HOME/lib/error_prone_annotations-2.5.1.jar:$APP_HOME/lib/j2objc-annotations-1.3.jar:$APP_HOME/lib/antlr-2.7.7.jar
+CLASSPATH=$APP_HOME/lib/jadx-cli-1.4.7.jar:$APP_HOME/lib/jadx-core-1.4.7.jar:$APP_HOME/lib/logback-classic-1.3.5.jar:$APP_HOME/lib/jadx-java-convert-1.4.7.jar:$APP_HOME/lib/jadx-smali-input-1.4.7.jar:$APP_HOME/lib/jadx-dex-input-1.4.7.jar:$APP_HOME/lib/jadx-java-input-1.4.7.jar:$APP_HOME/lib/jadx-plugins-api-1.4.7.jar:$APP_HOME/lib/raung-disasm-0.0.3.jar:$APP_HOME/lib/raung-common-0.0.3.jar:$APP_HOME/lib/slf4j-api-2.0.6.jar:$APP_HOME/lib/baksmali-2.5.2.jar:$APP_HOME/lib/smali-2.5.2.jar:$APP_HOME/lib/util-2.5.2.jar:$APP_HOME/lib/jcommander-1.82.jar:$APP_HOME/lib/gson-2.10.1.jar:$APP_HOME/lib/aapt2-proto-7.3.1-8691043.jar:$APP_HOME/lib/protobuf-java-3.21.12.jar:$APP_HOME/lib/logback-core-1.3.5.jar:$APP_HOME/lib/dexlib2-2.5.2.jar:$APP_HOME/lib/guava-30.1.1-jre.jar:$APP_HOME/lib/dalvik-dx-11.0.0_r3.jar:$APP_HOME/lib/r8-4.0.48.jar:$APP_HOME/lib/asm-9.4.jar:$APP_HOME/lib/antlr-3.5.2.jar:$APP_HOME/lib/ST4-4.0.8.jar:$APP_HOME/lib/antlr-runtime-3.5.2.jar:$APP_HOME/lib/stringtemplate-3.2.1.jar:$APP_HOME/lib/jsr305-3.0.2.jar:$APP_HOME/lib/failureaccess-1.0.1.jar:$APP_HOME/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:$APP_HOME/lib/checker-qual-3.8.0.jar:$APP_HOME/lib/error_prone_annotations-2.5.1.jar:$APP_HOME/lib/j2objc-annotations-1.3.jar:$APP_HOME/lib/antlr-2.7.7.jar
 
 
 # Determine the Java command to use to start the JVM.

diff --git a/libs/jadx/bin/jadx-gui b/libs/jadx/bin/jadx-gui
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/jadx-gui-1.4.6.jar:$APP_HOME/lib/jfontchooser-1.0.5.jar:$APP_HOME/lib/mapping-io-0.4.0-SNAPSHOT.jar:$APP_HOME/lib/jadx-cli-1.4.6.jar:$APP_HOME/lib/jadx-core-1.4.6.jar:$APP_HOME/lib/logback-classic-1.3.5.jar:$APP_HOME/lib/jadx-java-convert-1.4.6.jar:$APP_HOME/lib/jadx-smali-input-1.4.6.jar:$APP_HOME/lib/jadx-dex-input-1.4.6.jar:$APP_HOME/lib/jadx-java-input-1.4.6.jar:$APP_HOME/lib/jadx-plugins-api-1.4.6.jar:$APP_HOME/lib/raung-disasm-0.0.3.jar:$APP_HOME/lib/raung-common-0.0.3.jar:$APP_HOME/lib/slf4j-api-2.0.6.jar:$APP_HOME/lib/baksmali-2.5.2.jar:$APP_HOME/lib/smali-2.5.2.jar:$APP_HOME/lib/util-2.5.2.jar:$APP_HOME/lib/jcommander-1.82.jar:$APP_HOME/lib/rsyntaxtextarea-3.3.2.jar:$APP_HOME/lib/image-viewer-1.2.3.jar:$APP_HOME/lib/flatlaf-intellij-themes-3.0.jar:$APP_HOME/lib/flatlaf-extras-3.0.jar:$APP_HOME/lib/flatlaf-3.0.jar:$APP_HOME/lib/svgSalamander-1.1.4.jar:$APP_HOME/lib/gson-2.10.1.jar:$APP_HOME/lib/commons-text-1.10.0.jar:$APP_HOME/lib/commons-lang3-3.12.0.jar:$APP_HOME/lib/rxjava2-swing-0.3.7.jar:$APP_HOME/lib/rxjava-2.2.21.jar:$APP_HOME/lib/apksig-7.4.1.jar:$APP_HOME/lib/jdwp-2.0.0.jar:$APP_HOME/lib/aapt2-proto-7.3.1-8691043.jar:$APP_HOME/lib/protobuf-java-3.21.12.jar:$APP_HOME/lib/logback-core-1.3.5.jar:$APP_HOME/lib/reactive-streams-1.0.3.jar:$APP_HOME/lib/dexlib2-2.5.2.jar:$APP_HOME/lib/guava-30.1.1-jre.jar:$APP_HOME/lib/dalvik-dx-11.0.0_r3.jar:$APP_HOME/lib/r8-4.0.48.jar:$APP_HOME/lib/asm-9.4.jar:$APP_HOME/lib/antlr-3.5.2.jar:$APP_HOME/lib/ST4-4.0.8.jar:$APP_HOME/lib/antlr-runtime-3.5.2.jar:$APP_HOME/lib/stringtemplate-3.2.1.jar:$APP_HOME/lib/jsr305-3.0.2.jar:$APP_HOME/lib/failureaccess-1.0.1.jar:$APP_HOME/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:$APP_HOME/lib/checker-qual-3.8.0.jar:$APP_HOME/lib/error_prone_annotations-2.5.1.jar:$APP_HOME/lib/j2objc-annotations-1.3.jar:$APP_HOME/lib/antlr-2.7.7.jar
+CLASSPATH=$APP_HOME/lib/jadx-gui-1.4.7.jar:$APP_HOME/lib/jfontchooser-1.0.5.jar:$APP_HOME/lib/mapping-io-0.4.0-SNAPSHOT.jar:$APP_HOME/lib/jadx-cli-1.4.7.jar:$APP_HOME/lib/jadx-core-1.4.7.jar:$APP_HOME/lib/logback-classic-1.3.5.jar:$APP_HOME/lib/jadx-java-convert-1.4.7.jar:$APP_HOME/lib/jadx-smali-input-1.4.7.jar:$APP_HOME/lib/jadx-dex-input-1.4.7.jar:$APP_HOME/lib/jadx-java-input-1.4.7.jar:$APP_HOME/lib/jadx-plugins-api-1.4.7.jar:$APP_HOME/lib/raung-disasm-0.0.3.jar:$APP_HOME/lib/raung-common-0.0.3.jar:$APP_HOME/lib/slf4j-api-2.0.6.jar:$APP_HOME/lib/baksmali-2.5.2.jar:$APP_HOME/lib/smali-2.5.2.jar:$APP_HOME/lib/util-2.5.2.jar:$APP_HOME/lib/jcommander-1.82.jar:$APP_HOME/lib/rsyntaxtextarea-3.3.2.jar:$APP_HOME/lib/image-viewer-1.2.3.jar:$APP_HOME/lib/flatlaf-intellij-themes-3.0.jar:$APP_HOME/lib/flatlaf-extras-3.0.jar:$APP_HOME/lib/flatlaf-3.0.jar:$APP_HOME/lib/svgSalamander-1.1.4.jar:$APP_HOME/lib/gson-2.10.1.jar:$APP_HOME/lib/commons-text-1.10.0.jar:$APP_HOME/lib/commons-lang3-3.12.0.jar:$APP_HOME/lib/rxjava2-swing-0.3.7.jar:$APP_HOME/lib/rxjava-2.2.21.jar:$APP_HOME/lib/apksig-7.4.1.jar:$APP_HOME/lib/jdwp-2.0.0.jar:$APP_HOME/lib/aapt2-proto-7.3.1-8691043.jar:$APP_HOME/lib/protobuf-java-3.21.12.jar:$APP_HOME/lib/logback-core-1.3.5.jar:$APP_HOME/lib/reactive-streams-1.0.3.jar:$APP_HOME/lib/dexlib2-2.5.2.jar:$APP_HOME/lib/guava-30.1.1-jre.jar:$APP_HOME/lib/dalvik-dx-11.0.0_r3.jar:$APP_HOME/lib/r8-4.0.48.jar:$APP_HOME/lib/asm-9.4.jar:$APP_HOME/lib/antlr-3.5.2.jar:$APP_HOME/lib/ST4-4.0.8.jar:$APP_HOME/lib/antlr-runtime-3.5.2.jar:$APP_HOME/lib/stringtemplate-3.2.1.jar:$APP_HOME/lib/jsr305-3.0.2.jar:$APP_HOME/lib/failureaccess-1.0.1.jar:$APP_HOME/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:$APP_HOME/lib/checker-qual-3.8.0.jar:$APP_HOME/lib/error_prone_annotations-2.5.1.jar:$APP_HOME/lib/j2objc-annotations-1.3.jar:$APP_HOME/lib/antlr-2.7.7.jar
 
 
 # Determine the Java command to use to start the JVM.

diff --git a/libs/jadx/bin/jadx-gui.bat b/libs/jadx/bin/jadx-gui.bat
@@ -68,7 +68,7 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\lib\jadx-gui-1.4.6.jar;%APP_HOME%\lib\jfontchooser-1.0.5.jar;%APP_HOME%\lib\mapping-io-0.4.0-SNAPSHOT.jar;%APP_HOME%\lib\jadx-cli-1.4.6.jar;%APP_HOME%\lib\jadx-core-1.4.6.jar;%APP_HOME%\lib\logback-classic-1.3.5.jar;%APP_HOME%\lib\jadx-java-convert-1.4.6.jar;%APP_HOME%\lib\jadx-smali-input-1.4.6.jar;%APP_HOME%\lib\jadx-dex-input-1.4.6.jar;%APP_HOME%\lib\jadx-java-input-1.4.6.jar;%APP_HOME%\lib\jadx-plugins-api-1.4.6.jar;%APP_HOME%\lib\raung-disasm-0.0.3.jar;%APP_HOME%\lib\raung-common-0.0.3.jar;%APP_HOME%\lib\slf4j-api-2.0.6.jar;%APP_HOME%\lib\baksmali-2.5.2.jar;%APP_HOME%\lib\smali-2.5.2.jar;%APP_HOME%\lib\util-2.5.2.jar;%APP_HOME%\lib\jcommander-1.82.jar;%APP_HOME%\lib\rsyntaxtextarea-3.3.2.jar;%APP_HOME%\lib\image-viewer-1.2.3.jar;%APP_HOME%\lib\flatlaf-intellij-themes-3.0.jar;%APP_HOME%\lib\flatlaf-extras-3.0.jar;%APP_HOME%\lib\flatlaf-3.0.jar;%APP_HOME%\lib\svgSalamander-1.1.4.jar;%APP_HOME%\lib\gson-2.10.1.jar;%APP_HOME%\lib\commons-text-1.10.0.jar;%APP_HOME%\lib\commons-lang3-3.12.0.jar;%APP_HOME%\lib\rxjava2-swing-0.3.7.jar;%APP_HOME%\lib\rxjava-2.2.21.jar;%APP_HOME%\lib\apksig-7.4.1.jar;%APP_HOME%\lib\jdwp-2.0.0.jar;%APP_HOME%\lib\aapt2-proto-7.3.1-8691043.jar;%APP_HOME%\lib\protobuf-java-3.21.12.jar;%APP_HOME%\lib\logback-core-1.3.5.jar;%APP_HOME%\lib\reactive-streams-1.0.3.jar;%APP_HOME%\lib\dexlib2-2.5.2.jar;%APP_HOME%\lib\guava-30.1.1-jre.jar;%APP_HOME%\lib\dalvik-dx-11.0.0_r3.jar;%APP_HOME%\lib\r8-4.0.48.jar;%APP_HOME%\lib\asm-9.4.jar;%APP_HOME%\lib\antlr-3.5.2.jar;%APP_HOME%\lib\ST4-4.0.8.jar;%APP_HOME%\lib\antlr-runtime-3.5.2.jar;%APP_HOME%\lib\stringtemplate-3.2.1.jar;%APP_HOME%\lib\jsr305-3.0.2.jar;%APP_HOME%\lib\failureaccess-1.0.1.jar;%APP_HOME%\lib\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;%APP_HOME%\lib\checker-qual-3.8.0.jar;%APP_HOME%\lib\error_prone_annotations-2.5.1.jar;%APP_HOME%\lib\j2objc-annotations-1.3.jar;%APP_HOME%\lib\antlr-2.7.7.jar
+set CLASSPATH=%APP_HOME%\lib\jadx-gui-1.4.7.jar;%APP_HOME%\lib\jfontchooser-1.0.5.jar;%APP_HOME%\lib\mapping-io-0.4.0-SNAPSHOT.jar;%APP_HOME%\lib\jadx-cli-1.4.7.jar;%APP_HOME%\lib\jadx-core-1.4.7.jar;%APP_HOME%\lib\logback-classic-1.3.5.jar;%APP_HOME%\lib\jadx-java-convert-1.4.7.jar;%APP_HOME%\lib\jadx-smali-input-1.4.7.jar;%APP_HOME%\lib\jadx-dex-input-1.4.7.jar;%APP_HOME%\lib\jadx-java-input-1.4.7.jar;%APP_HOME%\lib\jadx-plugins-api-1.4.7.jar;%APP_HOME%\lib\raung-disasm-0.0.3.jar;%APP_HOME%\lib\raung-common-0.0.3.jar;%APP_HOME%\lib\slf4j-api-2.0.6.jar;%APP_HOME%\lib\baksmali-2.5.2.jar;%APP_HOME%\lib\smali-2.5.2.jar;%APP_HOME%\lib\util-2.5.2.jar;%APP_HOME%\lib\jcommander-1.82.jar;%APP_HOME%\lib\rsyntaxtextarea-3.3.2.jar;%APP_HOME%\lib\image-viewer-1.2.3.jar;%APP_HOME%\lib\flatlaf-intellij-themes-3.0.jar;%APP_HOME%\lib\flatlaf-extras-3.0.jar;%APP_HOME%\lib\flatlaf-3.0.jar;%APP_HOME%\lib\svgSalamander-1.1.4.jar;%APP_HOME%\lib\gson-2.10.1.jar;%APP_HOME%\lib\commons-text-1.10.0.jar;%APP_HOME%\lib\commons-lang3-3.12.0.jar;%APP_HOME%\lib\rxjava2-swing-0.3.7.jar;%APP_HOME%\lib\rxjava-2.2.21.jar;%APP_HOME%\lib\apksig-7.4.1.jar;%APP_HOME%\lib\jdwp-2.0.0.jar;%APP_HOME%\lib\aapt2-proto-7.3.1-8691043.jar;%APP_HOME%\lib\protobuf-java-3.21.12.jar;%APP_HOME%\lib\logback-core-1.3.5.jar;%APP_HOME%\lib\reactive-streams-1.0.3.jar;%APP_HOME%\lib\dexlib2-2.5.2.jar;%APP_HOME%\lib\guava-30.1.1-jre.jar;%APP_HOME%\lib\dalvik-dx-11.0.0_r3.jar;%APP_HOME%\lib\r8-4.0.48.jar;%APP_HOME%\lib\asm-9.4.jar;%APP_HOME%\lib\antlr-3.5.2.jar;%APP_HOME%\lib\ST4-4.0.8.jar;%APP_HOME%\lib\antlr-runtime-3.5.2.jar;%APP_HOME%\lib\stringtemplate-3.2.1.jar;%APP_HOME%\lib\jsr305-3.0.2.jar;%APP_HOME%\lib\failureaccess-1.0.1.jar;%APP_HOME%\lib\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;%APP_HOME%\lib\checker-qual-3.8.0.jar;%APP_HOME%\lib\error_prone_annotations-2.5.1.jar;%APP_HOME%\lib\j2objc-annotations-1.3.jar;%APP_HOME%\lib\antlr-2.7.7.jar
 
 
 @rem Execute jadx-gui

diff --git a/libs/jadx/bin/jadx.bat b/libs/jadx/bin/jadx.bat
@@ -68,7 +68,7 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\lib\jadx-cli-1.4.6.jar;%APP_HOME%\lib\jadx-core-1.4.6.jar;%APP_HOME%\lib\logback-classic-1.3.5.jar;%APP_HOME%\lib\jadx-java-convert-1.4.6.jar;%APP_HOME%\lib\jadx-smali-input-1.4.6.jar;%APP_HOME%\lib\jadx-dex-input-1.4.6.jar;%APP_HOME%\lib\jadx-java-input-1.4.6.jar;%APP_HOME%\lib\jadx-plugins-api-1.4.6.jar;%APP_HOME%\lib\raung-disasm-0.0.3.jar;%APP_HOME%\lib\raung-common-0.0.3.jar;%APP_HOME%\lib\slf4j-api-2.0.6.jar;%APP_HOME%\lib\baksmali-2.5.2.jar;%APP_HOME%\lib\smali-2.5.2.jar;%APP_HOME%\lib\util-2.5.2.jar;%APP_HOME%\lib\jcommander-1.82.jar;%APP_HOME%\lib\gson-2.10.1.jar;%APP_HOME%\lib\aapt2-proto-7.3.1-8691043.jar;%APP_HOME%\lib\protobuf-java-3.21.12.jar;%APP_HOME%\lib\logback-core-1.3.5.jar;%APP_HOME%\lib\dexlib2-2.5.2.jar;%APP_HOME%\lib\guava-30.1.1-jre.jar;%APP_HOME%\lib\dalvik-dx-11.0.0_r3.jar;%APP_HOME%\lib\r8-4.0.48.jar;%APP_HOME%\lib\asm-9.4.jar;%APP_HOME%\lib\antlr-3.5.2.jar;%APP_HOME%\lib\ST4-4.0.8.jar;%APP_HOME%\lib\antlr-runtime-3.5.2.jar;%APP_HOME%\lib\stringtemplate-3.2.1.jar;%APP_HOME%\lib\jsr305-3.0.2.jar;%APP_HOME%\lib\failureaccess-1.0.1.jar;%APP_HOME%\lib\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;%APP_HOME%\lib\checker-qual-3.8.0.jar;%APP_HOME%\lib\error_prone_annotations-2.5.1.jar;%APP_HOME%\lib\j2objc-annotations-1.3.jar;%APP_HOME%\lib\antlr-2.7.7.jar
+set CLASSPATH=%APP_HOME%\lib\jadx-cli-1.4.7.jar;%APP_HOME%\lib\jadx-core-1.4.7.jar;%APP_HOME%\lib\logback-classic-1.3.5.jar;%APP_HOME%\lib\jadx-java-convert-1.4.7.jar;%APP_HOME%\lib\jadx-smali-input-1.4.7.jar;%APP_HOME%\lib\jadx-dex-input-1.4.7.jar;%APP_HOME%\lib\jadx-java-input-1.4.7.jar;%APP_HOME%\lib\jadx-plugins-api-1.4.7.jar;%APP_HOME%\lib\raung-disasm-0.0.3.jar;%APP_HOME%\lib\raung-common-0.0.3.jar;%APP_HOME%\lib\slf4j-api-2.0.6.jar;%APP_HOME%\lib\baksmali-2.5.2.jar;%APP_HOME%\lib\smali-2.5.2.jar;%APP_HOME%\lib\util-2.5.2.jar;%APP_HOME%\lib\jcommander-1.82.jar;%APP_HOME%\lib\gson-2.10.1.jar;%APP_HOME%\lib\aapt2-proto-7.3.1-8691043.jar;%APP_HOME%\lib\protobuf-java-3.21.12.jar;%APP_HOME%\lib\logback-core-1.3.5.jar;%APP_HOME%\lib\dexlib2-2.5.2.jar;%APP_HOME%\lib\guava-30.1.1-jre.jar;%APP_HOME%\lib\dalvik-dx-11.0.0_r3.jar;%APP_HOME%\lib\r8-4.0.48.jar;%APP_HOME%\lib\asm-9.4.jar;%APP_HOME%\lib\antlr-3.5.2.jar;%APP_HOME%\lib\ST4-4.0.8.jar;%APP_HOME%\lib\antlr-runtime-3.5.2.jar;%APP_HOME%\lib\stringtemplate-3.2.1.jar;%APP_HOME%\lib\jsr305-3.0.2.jar;%APP_HOME%\lib\failureaccess-1.0.1.jar;%APP_HOME%\lib\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;%APP_HOME%\lib\checker-qual-3.8.0.jar;%APP_HOME%\lib\error_prone_annotations-2.5.1.jar;%APP_HOME%\lib\j2objc-annotations-1.3.jar;%APP_HOME%\lib\antlr-2.7.7.jar
 
 
 @rem Execute jadx

diff --git a/libs/jadx/lib/jadx-cli-1.4.6.jar → libs/jadx/lib/jadx-cli-1.4.7.jar b/libs/jadx/lib/jadx-cli-1.4.6.jar → libs/jadx/lib/jadx-cli-1.4.7.jar
diff --git a/libs/jadx/lib/jadx-core-1.4.6.jar → libs/jadx/lib/jadx-core-1.4.7.jar b/libs/jadx/lib/jadx-core-1.4.6.jar → libs/jadx/lib/jadx-core-1.4.7.jar
diff --git a/libs/jadx/lib/jadx-dex-input-1.4.6.jar → libs/jadx/lib/jadx-dex-input-1.4.7.jar b/libs/jadx/lib/jadx-dex-input-1.4.6.jar → libs/jadx/lib/jadx-dex-input-1.4.7.jar
diff --git a/libs/jadx/lib/jadx-gui-1.4.6.jar → libs/jadx/lib/jadx-gui-1.4.7.jar b/libs/jadx/lib/jadx-gui-1.4.6.jar → libs/jadx/lib/jadx-gui-1.4.7.jar
diff --git a/libs/jadx/lib/jadx-java-convert-1.4.6.jar → libs/jadx/lib/jadx-java-convert-1.4.7.jar b/libs/jadx/lib/jadx-java-convert-1.4.6.jar → libs/jadx/lib/jadx-java-convert-1.4.7.jar
diff --git a/libs/jadx/lib/jadx-java-input-1.4.6.jar → libs/jadx/lib/jadx-java-input-1.4.7.jar b/libs/jadx/lib/jadx-java-input-1.4.6.jar → libs/jadx/lib/jadx-java-input-1.4.7.jar
diff --git a/libs/jadx/lib/jadx-plugins-api-1.4.6.jar → libs/jadx/lib/jadx-plugins-api-1.4.7.jar b/libs/jadx/lib/jadx-plugins-api-1.4.6.jar → libs/jadx/lib/jadx-plugins-api-1.4.7.jar
diff --git a/libs/jadx/lib/jadx-smali-input-1.4.6.jar → libs/jadx/lib/jadx-smali-input-1.4.7.jar b/libs/jadx/lib/jadx-smali-input-1.4.6.jar → libs/jadx/lib/jadx-smali-input-1.4.7.jar
diff --git a/setup.cfg b/setup.cfg
@@ -10,4 +10,5 @@ ignore = E501,W503,E251,E228
 exclude = .git,__pycache__,docs/source/conf.py,old,build,dist,.vscode,libs,env,cache
 
 [version_info]
-version=1.6.0
+version=1.7.0
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,7 +80,7 @@ case "`uname`" in @@
         ;;
     esac
-    CLASSPATH=$APP_HOME/lib/dex-tools-2.2-SNAPSHOT.jar:$APP_HOME/lib/dex-translator-2.2-SNAPSHOT.jar:$APP_HOME/lib/dx-27.0.3.jar:$APP_HOME/lib/d2j-smali-2.2-SNAPSHOT.jar:$APP_HOME/lib/d2j-jasmin-2.2-SNAPSHOT.jar:$APP_HOME/lib/dex-writer-2.2-SNAPSHOT.jar:$APP_HOME/lib/d2j-base-cmd-2.2-SNAPSHOT.jar:$APP_HOME/lib/dex-reader-2.2-SNAPSHOT.jar:$APP_HOME/lib/dex-ir-2.2-SNAPSHOT.jar:$APP_HOME/lib/asm-debug-all-5.0.3.jar:$APP_HOME/lib/antlr4-4.5.jar:$APP_HOME/lib/antlr4-runtime-4.5.jar:$APP_HOME/lib/antlr-3.5.2.jar:$APP_HOME/lib/ST4-4.0.8.jar:$APP_HOME/lib/antlr-runtime-3.5.2.jar:$APP_HOME/lib/dex-reader-api-2.2-SNAPSHOT.jar:$APP_HOME/lib/org.abego.treelayout.core-1.0.1.jar
+    CLASSPATH=$APP_HOME/lib/dex-tools-2.2-SNAPSHOT.jar:$APP_HOME/lib/dex-translator-2.2-SNAPSHOT.jar:$APP_HOME/lib/dx-30.0.2.jar:$APP_HOME/lib/d2j-smali-2.2-SNAPSHOT.jar:$APP_HOME/lib/d2j-jasmin-2.2-SNAPSHOT.jar:$APP_HOME/lib/dex-writer-2.2-SNAPSHOT.jar:$APP_HOME/lib/d2j-base-cmd-2.2-SNAPSHOT.jar:$APP_HOME/lib/asm-util-9.5.jar:$APP_HOME/lib/asm-commons-9.5.jar:$APP_HOME/lib/asm-analysis-9.5.jar:$APP_HOME/lib/asm-tree-9.5.jar:$APP_HOME/lib/dex-reader-2.2-SNAPSHOT.jar:$APP_HOME/lib/dex-ir-2.2-SNAPSHOT.jar:$APP_HOME/lib/antlr4-4.9.3.jar:$APP_HOME/lib/antlr4-runtime-4.9.3.jar:$APP_HOME/lib/antlr-3.5.2.jar:$APP_HOME/lib/ST4-4.3.1.jar:$APP_HOME/lib/antlr-runtime-3.5.2.jar:$APP_HOME/lib/dex-reader-api-2.2-SNAPSHOT.jar:$APP_HOME/lib/asm-9.5.jar:$APP_HOME/lib/org.abego.treelayout.core-1.0.3.jar:$APP_HOME/lib/javax.json-1.0.4.jar:$APP_HOME/lib/icu4j-69.1.jar
     # Determine the Java command to use to start the JVM.
@@ Expand Down @@