From a0278b1e450be032a2b3a7b8f6933b19dfd12e71 Mon Sep 17 00:00:00 2001
From: rifsxd <rifat.44.azad.rifs@gmail.com>
Date: Fri, 21 Feb 2025 16:26:35 +0600
Subject: [PATCH] manager: refactor: remove FlashModule and update navigation
 to FlashModules

---
 .../com/rifsxd/ksunext/ui/screen/Flash.kt     |  4 --
 .../com/rifsxd/ksunext/ui/screen/Module.kt    | 52 ++++---------------
 2 files changed, 11 insertions(+), 45 deletions(-)

diff --git a/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Flash.kt b/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Flash.kt
index 3ae63bc3..b30d2839 100644
--- a/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Flash.kt
+++ b/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Flash.kt
@@ -218,8 +218,6 @@ sealed class FlashIt : Parcelable {
     data class FlashBoot(val boot: Uri? = null, val lkm: LkmSelection, val ota: Boolean) :
         FlashIt()
 
-    data class FlashModule(val uri: Uri) : FlashIt()
-
     data class FlashModules(val uris: List<Uri>) : FlashIt()
 
     data object FlashRestore : FlashIt()
@@ -241,8 +239,6 @@ fun flashIt(
             onStderr
         )
 
-        is FlashIt.FlashModule -> flashModule(flashIt.uri, onStdout, onStderr)
-
         is FlashIt.FlashModules -> {
             flashModulesSequentially(flashIt.uris, onStdout, onStderr)
         }
diff --git a/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Module.kt b/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Module.kt
index d59f4241..3a2d4021 100644
--- a/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Module.kt
+++ b/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Module.kt
@@ -237,19 +237,16 @@ fun ModuleScreen(navigator: DestinationsNavigator) {
                         data.data?.let { uris.add(it) }
                     }
 
-                    if (uris.size == 1) {
-                        navigator.navigate(FlashScreenDestination(FlashIt.FlashModule(uris.first())))
-                    } else if (uris.size > 1)  {
-                        // multiple files selected
-                        val moduleNames = uris.mapIndexed { index, uri -> "\n${index + 1}. ${uri.getFileName(context)}" }.joinToString("")
-                        val confirmContent = context.getString(R.string.module_install_prompt_with_name, moduleNames)
-                        zipUris = uris
-                        confirmDialog.showConfirm(
-                            title = confirmTitle,
-                            content = confirmContent,
-                            markdown = true
-                        )
-                    }
+                    // Show confirm dialog with selected zip file(s) name(s)
+                    val moduleNames = uris.mapIndexed { index, uri -> "\n${index + 1}. ${uri.getFileName(context)}" }.joinToString("")
+                    val confirmContent = context.getString(R.string.module_install_prompt_with_name, moduleNames)
+                    zipUris = uris
+                    confirmDialog.showConfirm(
+                        title = confirmTitle,
+                        content = confirmContent,
+                        markdown = true
+                    )
+                    
                 }
 
                 ExtendedFloatingActionButton(
@@ -269,34 +266,7 @@ fun ModuleScreen(navigator: DestinationsNavigator) {
         contentWindowInsets = WindowInsets.safeDrawing.only(WindowInsetsSides.Top + WindowInsetsSides.Horizontal),
         snackbarHost = { SnackbarHost(hostState = snackBarHost) }
     ) { innerPadding ->
-        // Confirmation dialog
-        if (showConfirmDialog && zipUris.isNotEmpty()) {
-            val moduleNames = zipUris.joinToString("\n") { getFileName(context, it) }
 
-            AlertDialog(
-                onDismissRequest = { showConfirmDialog = false },
-                confirmButton = {
-                    TextButton(onClick = {
-                        showConfirmDialog = false
-                        navigator.navigate(FlashScreenDestination(FlashIt.FlashModules(zipUris)))
-                        viewModel.markNeedRefresh()
-                    }) {
-                        Text(stringResource(R.string.confirm))
-                    }
-                },
-                dismissButton = {
-                    TextButton(onClick = { showConfirmDialog = false }) {
-                        Text(stringResource(android.R.string.cancel))
-                    }
-                },
-                title = { Text(stringResource(R.string.module)) },
-                text = {
-                    Text(
-                        stringResource(R.string.module_install_prompt_with_name, moduleNames)
-                    )
-                }
-            )
-        }
         when {
             hasMagisk -> {
                 Box(
@@ -318,7 +288,7 @@ fun ModuleScreen(navigator: DestinationsNavigator) {
                     modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
                     boxModifier = Modifier.padding(innerPadding),
                     onInstallModule = {
-                        navigator.navigate(FlashScreenDestination(FlashIt.FlashModule(it)))
+                        navigator.navigate(FlashScreenDestination(FlashIt.FlashModules(listOf(it))))
                     },
                     onClickModule = { id, name, hasWebUi ->
                         if (hasWebUi) {