From 71346d528b9f71fc9218212c70b6f5aa690540b2 Mon Sep 17 00:00:00 2001
From: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
Date: Mon, 26 Oct 2020 13:58:14 +0100
Subject: [PATCH] Fix text issues for low risk with 0/1+ encounters
(EXPOSUREAPP-3193) (#1464)
* Fix text issues for low risk with 0/1+ encounters (EXPOSUREAPP-3193)
* revert deletion of default string
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
---
.../tracing/details/DefaultRiskDetailPresenter.kt | 4 ++--
.../ui/tracing/details/TracingDetailsState.kt | 3 +--
.../tracing/details/TracingDetailsStateProvider.kt | 5 +++--
Corona-Warn-App/src/main/res/values-de/strings.xml | 2 --
.../riskdetails/DefaultRiskDetailPresenterTest.kt | 13 ++++++-------
.../ui/tracing/details/TracingDetailsStateTest.kt | 7 +++++--
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/details/DefaultRiskDetailPresenter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/details/DefaultRiskDetailPresenter.kt
index bc72c5fad..6ff94bb2b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/details/DefaultRiskDetailPresenter.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/details/DefaultRiskDetailPresenter.kt
@@ -10,6 +10,6 @@ class DefaultRiskDetailPresenter @Inject constructor() {
fun isAdditionalInfoVisible(riskLevel: Int, matchedKeyCount: Int) =
riskLevel == RiskLevelConstants.LOW_LEVEL_RISK && matchedKeyCount > 0
- fun isInformationBodyNoticeVisible(riskLevel: Int, matchedKeyCount: Int) =
- !(riskLevel == RiskLevelConstants.LOW_LEVEL_RISK && matchedKeyCount > 0)
+ fun isInformationBodyNoticeVisible(riskLevel: Int) =
+ riskLevel != RiskLevelConstants.LOW_LEVEL_RISK
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsState.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsState.kt
index 2e16490f0..2348a0e71 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsState.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsState.kt
@@ -51,7 +51,7 @@ data class TracingDetailsState(
* Only applied in special case for low level risk
*/
fun isBehaviorLowLevelRiskVisible(): Boolean =
- riskLevelScore == RiskLevelConstants.LOW_LEVEL_RISK
+ riskLevelScore == RiskLevelConstants.LOW_LEVEL_RISK && matchedKeyCount > 0
/**
* Formats the risk details text display for each risk level
@@ -85,7 +85,6 @@ data class TracingDetailsState(
*/
fun getRiskDetailsRiskLevelBodyNotice(c: Context): String = when (riskLevelScore) {
RiskLevelConstants.INCREASED_RISK -> R.string.risk_details_information_body_notice_increased
- RiskLevelConstants.LOW_LEVEL_RISK -> R.string.risk_details_information_body_notice_low
else -> R.string.risk_details_information_body_notice
}.let { c.getString(it) }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsStateProvider.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsStateProvider.kt
index 492b458e4..5d2ab8b1d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsStateProvider.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsStateProvider.kt
@@ -54,8 +54,9 @@ class TracingDetailsStateProvider @Inject constructor(
val isAdditionalInformationVisible = riskDetailPresenter.isAdditionalInfoVisible(
riskLevelScore, matchedKeyCount
)
- val isInformationBodyNoticeVisible = riskDetailPresenter.isInformationBodyNoticeVisible(
- riskLevelScore, matchedKeyCount
+ val isInformationBodyNoticeVisible =
+ riskDetailPresenter.isInformationBodyNoticeVisible(
+ riskLevelScore
)
TracingDetailsState(
diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml
index 460e3475b..3c7dd2a1c 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -350,8 +350,6 @@
</plurals>
<!-- YTXT: risk details - risk calculation explanation -->
<string name="risk_details_information_body_notice">"Das Infektionsrisiko wird anhand der Daten der Risiko-Ermittlung unter Berücksichtigung von Abstand und Dauer lokal auf Ihrem Smartphone berechnet. Ihr Infektionsrisiko ist für niemanden einsehbar und wird nicht weitergegeben."</string>
- <!-- YTXT: risk details - risk calculation explanation for low risk -->
- <string name="risk_details_information_body_notice_low">"Die Infektionswahrscheinlichkeit wird daher als niedrig für Sie eingestuft. Das Infektionsrisiko wird anhand der Daten der Risiko-Ermittlung unter Berücksichtigung von Abstand und Dauer lokal auf Ihrem Smartphone berechnet. Ihr Infektionsrisiko ist für niemanden einsehbar und wird nicht weitergegeben."</string>
<!-- YTXT: risk details - risk calculation explanation for increased risk -->
<string name="risk_details_information_body_notice_increased">"Die Infektionswahrscheinlichkeit wird daher als erhöht für Sie eingestuft. Das Infektionsrisiko wird anhand der Daten der Risiko-Ermittlung unter Berücksichtigung von Abstand und Dauer lokal auf Ihrem Smartphone berechnet. Ihr Infektionsrisiko ist für niemanden einsehbar und wird nicht weitergegeben. Wenn Sie nach Hause kommen, vermeiden Sie auch Begegnungen mit Familienmitgliedern und Mitbewohnern."</string>
<!-- NOTR -->
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/riskdetails/DefaultRiskDetailPresenterTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/riskdetails/DefaultRiskDetailPresenterTest.kt
index 26c25f07d..a8363c8c3 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/riskdetails/DefaultRiskDetailPresenterTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/riskdetails/DefaultRiskDetailPresenterTest.kt
@@ -23,13 +23,12 @@ class DefaultRiskDetailPresenterTest {
@Test
fun test_isInformationBodyNoticeVisible() {
DefaultRiskDetailPresenter().apply {
- Assert.assertTrue(isInformationBodyNoticeVisible(RiskLevelConstants.LOW_LEVEL_RISK, 0))
- Assert.assertFalse(isInformationBodyNoticeVisible(RiskLevelConstants.LOW_LEVEL_RISK, 1))
- Assert.assertTrue(isInformationBodyNoticeVisible(RiskLevelConstants.UNKNOWN_RISK_INITIAL, 0))
- Assert.assertTrue(isInformationBodyNoticeVisible(RiskLevelConstants.INCREASED_RISK, 0))
- Assert.assertTrue(isInformationBodyNoticeVisible(RiskLevelConstants.UNKNOWN_RISK_OUTDATED_RESULTS, 0))
- Assert.assertTrue(isInformationBodyNoticeVisible(RiskLevelConstants.NO_CALCULATION_POSSIBLE_TRACING_OFF, 0))
- Assert.assertTrue(isInformationBodyNoticeVisible(RiskLevelConstants.UNDETERMINED, 0))
+ Assert.assertFalse(isInformationBodyNoticeVisible(RiskLevelConstants.LOW_LEVEL_RISK))
+ Assert.assertTrue(isInformationBodyNoticeVisible(RiskLevelConstants.UNKNOWN_RISK_INITIAL))
+ Assert.assertTrue(isInformationBodyNoticeVisible(RiskLevelConstants.INCREASED_RISK))
+ Assert.assertTrue(isInformationBodyNoticeVisible(RiskLevelConstants.UNKNOWN_RISK_OUTDATED_RESULTS))
+ Assert.assertTrue(isInformationBodyNoticeVisible(RiskLevelConstants.NO_CALCULATION_POSSIBLE_TRACING_OFF))
+ Assert.assertTrue(isInformationBodyNoticeVisible(RiskLevelConstants.UNDETERMINED))
}
}
}
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsStateTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsStateTest.kt
index ee9c15f74..3cf9e6593 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsStateTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsStateTest.kt
@@ -148,9 +148,12 @@ class TracingDetailsStateTest : BaseTest() {
createInstance(riskLevelScore = RiskLevelConstants.NO_CALCULATION_POSSIBLE_TRACING_OFF).apply {
isBehaviorLowLevelRiskVisible() shouldBe false
}
- createInstance(riskLevelScore = RiskLevelConstants.LOW_LEVEL_RISK).apply {
+ createInstance(riskLevelScore = RiskLevelConstants.LOW_LEVEL_RISK, matchedKeyCount = 1).apply {
isBehaviorLowLevelRiskVisible() shouldBe true
}
+ createInstance(riskLevelScore = RiskLevelConstants.LOW_LEVEL_RISK, matchedKeyCount = 0).apply {
+ isBehaviorLowLevelRiskVisible() shouldBe false
+ }
createInstance(riskLevelScore = RiskLevelConstants.INCREASED_RISK).apply {
isBehaviorLowLevelRiskVisible() shouldBe false
}
@@ -221,7 +224,7 @@ class TracingDetailsStateTest : BaseTest() {
}
createInstance(riskLevelScore = RiskLevelConstants.LOW_LEVEL_RISK).apply {
getRiskDetailsRiskLevelBodyNotice(context)
- verify { context.getString(R.string.risk_details_information_body_notice_low) }
+ verify { context.getString(R.string.risk_details_information_body_notice) }
}
createInstance(riskLevelScore = RiskLevelConstants.INCREASED_RISK).apply {
getRiskDetailsRiskLevelBodyNotice(context)
--
GitLab