Hide install button when installing

ReVanced · Jul 28, 2024 · e48013a · e48013a
1 parent dc05099
commit e48013a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
@@ -62,6 +62,7 @@ fun PatcherScreen(
 
     val patcherSucceeded by vm.patcherSucceeded.observeAsState(null)
     val canInstall by remember { derivedStateOf { patcherSucceeded == true && (vm.installedPackageName != null || !vm.isInstalling) } }
+    val canSaveApk by remember { derivedStateOf { patcherSucceeded == true && (vm.installedPackageName != null) } }
     var showInstallPicker by rememberSaveable { mutableStateOf(false) }
 
     val steps by remember {
@@ -107,7 +108,7 @@ fun PatcherScreen(
                 actions = {
                     IconButton(
                         onClick = { exportApkLauncher.launch("${vm.packageName}.apk") },
-                        enabled = canInstall
+                        enabled = canSaveApk
                     ) {
                         Icon(Icons.Outlined.Save, stringResource(id = R.string.save_apk))
                     }

diff --git a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt
@@ -194,6 +194,8 @@ class PatcherViewModel(
                     }
 
                     installerStatusDialogModel.packageInstallerStatus = pmStatus
+
+                    isInstalling = false
                 }
 
                 UninstallService.APP_UNINSTALL_ACTION -> {
@@ -367,7 +369,7 @@ class PatcherViewModel(
                     }
                 }
             }
-        } finally {
+        } catch(_: Exception) {
             isInstalling = false
         }
     }