From 7e1c363bad33426f208dab4561e13bdac91a9f90 Mon Sep 17 00:00:00 2001
From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com>
Date: Wed, 16 Apr 2025 14:36:27 +0800
Subject: [PATCH] Add module uninstallation confirmation dialog and file type
 validation message

---
 .../main/java/zako/zako/zako/ui/screen/kpm.kt | 27 ++++++++++++-------
 .../src/main/res/values-zh-rCN/strings.xml    |  3 +++
 manager/app/src/main/res/values/strings.xml   |  3 +++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/manager/app/src/main/java/zako/zako/zako/ui/screen/kpm.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/kpm.kt
index 7b11603b..e43d6d37 100644
--- a/manager/app/src/main/java/zako/zako/zako/ui/screen/kpm.kt
+++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/kpm.kt
@@ -47,6 +47,8 @@ import java.net.URLEncoder
  * 以下内核模块功能由KernelPatch开发，经过修改后加入SukiSU Ultra的内核模块功能
  * 开发者：zako, Liaokong
  */
+var globalModuleFileName: String = ""
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Destination<RootGraph>
 @Composable
@@ -70,13 +72,16 @@ fun KpmScreen(
     val kpmInstallFailed = stringResource(R.string.kpm_install_failed)
     val cancel = stringResource(R.string.cancel)
     val uninstall = stringResource(R.string.uninstall)
-    val FailedtoCheckModuleFile = stringResource(R.string.snackbar_failed_to_check_module_file)
+    val failedToCheckModuleFile = stringResource(R.string.snackbar_failed_to_check_module_file)
     val kpmUninstallSuccess = stringResource(R.string.kpm_uninstall_success)
     val kpmUninstallFailed = stringResource(R.string.kpm_uninstall_failed)
     val kpmInstallMode = stringResource(R.string.kpm_install_mode)
     val kpmInstallModeLoad = stringResource(R.string.kpm_install_mode_load)
     val kpmInstallModeEmbed = stringResource(R.string.kpm_install_mode_embed)
     val kpmInstallModeDescription = stringResource(R.string.kpm_install_mode_description)
+    val invalidFileTypeMessage = stringResource(R.string.invalid_file_type)
+    val confirmTitle = stringResource(R.string.confirm_uninstall_title_with_filename)
+    val confirmContent = stringResource(R.string.confirm_uninstall_content, globalModuleFileName)
 
     var tempFileForInstall by remember { mutableStateOf<File?>(null) }
     val installModeDialog = rememberCustomDialog { dismiss ->
@@ -167,7 +172,7 @@ fun KpmScreen(
 
             if (!tempFile.name.endsWith(".kpm")) {
                 snackBarHost.showSnackbar(
-                    message = "文件类型不正确，请选择 .kpm 文件",
+                    message = invalidFileTypeMessage,
                     duration = SnackbarDuration.Short
                 )
                 tempFile.delete()
@@ -282,10 +287,12 @@ fun KpmScreen(
                                         snackBarHost = snackBarHost,
                                         kpmUninstallSuccess = kpmUninstallSuccess,
                                         kpmUninstallFailed = kpmUninstallFailed,
-                                        FailedtoCheckModuleFile = FailedtoCheckModuleFile,
+                                        failedToCheckModuleFile = failedToCheckModuleFile,
                                         uninstall = uninstall,
                                         cancel = cancel,
-                                        confirmDialog = confirmDialog
+                                        confirmDialog = confirmDialog,
+                                        confirmTitle = confirmTitle,
+                                        confirmContent = confirmContent
                                     )
                                 }
                             },
@@ -369,12 +376,15 @@ private suspend fun handleModuleUninstall(
     snackBarHost: SnackbarHostState,
     kpmUninstallSuccess: String,
     kpmUninstallFailed: String,
-    FailedtoCheckModuleFile: String,
+    failedToCheckModuleFile: String,
     uninstall: String,
     cancel: String,
+    confirmTitle : String,
+    confirmContent : String,
     confirmDialog: ConfirmDialogHandle
 ) {
     val moduleFileName = "${module.id}.kpm"
+    globalModuleFileName = moduleFileName
     val moduleFilePath = "/data/adb/kpm/$moduleFileName"
 
     val fileExists = try {
@@ -383,15 +393,14 @@ private suspend fun handleModuleUninstall(
     } catch (e: Exception) {
         Log.e("KsuCli", "Failed to check module file existence: ${e.message}", e)
         snackBarHost.showSnackbar(
-            message = FailedtoCheckModuleFile,
+            message = failedToCheckModuleFile,
             duration = SnackbarDuration.Short
         )
         false
     }
-
     val confirmResult = confirmDialog.awaitConfirm(
-        title = "将卸载以下kpm模块：\n$moduleFileName",
-        content = "The following kpm modules will be uninstalled：\n$moduleFileName",
+        title = confirmTitle,
+        content = confirmContent,
         confirm = uninstall,
         dismiss = cancel
     )
diff --git a/manager/app/src/main/res/values-zh-rCN/strings.xml b/manager/app/src/main/res/values-zh-rCN/strings.xml
index 951c4a53..34c139ef 100644
--- a/manager/app/src/main/res/values-zh-rCN/strings.xml
+++ b/manager/app/src/main/res/values-zh-rCN/strings.xml
@@ -259,4 +259,7 @@
     <string name="confirm_uninstall_confirm">删除</string>
     <string name="confirm_uninstall_dismiss">取消</string>
     <string name="theme_color">主题颜色</string>
+    <string name="invalid_file_type">文件类型不正确，请选择 .kpm 文件</string>
+    <string name="confirm_uninstall_title_with_filename">卸载</string>
+    <string name="confirm_uninstall_content">将卸载以下 kpm 模块：\n%s</string>
 </resources>
diff --git a/manager/app/src/main/res/values/strings.xml b/manager/app/src/main/res/values/strings.xml
index d810c624..47267313 100644
--- a/manager/app/src/main/res/values/strings.xml
+++ b/manager/app/src/main/res/values/strings.xml
@@ -263,4 +263,7 @@
     <string name="confirm_uninstall_confirm">removing</string>
     <string name="confirm_uninstall_dismiss">abolish</string>
     <string name="theme_color">Theme Color</string>
+    <string name="invalid_file_type">Incorrect file type, select .kpm file</string>
+    <string name="confirm_uninstall_title_with_filename">uninstallation</string>
+    <string name="confirm_uninstall_content">The following kpm modules will be uninstalled：\n%s</string>
 </resources>