From f8de1560659cc9beb60ec41d41f64970a89f5495 Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Fri, 22 Jan 2021 11:42:55 +0100
Subject: [PATCH] Small LocalData cleanup (DEV, EXPOSUREAPP-2126) #2183
* Remove unused getters.
* Don't use XML for preference keys.
(Affects all items in LocalData, but this one may fit a bug description, the others are scheduled for refactoring in another PR)
Co-authored-by: Mohamed Metwalli <Mohamed.Metwalli@sap.com>
---
.../de/rki/coronawarnapp/storage/LocalData.kt | 36 ++++---------------
.../src/main/res/values-de/strings.xml | 6 ----
2 files changed, 6 insertions(+), 36 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 24e670aff..d5ba70460 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
@@ -22,6 +22,7 @@ object LocalData {
private const val PREFERENCE_HAS_RISK_STATUS_LOWERED =
"preference_has_risk_status_lowered"
+
/****************************************************
* ONBOARDING DATA
****************************************************/
@@ -342,40 +343,19 @@ object LocalData {
putInt(PKEY_POSITIVE_TEST_RESULT_REMINDER_COUNT, value)
}
- /**
- * Gets the decision if background jobs are enabled
- *
- * @return
- */
- fun isBackgroundJobEnabled(): Boolean = getSharedPreferenceInstance().getBoolean(
- CoronaWarnApplication.getAppContext().getString(R.string.preference_background_job_allowed),
- false
- )
-
- /**
- * Gets the boolean if the user has mobile data enabled
- *
- * @return
- */
- fun isMobileDataEnabled(): Boolean = getSharedPreferenceInstance().getBoolean(
- CoronaWarnApplication.getAppContext().getString(R.string.preference_mobile_data_allowed),
- false
- )
-
/****************************************************
* SUBMISSION DATA
****************************************************/
+ private const val PREFERENCE_REGISTRATION_TOKEN = "preference_registration_token"
+
/**
* Gets the registration token that is needed for the submission process
*
* @return the registration token
*/
- fun registrationToken(): String? = getSharedPreferenceInstance().getString(
- CoronaWarnApplication.getAppContext()
- .getString(R.string.preference_registration_token),
- null
- )
+ fun registrationToken(): String? = getSharedPreferenceInstance()
+ .getString(PREFERENCE_REGISTRATION_TOKEN, null)
/**
* Sets the registration token that is needed for the submission process
@@ -384,11 +364,7 @@ object LocalData {
*/
fun registrationToken(value: String?) {
getSharedPreferenceInstance().edit(true) {
- putString(
- CoronaWarnApplication.getAppContext()
- .getString(R.string.preference_registration_token),
- value
- )
+ putString(PREFERENCE_REGISTRATION_TOKEN, value)
}
}
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 ebf933188..7220ae46e 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -23,12 +23,6 @@
<!-- 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_background_job_allowed"><xliff:g id="preference">"preference_background_job_enabled"</xliff:g></string>
- <!-- NOTR -->
- <string name="preference_mobile_data_allowed"><xliff:g id="preference">"preference_mobile_data_enabled"</xliff:g></string>
- <!-- NOTR -->
- <string name="preference_registration_token"><xliff:g id="preference">"preference_registration_token"</xliff:g></string>
- <!-- NOTR -->
<string name="preference_device_pairing_successful_time"><xliff:g id="preference">"preference_device_pairing_successful_time"</xliff:g></string>
<!-- NOTR -->
<string name="preference_initial_tracing_activation_time"><xliff:g id="preference">"preference_initial_tracing_activation_time"</xliff:g></string>
--
GitLab