From f90adf5ce595177f8527469aa25a5197abc0dc7d Mon Sep 17 00:00:00 2001 From: Adam Novak Date: Wed, 2 Sep 2020 21:27:28 -0700 Subject: [PATCH] Tie addon account preferences back to BuildConfig --- app/build.gradle | 6 ++++++ app/src/main/java/org/mozilla/fenix/utils/Settings.kt | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index afddb579c..92117a8b0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -115,6 +115,9 @@ android { // Need to replicate default debug config features signingConfig signingConfigs.debug debuggable true + // Use custom default allowed addon list + buildConfigField "String", "AMO_ACCOUNT", "\"16201230\"" + buildConfigField "String", "AMO_COLLECTION", "\"What-I-want-on-Fenix\"" } forkRelease releaseTemplate >> { buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" @@ -124,6 +127,9 @@ android { manifestPlaceholders = [ "deepLinkScheme": deepLinkSchemeValue ] + // Use custom default allowed addon list + buildConfigField "String", "AMO_ACCOUNT", "\"16201230\"" + buildConfigField "String", "AMO_COLLECTION", "\"What-I-want-on-Fenix\"" } } diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index 0d7d35468..ad5d8497c 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -867,12 +867,12 @@ class Settings(private val appContext: Context) : PreferencesHolder { val customAddonsAccount by stringPreference( appContext.getPreferenceKey(R.string.pref_key_addons_custom_account), - "16201230" + BuildConfig.AMO_ACCOUNT ) val customAddonsCollection by stringPreference( appContext.getPreferenceKey(R.string.pref_key_addons_custom_collection), - "What-I-want-on-Fenix" + BuildConfig.AMO_COLLECTION ) private var savedLoginsSortingStrategyString by stringPreference(