From 7f743d4680fdd2dcc98e613801f4ac5e53453687 Mon Sep 17 00:00:00 2001
From: Alex Paulescu <alex.paulescu@gmail.com>
Date: Thu, 20 May 2021 11:28:58 +0300
Subject: [PATCH] Deleted code that would prevent screen navigation upon
successful request. (#3229)
Co-authored-by: Mohamed Metwalli <mohamed.metwalli@sap.com>
---
.../qrcode/scan/SubmissionQRCodeScanFragment.kt | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanFragment.kt
index 561cf45bf..3bf210bdb 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanFragment.kt
@@ -102,17 +102,7 @@ class SubmissionQRCodeScanFragment : Fragment(R.layout.fragment_submission_qr_co
ApiRequestState.STARTED -> View.VISIBLE
else -> View.GONE
}
-
- if (ApiRequestState.SUCCESS == state.apiRequestState) {
- return@observe2
- }
-
- if (state.test == null) {
- Timber.w("Successful API request, but test was null?")
- return@observe2
- }
-
- when (state.test.testResult) {
+ when (state.test?.testResult) {
CoronaTestResult.PCR_POSITIVE ->
NavGraphDirections.actionToSubmissionTestResultAvailableFragment(testType = Type.PCR)
@@ -132,6 +122,10 @@ class SubmissionQRCodeScanFragment : Fragment(R.layout.fragment_submission_qr_co
CoronaTestResult.RAT_PENDING,
CoronaTestResult.RAT_REDEEMED ->
NavGraphDirections.actionSubmissionTestResultPendingFragment(testType = Type.RAPID_ANTIGEN)
+ null -> {
+ Timber.w("Successful API request, but test was null?")
+ return@observe2
+ }
}.run { doNavigate(this) }
}
--
GitLab