From 0a1247b835a6f80d06769eb248f9c5017a1851ff Mon Sep 17 00:00:00 2001
From: tiann <twsxtd@gmail.com>
Date: Thu, 5 Jan 2023 10:57:25 +0800
Subject: [PATCH] manager: allow uninstall when update module

---
 .../main/java/me/weishu/kernelsu/ui/screen/Module.kt  | 11 ++++++++++-
 manager/app/src/main/res/values/strings.xml           |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt b/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt
index f4505ef2..f919c7b5 100644
--- a/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt
+++ b/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt
@@ -84,6 +84,8 @@ fun ModuleScreen(navigator: DestinationsNavigator) {
     ) { innerPadding ->
         val failedEnable = stringResource(R.string.module_failed_to_enable)
         val failedDisable = stringResource(R.string.module_failed_to_disable)
+        val failedUninstall = stringResource(R.string.module_uninstall_failed)
+        val successUninstall = stringResource(R.string.module_uninstall_success)
         val swipeState = rememberSwipeRefreshState(viewModel.isRefreshing)
         // TODO: Replace SwipeRefresh with RefreshIndicator when it's ready
         if (Natives.getVersion() < 8) {
@@ -116,6 +118,13 @@ fun ModuleScreen(navigator: DestinationsNavigator) {
                             onUninstall = {
                                 scope.launch {
                                     val result = uninstallModule(module.id)
+                                    snackBarHost.showSnackbar(
+                                        if (result) {
+                                            successUninstall.format(module.name)
+                                        } else {
+                                            failedUninstall.format(module.name)
+                                        }
+                                    )
                                 }
                             },
                             onCheckChanged = {
@@ -224,7 +233,7 @@ private fun ModuleItem(
                 Spacer(modifier = Modifier.weight(1f, true))
 
                 TextButton(
-                    enabled = !module.update && !module.remove,
+                    enabled = !module.remove,
                     onClick = { onUninstall(module) },
                 ) {
                     Text(
diff --git a/manager/app/src/main/res/values/strings.xml b/manager/app/src/main/res/values/strings.xml
index e349971c..df8ae7e2 100644
--- a/manager/app/src/main/res/values/strings.xml
+++ b/manager/app/src/main/res/values/strings.xml
@@ -40,5 +40,7 @@
     <string name="settings_system_rw_summary">Use overlayfs to make system partition writable, reboot to take effect.</string>
     <string name="about">About</string>
     <string name="require_kernel_version_8">Require KernelSU version 8+</string>
+    <string name="module_uninstall_success">%s uninstalled</string>
+    <string name="module_uninstall_failed">Failed to uninstall: %s</string>
 
 </resources>