Fix navigation after test scanning (EXPOSUREAPP-12985)

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionSymptomCalendarFragmentTest.kt

@@ -45,13 +45,14 @@ class SubmissionSymptomCalendarFragmentTest : BaseUITest() {
         MockKAnnotations.init(this, relaxed = true)
         viewModel = spyk(
             SubmissionSymptomCalendarViewModel(
-                Symptoms.Indication.POSITIVE,
-                BaseCoronaTest.Type.PCR,
-                TestDispatcherProvider(),
-                submissionRepository,
-                autoSubmission,
-                analyticsKeySubmissionCollector,
-                TestScope()
+                symptomIndication = Symptoms.Indication.POSITIVE,
+                testType = BaseCoronaTest.Type.PCR,
+                comesFromDispatcherFragment = false,
+                dispatcherProvider = TestDispatcherProvider(),
+                submissionRepository = submissionRepository,
+                autoSubmission = autoSubmission,
+                analyticsKeySubmissionCollector = analyticsKeySubmissionCollector,
+                appScope = TestScope()
             )
         )
         with(viewModel) {
@@ -61,7 +62,8 @@ class SubmissionSymptomCalendarFragmentTest : BaseUITest() {
             object : SubmissionSymptomCalendarViewModel.Factory {
                 override fun create(
                     symptomIndication: Symptoms.Indication,
-                    testType: BaseCoronaTest.Type
+                    testType: BaseCoronaTest.Type,
+                    comesFromDispatcherFragment: Boolean
                 ): SubmissionSymptomCalendarViewModel = viewModel
             }
         )

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionSymptomIntroFragmentTest.kt

@@ -47,20 +47,24 @@ class SubmissionSymptomIntroFragmentTest : BaseUITest() {
         MockKAnnotations.init(this, relaxed = true)
         viewModel = spyk(
             SubmissionSymptomIntroductionViewModel(
-                TestDispatcherProvider(),
-                submissionRepository,
-                autoSubmission,
-                analyticsKeySubmissionCollector,
-                BaseCoronaTest.Type.PCR,
-                TestScope()
+                dispatcherProvider = TestDispatcherProvider(),
+                submissionRepository = submissionRepository,
+                autoSubmission = autoSubmission,
+                analyticsKeySubmissionCollector = analyticsKeySubmissionCollector,
+                testType = BaseCoronaTest.Type.PCR,
+                comesFromDispatcherFragment = false,
+                appScope = TestScope()
             )
         )
         with(viewModel) {
             every { symptomIndication } returns MutableLiveData(Symptoms.Indication.POSITIVE)
         }
         setupMockViewModel(
             object : SubmissionSymptomIntroductionViewModel.Factory {
-                override fun create(testType: BaseCoronaTest.Type): SubmissionSymptomIntroductionViewModel = viewModel
+                override fun create(
+                    testType: BaseCoronaTest.Type,
+                    comesFromDispatcherFragment: Boolean
+                ): SubmissionSymptomIntroductionViewModel = viewModel
             }
         )
     }

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultAvailableFragmentTest.kt

@@ -60,14 +60,18 @@ class SubmissionTestResultAvailableFragmentTest : BaseUITest() {
                 autoSubmission = autoSubmission,
                 analyticsKeySubmissionCollector = analyticsKeySubmissionCollector,
                 checkInRepository = checkInRepository,
+                comesFromDispatcherFragment = false,
                 coronaTestProvider = coronaTestProvider,
                 testIdentifier = ""
             )
         )
 
         setupMockViewModel(
             object : SubmissionTestResultAvailableViewModel.Factory {
-                override fun create(testIdentifier: TestIdentifier): SubmissionTestResultAvailableViewModel = viewModel
+                override fun create(
+                    testIdentifier: TestIdentifier,
+                    comesFromDispatcherFragment: Boolean
+                ): SubmissionTestResultAvailableViewModel = viewModel
             }
         )
     }

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragmentTest.kt

@@ -60,6 +60,7 @@ class SubmissionTestResultFragmentTest : BaseUITest() {
                 recycledTestProvider = recycledTestProvider,
                 initialUpdate = false,
                 testIdentifier = "",
+                comesFromDispatcherFragment = false,
                 coronaTestProvider = coronaTestProvider
             )
         )
