From 79257ee1c647bc37214d420ffefe76959cdb6957 Mon Sep 17 00:00:00 2001
From: Bitmap <mohdzaki407@gmail.com>
Date: Tue, 27 Feb 2024 22:52:28 +0530
Subject: [PATCH] Added New File Option Enable Disable to Unzip and Delete Apks
 File.

---
 src/jvmMain/kotlin/Main.kt             | 28 ++++++++++++++++++++++----
 src/jvmMain/kotlin/utils/FileHelper.kt |  2 +-
 src/jvmMain/kotlin/utils/Strings.kt    |  3 +++
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/jvmMain/kotlin/Main.kt b/src/jvmMain/kotlin/Main.kt
index e2777a1..da558a5 100644
--- a/src/jvmMain/kotlin/Main.kt
+++ b/src/jvmMain/kotlin/Main.kt
@@ -52,6 +52,7 @@ fun App(fileStorageHelper: FileStorageHelper, savedPath: String?) {
     var keyStorePassword by remember { mutableStateOf("") }
     var keyAlias by remember { mutableStateOf("") }
     var keyPassword by remember { mutableStateOf("") }
+    var isAutoUnzip by remember { mutableStateOf(true) }
 
     savedPath?.let {
         bundletoolPath = it
@@ -96,7 +97,7 @@ fun App(fileStorageHelper: FileStorageHelper, savedPath: String?) {
                 if (savedPath == null) {
                     fileStorageHelper.save("path", bundletoolPath)
                 } else {
-                    if(fileStorageHelper.delete("path"))
+                    if (fileStorageHelper.delete("path"))
                         saveJarPath = false
                 }
 
@@ -117,10 +118,16 @@ fun App(fileStorageHelper: FileStorageHelper, savedPath: String?) {
                         Log.i("Command Executed in ${((endTime - startTime) / 1000)}s")
                         logs += "\nCommand Executed in ${((endTime - startTime) / 1000)}s\n"
                         // Do further file operation after new apks is generated
-                        FileHelper.performFileOperations(aabFilePath.first, aabFilePath.second) { status, message ->
+                        // From Auto Zip you can control further file operations.
+                        if (isAutoUnzip) {
+                            FileHelper.performFileOperations(aabFilePath.first, aabFilePath.second) { status, message ->
+                                isLoading = false
+                                Log.i("STATUS - $status\nMESSAGE - $message")
+                                logs += "\nFiles Operations Starting...\n$message\n"
+                            }
+                        } else {
+                            logs += "\nFile will be saved at ${aabFilePath.first.removeSuffix("\\")}.\n"
                             isLoading = false
-                            Log.i("STATUS - $status\nMESSAGE - $message")
-                            logs += "\nFiles Operations Starting...\n$message\n"
                         }
                     }
                 } catch (e: Exception) {
@@ -316,6 +323,19 @@ fun App(fileStorageHelper: FileStorageHelper, savedPath: String?) {
                     )
                 }
             }
+            Text(
+                text = Strings.FILE_OPTIONS,
+                style = Styles.TextStyleBold(16.sp),
+                modifier = Modifier.padding(start = 16.dp, top = 8.dp, end = 16.dp, bottom = 8.dp)
+            )
+            CheckboxWithText(
+                Strings.AUTO_UNZIP,
+                isAutoUnzip,
+                onCheckedChange = {
+                    isAutoUnzip = it
+                },
+                Strings.AUTO_UNZIP
+            )
             Spacer(modifier = Modifier.padding(8.dp))
             if (isLoading) {
                 CircularProgressIndicator(
diff --git a/src/jvmMain/kotlin/utils/FileHelper.kt b/src/jvmMain/kotlin/utils/FileHelper.kt
index 7d4c2a5..182b35f 100644
--- a/src/jvmMain/kotlin/utils/FileHelper.kt
+++ b/src/jvmMain/kotlin/utils/FileHelper.kt
@@ -12,7 +12,7 @@ object FileHelper {
             Log.i("CHANGED NAME\n Unzipping...")
             try {
                 FileUtils.unzip(newFile, directory)
-                fileStatus.invoke(Constant.SUCCESS, "Rename and Unzip Successful")
+                fileStatus.invoke(Constant.SUCCESS, "Rename and Unzip Successful\nFile Saved at ${directory.removeSuffix("\\")}.")
                 Log.i("TRYING DELETING FILE")
                 val value = FileUtils.deleteFile(newFile)
                 Log.i("DELETE STATUS : $value")
diff --git a/src/jvmMain/kotlin/utils/Strings.kt b/src/jvmMain/kotlin/utils/Strings.kt
index cd7378d..8e28531 100644
--- a/src/jvmMain/kotlin/utils/Strings.kt
+++ b/src/jvmMain/kotlin/utils/Strings.kt
@@ -27,4 +27,7 @@ object Strings {
     const val KEY_ALIAS = "Key Alias"
     const val KEY_PASSWORD = "Key Password"
     const val EXECUTE = "Execute"
+    const val FILE_OPTIONS = "File Options"
+    const val AUTO_UNZIP = "Automatically Unzip and Delete Apks File"
+    const val AUTO_UNZIP_INFO = "Automatically Unzip and Delete Apks File"
 }
\ No newline at end of file