From b960fbaa9f9447b1ef5752e975453dd965250637 Mon Sep 17 00:00:00 2001
From: Juraj Kusnier <jurajkusnier@users.noreply.github.com>
Date: Mon, 14 Jun 2021 12:46:21 +0200
Subject: [PATCH] Fix "Testcertificate not supported" on pending testresult
screen (EXPOSUREAPP-7752) (#3423)
* implement isDccSupportedByPoc into SubmissionTestResultPendingViewModel
* small code update
Co-authored-by: Kolya Opahle <k.opahle@sap.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
---
.../pending/SubmissionTestResultPendingFragment.kt | 4 ++++
.../SubmissionTestResultPendingViewModel.kt | 14 +++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingFragment.kt
index 709851dc7..60a7816a5 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingFragment.kt
@@ -61,6 +61,10 @@ class SubmissionTestResultPendingFragment : Fragment(R.layout.fragment_submissio
}
}
+ viewModel.testCertResultInfo.observe2(this) { result ->
+ binding.testResultPendingStepsCertificateInfo.setEntryText(result.get(requireContext()))
+ }
+
binding.apply {
val isPcr = navArgs.testType == CoronaTest.Type.PCR
testResultPendingStepsWaitingAntigenResult.isVisible = !isPcr
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingViewModel.kt
index ada54dddd..0a7ea7fe9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingViewModel.kt
@@ -101,12 +101,16 @@ class SubmissionTestResultPendingViewModel @AssistedInject constructor(
val testCertResultInfo: LiveData<LazyString> = testResultFlow
.map {
- when (it.coronaTest.type) {
- CoronaTest.Type.RAPID_ANTIGEN ->
+ when {
+ !it.coronaTest.isDccSupportedByPoc -> {
R.string.submission_test_result_pending_steps_test_certificate_not_supported_body
- CoronaTest.Type.PCR -> when (it.coronaTest.isAdvancedConsentGiven) {
- true -> R.string.submission_test_result_pending_steps_test_certificate_not_available_yet_body
- false -> R.string.submission_test_result_pending_steps_test_certificate_not_desired_by_user_body
+ }
+ else -> {
+ if (it.coronaTest.isAdvancedConsentGiven) {
+ R.string.submission_test_result_pending_steps_test_certificate_not_available_yet_body
+ } else {
+ R.string.submission_test_result_pending_steps_test_certificate_not_desired_by_user_body
+ }
}
}.toResolvingString()
}
--
GitLab