From 59b6aa268e3320f78f2b95f1c9c1f4ddddb2e943 Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Thu, 19 Nov 2020 16:40:21 +0100
Subject: [PATCH] Fix update of last submission date (EXPOSUREAPP-3874) (#1669)
---
.../de/rki/coronawarnapp/storage/LocalData.kt | 48 +++++--------------
.../src/main/res/values-bg/strings.xml | 2 -
.../src/main/res/values-de/strings.xml | 2 -
.../src/main/res/values-en/strings.xml | 2 -
.../src/main/res/values-pl/strings.xml | 2 -
.../src/main/res/values-ro/strings.xml | 2 -
.../src/main/res/values-tr/strings.xml | 2 -
.../src/main/res/values/strings.xml | 2 -
8 files changed, 13 insertions(+), 49 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt
index 279d405c9..2e0347c40 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt
@@ -383,46 +383,24 @@ object LocalData {
* SERVER FETCH DATA
****************************************************/
- /**
- * Gets the last time the server fetched the diagnosis keys from the server as Date object
- * from the EncryptedSharedPrefs
- *
- * @return timestamp as Date
- */
- // TODO should be changed to Long as well to align with other timestamps
- fun lastTimeDiagnosisKeysFromServerFetch(): Date? {
- val time = getSharedPreferenceInstance().getLong(
- CoronaWarnApplication.getAppContext()
- .getString(R.string.preference_timestamp_diagnosis_keys_fetch),
- 0L
- )
- if (time == 0L) return null
-
- return Date(time)
+ private val dateMapperForFetchTime: (Long) -> Date? = {
+ if (it != 0L) Date(it) else null
}
- fun lastTimeDiagnosisKeysFromServerFetchFlow() =
+ private val lastTimeDiagnosisKeysFetchedFlowPref by lazy {
getSharedPreferenceInstance()
- .createFlowPreference<Long?>(CoronaWarnApplication.getAppContext()
- .getString(R.string.preference_timestamp_diagnosis_keys_fetch), 0L).flow
- .map { if (it != null && it != 0L) Date(it) else null }
-
- /**
- * Sets the last time the server fetched the diagnosis keys from the server as Date object
- * from the EncryptedSharedPrefs
- *
- * @param value timestamp as Date
- */
- fun lastTimeDiagnosisKeysFromServerFetch(value: Date?) {
- getSharedPreferenceInstance().edit(true) {
- putLong(
- CoronaWarnApplication.getAppContext()
- .getString(R.string.preference_timestamp_diagnosis_keys_fetch),
- value?.time ?: 0L
- )
- }
+ .createFlowPreference<Long>(key = "preference_timestamp_diagnosis_keys_fetch", 0L)
}
+ fun lastTimeDiagnosisKeysFromServerFetchFlow() = lastTimeDiagnosisKeysFetchedFlowPref.flow
+ .map { dateMapperForFetchTime(it) }
+
+ fun lastTimeDiagnosisKeysFromServerFetch() =
+ dateMapperForFetchTime(lastTimeDiagnosisKeysFetchedFlowPref.value)
+
+ fun lastTimeDiagnosisKeysFromServerFetch(value: Date?) =
+ lastTimeDiagnosisKeysFetchedFlowPref.update { value?.time ?: 0L }
+
/**
* Gets the last time of successful risk level calculation as long
* from the EncryptedSharedPrefs
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 719004385..b12239756 100644
--- a/Corona-Warn-App/src/main/res/values-bg/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-bg/strings.xml
@@ -20,8 +20,6 @@
<!-- NOTR -->
<string name="preference_tracing"><xliff:g id="preference">"preference_tracing"</xliff:g></string>
<!-- NOTR -->
- <string name="preference_timestamp_diagnosis_keys_fetch"><xliff:g id="preference">"preference_timestamp_diagnosis_keys_fetch"</xliff:g></string>
- <!-- NOTR -->
<string name="preference_timestamp_manual_diagnosis_keys_retrieval"><xliff:g id="preference">"preference_timestamp_manual_diagnosis_keys_retrieval"</xliff:g></string>
<!-- NOTR -->
<string name="preference_string_google_api_token"><xliff:g id="preference">"preference_m_string_google_api_token"</xliff:g></string>
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 8b872f6fd..b00715903 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -21,8 +21,6 @@
<!-- NOTR -->
<string name="preference_tracing"><xliff:g id="preference">"preference_tracing"</xliff:g></string>
<!-- NOTR -->
- <string name="preference_timestamp_diagnosis_keys_fetch"><xliff:g id="preference">"preference_timestamp_diagnosis_keys_fetch"</xliff:g></string>
- <!-- NOTR -->
<string name="preference_timestamp_manual_diagnosis_keys_retrieval"><xliff:g id="preference">"preference_timestamp_manual_diagnosis_keys_retrieval"</xliff:g></string>
<!-- NOTR -->
<string name="preference_string_google_api_token"><xliff:g id="preference">"preference_m_string_google_api_token"</xliff:g></string>
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 9d8ce585c..91c769999 100644
--- a/Corona-Warn-App/src/main/res/values-en/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/strings.xml
@@ -20,8 +20,6 @@
<!-- NOTR -->
<string name="preference_tracing"><xliff:g id="preference">"preference_tracing"</xliff:g></string>
<!-- NOTR -->
- <string name="preference_timestamp_diagnosis_keys_fetch"><xliff:g id="preference">"preference_timestamp_diagnosis_keys_fetch"</xliff:g></string>
- <!-- NOTR -->
<string name="preference_timestamp_manual_diagnosis_keys_retrieval"><xliff:g id="preference">"preference_timestamp_manual_diagnosis_keys_retrieval"</xliff:g></string>
<!-- NOTR -->
<string name="preference_string_google_api_token"><xliff:g id="preference">"preference_m_string_google_api_token"</xliff:g></string>
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 7a02cc77e..ca91dc58b 100644
--- a/Corona-Warn-App/src/main/res/values-pl/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-pl/strings.xml
@@ -20,8 +20,6 @@
<!-- NOTR -->
<string name="preference_tracing"><xliff:g id="preference">"preference_tracing"</xliff:g></string>
<!-- NOTR -->
- <string name="preference_timestamp_diagnosis_keys_fetch"><xliff:g id="preference">"preference_timestamp_diagnosis_keys_fetch"</xliff:g></string>
- <!-- NOTR -->
<string name="preference_timestamp_manual_diagnosis_keys_retrieval"><xliff:g id="preference">"preference_timestamp_manual_diagnosis_keys_retrieval"</xliff:g></string>
<!-- NOTR -->
<string name="preference_string_google_api_token"><xliff:g id="preference">"preference_m_string_google_api_token"</xliff:g></string>
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 450e1d43d..e4113c777 100644
--- a/Corona-Warn-App/src/main/res/values-ro/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-ro/strings.xml
@@ -20,8 +20,6 @@
<!-- NOTR -->
<string name="preference_tracing"><xliff:g id="preference">"preference_tracing"</xliff:g></string>
<!-- NOTR -->
- <string name="preference_timestamp_diagnosis_keys_fetch"><xliff:g id="preference">"preference_timestamp_diagnosis_keys_fetch"</xliff:g></string>
- <!-- NOTR -->
<string name="preference_timestamp_manual_diagnosis_keys_retrieval"><xliff:g id="preference">"preference_timestamp_manual_diagnosis_keys_retrieval"</xliff:g></string>
<!-- NOTR -->
<string name="preference_string_google_api_token"><xliff:g id="preference">"preference_m_string_google_api_token"</xliff:g></string>
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 6cfc04d33..bc2369beb 100644
--- a/Corona-Warn-App/src/main/res/values-tr/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-tr/strings.xml
@@ -20,8 +20,6 @@
<!-- NOTR -->
<string name="preference_tracing"><xliff:g id="preference">"preference_tracing"</xliff:g></string>
<!-- NOTR -->
- <string name="preference_timestamp_diagnosis_keys_fetch"><xliff:g id="preference">"preference_timestamp_diagnosis_keys_fetch"</xliff:g></string>
- <!-- NOTR -->
<string name="preference_timestamp_manual_diagnosis_keys_retrieval"><xliff:g id="preference">"preference_timestamp_manual_diagnosis_keys_retrieval"</xliff:g></string>
<!-- NOTR -->
<string name="preference_string_google_api_token"><xliff:g id="preference">"preference_m_string_google_api_token"</xliff:g></string>
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 35bfadc55..8299780ee 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -21,8 +21,6 @@
<!-- NOTR -->
<string name="preference_tracing"><xliff:g id="preference">"preference_tracing"</xliff:g></string>
<!-- NOTR -->
- <string name="preference_timestamp_diagnosis_keys_fetch"><xliff:g id="preference">"preference_timestamp_diagnosis_keys_fetch"</xliff:g></string>
- <!-- NOTR -->
<string name="preference_timestamp_manual_diagnosis_keys_retrieval"><xliff:g id="preference">"preference_timestamp_manual_diagnosis_keys_retrieval"</xliff:g></string>
<!-- NOTR -->
<string name="preference_string_google_api_token"><xliff:g id="preference">"preference_m_string_google_api_token"</xliff:g></string>
--
GitLab