@@ -82,7 +83,8 @@ class SubmissionTestResultFragmentTest : BaseUITest() {
             object : SubmissionTestResultPendingViewModel.Factory {
                 override fun create(
                     testIdentifier: TestIdentifier,
-                    initialUpdate: Boolean
+                    initialUpdate: Boolean,
+                    comesFromDispatcherFragment: Boolean
                 ): SubmissionTestResultPendingViewModel = viewModel
             }
         )

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/familytest/ui/consent/FamilyTestConsentFragment.kt

@@ -65,7 +65,7 @@ class FamilyTestConsentFragment : Fragment(R.layout.fragment_family_test_consent
                 }
                 is FamilyTestConsentNavigationEvents.NavigateClose -> {
                     binding.root.hideKeyboard()
-                    popBackStack()
+                    goBack()
                 }
                 is FamilyTestConsentNavigationEvents.NavigateToDataPrivacy -> doNavigate(
                     FamilyTestConsentFragmentDirections.actionFamilyTestConsentFragmentToInformationPrivacyFragment()
@@ -143,4 +143,10 @@ class FamilyTestConsentFragment : Fragment(R.layout.fragment_family_test_consent
             binding.consentButton.isActive = it
         }
     }
+
+    private fun goBack() {
+        if (navArgs.comesFromDispatcherFragment) {
+            doNavigate(FamilyTestConsentFragmentDirections.actionGlobalMainFragment())
+        } else popBackStack()
+    }
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/familytest/ui/selection/TestRegistrationSelectionFragment.kt

@@ -44,7 +44,8 @@ class TestRegistrationSelectionFragment : Fragment(R.layout.fragment_test_regist
                         TestRegistrationSelectionFragmentDirections
                             .actionTestRegistrationSelectionFragmentToSubmissionConsentFragment(
                                 coronaTestQrCode = it.coronaTestQRCode,
-                                navigateBackTo = BackToTestRegistrationSelection
+                                navigateBackTo = BackToTestRegistrationSelection,
+                                comesFromDispatcherFragment = navArgs.comesFromDispatcherFragment
                             ),
                         navOptions
                     )
@@ -54,15 +55,17 @@ class TestRegistrationSelectionFragment : Fragment(R.layout.fragment_test_regist
                         TestRegistrationSelectionFragmentDirections
                             .actionTestRegistrationSelectionFragmentToSubmissionDeletionWarningFragment(
                                 testRegistrationRequest = it.testRegistrationRequest,
-                                popToTestCategorySelection = true
+                                popToTestCategorySelection = true,
+                                comesFromDispatcherFragment = navArgs.comesFromDispatcherFragment
                             )
                     )
                 }
                 is TestRegistrationSelectionNavigationEvents.NavigateToFamily -> {
                     findNavController().navigate(
                         TestRegistrationSelectionFragmentDirections
                             .actionTestRegistrationSelectionFragmentToFamilyTestConsentFragment(
-                                coronaTestQrCode = it.coronaTestQRCode
+                                coronaTestQrCode = it.coronaTestQRCode,
+                                comesFromDispatcherFragment = navArgs.comesFromDispatcherFragment
                             ),
                         navOptions
                     )

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/qrcode/ui/QrCodeScannerFragment.kt

@@ -237,7 +237,8 @@ class QrCodeScannerFragment : Fragment(R.layout.fragment_qrcode_scanner), AutoIn
             is CoronaTestResult.TestRegistrationSelection -> {
                 qrcodeSharedViewModel.familyTestPersonName = navArgs.familyTestPersonName
                 QrCodeScannerFragmentDirections.actionUniversalScannerToTestRegistrationSelectionFragment(
-                    scannerResult.coronaTestQrCode
+                    scannerResult.coronaTestQrCode,
+                    comesFromDispatcherFragment = navArgs.comesFromDispatcherFragment
                 )
             }
 
@@ -247,29 +248,35 @@ class QrCodeScannerFragment : Fragment(R.layout.fragment_qrcode_scanner), AutoIn
             }
             is CoronaTestResult.RestoreDuplicateTest ->
                 QrCodeScannerFragmentDirections.actionUniversalScannerToSubmissionDeletionWarningFragment(
-                    scannerResult.restoreRecycledTestRequest
+                    scannerResult.restoreRecycledTestRequest,
+                    comesFromDispatcherFragment = navArgs.comesFromDispatcherFragment
                 )
             is CoronaTestResult.TestPending ->
                 QrCodeScannerFragmentDirections.actionUniversalScannerToPendingTestResult(
                     testIdentifier = scannerResult.test.identifier,
-                    forceTestResultUpdate = true
+                    forceTestResultUpdate = true,
+                    comesFromDispatcherFragment = navArgs.comesFromDispatcherFragment
                 )
             is CoronaTestResult.TestInvalid ->
                 QrCodeScannerFragmentDirections.actionUniversalScannerToSubmissionTestResultInvalidFragment(
-                    testIdentifier = scannerResult.test.identifier
+                    testIdentifier = scannerResult.test.identifier,
+                    comesFromDispatcherFragment = navArgs.comesFromDispatcherFragment
                 )
             is CoronaTestResult.TestNegative ->
                 QrCodeScannerFragmentDirections.actionUniversalScannerToSubmissionTestResultNegativeFragment(
-                    testIdentifier = scannerResult.test.identifier
+                    testIdentifier = scannerResult.test.identifier,
+                    comesFromDispatcherFragment = navArgs.comesFromDispatcherFragment
                 )
             is CoronaTestResult.TestPositive ->
                 QrCodeScannerFragmentDirections.actionUniversalScannerToSubmissionTestResultKeysSharedFragment(
-                    testIdentifier = scannerResult.test.identifier
+                    testIdentifier = scannerResult.test.identifier,
+                    comesFromDispatcherFragment = navArgs.comesFromDispatcherFragment
                 )
             is CoronaTestResult.WarnOthers ->
                 QrCodeScannerFragmentDirections
                     .actionUniversalScannerToSubmissionResultPositiveOtherWarningNoConsentFragment(
-                        testIdentifier = scannerResult.test.identifier
+                        testIdentifier = scannerResult.test.identifier,
+                        comesFromDispatcherFragment = navArgs.comesFromDispatcherFragment
                     )
         }
             ?.let {

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/covidcertificate/RequestCovidCertificateFragment.kt

@@ -21,6 +21,7 @@ import de.rki.coronawarnapp.familytest.core.model.FamilyCoronaTest
 import de.rki.coronawarnapp.submission.TestRegistrationStateProcessor.State
 import de.rki.coronawarnapp.util.TimeAndDateExtensions.toDayFormat
 import de.rki.coronawarnapp.util.di.AutoInject
+import de.rki.coronawarnapp.util.ui.doNavigate
 import de.rki.coronawarnapp.util.ui.popBackStack
 import de.rki.coronawarnapp.util.ui.viewBinding
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
@@ -94,18 +95,21 @@ class RequestCovidCertificateFragment : Fragment(R.layout.fragment_request_covid
                 state.test.isPositive ->
                     if (state.test is FamilyCoronaTest) {
                         NavGraphDirections.actionSubmissionTestResultPendingFragment(
-                            testIdentifier = state.test.identifier
+                            testIdentifier = state.test.identifier,
+                            comesFromDispatcherFragment = args.comesFromDispatcherFragment
                         )
                     } else {
                         NavGraphDirections.actionToSubmissionTestResultAvailableFragment(
-                            testIdentifier = state.test.identifier
+                            testIdentifier = state.test.identifier,
+                            comesFromDispatcherFragment = args.comesFromDispatcherFragment
                         )
                     }
                         .run { findNavController().navigate(this, navOptions) }
 
                 else ->
                     NavGraphDirections.actionSubmissionTestResultPendingFragment(
-                        testIdentifier = state.test.identifier
+                        testIdentifier = state.test.identifier,
+                        comesFromDispatcherFragment = args.comesFromDispatcherFragment
                     )
                         .run { findNavController().navigate(this, navOptions) }
             }
@@ -116,7 +120,13 @@ class RequestCovidCertificateFragment : Fragment(R.layout.fragment_request_covid
         .setTitle(R.string.request_gc_dialog_title)
         .setMessage(R.string.request_gc_dialog_message)
         .setNegativeButton(R.string.request_gc_dialog_negative_button) { _, _ -> }
-        .setPositiveButton(R.string.request_gc_dialog_positive_button) { _, _ -> popBackStack() }
+        .setPositiveButton(R.string.request_gc_dialog_positive_button) { _, _ ->
+            if (args.comesFromDispatcherFragment) {
+                doNavigate(
+                    RequestCovidCertificateFragmentDirections.actionRequestCovidCertificateFragmentToHomeFragment()
+                )
+            } else popBackStack()
+        }
         .create()
         .show()
 

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/deletionwarning/SubmissionDeletionWarningFragment.kt

@@ -11,6 +11,7 @@ import de.rki.coronawarnapp.NavGraphDirections
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.coronatest.tan.CoronaTestTAN
 import de.rki.coronawarnapp.coronatest.type.BaseCoronaTest
+import de.rki.coronawarnapp.coronatest.type.TestIdentifier
 import de.rki.coronawarnapp.databinding.FragmentSubmissionDeletionWarningBinding
 import de.rki.coronawarnapp.submission.TestRegistrationStateProcessor.State
 import de.rki.coronawarnapp.util.di.AutoInject
@@ -41,7 +42,7 @@ class SubmissionDeletionWarningFragment : Fragment(R.layout.fragment_submission_
         factoryProducer = { viewModelFactory },
         constructorCall = { factory, _ ->
             factory as SubmissionDeletionWarningViewModel.Factory
-            factory.create(args.testRegistrationRequest)
+            factory.create(args.testRegistrationRequest, args.comesFromDispatcherFragment)
         }
     )
     private val binding: FragmentSubmissionDeletionWarningBinding by viewBinding()
@@ -82,34 +83,53 @@ class SubmissionDeletionWarningFragment : Fragment(R.layout.fragment_submission_
                     popBackStack()
                 }
                 is State.TestRegistered -> when {
-                    state.test.isPositive -> {
-                        if (args.testRegistrationRequest is CoronaTestTAN) {
-                            SubmissionDeletionWarningFragmentDirections
-                                .actionSubmissionDeletionFragmentToSubmissionTestResultNoConsentFragment(
-                                    testIdentifier = state.test.identifier
-                                )
-                        } else {
-                            NavGraphDirections.actionToSubmissionTestResultAvailableFragment(
-                                testIdentifier = state.test.identifier
-                            )
-                        }
-                    }
-                    else -> NavGraphDirections.actionSubmissionTestResultPendingFragment(
-                        testIdentifier = state.test.identifier
+                    state.test.isPositive -> sortNavigation(state.test.identifier)
+                    else -> findNavController().navigate(
+                        NavGraphDirections.actionSubmissionTestResultPendingFragment(
+                            testIdentifier = state.test.identifier,
+                            comesFromDispatcherFragment = args.comesFromDispatcherFragment
+                        ),
+                        navOptions
                     )
-                }.also { findNavController().navigate(it, navOptions) }
+                }
             }
 
             viewModel.routeToScreen.observe2(this) { event ->
                 Timber.d("Navigating to %s", event)
                 when (event) {
-                    DuplicateWarningEvent.Back -> popBackStack()
+                    DuplicateWarningEvent.Back -> {
+                        if (args.comesFromDispatcherFragment) {
+                            SubmissionDeletionWarningFragmentDirections.actionGlobalMainFragment()
+                        }
+                        popBackStack()
+                    }
                     is DuplicateWarningEvent.Direction -> findNavController().navigate(event.direction, navOptions)
                 }
             }
         }
     }
 
+    private fun sortNavigation(identifier: TestIdentifier) {
+        if (args.testRegistrationRequest is CoronaTestTAN) {
+            findNavController().navigate(
+                SubmissionDeletionWarningFragmentDirections
+                    .actionSubmissionDeletionFragmentToSubmissionTestResultNoConsentFragment(
+                        testIdentifier = identifier,
+                        comesFromDispatcherFragment = args.comesFromDispatcherFragment
+                    ),
+                navOptions
+            )
+        } else {
+            findNavController().navigate(
+                NavGraphDirections.actionToSubmissionTestResultAvailableFragment(
+                    testIdentifier = identifier,
+                    comesFromDispatcherFragment = args.comesFromDispatcherFragment
+                ),
+                navOptions
+            )
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         binding.contentContainer.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT)