Fix navigation after test scanning (EXPOSUREAPP-12985)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableFragment.kt

@@ -16,6 +16,7 @@ import de.rki.coronawarnapp.util.di.AutoInject
 import de.rki.coronawarnapp.util.shortcuts.AppShortcutsHelper
 import de.rki.coronawarnapp.util.ui.doNavigate
 import de.rki.coronawarnapp.util.ui.observe2
+import de.rki.coronawarnapp.util.ui.popBackStack
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted
@@ -112,11 +113,15 @@ class SubmissionTestResultAvailableFragment : Fragment(R.layout.fragment_submiss
             negativeButton = R.string.submission_test_result_available_close_dialog_cancel_button,
             cancelable = true,
             positiveButtonFunction = {},
-            negativeButtonFunction = { viewModel.onCancelConfirmed() }
+            negativeButtonFunction = { returnToScreenWhereUQSWasOpened() }
         )
         DialogHelper.showDialog(closeDialogInstance)
     }
 
+    private fun returnToScreenWhereUQSWasOpened() {
+        popBackStack()
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         viewModel.handleActivityResult(requestCode, resultCode, data)
     }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt

@@ -112,13 +112,6 @@ class SubmissionTestResultAvailableViewModel @AssistedInject constructor(
         showCloseDialog.postValue(Unit)
     }
 
-    fun onCancelConfirmed() {
-        routeToScreen.postValue(
-            SubmissionTestResultAvailableFragmentDirections
-                .actionSubmissionTestResultAvailableFragmentToMainFragment()
-        )
-    }
-
     fun goConsent() = launch {
         routeToScreen.postValue(
             SubmissionTestResultAvailableFragmentDirections

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/submissiondone/SubmissionDoneFragment.kt

@@ -12,8 +12,8 @@ import de.rki.coronawarnapp.databinding.FragmentSubmissionDoneBinding
 import de.rki.coronawarnapp.ui.submission.viewmodel.SubmissionNavigationEvents
 import de.rki.coronawarnapp.util.ContextExtensions.getDrawableCompat
 import de.rki.coronawarnapp.util.di.AutoInject
-import de.rki.coronawarnapp.util.ui.doNavigate
 import de.rki.coronawarnapp.util.ui.observe2
+import de.rki.coronawarnapp.util.ui.popBackStack
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted
@@ -57,11 +57,7 @@ class SubmissionDoneFragment : Fragment(R.layout.fragment_submission_done), Auto
 
         viewModel.routeToScreen.observe2(this) {
             when (it) {
-                SubmissionNavigationEvents.NavigateToMainActivity -> {
-                    doNavigate(
-                        SubmissionDoneFragmentDirections.actionSubmissionDoneFragmentToMainFragment()
-                    )
-                }
+                SubmissionNavigationEvents.NavigateToMainActivity -> popBackStack()
                 else -> Unit
             }
         }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultConsentGivenFragment.kt

@@ -16,6 +16,7 @@ import de.rki.coronawarnapp.ui.submission.viewmodel.SubmissionNavigationEvents
 import de.rki.coronawarnapp.util.di.AutoInject
 import de.rki.coronawarnapp.util.ui.doNavigate
 import de.rki.coronawarnapp.util.ui.observe2
+import de.rki.coronawarnapp.util.ui.popBackStack
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted
@@ -80,11 +81,7 @@ class SubmissionTestResultConsentGivenFragment :
                                 navArgs.testType
                             )
                     )
-                is SubmissionNavigationEvents.NavigateToMainActivity ->
-                    doNavigate(
-                        SubmissionTestResultConsentGivenFragmentDirections
-                            .actionSubmissionTestResultConsentGivenFragmentToHomeFragment()
-                    )
+                is SubmissionNavigationEvents.NavigateToMainActivity -> popBackStack()
                 else -> Unit
             }
         }

Corona-Warn-App/src/main/res/navigation/nav_graph.xml

@@ -112,8 +112,8 @@
         <action
             android:id="@+id/action_universalScanner_to_testRegistrationSelectionFragment"
             app:destination="@id/testRegistrationSelectionFragment"
