From 188244c87f82d0eea9f0127be2b630153e5a74d0 Mon Sep 17 00:00:00 2001
From: Chilja Gossow <49635654+chiljamgossow@users.noreply.github.com>
Date: Fri, 11 Dec 2020 16:27:31 +0100
Subject: [PATCH] Display country list from config (EXPOSUREAPP-4278) #1879
---
.../appconfig/sources/local/LocalAppConfigSource.kt | 6 +++---
.../storage/interoperability/InteroperabilityRepository.kt | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/LocalAppConfigSource.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/LocalAppConfigSource.kt
index c6a015c9a..d44410139 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/LocalAppConfigSource.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/LocalAppConfigSource.kt
@@ -19,14 +19,14 @@ class LocalAppConfigSource @Inject constructor(
suspend fun getConfigData(): ConfigData? = withContext(dispatcherProvider.IO) {
Timber.tag(TAG).v("retrieveConfig()")
- val configDownload = storage.getStoredConfig()
- if (configDownload == null) {
+ val internalConfigData = storage.getStoredConfig()
+ if (internalConfigData == null) {
Timber.tag(TAG).d("No stored config available.")
return@withContext null
}
return@withContext try {
- configDownload.let {
+ internalConfigData.let {
ConfigDataContainer(
mappedConfig = parser.parse(it.rawData),
serverTime = it.serverTime,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/interoperability/InteroperabilityRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/interoperability/InteroperabilityRepository.kt
index a0f7936a9..fb07dcbae 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/interoperability/InteroperabilityRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/interoperability/InteroperabilityRepository.kt
@@ -16,9 +16,9 @@ class InteroperabilityRepository @Inject constructor(
) {
val countryList = appConfigProvider.currentConfig
- .map {
+ .map { configData ->
try {
- appConfigProvider.getAppConfig()
+ configData
.supportedCountries
.mapNotNull { rawCode ->
val countryCode = rawCode.toLowerCase(Locale.ROOT)
--
GitLab