Fixed zipalign issue

AndnixSH · Sep 30, 2023 · ec6fd42 · ec6fd42
1 parent 07e4026
commit ec6fd42
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/APKToolGUI/Forms/FormMain.cs b/APKToolGUI/Forms/FormMain.cs
@@ -955,6 +955,7 @@ internal async Task<int> Build(string inputFolder)
                 await Task.Factory.StartNew(() =>
                 {
                     string outputFile = inputFolder + " compiled.apk";
+                    string outputUnsignedApk = inputFolder + " unsigned.apk";
                     if (Settings.Default.Build_SignAfterBuild)
                         outputFile = inputFolder + " signed.apk";
                     if (Settings.Default.Build_UseOutputAppPath && !IgnoreOutputDirContextMenu)
@@ -985,6 +986,22 @@ await Task.Factory.StartNew(() =>
                     {
                         ToLog(ApktoolEventType.None, String.Format(Language.CompilingSuccessfullyCompleted, outputFile));
 
+                        if (Settings.Default.Build_CreateUnsignedApk)
+                        {
+                            ToStatus(Language.CreateUnsignedApk, Resources.waiting);
+                            ToLog(ApktoolEventType.Infomation, "=====[ " + Language.CreateUnsignedApk + " ]=====");
+
+                            if (Directory.Exists(Path.Combine(inputFolder, "original", "META-INF")))
+                            {
+                                string unsignedApkPath = Path.Combine(Path.GetDirectoryName(outputCompiledApkFile), Path.GetFileName(outputUnsignedApk));
+                                ZipUtils.UpdateDirectory(outputFile, Path.Combine(inputFolder, "original", "META-INF"), "META-INF");
+                                ToLog(ApktoolEventType.Infomation, String.Format(Language.CopyFileTo, outputFile, unsignedApkPath));
+                                File.Copy(outputFile, unsignedApkPath, true);
+                            }
+                            else
+                                ToLog(ApktoolEventType.Warning, Language.MetainfNotExist);
+                        }
+
                         if (Settings.Default.Build_ZipalignAfterBuild)
                         {
                             ToStatus(Language.Aligning, Resources.waiting);
@@ -994,20 +1011,6 @@ await Task.Factory.StartNew(() =>
                             if (zipalign.Align(outputFile, outputFile) == 0)
                             {
                                 ToLog(ApktoolEventType.None, Language.Done);
-                                if (Settings.Default.Build_CreateUnsignedApk)
-                                {
-                                    ToStatus(Language.CreateUnsignedApk, Resources.waiting);
-                                    ToLog(ApktoolEventType.Infomation, "=====[ " + Language.CreateUnsignedApk + " ]=====");
-
-                                    if (Directory.Exists(Path.Combine(inputFolder, "original", "META-INF")))
-                                    {
-                                        ZipUtils.UpdateDirectory(outputFile, Path.Combine(inputFolder, "original", "META-INF"), "META-INF");
-                                        File.Copy(outputFile, Path.Combine(Path.GetDirectoryName(outputFile), Path.GetFileName(inputFolder) + " unsigned.apk"), true);
-                                        ToLog(ApktoolEventType.None, Language.Done);
-                                    }
-                                    else
-                                        ToLog(ApktoolEventType.Warning, Language.MetainfNotExist);
-                                }
                             }
                             else
                             {

diff --git a/APKToolGUI/Languages/Language.Designer.cs b/APKToolGUI/Languages/Language.Designer.cs
diff --git a/APKToolGUI/Languages/Language.resx b/APKToolGUI/Languages/Language.resx
@@ -534,4 +534,7 @@
   <data name="FixApktoolYml" xml:space="preserve">
     <value>Fixed apktool.yml</value>
   </data>
+  <data name="CopyFileTo" xml:space="preserve">
+    <value>Copy file "{0}" to "{1}"</value>
+  </data>
 </root>