From 5e9d5dd5452fea1ad2b6d4f2311a86c4159b922a Mon Sep 17 00:00:00 2001 From: Christian Sadilek Date: Thu, 26 Mar 2020 14:53:56 -0400 Subject: [PATCH] Closes #9414: Make AMO collection configurable --- app/build.gradle | 1 + .../java/org/mozilla/fenix/components/Components.kt | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index b7a307ff1..12c475f92 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,6 +47,7 @@ android { testInstrumentationRunnerArguments clearPackageData: 'true' resValue "bool", "IS_DEBUG", "false" buildConfigField "boolean", "USE_RELEASE_VERSIONING", "false" + buildConfigField "String", "AMO_COLLECTION", "\"7e8d6dc651b54ab385fb8791bf9dac\"" manifestPlaceholders = [ "isRaptorEnabled": "false", "deepLinkScheme": "fenix-dev" diff --git a/app/src/main/java/org/mozilla/fenix/components/Components.kt b/app/src/main/java/org/mozilla/fenix/components/Components.kt index 4aaf6e570..9b377861d 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Components.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt @@ -17,6 +17,7 @@ import mozilla.components.feature.addons.migration.DefaultSupportedAddonsChecker import mozilla.components.feature.tabs.TabsUseCases import mozilla.components.lib.publicsuffixlist.PublicSuffixList import mozilla.components.support.migration.state.MigrationStore +import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.ext.settings import org.mozilla.fenix.test.Mockable @@ -69,7 +70,16 @@ class Components(private val context: Context) { } val addonCollectionProvider by lazy { - AddonCollectionProvider(context, core.client, maxCacheAgeInMinutes = DAY_IN_MINUTES) + if (!BuildConfig.AMO_COLLECTION.isNullOrEmpty()) { + AddonCollectionProvider( + context, + core.client, + collectionName = BuildConfig.AMO_COLLECTION, + maxCacheAgeInMinutes = DAY_IN_MINUTES + ) + } else { + AddonCollectionProvider(context, core.client, maxCacheAgeInMinutes = DAY_IN_MINUTES) + } } @Suppress("MagicNumber")