From c632b93ee7fa2347f3f070e183db7af8ff5785c6 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Mon, 6 Apr 2020 14:29:52 -0700
Subject: [PATCH] For #220 - Removes feature flag for language picker (#9191)

* For #220 - Removes feature flag for language picker

* For #220 - Updates Android Components
---
 app/src/main/java/org/mozilla/fenix/FeatureFlags.kt       | 4 ++--
 .../java/org/mozilla/fenix/settings/SettingsFragment.kt   | 8 --------
 .../fenix/settings/advanced/LocaleManagerExtension.kt     | 4 ++--
 buildSrc/src/main/java/AndroidComponents.kt               | 2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 69dfce8d6..09f5a4864 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -36,9 +36,9 @@ object FeatureFlags {
     val dynamicBottomToolbar = Config.channel.isNightlyOrDebug
 
     /**
-     * Enables the new language picker
+     * Enables deleting individual tracking protection exceptions.
      */
-    val fenixLanguagePicker = Config.channel.isNightlyOrDebug
+    val deleteIndividualTrackingProtectionExceptions = Config.channel.isNightlyOrDebug
 
     /**
      * Integration of push support provided by `feature-push` component into the Gecko engine.
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 0b923ecf3..a42ae753e 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -31,7 +31,6 @@ import mozilla.components.concept.sync.OAuthAccount
 import mozilla.components.concept.sync.Profile
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.Config
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.Event
@@ -116,7 +115,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.preferences, rootKey)
-        updatePreferenceVisibilityForFeatureFlags()
     }
 
     override fun onResume() {
@@ -177,12 +175,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
     }
 
-    private fun updatePreferenceVisibilityForFeatureFlags() {
-        findPreference<Preference>(getPreferenceKey(R.string.pref_key_language))?.apply {
-            isVisible = FeatureFlags.fenixLanguagePicker
-        }
-    }
-
     @Suppress("ComplexMethod", "LongMethod")
     override fun onPreferenceTreeClick(preference: Preference): Boolean {
         // Hide the scrollbar so the animation looks smoother
diff --git a/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleManagerExtension.kt b/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleManagerExtension.kt
index a2e68e7c4..075ca3271 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleManagerExtension.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleManagerExtension.kt
@@ -15,7 +15,7 @@ import java.util.Locale
  */
 fun LocaleManager.getSupportedLocales(): List<Locale> {
     val resultLocaleList: MutableList<Locale> = ArrayList()
-    resultLocaleList.add(0, getSystemDefault() ?: Locale.getDefault())
+    resultLocaleList.add(0, getSystemDefault())
 
     resultLocaleList.addAll(BuildConfig.SUPPORTED_LOCALE_ARRAY
         .toList()
@@ -37,7 +37,7 @@ fun LocaleManager.getSelectedLocale(
     localeList: List<Locale> = getSupportedLocales()
 ): Locale {
     val selectedLocale = getCurrentLocale(context)?.toLanguageTag()
-    val defaultLocale = getSystemDefault() ?: Locale.getDefault()
+    val defaultLocale = getSystemDefault()
 
     return if (selectedLocale == null) {
         defaultLocale
diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
index d2a331261..090009c1b 100644
--- a/buildSrc/src/main/java/AndroidComponents.kt
+++ b/buildSrc/src/main/java/AndroidComponents.kt
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 object AndroidComponents {
-    const val VERSION = "38.0.20200406130135"
+    const val VERSION = "38.0.20200406190117"
 }