diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/reporting/ExceptionReporter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/reporting/ExceptionReporter.kt
index 1d0e0cac0be11a853ca2da2ca56c087f8d96c580..d18d4e2ce9437dea46fd596f21e6a754e25bd863 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/reporting/ExceptionReporter.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/reporting/ExceptionReporter.kt
@@ -6,7 +6,9 @@ import com.google.android.gms.common.api.ApiException
import de.rki.coronawarnapp.CoronaWarnApplication
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.exception.ExceptionCategory
+import de.rki.coronawarnapp.exception.reporting.ReportingConstants.STATUS_CODE_GOOGLE_API_FAIL
import de.rki.coronawarnapp.exception.reporting.ReportingConstants.STATUS_CODE_GOOGLE_UPDATE_NEEDED
+import de.rki.coronawarnapp.exception.reporting.ReportingConstants.STATUS_CODE_REACHED_REQUEST_LIMIT
import java.io.PrintWriter
import java.io.StringWriter
@@ -38,6 +40,10 @@ fun Throwable.report(
if (this.statusCode == STATUS_CODE_GOOGLE_UPDATE_NEEDED) {
errorMessage = R.string.errors_google_update_needed
+ } else if (this.statusCode == STATUS_CODE_REACHED_REQUEST_LIMIT ||
+ this.statusCode == STATUS_CODE_GOOGLE_API_FAIL
+ ) {
+ errorMessage = R.string.errors_google_api_error
}
intent.putExtra(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/reporting/ReportingConstants.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/reporting/ReportingConstants.kt
index 446fa7ba2a0176935f6db19a13dd6c73341cc12c..16e021b5c85da260a870e0e2b0bfefdcbe63dcda 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/reporting/ReportingConstants.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/reporting/ReportingConstants.kt
@@ -13,4 +13,6 @@ object ReportingConstants {
val ERROR_REPORT_UNKNOWN_ERROR = ErrorCodes.REPORTED_EXCEPTION_UNKNOWN_PROBLEM.code
const val STATUS_CODE_GOOGLE_UPDATE_NEEDED = 17
+ const val STATUS_CODE_REACHED_REQUEST_LIMIT = 39508
+ const val STATUS_CODE_GOOGLE_API_FAIL = 10
}
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 e9dca21e1bb9eb169e8af36dfa6bd531c74ee907..750e6c4d69b297e81beee6fc51c3800e09aedd36 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -958,6 +958,8 @@
<string name="errors_external_action">"Diese Aktion ist aktuell leider nicht verfügbar. Bitte kontaktieren Sie die Hotline."</string>
<!-- XTXT: error dialog - phone still needs Google Play Services or Google Mobile Services update -->
<string name="errors_google_update_needed">"Ihre Corona-Warn-App ist korrekt installiert. Leider fehlen Ihrem Smartphone die "Benachrichtigungen zu möglicher Begegnung mit COVID-19-Infizierten" und Sie können die Corona-Warn-App nicht nutzen. Weitere Informationen finden Sie in unseren FAQ: https://www.coronawarn.app/de/faq/ \n"</string>
+ <!-- XTXT: error dialog - either Google API Error (10) or reached request limit per day -->
+ <string name="errors_google_api_error">"Ihre Corona-Warn-App läuft fehlerfrei. Leider können Sie Ihren Risikostatus im Moment nicht aktualisieren. Ihre Risiko-Ermittlung ist weiterhin aktiv und funktioniert. Weitere Informationen finden Sie in unseren FAQ: https://www.coronawarn.app/de/faq/ \n"</string>
<!-- ####################################
Generic Error Messages
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 4ebc2ce02ce8192fc506bff4799bb825cbbababd..2e8c65a93f4d5d1d3123da785c2cd4c696301e6d 100644
--- a/Corona-Warn-App/src/main/res/values-en/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/strings.xml
@@ -942,6 +942,8 @@
<string name="errors_external_action">"You cannot perform this action. Please contact the hotline."</string>
<!-- XTXT: error dialog - phone still needs Google Play Services or Google Mobile Services update -->
<string name="errors_google_update_needed">"Your Corona-Warn-App was installed correctly. Unfortunately, COVID-19 Exposure Notifications is currently not available on your device and you cannot use the Corona-Warn-App. Further information is available on our FAQ page: https://www.coronawarn.app/en/faq/ \n"</string>
+ <!-- XTXT: error dialog - either Google API Error (10) or reached request limit per day -->
+ <string name="errors_google_api_error">"Your Corona-Warn-App is working correctly. Unfortunately, you cannot update your risk level at the moment. Your exposure logging is still active and working correctly. Further information is available on our FAQ page: https://www.coronawarn.app/en/faq/ \n"</string>
<!-- ####################################
Generic Error Messages
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 78b8238986a2da6448f42e9f2dc67886679a4b21..b0df33ef4fe17e4ec6472212b4b62085b81475c4 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -958,6 +958,8 @@
<string name="errors_external_action">"You cannot perform this action. Please contact the hotline."</string>
<!-- XTXT: error dialog - phone still needs Google Play Services or Google Mobile Services update -->
<string name="errors_google_update_needed">"Your Corona-Warn-App was installed correctly. Unfortunately, COVID-19 Exposure Notifications is currently not available on your device and you cannot use the Corona-Warn-App. Further information is available on our FAQ page: https://www.coronawarn.app/en/faq/ \n"</string>
+ <!-- XTXT: error dialog - either Google API Error (10) or reached request limit per day -->
+ <string name="errors_google_api_error">"Your Corona-Warn-App is working correctly. Unfortunately, you cannot update your risk level at the moment. Your exposure logging is still active and working correctly. Further information is available on our FAQ page: https://www.coronawarn.app/en/faq/ \n"</string>
<!-- ####################################
Generic Error Messages
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/exception/reporting/ReportingConstantsTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/exception/reporting/ReportingConstantsTest.kt
index e36b07a4672da41b0a5046a442bf6b0ed5f338b8..17150c2d27b3a38f60491da19de7553fbb0c7cf1 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/exception/reporting/ReportingConstantsTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/exception/reporting/ReportingConstantsTest.kt
@@ -17,5 +17,7 @@ class ReportingConstantsTest {
Assert.assertEquals(ReportingConstants.ERROR_REPORT_API_EXCEPTION_CODE, "api-exception-code")
Assert.assertEquals(ReportingConstants.ERROR_REPORT_RES_ID, "res-id")
Assert.assertEquals(ReportingConstants.STATUS_CODE_GOOGLE_UPDATE_NEEDED, 17)
+ Assert.assertEquals(ReportingConstants.STATUS_CODE_REACHED_REQUEST_LIMIT, 39508)
+ Assert.assertEquals(ReportingConstants.STATUS_CODE_GOOGLE_API_FAIL, 10)
}
}
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelperTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelperTest.kt
index 79b94264e14699ca7a184f50de07b59ca2df8682..cc70f791124859e300a2366e3f79d4aa6593a2ad 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelperTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelperTest.kt
@@ -6,8 +6,8 @@ import de.rki.coronawarnapp.CoronaWarnApplication
import de.rki.coronawarnapp.R
import io.mockk.MockKAnnotations
import io.mockk.every
-import io.mockk.mockk
import io.mockk.impl.annotations.MockK
+import io.mockk.mockk
import io.mockk.mockkObject
import io.mockk.unmockkAll
import org.hamcrest.CoreMatchers
@@ -105,7 +105,6 @@ class FormatterSettingsHelperTest {
assertThat(result, `is`((context.getString(iValue))))
}
-
private fun formatTracingContentDescriptionBase(
bTracing: Boolean,
bBluetooth: Boolean,
@@ -522,7 +521,7 @@ class FormatterSettingsHelperTest {
bTracing = true,
bBluetooth = true,
bConnection = true,
- sValue = R.string.settings_tracing_body_active.toString() + " " +R.string.accessibility_button.toString()
+ sValue = R.string.settings_tracing_body_active.toString() + " " + R.string.accessibility_button.toString()
)
// When tracing is false, bluetooth is false, connection is false
@@ -530,7 +529,7 @@ class FormatterSettingsHelperTest {
bTracing = false,
bBluetooth = false,
bConnection = false,
- sValue = R.string.settings_tracing_body_inactive.toString() + " " +R.string.accessibility_button.toString()
+ sValue = R.string.settings_tracing_body_inactive.toString() + " " + R.string.accessibility_button.toString()
)
// When tracing is true, bluetooth is false, connection is false
@@ -538,7 +537,7 @@ class FormatterSettingsHelperTest {
bTracing = true,
bBluetooth = false,
bConnection = false,
- sValue = R.string.settings_tracing_body_bluetooth_inactive.toString() + " " +R.string.accessibility_button.toString()
+ sValue = R.string.settings_tracing_body_bluetooth_inactive.toString() + " " + R.string.accessibility_button.toString()
)
// When tracing is true, bluetooth is true, connection is false
@@ -546,7 +545,7 @@ class FormatterSettingsHelperTest {
bTracing = true,
bBluetooth = true,
bConnection = false,
- sValue = R.string.settings_tracing_body_connection_inactive.toString() + " " +R.string.accessibility_button.toString()
+ sValue = R.string.settings_tracing_body_connection_inactive.toString() + " " + R.string.accessibility_button.toString()
)
// When tracing is false, bluetooth is true, connection is false
@@ -554,7 +553,7 @@ class FormatterSettingsHelperTest {
bTracing = false,
bBluetooth = true,
bConnection = false,
- sValue = R.string.settings_tracing_body_inactive.toString() + " " +R.string.accessibility_button.toString()
+ sValue = R.string.settings_tracing_body_inactive.toString() + " " + R.string.accessibility_button.toString()
)
// When tracing is false, bluetooth is true, connection is true
@@ -562,7 +561,7 @@ class FormatterSettingsHelperTest {
bTracing = false,
bBluetooth = true,
bConnection = true,
- sValue = R.string.settings_tracing_body_inactive.toString() + " " +R.string.accessibility_button.toString()
+ sValue = R.string.settings_tracing_body_inactive.toString() + " " + R.string.accessibility_button.toString()
)
// When tracing is true, bluetooth is false, connection is true
@@ -570,7 +569,7 @@ class FormatterSettingsHelperTest {
bTracing = true,
bBluetooth = false,
bConnection = true,
- sValue = R.string.settings_tracing_body_bluetooth_inactive.toString() + " " +R.string.accessibility_button.toString()
+ sValue = R.string.settings_tracing_body_bluetooth_inactive.toString() + " " + R.string.accessibility_button.toString()
)
// When tracing is false, bluetooth is false, connection is true
@@ -578,7 +577,7 @@ class FormatterSettingsHelperTest {
bTracing = false,
bBluetooth = false,
bConnection = true,
- sValue = R.string.settings_tracing_body_inactive.toString() + " " +R.string.accessibility_button.toString()
+ sValue = R.string.settings_tracing_body_inactive.toString() + " " + R.string.accessibility_button.toString()
)
}