Merge pull request #191 from Tiqr/feature/TIQR-502

TIQR-502: Fix crash an aborting the account linking flow
Tiqr · Jan 23, 2025 · d76a131 · d76a131
2 parents 29cdaa0 + 4e07db6
commit d76a131
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 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
@@ -312,7 +312,6 @@ fun MainGraph(
     composable(Graph.FIRST_TIME_DIALOG) { entry ->
         val viewModel = hiltViewModel<LinkAccountViewModel>(entry)
         FirstTimeDialogRoute(viewModel = viewModel,
-            goToAccountLinked = { navController.goToWithPopCurrent(AccountLinked.routeWithRegistrationFlowParam(true)) },
             skipThis = {
                 navController.navigate(Graph.HOME_PAGE) {
                     //Clear existing home page that has no account

diff --git a/app/src/main/kotlin/nl/eduid/screens/firsttimedialog/FirstTimeDialogScreen.kt b/app/src/main/kotlin/nl/eduid/screens/firsttimedialog/FirstTimeDialogScreen.kt
@@ -50,12 +50,14 @@ import nl.eduid.ui.theme.AlertWarningBackground
 import nl.eduid.ui.theme.EduidAppAndroidTheme
 
 @Composable
-fun FirstTimeDialogRoute(viewModel: LinkAccountViewModel, goToAccountLinked: () -> Unit, skipThis: () -> Unit) {
+fun FirstTimeDialogRoute(viewModel: LinkAccountViewModel, skipThis: () -> Unit) {
     var isGettingLinkUrl by rememberSaveable { mutableStateOf(false) }
     var isLinkingStarted by rememberSaveable { mutableStateOf(false) }
     val launcher = rememberLauncherForActivityResult(contract = LinkAccountContract(), onResult = { _ ->
         if (isLinkingStarted) {
-            goToAccountLinked()
+            // This part is called when the user came back to the app without linking anything
+            // (otherwise we would go via a deeplink to the success / error screen).
+            // In this case we do nothing. The user can choose to link again, or just press on the skip button.
             isLinkingStarted = false
         }
     })
+9 −1		core/src/main/java/org/tiqr/core/scan/ScanFragment.kt
+2 −2		data/src/main/java/org/tiqr/data/scan/ScanComponent.kt