update libs && decompile aar directly when use jadx

tp7309 · Apr 10, 2020 · 165f3c1 · 165f3c1
1 parent fe3fe9f
commit 165f3c1
Show file tree

Hide file tree

Showing 21 changed files with 15 additions and 816 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,10 @@ libs/**/tests/
 .DS_Store
 /.history/
 Pipfile.lock
+libs/**/README.md
+libs/**/LICENSE
+libs/**/LICENSE.txt
+libs/**/NOTICE
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

diff --git a/README.md b/README.md
@@ -6,14 +6,14 @@ README i18n: [中文说明](https://github.com/tp7309/AndroidOneKeyDecompiler/bl
 
 The tool for quickly decompile **apk/aar/dex/jar**, will be updated depending on the update of libs.
 
-> - update at 2020-01-02
+> - update at 2020-04-10
 >
 > - jadx=1.1.0
 > - Storyyeller/enjarify(build by source)
 > - dex2jar(build by source)
 > - jdgui=1.6.6
 > - apktool=2.4.1
-> - cfr=0.148
+> - cfr=0.149
 
 # Requirements
 No need to install python environment.

diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -5,14 +5,14 @@
 
 一键反编译 **apk/aar/dex/jar**，没什么技术含量，只是调调工具命令，脚本找个放的地方，会视反编译库的更新情况更新工具版本。
 
-> - update at 2020-01-02
+> - update at 2020-04-10
 >
 > - jadx=1.1.0
 > - Storyyeller/enjarify(build by source)
 > - dex2jar(build by source)
 > - jdgui=1.6.6
 > - apktool=2.4.1
-> - cfr=0.148
+> - cfr=0.149
 
 # 使用要求
 只是使用的话**不需要**手动安装python环境。

diff --git a/bin/showjar.exe b/bin/showjar.exe
diff --git a/libs/cfr/cfr-0.148.jar → libs/cfr/cfr-0.149.jar b/libs/cfr/cfr-0.148.jar → libs/cfr/cfr-0.149.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-jasmin-2.1-SNAPSHOT.jar b/libs/dex2jar/lib/d2j-jasmin-2.1-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/dex-ir-2.1-SNAPSHOT.jar b/libs/dex2jar/lib/dex-ir-2.1-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-api-2.1-SNAPSHOT.jar b/libs/dex2jar/lib/dex-reader-api-2.1-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-translator-2.1-SNAPSHOT.jar b/libs/dex2jar/lib/dex-translator-2.1-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/enjarify/LICENSE.txt b/libs/enjarify/LICENSE.txt
diff --git a/libs/enjarify/README.md b/libs/enjarify/README.md
diff --git a/libs/enjarify/enjarify/parsedex.py b/libs/enjarify/enjarify/parsedex.py
@@ -271,6 +271,9 @@ def clsType(self, i):
             return desc
         elif desc.startswith(b'L'):
             return desc[1:-1]
+        # Not sure how to handle primative classes properly,
+        # but this should hopefully be good enough.
+        return desc
 
     def field_id(self, i): return FieldId(self, i)
     def method_id(self, i): return MethodId(self, i)