From f842693457b67081227a1bf7e5531b566033e1b3 Mon Sep 17 00:00:00 2001 From: Sawyer Blatz Date: Tue, 21 May 2019 10:07:17 -0700 Subject: [PATCH] [fenix] No issue: Removes usage of COLLECTIONS_ENABLED flag --- app/build.gradle | 2 -- .../fenix/home/sessioncontrol/SessionControlUIView.kt | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index edfb537f23..7030476a98 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -133,8 +133,6 @@ android.applicationVariants.all { variant -> def releaseChannels = ["nightly", "beta", "release"] def isReleased = releaseChannels.contains(buildType) - buildConfigField 'Boolean', 'COLLECTIONS_ENABLED', (!isReleased).toString() - if (isReleased) { versionCode = generatedVersionCode diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlUIView.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlUIView.kt index 9a341be1f9..aef7f84c41 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlUIView.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlUIView.kt @@ -14,7 +14,6 @@ import io.reactivex.functions.Consumer import org.mozilla.fenix.R import org.mozilla.fenix.mvi.UIView import androidx.recyclerview.widget.ItemTouchHelper -import org.mozilla.fenix.BuildConfig private fun normalModeAdapterItems( tabs: List, @@ -26,9 +25,7 @@ private fun normalModeAdapterItems( if (tabs.isNotEmpty()) { items.addAll(tabs.reversed().map(AdapterItem::TabItem)) - if (BuildConfig.COLLECTIONS_ENABLED) { - items.add(AdapterItem.SaveTabGroup) - } + items.add(AdapterItem.SaveTabGroup) } else { items.add(AdapterItem.NoTabMessage) }