Fixed issue decompiling split apk using Apkeditor

AndnixSH · Sep 30, 2024 · 48b6736 · 48b6736
1 parent f2329a4
commit 48b6736
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/APKToolGUI/Forms/FormMain.cs b/APKToolGUI/Forms/FormMain.cs
@@ -636,7 +636,10 @@ await Task.Factory.StartNew(() =>
                     code = apkeditor.Merge(extractedDir, tempApk);
                     if (code == 0)
                     {
-                        code = apktool.Decompile(tempApk, tempDecApk);
+                        if (useAPKEditorForDecompilingItem.Checked)
+                            code = apkeditor.Decompile(tempApk, tempDecApk);
+                        else
+                            code = apktool.Decompile(tempApk, tempDecApk);
 
                         if (code == 0)
                         {

diff --git a/APKToolGUI/Handlers/DecodeControlEventHandlers.cs b/APKToolGUI/Handlers/DecodeControlEventHandlers.cs
@@ -96,7 +96,7 @@ internal async void button_DECODE_Decode_Click(object sender, EventArgs e)
                     }
                 }
 
-                if (inputFile.ContainsAny(".xapk", ".zip", ".apks", ".apkm") && !main.useAPKEditorForDecompilingItem.Checked)
+                if (inputFile.ContainsAny(".xapk", ".zip", ".apks", ".apkm"))
                 {
                     await main.MergeAndDecompile(inputFile);
                 }

diff --git a/APKToolGUI/Handlers/DragDropHandlers.cs b/APKToolGUI/Handlers/DragDropHandlers.cs
@@ -93,7 +93,7 @@ private async void DropApkToDec(DragEventArgs e)
                     if (!Settings.Default.Decode_DontParseApkInfo)
                         await main.GetApkInfo(apkFile);
 
-                    if (apkFile.ContainsAny(".xapk", ".zip", ".apks", ".apkm") && !main.useAPKEditorForDecompilingItem.Checked)
+                    if (apkFile.ContainsAny(".xapk", ".zip", ".apks", ".apkm"))
                     {
                         await main.MergeAndDecompile(apkFile);
                     }
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                     }
-                    if (inputFile.ContainsAny(".xapk", ".zip", ".apks", ".apkm") && !main.useAPKEditorForDecompilingItem.Checked)
+                    if (inputFile.ContainsAny(".xapk", ".zip", ".apks", ".apkm"))
                     {
                         await main.MergeAndDecompile(inputFile);
                     }
@@ Expand Down @@