Update Bookmarks string after a language change (#2798)

MozillaReality · Feb 18, 2020 · 37ac4cb · 37ac4cb
1 parent aa2edc9
commit 37ac4cb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -513,9 +513,8 @@ public void onConfigurationChanged(Configuration newConfig) {
 
         LocaleUtils.update(this, language);
 
-        mWidgets.forEach((i, widget) -> widget.onConfigurationChanged(newConfig));
-
         SessionStore.get().onConfigurationChanged(newConfig);
+        mWidgets.forEach((i, widget) -> widget.onConfigurationChanged(newConfig));
 
         super.onConfigurationChanged(newConfig);
     }

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/BookmarksStore.kt b/app/src/common/shared/org/mozilla/vrbrowser/browser/BookmarksStore.kt
@@ -6,6 +6,7 @@
 package org.mozilla.vrbrowser.browser
 
 import android.content.Context
+import android.content.res.Configuration
 import android.os.Handler
 import android.os.Looper
 import androidx.lifecycle.ProcessLifecycleOwner
@@ -60,7 +61,7 @@ class BookmarksStore constructor(val context: Context) {
 
     private val listeners = ArrayList<BookmarkListener>()
     private var storage = (context.applicationContext as VRBrowserApplication).places.bookmarks
-    private val titles = rootTitles(context)
+    private var titles = rootTitles(context)
     private val accountManager = (context.applicationContext as VRBrowserApplication).services.accountManager
 
     // Bookmarks might have changed during sync, so notify our listeners.
@@ -81,6 +82,11 @@ class BookmarksStore constructor(val context: Context) {
         )
     }
 
+    // Update the folder strings after a language update
+    fun onConfigurationChanged(newConfig: Configuration) {
+        titles = rootTitles(context)
+    }
+
     interface BookmarkListener {
         fun onBookmarksUpdated()
         fun onBookmarkAdded()

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java
@@ -241,6 +241,8 @@ public void onConfigurationChanged(Configuration newConfig) {
         if (mRuntime != null) {
             mRuntime.configurationChanged(newConfig);
         }
+
+        mBookmarksStore.onConfigurationChanged(newConfig);
     }
 
     // Session Settings