diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MainActivity.kt b/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MainActivity.kt index f78b1b3ef50993e4c8ca296f5d0646fce5f059c2..fdbe14ae775f6c90b07eec0628a71029d85e6f0b 100644 --- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MainActivity.kt +++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MainActivity.kt @@ -38,6 +38,7 @@ import org.briarproject.mailbox.NavOnboardingDirections.actionGlobalClockSkewFra import org.briarproject.mailbox.NavOnboardingDirections.actionGlobalDoNotKillMeFragment import org.briarproject.mailbox.NavOnboardingDirections.actionGlobalNoNetworkFragment import org.briarproject.mailbox.NavOnboardingDirections.actionGlobalQrCodeFragment +import org.briarproject.mailbox.NavOnboardingDirections.actionGlobalSetupCompleteFragment import org.briarproject.mailbox.NavOnboardingDirections.actionGlobalStartupFragment import org.briarproject.mailbox.NavOnboardingDirections.actionGlobalStatusFragment import org.briarproject.mailbox.NavOnboardingDirections.actionGlobalStoppingFragment @@ -106,7 +107,11 @@ class MainActivity : AppCompatActivity(), ActivityResultCallback<ActivityResult> nav.navigate(actionGlobalStartupFragment()) is StartedSettingUp -> if (nav.currentDestination?.id != R.id.qrCodeFragment) nav.navigate(actionGlobalQrCodeFragment()) - StartedSetupComplete -> if (nav.currentDestination?.id != R.id.statusFragment) + StartedSetupComplete -> if (nav.currentDestination?.id == R.id.qrCodeFragment) + nav.navigate(actionGlobalSetupCompleteFragment()) + else if (nav.currentDestination?.id != R.id.statusFragment && + nav.currentDestination?.id != R.id.setupCompleteFragment + ) nav.navigate(actionGlobalStatusFragment()) ErrorNoNetwork -> if (nav.currentDestination?.id != R.id.noNetworkFragment) nav.navigate(actionGlobalNoNetworkFragment()) diff --git a/mailbox-android/src/main/res/navigation/nav_main.xml b/mailbox-android/src/main/res/navigation/nav_main.xml index 1e8162752618a57754ec8fef1e1bf2458b6921cc..0e82751c57bb196207e7e01e75d9f9f0992851bf 100644 --- a/mailbox-android/src/main/res/navigation/nav_main.xml +++ b/mailbox-android/src/main/res/navigation/nav_main.xml @@ -70,6 +70,11 @@ app:destination="@id/qrCodeFragment" app:popUpTo="@id/nav_onboarding" app:popUpToInclusive="true" /> + <action + android:id="@+id/action_global_setupCompleteFragment" + app:destination="@id/setupCompleteFragment" + app:popUpTo="@id/nav_onboarding" + app:popUpToInclusive="true" /> <action android:id="@+id/action_global_statusFragment" app:destination="@id/statusFragment"