-            app:popUpTo="@id/mainFragment"
-            app:popUpToInclusive="false" />
+            app:popUpTo="@id/universalScanner"
+            app:popUpToInclusive="true" />
 
         <action
             android:id="@+id/action_universalScanner_to_submissionDeletionWarningFragment"
@@ -192,19 +192,14 @@
         android:name="de.rki.coronawarnapp.ui.submission.resultavailable.SubmissionTestResultAvailableFragment"
         android:label="SubmissionTestResultAvailableFragment"
         tools:layout="@layout/fragment_submission_test_result_available">
-        <action
-            android:id="@+id/action_submissionTestResultAvailableFragment_to_mainFragment"
-            app:destination="@id/status_nav_graph"
-            app:popUpTo="@id/nav_graph"
-            app:popUpToInclusive="true" />
         <action
             android:id="@+id/action_submissionTestResultAvailableFragment_to_submissionYourConsentFragment"
             app:destination="@id/submissionYourConsentFragment" />
         <action
             android:id="@+id/action_submissionTestResultAvailableFragment_to_submissionTestResultConsentGivenFragment"
             app:destination="@id/submissionTestResultConsentGivenFragment"
-            app:popUpTo="@id/mainFragment"
-            app:popUpToInclusive="false" />
+            app:popUpTo="@id/submissionTestResultAvailableFragment"
+            app:popUpToInclusive="true" />
         <action
             android:id="@+id/action_submissionTestResultAvailableFragment_to_checkInsConsentFragment"
             app:destination="@id/checkInsConsentFragment"
@@ -330,8 +325,8 @@
         <action
             android:id="@+id/action_submissionSymptomIntroductionFragment_to_submissionDoneFragment"
             app:destination="@id/submissionDoneFragment"
-            app:popUpTo="@id/status_nav_graph"
-            app:popUpToInclusive="false" />
+            app:popUpTo="@id/submissionTestResultConsentGivenFragment"
+            app:popUpToInclusive="true" />
     </fragment>
     <fragment
         android:id="@+id/submissionSymptomCalendarFragment"
@@ -358,8 +353,8 @@
         <action
             android:id="@+id/action_submissionSymptomCalendarFragment_to_submissionDoneFragment"
             app:destination="@id/submissionDoneFragment"
-            app:popUpTo="@id/status_nav_graph"
-            app:popUpToInclusive="false" />
+            app:popUpTo="@id/submissionTestResultConsentGivenFragment"
+            app:popUpToInclusive="true" />
     </fragment>
     <fragment
         android:id="@+id/submissionConsentFragment"
@@ -383,11 +378,6 @@
         android:id="@+id/submissionTestResultConsentGivenFragment"
         android:name="de.rki.coronawarnapp.ui.submission.testresult.positive.SubmissionTestResultConsentGivenFragment"
         android:label="SubmissionTestResultConsentFragment">
-        <action
-            android:id="@+id/action_submissionTestResultConsentGivenFragment_to_homeFragment"
-            app:destination="@id/status_nav_graph"
-            app:popUpTo="@id/nav_graph"
-            app:popUpToInclusive="true" />
         <action
             android:id="@+id/action_submissionTestResultConsentGivenFragment_to_submissionSymptomIntroductionFragment"
             app:destination="@id/submissionSymptomIntroductionFragment" />
@@ -963,11 +953,6 @@
         android:name="de.rki.coronawarnapp.ui.submission.submissiondone.SubmissionDoneFragment"
         android:label="SubmissionDoneFragment"
         tools:layout="@layout/fragment_submission_done">
-        <action
-            android:id="@+id/action_submissionDoneFragment_to_mainFragment"
-            app:destination="@id/status_nav_graph"
-            app:popUpTo="@id/nav_graph"
-            app:popUpToInclusive="true" />
         <argument
             android:name="testType"
             app:argType="de.rki.coronawarnapp.coronatest.type.BaseCoronaTest$Type" />