Edured-77: Fixed error dialog showing & backstack navigation when fai…

…ling
Tiqr · Apr 6, 2023 · 40d73a1 · 40d73a1
1 parent b0a7231
commit 40d73a1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/app-core b/app-core
diff --git a/app/src/main/kotlin/nl/eduid/graphs/MainGraph.kt b/app/src/main/kotlin/nl/eduid/graphs/MainGraph.kt
@@ -173,8 +173,7 @@ fun MainGraph(
                         )
                     )
                 }
-            },
-            goHome = { navController.goToWithPopCurrent(Graph.HOME_PAGE) }) { navController.popBackStack() }
+            }) { navController.popBackStack() }
     }
     composable(
         route = Account.AuthenticationCompleted.routeWithArgs,

diff --git a/app/src/main/kotlin/nl/eduid/screens/authorize/AuthenticationPinBiometricScreen.kt b/app/src/main/kotlin/nl/eduid/screens/authorize/AuthenticationPinBiometricScreen.kt
@@ -49,7 +49,6 @@ import timber.log.Timber
 fun AuthenticationPinBiometricScreen(
     viewModel: EduIdAuthenticationViewModel,
     goToAuthenticationComplete: (AuthenticationChallenge?, String) -> Unit,
-    goHome: () -> Unit,
     onCancel: () -> Unit,
 ) = EduIdTopAppBar(
     withBackIcon = false
@@ -72,7 +71,7 @@ fun AuthenticationPinBiometricScreen(
             goToAuthenticationComplete(authChallenge, pin)
         },
         clearCompleteChallenge = viewModel::clearCompleteChallenge,
-        goHome = goHome
+        goHomeOnFail = onCancel
     )
 }
 
@@ -86,7 +85,7 @@ private fun AuthenticationPinBiometricContent(
     onCancel: () -> Unit = {},
     goToAuthenticationComplete: (String) -> Unit = {},
     clearCompleteChallenge: () -> Unit = {},
-    goHome: () -> Unit = {},
+    goHomeOnFail: () -> Unit = {},
 ) {
     var isCheckingSecret by rememberSaveable { mutableStateOf(false) }
     var pinValue by rememberSaveable { mutableStateOf("") }
@@ -100,7 +99,6 @@ private fun AuthenticationPinBiometricContent(
                 } else {
                     return
                 }
-                isCheckingSecret = false
                 when (failure.reason) {
                     AuthenticationCompleteFailure.Reason.UNKNOWN,
                     AuthenticationCompleteFailure.Reason.CONNECTION,
@@ -119,9 +117,10 @@ private fun AuthenticationPinBiometricContent(
                             buttonLabel = stringResource(R.string.button_ok),
                             onDismiss = {
                                 if (remaining != null && remaining == 0) {
-                                    goHome()
+                                    goHomeOnFail()
                                 }
-                                clearCompleteChallenge.invoke()
+                                isCheckingSecret = false
+                                clearCompleteChallenge()
                             })
                     }
 
@@ -130,7 +129,10 @@ private fun AuthenticationPinBiometricContent(
                             title = failure.title,
                             explanation = failure.message,
                             buttonLabel = stringResource(R.string.button_ok),
-                            onDismiss = clearCompleteChallenge
+                            onDismiss = {
+                                isCheckingSecret = false
+                                clearCompleteChallenge()
+                            }
                         )
                     }
                 }
+13 −21		core/src/main/java/org/tiqr/core/enrollment/EnrollmentPinVerifyFragment.kt
+3 −2		data/src/main/java/org/tiqr/data/model/ChallengeFailure.kt
+14 −7		data/src/main/java/org/tiqr/data/repository/AuthenticationRepository.kt
+41 −18		data/src/main/java/org/tiqr/data/repository/EnrollmentRepository.kt
+2 −0		data/src/main/res/values/strings.xml
+1 −1		gradle/libs.versions.toml