Unverified Commit a5110f8c authored by Gabriel Luong's avatar Gabriel Luong Committed by GitHub
Browse files

For #19746 - Remove FeatureFlags.nimbusExperiments (#19771)

parent e4fa71fd
......@@ -14,11 +14,6 @@ object FeatureFlags {
*/
val pullToRefreshEnabled = Config.channel.isNightlyOrDebug
/**
* Enables the Nimbus experiments library.
*/
const val nimbusExperiments = true
/**
* Enables the Addresses autofill feature.
*/
......
......@@ -14,10 +14,8 @@ import mozilla.components.lib.crash.service.GleanCrashReporterService
import mozilla.components.lib.crash.service.MozillaSocorroService
import mozilla.components.lib.crash.service.SentryService
import mozilla.components.service.nimbus.NimbusApi
import mozilla.components.service.nimbus.NimbusDisabled
import org.mozilla.fenix.BuildConfig
import org.mozilla.fenix.Config
import org.mozilla.fenix.FeatureFlags
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R
import org.mozilla.fenix.ReleaseChannel
......@@ -25,7 +23,6 @@ import org.mozilla.fenix.components.metrics.AdjustMetricsService
import org.mozilla.fenix.components.metrics.GleanMetricsService
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.experiments.createNimbus
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.perf.lazyMonitored
import org.mozilla.fenix.utils.Mockable
......@@ -59,9 +56,11 @@ class Analytics(
// The name "Fenix" here matches the product name on Socorro and is unrelated to the actual app name:
// https://bugzilla.mozilla.org/show_bug.cgi?id=1523284
val socorroService = MozillaSocorroService(context, appName = "Fenix",
val socorroService = MozillaSocorroService(
context, appName = "Fenix",
version = MOZ_APP_VERSION, buildId = MOZ_APP_BUILDID, vendor = MOZ_APP_VENDOR,
releaseChannel = MOZ_UPDATE_CHANNEL)
releaseChannel = MOZ_UPDATE_CHANNEL
)
services.add(socorroService)
val intent = Intent(context, HomeActivity::class.java).apply {
......@@ -102,11 +101,7 @@ class Analytics(
}
val experiments: NimbusApi by lazyMonitored {
if (FeatureFlags.nimbusExperiments) {
createNimbus(context, BuildConfig.NIMBUS_ENDPOINT)
} else {
NimbusDisabled()
}
createNimbus(context, BuildConfig.NIMBUS_ENDPOINT)
}
}
......
......@@ -7,7 +7,6 @@ package org.mozilla.fenix.settings
import android.os.Bundle
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.SwitchPreference
import org.mozilla.fenix.FeatureFlags
import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.MetricServiceType
import org.mozilla.fenix.ext.components
......@@ -72,7 +71,6 @@ class DataChoicesFragment : PreferenceFragmentCompat() {
requirePreference<SwitchPreference>(R.string.pref_key_experimentation).apply {
isChecked = context.settings().isExperimentationEnabled
isVisible = FeatureFlags.nimbusExperiments
onPreferenceChangeListener = SharedPreferenceUpdater()
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment