From 9dc08bd1d0e2d4767adf4893a4197cf3234750d0 Mon Sep 17 00:00:00 2001
From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com>
Date: Sun, 4 Aug 2024 11:13:33 -0700
Subject: [PATCH] fix(PatchingScreen): retry/exit state handling

---
 .../ui/screens/patching/PatchingScreen.kt     | 28 +++++++++++--------
 .../screens/patching/PatchingScreenModel.kt   |  2 +-
 .../screens/patching/PatchingScreenState.kt   | 15 ++++------
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreen.kt
index 7fb119d..ae2aeb9 100644
--- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreen.kt
+++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreen.kt
@@ -64,16 +64,12 @@ class PatchingScreen(private val data: PatchOptions) : Screen, Parcelable {
         val listState = rememberLazyListState()
         val showMinimizationWarning = remember { !context.isIgnoringBatteryOptimizations() }
 
+        // Go home directly if screen model mandates so (usually caused by cancelled PackageInstaller dialog)
         LaunchedEffect(state) {
             if (state is PatchingScreenState.CloseScreen)
                 navigator.popUntilRoot()
         }
 
-        // Go home directly if install was successful
-        BackHandler(state is PatchingScreenState.Success) {
-            navigator.popUntilRoot()
-        }
-
         // Prevent screen from turning off while working
         Wakelock(active = state is PatchingScreenState.Working)
 
@@ -86,9 +82,16 @@ class PatchingScreen(private val data: PatchOptions) : Screen, Parcelable {
         // Only show exit warning if currently working
         val onTryExit: () -> Unit = remember {
             {
+                // Show cancellation if currently running
                 if (state == PatchingScreenState.Working && !model.devMode) {
                     showAbortWarning = true
-                } else {
+                }
+                // Go home directly if install was successful
+                else if (state is PatchingScreenState.Success) {
+                    navigator.popUntilRoot()
+                }
+                // Go back to the patch options screen
+                else {
                     navigator.back(currentActivity = null)
                 }
             }
@@ -214,13 +217,13 @@ class PatchingScreen(private val data: PatchOptions) : Screen, Parcelable {
 
                     item(key = "BUTTONS") {
                         var cacheCleared by remember { mutableStateOf(false) }
-                        val filteredState by remember { model.state.filter { it.isNewlyFinished } }
-                            .collectAsState(initial = null)
+                        val filteredState by remember { model.state.filter { it.isProgressChange } }
+                            .collectAsState(initial = PatchingScreenState.Working)
 
                         AnimatedVisibility(
-                            visible = filteredState != null,
+                            visible = filteredState != PatchingScreenState.Working,
                             enter = fadeIn() + slideInVertically(),
-                            exit = ExitTransition.None,
+                            exit = fadeOut() + slideOutVertically { it * -2 },
                         ) {
                             Column {
                                 HorizontalDivider(
@@ -231,6 +234,9 @@ class PatchingScreen(private val data: PatchOptions) : Screen, Parcelable {
                                 )
 
                                 when (filteredState) {
+                                    PatchingScreenState.Working -> {}
+                                    PatchingScreenState.CloseScreen -> error("unreachable")
+
                                     PatchingScreenState.Success -> {
                                         MainActionButton(
                                             text = "Launch Aliucord",
@@ -246,8 +252,6 @@ class PatchingScreen(private val data: PatchOptions) : Screen, Parcelable {
                                             onClick = model::restart,
                                         )
                                     }
-
-                                    else -> error("unreachable")
                                 }
 
                                 MainActionButton(
diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenModel.kt
index c8bb182..3e78c0f 100644
--- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenModel.kt
+++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenModel.kt
@@ -35,7 +35,7 @@ class PatchingScreenModel(
     private val paths: PathManager,
     private val options: PatchOptions,
     private val prefs: PreferencesManager,
-) : StateScreenModel<PatchingScreenState>(PatchingScreenState.Pending) {
+) : StateScreenModel<PatchingScreenState>(PatchingScreenState.Working) {
     private var startTime: Date? = null
     private var runnerJob: Job? = null
     private var stepRunner: StepRunner? = null
diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenState.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenState.kt
index 2113e5c..2f5907c 100644
--- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenState.kt
+++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenState.kt
@@ -1,21 +1,16 @@
 package com.aliucord.manager.ui.screens.patching
 
-import com.aliucord.manager.ui.screens.patching.PatchingScreenState.*
+import com.aliucord.manager.ui.screens.patching.PatchingScreenState.CloseScreen
 
 sealed interface PatchingScreenState {
-    data object Pending : PatchingScreenState
     data object Working : PatchingScreenState
     data object Success : PatchingScreenState
-
-    data class Failed(
-        val failureLog: String,
-    ) : PatchingScreenState
-
+    data class Failed(val failureLog: String) : PatchingScreenState
     data object CloseScreen : PatchingScreenState
 }
 
-val PatchingScreenState.isNewlyFinished: Boolean
-    inline get() = this == Success || this is Failed
+val PatchingScreenState.isProgressChange: Boolean
+    inline get() = this != CloseScreen
 
 val PatchingScreenState.isFinished: Boolean
-    inline get() = isNewlyFinished || this == CloseScreen
+    inline get() = isProgressChange || this == CloseScreen