diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt index 5c5fe1ffbcc6f52e917cd22872a582d4f4f735a8..37730c60a2c346ef7cfd3d994713f395beb65efd 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt @@ -142,7 +142,7 @@ fun formatRiskContact(riskLevelScore: Int?, matchedKeysCount: Int?): String { } RiskLevelConstants.LOW_LEVEL_RISK -> { if (matchedKeysCount == 0) { - appContext.getString(R.string.risk_card_body_contact_low_risk) + appContext.getString(R.string.risk_card_body_contact) } else { resources.getQuantityString( R.plurals.risk_card_body_contact_value, diff --git a/Corona-Warn-App/src/main/res/values-bg/strings.xml b/Corona-Warn-App/src/main/res/values-bg/strings.xml index 2b99bd90380fc50f393bf4c15b2df258f1e3d739..45c9faa6befbd7ca8a1180c8d9208bd4aeca3a43 100644 --- a/Corona-Warn-App/src/main/res/values-bg/strings.xml +++ b/Corona-Warn-App/src/main/res/values-bg/strings.xml @@ -135,8 +135,6 @@ <!-- XTXT: risk card - no contact yet --> <string name="risk_card_body_contact">"До момента нÑма излагане на риÑк"</string> - <!-- XTXT: risk card - no exposures with low risk --> - <string name="risk_card_body_contact_low_risk">"До момента нÑма излагане на ниÑък риÑк"</string> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value"> <item quantity="one">"%1$s излагане на ниÑък риÑк"</item> 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 337569d67431b1af49b6b5285c13b23747002f52..0c8e4fc5a355906bd1a178594213728b5311dac8 100644 --- a/Corona-Warn-App/src/main/res/values-de/strings.xml +++ b/Corona-Warn-App/src/main/res/values-de/strings.xml @@ -135,16 +135,14 @@ <!-- XTXT: risk card - no contact yet --> <string name="risk_card_body_contact">"Bisher keine Risiko-Begegnungen"</string> - <!-- XTXT: risk card - no exposures with low risk --> - <string name="risk_card_body_contact_low_risk">"Bisher keine Begegnungen mit niedrigem Risiko"</string> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value"> - <item quantity="one">"%1$s Risiko-Begegnung mit niedrigem Risiko"</item> - <item quantity="other">"%1$s Risiko-Begegnungen mit niedrigem Risiko"</item> + <item quantity="one">"%1$s Begegnung mit niedrigem Risiko"</item> + <item quantity="other">"%1$s Begegnungen mit niedrigem Risiko"</item> <item quantity="zero">"Bisher keine Begegnungen mit niedrigem Risiko"</item> - <item quantity="two">"%1$s Risiko-Begegnungen mit niedrigem Risiko"</item> - <item quantity="few">"%1$s Risiko-Begegnungen mit niedrigem Risiko"</item> - <item quantity="many">"%1$s Risiko-Begegnungen mit niedrigem Risiko"</item> + <item quantity="two">"%1$s Begegnungen mit niedrigem Risiko"</item> + <item quantity="few">"%1$s Begegnungen mit niedrigem Risiko"</item> + <item quantity="many">"%1$s Begegnungen mit niedrigem Risiko"</item> </plurals> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value_high_risk"> diff --git a/Corona-Warn-App/src/main/res/values-en/strings.xml b/Corona-Warn-App/src/main/res/values-en/strings.xml index 830860d2cdd1d8c227da0600f5cac8f9412cec52..005b2a931e49760300082dc2fa747fd82b0c60d3 100644 --- a/Corona-Warn-App/src/main/res/values-en/strings.xml +++ b/Corona-Warn-App/src/main/res/values-en/strings.xml @@ -135,8 +135,6 @@ <!-- XTXT: risk card - no contact yet --> <string name="risk_card_body_contact">"No exposure up to now"</string> - <!-- XTXT: risk card - no exposures with low risk --> - <string name="risk_card_body_contact_low_risk">"No exposure with low risk so far"</string> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value"> <item quantity="one">"%1$s exposure with low risk"</item> diff --git a/Corona-Warn-App/src/main/res/values-pl/strings.xml b/Corona-Warn-App/src/main/res/values-pl/strings.xml index d3faa61b4ffc52209fd65198ab225cd4bcca43b9..fdf867dd9191d34ec6f1c2d62e674cb2ba33a8a3 100644 --- a/Corona-Warn-App/src/main/res/values-pl/strings.xml +++ b/Corona-Warn-App/src/main/res/values-pl/strings.xml @@ -135,8 +135,6 @@ <!-- XTXT: risk card - no contact yet --> <string name="risk_card_body_contact">"Brak narażenia do tej pory"</string> - <!-- XTXT: risk card - no exposures with low risk --> - <string name="risk_card_body_contact_low_risk">"Brak narażenia z niskim ryzykiem do tej pory"</string> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value"> <item quantity="one">"%1$s narażenie z niskim ryzykiem"</item> diff --git a/Corona-Warn-App/src/main/res/values-ro/strings.xml b/Corona-Warn-App/src/main/res/values-ro/strings.xml index 13535ea50e1801adbd74efad53a492f666935ca6..62cf4a4e029ee56234c811f2f59c18233b03cf80 100644 --- a/Corona-Warn-App/src/main/res/values-ro/strings.xml +++ b/Corona-Warn-App/src/main/res/values-ro/strings.xml @@ -135,8 +135,6 @@ <!-- XTXT: risk card - no contact yet --> <string name="risk_card_body_contact">"Nicio expunere până acum"</string> - <!-- XTXT: risk card - no exposures with low risk --> - <string name="risk_card_body_contact_low_risk">"Nicio expunere cu risc redus până acum"</string> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value"> <item quantity="one">"%1$s expunere cu risc redus"</item> diff --git a/Corona-Warn-App/src/main/res/values-tr/strings.xml b/Corona-Warn-App/src/main/res/values-tr/strings.xml index 844fd6e2bb2f652c724a34d6b15bbe7c9ac62573..98808553c5f60bc14d6661af6004bbf825d4eb7f 100644 --- a/Corona-Warn-App/src/main/res/values-tr/strings.xml +++ b/Corona-Warn-App/src/main/res/values-tr/strings.xml @@ -135,8 +135,6 @@ <!-- XTXT: risk card - no contact yet --> <string name="risk_card_body_contact">"Åžu ana dek hiçbir maruz kalma yok"</string> - <!-- XTXT: risk card - no exposures with low risk --> - <string name="risk_card_body_contact_low_risk">"Åžu ana dek hiçbir düşük riskli maruz kalma yok"</string> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value"> <item quantity="one">"%1$s kez düşük riskli maruz kalma"</item> diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml index 92fcc4795b039fd4cdb916e2797521868b159ecb..135dfaf5e3fd34c013236ad308e03362463086a1 100644 --- a/Corona-Warn-App/src/main/res/values/strings.xml +++ b/Corona-Warn-App/src/main/res/values/strings.xml @@ -137,8 +137,6 @@ <!-- XTXT: risk card - no contact yet --> <string name="risk_card_body_contact">"No exposure up to now"</string> - <!-- XTXT: risk card - no exposures with low risk --> - <string name="risk_card_body_contact_low_risk">"No exposure with low risk so far"</string> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value"> <item quantity="one">"%1$s exposure with low risk"</item> diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt index 607077c1a69ba68c85a333518508c4d6291eeb77..b03e57dd79478303134648a0bd26d9d8638d2b04 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/CachedKeyFileHolderTest.kt @@ -53,7 +53,6 @@ class CachedKeyFileHolderTest { every { CachedKeyFileHolder["checkForFreeSpace"]() } returns Unit every { CachedKeyFileHolder["getDatesFromServer"]() } returns arrayListOf<String>() - runBlocking { CachedKeyFileHolder.asyncFetchFiles(date) diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/GoogleQuotaCalculatorTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/GoogleQuotaCalculatorTest.kt index c60f9ed7dbbf4d143cc93e8c2af03613c91d189d..1a506b0cd9d74c7c08d210f45aad2534396498fe 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/GoogleQuotaCalculatorTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/GoogleQuotaCalculatorTest.kt @@ -54,7 +54,6 @@ internal class GoogleQuotaCalculatorTest { every { LocalData.googleAPIProvideDiagnosisKeysCallCount } answers { googleAPIProvideDiagnosisKeysCallCount.get() } - } @Test @@ -278,7 +277,6 @@ internal class GoogleQuotaCalculatorTest { val testTimeGMTAfterUTC = testTimeGMT.plusMinutes(1) assertEquals(true, testTimeGMTAfterUTC.isAfter(testTimeUTC)) - } @After @@ -286,4 +284,4 @@ internal class GoogleQuotaCalculatorTest { DateTimeUtils.setCurrentMillisSystem() unmockkObject(LocalData) } -} \ No newline at end of file +} diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelperTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelperTest.kt index 3240d2c3eb558619c041d5bc88799dde19f4b6b9..76cdd364785e7a32633eb744e3b58a0fb6f673c6 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelperTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelperTest.kt @@ -95,7 +95,6 @@ class FormatterRiskHelperTest { private fun formatRiskContactBase(iRiskLevelScore: Int?, iMatchedKeysCount: Int?, sValue: String) { every { context.getString(R.string.risk_card_body_contact) } returns R.string.risk_card_body_contact.toString() - every { context.getString(R.string.risk_card_body_contact_low_risk) } returns R.string.risk_card_body_contact_low_risk.toString() val result = formatRiskContact(riskLevelScore = iRiskLevelScore, matchedKeysCount = iMatchedKeysCount) assertThat( @@ -105,7 +104,6 @@ class FormatterRiskHelperTest { private fun formatRiskContactLastBase(iRiskLevelScore: Int?, iDaysSinceLastExposure: Int?, sValue: String) { every { context.getString(R.string.risk_card_body_contact) } returns R.string.risk_card_body_contact.toString() - every { context.getString(R.string.risk_card_body_contact_low_risk) } returns R.string.risk_card_body_contact_low_risk.toString() val result = formatRiskContactLast(riskLevelScore = iRiskLevelScore, daysSinceLastExposure = iDaysSinceLastExposure) @@ -602,7 +600,7 @@ class FormatterRiskHelperTest { formatRiskContactBase( iRiskLevelScore = RiskLevelConstants.LOW_LEVEL_RISK, iMatchedKeysCount = 0, - sValue = context.getString(R.string.risk_card_body_contact_low_risk) + sValue = context.getString(R.string.risk_card_body_contact) ) formatRiskContactBase( iRiskLevelScore = RiskLevelConstants.LOW_LEVEL_RISK,