From e472d885394c01edf3958450c0a41722174256a6 Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Fri, 26 Feb 2021 10:29:09 +0100
Subject: [PATCH] Align behavior of toResolvingString with Context.getString
(DEV) #2465
* Align behavior of toResolvingString with Context.getString
* Fix unit test mocking getString().
Co-authored-by: BMItter <46747780+BMItter@users.noreply.github.com>
---
.../main/java/de/rki/coronawarnapp/util/ui/LazyString.kt | 6 +++++-
.../analytics/ui/input/AnalyticsUserInputViewModelTest.kt | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ui/LazyString.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ui/LazyString.kt
index 548bd0b9a..95ef73387 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ui/LazyString.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ui/LazyString.kt
@@ -19,5 +19,9 @@ fun String.toLazyString() = object : LazyString {
}
fun Int.toResolvingString(vararg formatArgs: Any): LazyString = object : LazyString {
- override fun get(context: Context): String = context.getString(this@toResolvingString, *formatArgs)
+ override fun get(context: Context): String = if (formatArgs.isNotEmpty()) {
+ context.getString(this@toResolvingString, *formatArgs)
+ } else {
+ context.getString(this@toResolvingString)
+ }
}
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/analytics/ui/input/AnalyticsUserInputViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/analytics/ui/input/AnalyticsUserInputViewModelTest.kt
index 2dddc1558..35f921d91 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/analytics/ui/input/AnalyticsUserInputViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/analytics/ui/input/AnalyticsUserInputViewModelTest.kt
@@ -37,7 +37,7 @@ class AnalyticsUserInputViewModelTest : BaseTest() {
fun setup() {
MockKAnnotations.init(this)
- every { context.getString(any(), *anyVararg()) } returns ""
+ every { context.getString(any()) } returns ""
every { analyticsSettings.userInfoAgeGroup } returns userInfoAgeGroup
every { analyticsSettings.userInfoFederalState } returns userInfoFederalState
--
GitLab