diff --git a/app-core b/app-core index faafe15..06cfb3f 160000 --- a/app-core +++ b/app-core @@ -1 +1 @@ -Subproject commit faafe1548f5dac8ad745ef5d6fe7b27640af262f +Subproject commit 06cfb3fb4038925b71a1f4c91062acdd4b6edea8 diff --git a/app/src/main/kotlin/nl/eduid/graphs/MainGraph.kt b/app/src/main/kotlin/nl/eduid/graphs/MainGraph.kt index 6f1973e..350d0fd 100644 --- 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(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 index f43da3e..753af4a 100644 --- 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 } })