From 1e56c522eb2ed6a0075f78f9e95208097d211859 Mon Sep 17 00:00:00 2001 From: Philipp Woessner <64482866+pwoessner@users.noreply.github.com> Date: Mon, 3 Aug 2020 13:59:08 +0200 Subject: [PATCH 1/2] changed background prio dialogs and texts (#963) --- .../main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt | 2 +- .../rki/coronawarnapp/transaction/RiskLevelTransaction.kt | 2 +- .../main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt | 5 ++--- .../de/rki/coronawarnapp/ui/viewmodel/TracingViewModel.kt | 2 +- .../java/de/rki/coronawarnapp/util/ConnectivityHelper.kt | 6 ++---- Corona-Warn-App/src/main/res/values-de/strings.xml | 4 ++-- .../coronawarnapp/transaction/RiskLevelTransactionTest.kt | 4 ++-- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt index d70277f32c9..244c8811965 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt @@ -70,7 +70,7 @@ class CoronaWarnApplication : Application(), LifecycleObserver, "Application onCreate", "App was woken up" ) // Only do this if the background jobs are enabled - if (ConnectivityHelper.isBackgroundJobEnabled(applicationContext)) + if (ConnectivityHelper.autoModeEnabled(applicationContext)) ProcessLifecycleOwner.get().lifecycleScope.launch { // we want a wakelock as the OS does not handle this for us like in the background // job execution diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RiskLevelTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RiskLevelTransaction.kt index d7daa2c0dcb..bb272906f58 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RiskLevelTransaction.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RiskLevelTransaction.kt @@ -300,7 +300,7 @@ object RiskLevelTransaction : Transaction() { if (timeSinceLastDiagnosisKeyFetchFromServer.millisecondsToHours() > TimeVariables.getMaxStaleExposureRiskRange() && isActiveTracingTimeAboveThreshold() ) { - if (ConnectivityHelper.isBackgroundJobEnabled(CoronaWarnApplication.getAppContext())) { + if (ConnectivityHelper.autoModeEnabled(CoronaWarnApplication.getAppContext())) { return@executeState UNKNOWN_RISK_OUTDATED_RESULTS.also { Timber.v("diagnosis keys outdated and active tracing time is above threshold") Timber.v("manual mode not active (background jobs enabled)") diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt index 21aab5b5280..2302135b625 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt @@ -93,7 +93,7 @@ class MainActivity : AppCompatActivity() { ConnectivityHelper.registerNetworkStatusCallback(this, callbackNetwork) ConnectivityHelper.registerBluetoothStatusCallback(this, callbackBluetooth) ConnectivityHelper.registerLocationStatusCallback(this, callbackLocation) - settingsViewModel.updateBackgroundJobEnabled(ConnectivityHelper.isBackgroundJobEnabled(this)) + settingsViewModel.updateBackgroundJobEnabled(ConnectivityHelper.autoModeEnabled(this)) scheduleWork() checkShouldDisplayBackgroundWarning() } @@ -150,8 +150,7 @@ class MainActivity : AppCompatActivity() { // show battery optimization system dialog after background processing dialog checkForEnergyOptimizedEnabled() }, { - // declined, show additional dialog explaining manual risk calculation - showManualCheckingRequiredDialog() + // declined }) DialogHelper.showDialog(dialog) } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/TracingViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/TracingViewModel.kt index 26e65a0388c..145486acde5 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/TracingViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/TracingViewModel.kt @@ -82,7 +82,7 @@ class TracingViewModel : ViewModel() { // only fetch the diagnosis keys if background jobs are enabled, so that in manual // model the keys are only fetched on button press of the user val isBackgroundJobEnabled = - ConnectivityHelper.isBackgroundJobEnabled(CoronaWarnApplication.getAppContext()) + ConnectivityHelper.autoModeEnabled(CoronaWarnApplication.getAppContext()) Timber.v("Keys were not retrieved today $keysWereNotRetrievedToday") Timber.v("Network is enabled $isNetworkEnabled") diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ConnectivityHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ConnectivityHelper.kt index da39aa39b7b..7771bd45d1d 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ConnectivityHelper.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ConnectivityHelper.kt @@ -209,10 +209,8 @@ object ConnectivityHelper { * * @see isBackgroundRestricted */ - fun isBackgroundJobEnabled(context: Context): Boolean { - return !isBackgroundRestricted(context) && PowerManagementHelper.isIgnoringBatteryOptimizations( - context - ) + fun autoModeEnabled(context: Context): Boolean { + return !isBackgroundRestricted(context) || PowerManagementHelper.isIgnoringBatteryOptimizations(context) } /** 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 803710aef0e..0875bd31362 100644 --- a/Corona-Warn-App/src/main/res/values-de/strings.xml +++ b/Corona-Warn-App/src/main/res/values-de/strings.xml @@ -420,7 +420,7 @@ "Priorisierte Hintergrundaktivität erlauben" - "Erlauben Sie die priorisierte Hintergrundaktivität, damit die App jederzeit Ihren Risikostatus im Hintergrund ermitteln kann (empfohlen). Damit wird die Optimierung des Akku-Verbrauchs ausschließlich für die Corona-Warn-App deaktiviert. Ein stark erhöhter Akku-Verbrauch ist hierbei nicht zu erwarten. \n\nWenn Sie diese Einstellung nicht erlauben, müssen Sie Ihren Risikostatus manuell in der App aktualisieren." + "Erlauben Sie die priorisierte Hintergrundaktivität, damit die App jederzeit Ihren Risikostatus im Hintergrund ermitteln kann (empfohlen). Damit wird die Optimierung des Akku-Verbrauchs ausschließlich für die Corona-Warn-App deaktiviert. Ein stark erhöhter Akku-Verbrauch ist hierbei nicht zu erwarten.\n\nWenn Sie diese Einstellung nicht erlauben, empfehlen wir die App mindestens alle 24 Stunden einmal aktiv zu öffnen." "Erlauben" @@ -428,7 +428,7 @@ "Priorisierte Hintergrundaktivität deaktiviert" - "Beachten Sie, dass Sie ohne Aktivierung der priorisierten Hintergrundaktivität die App einmal am Tag aufrufen müssen, um Ihren Risikostatus manuell aktualisieren zu können. \n\nSie können die priorisierte Hintergrundaktivität jederzeit in Ihren Einstellungen aktivieren. " + "Beachten Sie, dass Sie ohne Aktivierung der priorisierten Hintergrundaktivität die App mindestens alle 24 Stunden einmal aktiv aufrufen müssen, um Ihren Risikostatus aktualisieren zu können.\n\nSie können die priorisierte Hintergrundaktivität jederzeit in Ihren Einstellungen aktivieren." "Ok" diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt index afdac4dc5f2..288032cc3c7 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt @@ -152,7 +152,7 @@ class RiskLevelTransactionTest { ) // background jobs are enabled - every { ConnectivityHelper.isBackgroundJobEnabled(CoronaWarnApplication.getAppContext()) } returns true + every { ConnectivityHelper.autoModeEnabled(CoronaWarnApplication.getAppContext()) } returns true runBlocking { @@ -200,7 +200,7 @@ class RiskLevelTransactionTest { ) // background jobs are disabled - every { ConnectivityHelper.isBackgroundJobEnabled(CoronaWarnApplication.getAppContext()) } returns false + every { ConnectivityHelper.autoModeEnabled(CoronaWarnApplication.getAppContext()) } returns false runBlocking { From fb7267d1bdfc843b04580e1e05ef926051feffeb Mon Sep 17 00:00:00 2001 From: Philipp Woessner <64482866+pwoessner@users.noreply.github.com> Date: Mon, 3 Aug 2020 14:08:21 +0200 Subject: [PATCH 2/2] Text changes for the high risk description (EXPOSUREAPP-1994, EXPOSUREAPP-1999) (#961) * text changes for the high risk description * text changes for the high risk description in en * fixed an issue for number of exposure text for increased risk level --- .../util/formatter/FormatterRiskHelper.kt | 12 +++++++++- .../src/main/res/values-de/strings.xml | 23 +++++++++++++------ .../src/main/res/values-en/strings.xml | 23 +++++++++++++------ .../src/main/res/values/strings.xml | 23 +++++++++++++------ 4 files changed, 59 insertions(+), 22 deletions(-) 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 76723092365..6e87dce0b91 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 @@ -129,7 +129,17 @@ fun formatRiskContact(riskLevelScore: Int?, matchedKeysCount: Int?): String { val resources = appContext.resources val contacts = matchedKeysCount ?: 0 return when (riskLevelScore) { - RiskLevelConstants.INCREASED_RISK, + RiskLevelConstants.INCREASED_RISK -> { + if (matchedKeysCount == 0) { + appContext.getString(R.string.risk_card_body_contact) + } else { + resources.getQuantityString( + R.plurals.risk_card_body_contact_value_high_risk, + contacts, + contacts + ) + } + } RiskLevelConstants.LOW_LEVEL_RISK -> { if (matchedKeysCount == 0) { appContext.getString(R.string.risk_card_body_contact) 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 0875bd31362..599eb7de369 100644 --- a/Corona-Warn-App/src/main/res/values-de/strings.xml +++ b/Corona-Warn-App/src/main/res/values-de/strings.xml @@ -144,6 +144,15 @@ "%1$s Risiko-Begegnungen mit niedrigem Risiko" "%1$s Risiko-Begegnungen mit niedrigem Risiko" + + + "%1$s Risiko-Begegnung" + "%1$s Risiko-Begegnungen" + "Bisher keine Risiko-Begegnungen" + "%1$s Risiko-Begegnungen" + "%1$s Risiko-Begegnungen" + "%1$s Risiko-Begegnungen" + "Risiko-Ermittlung war für %1$s der letzten 14 Tage aktiv" @@ -329,15 +338,15 @@ "Sie haben ein niedriges Infektionsrisiko, da keine Begegnung mit nachweislich Corona-positiv getesteten Personen aufgezeichnet wurde oder sich Ihre Begegnung auf kurze Zeit und einen größeren Abstand beschränkt hat." - "Sie haben ein erhöhtes Infektionsrisiko, da Sie zuletzt vor %1$s Tag mindestens einer Corona-positiv getesteten Person über einen längeren Zeitraum und mit einem geringen Abstand begegnet sind." - "Sie haben ein erhöhtes Infektionsrisiko, da Sie zuletzt vor %1$s Tagen mindestens einer Corona-positiv getesteten Person über einen längeren Zeitraum und mit einem geringen Abstand begegnet sind." - "Sie haben ein erhöhtes Infektionsrisiko, da Sie zuletzt vor %1$s Tagen mindestens einer Corona-positiv getesteten Person über einen längeren Zeitraum und mit einem geringen Abstand begegnet sind." - "Sie haben ein erhöhtes Infektionsrisiko, da Sie zuletzt vor %1$s Tagen mindestens einer Corona-positiv getesteten Person über einen längeren Zeitraum und mit einem geringen Abstand begegnet sind." - "Sie haben ein erhöhtes Infektionsrisiko, da Sie zuletzt vor %1$s Tagen mindestens einer Corona-positiv getesteten Person über einen längeren Zeitraum und mit einem geringen Abstand begegnet sind." - "Sie haben ein erhöhtes Infektionsrisiko, da Sie zuletzt vor %1$s Tagen mindestens einer Corona-positiv getesteten Person über einen längeren Zeitraum und mit einem geringen Abstand begegnet sind." + "Sie haben ein erhöhtes Infektionsrisiko, da Sie zuletzt vor %1$s Tag mindestens einer nachweislich Corona-positiv getesteten Person über einen längeren Zeitpunkt und mit einem geringen Abstand begegnet sind." + "Sie haben ein erhöhtes Infektionsrisiko, da Sie zuletzt vor %1$s Tagen mindestens einer nachweislich Corona-positiv getesteten Person über einen längeren Zeitpunkt und mit einem geringen Abstand begegnet sind." + "Sie haben ein erhöhtes Infektionsrisiko, da Sie zuletzt vor %1$s Tagen mindestens einer nachweislich Corona-positiv getesteten Person über einen längeren Zeitpunkt und mit einem geringen Abstand begegnet sind." + "Sie haben ein erhöhtes Infektionsrisiko, da Sie zuletzt vor %1$s Tagen mindestens einer nachweislich Corona-positiv getesteten Person über einen längeren Zeitpunkt und mit einem geringen Abstand begegnet sind." + "Sie haben ein erhöhtes Infektionsrisiko, da Sie zuletzt vor %1$s Tagen mindestens einer nachweislich Corona-positiv getesteten Person über einen längeren Zeitpunkt und mit einem geringen Abstand begegnet sind." + "Sie haben ein erhöhtes Infektionsrisiko, da Sie zuletzt vor %1$s Tagen mindestens einer nachweislich Corona-positiv getesteten Person über einen längeren Zeitpunkt und mit einem geringen Abstand begegnet sind." - "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." + "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/risk_card_button_update 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 3f22d43a9ab..1446f2ce127 100644 --- a/Corona-Warn-App/src/main/res/values-en/strings.xml +++ b/Corona-Warn-App/src/main/res/values-en/strings.xml @@ -146,6 +146,15 @@ "%1$s exposures with low risk" "%1$s exposures with low risk" + + + "%1$s exposure" + "%1$s exposures" + "No exposure up to now" + "%1$s exposures" + "%1$s exposures" + "%1$s exposures" + "Exposure logging was active for %1$s of the past 14 days." @@ -331,15 +340,15 @@ "You have a low risk of infection because no exposure to people later diagnosed with COVID-19 was logged, or because your encounters were only for a short time and at a greater distance." - "You have a higher risk of infection because you were last exposed %1$s day ago over a longer period of time and in close proximity to at least one person diagnosed with COVID-19." - "You have a higher risk of infection because you were last exposed %1$s days ago over a longer period of time and in close proximity to at least one person diagnosed with COVID-19." - "You have a higher risk of infection because you were last exposed %1$s days ago over a longer period of time and in close proximity to at least one person diagnosed with COVID-19." - "You have a higher risk of infection because you were last exposed %1$s days ago over a longer period of time and in close proximity to at least one person diagnosed with COVID-19." - "You have a higher risk of infection because you were last exposed %1$s days ago over a longer period of time and in close proximity to at least one person diagnosed with COVID-19." - "You have a higher risk of infection because you were last exposed %1$s days ago over a longer period of time and in close proximity to at least one person diagnosed with COVID-19." + "You have an increased risk of infection because you were last exposed %1$s day ago over a longer period of time and at close proximity to at least one person diagnosed with COVID-19." + "You have an increased risk of infection because you were last exposed %1$s days ago over a longer period of time and at close proximity to at least one person diagnosed with COVID-19." + "You have an increased risk of infection because you were last exposed %1$s days ago over a longer period of time and at close proximity to at least one person diagnosed with COVID-19." + "You have an increased risk of infection because you were last exposed %1$s days ago over a longer period of time and at close proximity to at least one person diagnosed with COVID-19." + "You have an increased risk of infection because you were last exposed %1$s days ago over a longer period of time and at close proximity to at least one person diagnosed with COVID-19." + "You have an increased risk of infection because you were last exposed %1$s days ago over a longer period of time and at close proximity to at least one person diagnosed with COVID-19." - "Your risk of infection is calculated from the exposure logging data (duration and proximity) locally on your device. Your risk of infection cannot be seen by, or passed on to, anyone else." + "Therefore, your risk of infection has been ranked as increased. Your risk of infection is calculated from the exposure logging data (duration and proximity) locally on your device. Your risk of infection cannot be seen by, or passed on to, anyone else. When you get home, please also avoid close contact with members of your family or household." @string/risk_card_button_update diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml index 1f16ff120e0..e97a5658898 100644 --- a/Corona-Warn-App/src/main/res/values/strings.xml +++ b/Corona-Warn-App/src/main/res/values/strings.xml @@ -146,6 +146,15 @@ "%1$s exposures with low risk" "%1$s exposures with low risk" + + + "%1$s exposure" + "%1$s exposures" + "No exposure up to now" + "%1$s exposures" + "%1$s exposures" + "%1$s exposures" + "Exposure logging was active for %1$s of the past 14 days." @@ -331,15 +340,15 @@ "You have a low risk of infection because no exposure to people later diagnosed with COVID-19 was logged, or because your encounters were only for a short time and at a greater distance." - "You have a higher risk of infection because you were last exposed %1$s day ago over a longer period of time and in close proximity to at least one person diagnosed with COVID-19." - "You have a higher risk of infection because you were last exposed %1$s days ago over a longer period of time and in close proximity to at least one person diagnosed with COVID-19." - "You have a higher risk of infection because you were last exposed %1$s days ago over a longer period of time and in close proximity to at least one person diagnosed with COVID-19." - "You have a higher risk of infection because you were last exposed %1$s days ago over a longer period of time and in close proximity to at least one person diagnosed with COVID-19." - "You have a higher risk of infection because you were last exposed %1$s days ago over a longer period of time and in close proximity to at least one person diagnosed with COVID-19." - "You have a higher risk of infection because you were last exposed %1$s days ago over a longer period of time and in close proximity to at least one person diagnosed with COVID-19." + "You have an increased risk of infection because you were last exposed %1$s day ago over a longer period of time and at close proximity to at least one person diagnosed with COVID-19." + "You have an increased risk of infection because you were last exposed %1$s days ago over a longer period of time and at close proximity to at least one person diagnosed with COVID-19." + "You have an increased risk of infection because you were last exposed %1$s days ago over a longer period of time and at close proximity to at least one person diagnosed with COVID-19." + "You have an increased risk of infection because you were last exposed %1$s days ago over a longer period of time and at close proximity to at least one person diagnosed with COVID-19." + "You have an increased risk of infection because you were last exposed %1$s days ago over a longer period of time and at close proximity to at least one person diagnosed with COVID-19." + "You have an increased risk of infection because you were last exposed %1$s days ago over a longer period of time and at close proximity to at least one person diagnosed with COVID-19." - "Your risk of infection is calculated from the exposure logging data (duration and proximity) locally on your device. Your risk of infection cannot be seen by, or passed on to, anyone else." + "Therefore, your risk of infection has been ranked as increased. Your risk of infection is calculated from the exposure logging data (duration and proximity) locally on your device. Your risk of infection cannot be seen by, or passed on to, anyone else. When you get home, please also avoid close contact with members of your family or household." @string/risk_card_button_update