Merge mozilla-mobile#6518

6518: For mozilla-mobile#6517 - Always try to set a locale in updateResources r=Amejia481 a=boek Co-authored-by: Jeff Boek <[email protected]>
gabrielluong · Apr 6, 2020 · df55e79 · df55e79
2 parents fa55f28 + f4cc229
commit df55e79
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/components/support/locale/src/main/java/mozilla/components/support/locale/LocaleManager.kt b/components/support/locale/src/main/java/mozilla/components/support/locale/LocaleManager.kt
@@ -39,15 +39,7 @@ object LocaleManager {
      * The latest stored locale saved by [setNewLocale].
      */
     fun getCurrentLocale(context: Context): Locale? {
-        var currentLocale: Locale? = null
-
-        if (currentLocale == null) {
-            val locale = Storage.getLocale(context)
-            if (locale != null) {
-                currentLocale = locale.toLocale()
-            }
-        }
-        return currentLocale
+        return Storage.getLocale(context)?.toLocale()
     }
 
     /**
@@ -63,28 +55,24 @@ object LocaleManager {
     fun resetToSystemDefault(context: Context) {
         clear(context)
         val locale = getSystemDefault()
-        locale?.let {
-            updateSystemLocale(locale)
-            updateConfiguration(context, locale)
-        }
+
+        updateSystemLocale(locale)
+        updateConfiguration(context, locale)
     }
 
     /**
      * Returns the locale set by the system
      */
-    fun getSystemDefault(): Locale? {
+    fun getSystemDefault(): Locale {
         val config = Resources.getSystem().configuration
         return ConfigurationCompat.getLocales(config).get(0)
     }
 
     internal fun updateResources(baseContext: Context): Context {
-        val locale = getCurrentLocale(baseContext)
-        return if (locale != null) {
-            updateSystemLocale(locale)
-            updateConfiguration(baseContext, locale)
-        } else {
-            baseContext
-        }
+        val locale = getCurrentLocale(baseContext) ?: getSystemDefault()
+
+        updateSystemLocale(locale)
+        return updateConfiguration(baseContext, locale)
     }
 
     private fun updateConfiguration(context: Context, locale: Locale): Context {

diff --git a/...nents/support/locale/src/test/java/mozilla/components/support/locale/LocaleManagerTest.kt b/...nents/support/locale/src/test/java/mozilla/components/support/locale/LocaleManagerTest.kt
@@ -42,11 +42,10 @@ class LocaleManagerTest {
 
     @Test
     @Config(qualifiers = "en-rUS")
-    fun `when calling updateResources with none current language must not change the system locale neither change configurations`() {
+    fun `when calling updateResources without a stored language we must not change the system locale`() {
         val previousSystemLocale = Locale.getDefault()
-        val context = LocaleManager.updateResources(testContext)
+        LocaleManager.updateResources(testContext)
 
-        assertEquals(testContext, context)
         assertEquals(previousSystemLocale, Locale.getDefault())
     }
 

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -12,6 +12,9 @@ permalink: /changelog/
 * [Gecko](https://github.com/mozilla-mobile/android-components/blob/master/buildSrc/src/main/java/Gecko.kt)
 * [Configuration](https://github.com/mozilla-mobile/android-components/blob/master/buildSrc/src/main/java/Config.kt)
 
+* **support-locale**
+  * Updates `updateResources` to always update the context configuration
+
 * **feature-toolbar**
   * Added `forceExpand` to [BrowserToolbarBottomBehavior] so consumers can expand the BrowserToolbar on demand.