diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19ff330b8c9cea2eda5d7546ea6550ae80d79e49..c9c70cbc69dabb13ae630c3629ecb6539efcb708 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:1263-Add_java_17_support" variables: - OWM_KEY: ${DEFAULT_OWM_KEY} + WEATHER_API_KEY: ${WEATHER_API_KEY} SENTRY_DSN: ${SENTRY_DSN} stages: diff --git a/preferences/build.gradle.kts b/preferences/build.gradle.kts index 9b7db63abd6c562b2a6d06145827b99a91de95dc..514402328a06478e979aea49cc2956af986f1f65 100644 --- a/preferences/build.gradle.kts +++ b/preferences/build.gradle.kts @@ -15,7 +15,7 @@ android { buildTypes { configureEach { - buildConfigField("String", "OWM_API_KEY", "\"${System.getenv("OWM_KEY")}\"") + buildConfigField("String", "WEATHER_API_KEY", "\"${System.getenv("WEATHER_API_KEY")}\"") } } diff --git a/preferences/src/main/kotlin/foundation/e/blissweather/AppPreferences.kt b/preferences/src/main/kotlin/foundation/e/blissweather/AppPreferences.kt index 8d667976a475f30e73b4d0d46ba36e61288b0f66..239f403268f561efe14c0addbfbfe31baf52765b 100644 --- a/preferences/src/main/kotlin/foundation/e/blissweather/AppPreferences.kt +++ b/preferences/src/main/kotlin/foundation/e/blissweather/AppPreferences.kt @@ -28,7 +28,7 @@ class AppPreferences @Inject constructor(private val sharedPrefs: SharedPreferen get() = sharedPrefs.all var weatherApiKey: String? - get() = sharedPrefs.getString(Constants.WEATHER_API_KEY, BuildConfig.OWM_API_KEY)!! + get() = sharedPrefs.getString(Constants.WEATHER_API_KEY, BuildConfig.WEATHER_API_KEY)!! set(value) { sharedPrefs.edit { putString(Constants.WEATHER_API_KEY, value?.trim()) } }