Fixes voice language issue when reset. Also force save the display one (

#2692)
MozillaReality · Jan 21, 2020 · 2868a7e · 2868a7e
1 parent eb9a1ec
commit 2868a7e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...c/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DisplayLanguageOptionsView.java b/...c/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DisplayLanguageOptionsView.java
@@ -62,6 +62,7 @@ protected boolean reset() {
         String currentLocale = LocaleUtils.getCurrentLocale();
         if (currentLocale.equalsIgnoreCase(systemLocale)) {
             setLanguage(LocaleUtils.getIndexForSupportedLocale(systemLocale), false);
+            SettingsStore.getInstance(getContext()).setDisplayLocale(currentLocale);
             return false;
 
         } else {

diff --git a/...mmon/shared/org/mozilla/vrbrowser/ui/widgets/settings/VoiceSearchLanguageOptionsView.java b/...mmon/shared/org/mozilla/vrbrowser/ui/widgets/settings/VoiceSearchLanguageOptionsView.java
@@ -59,16 +59,16 @@ private void initialize(Context aContext) {
     @Override
     protected boolean reset() {
         String systemLocale = LocaleUtils.getClosestSupportedLocale(getContext(), LocaleUtils.getDeviceLanguage().getId());
-        String currentLocale = LocaleUtils.getCurrentLocale();
+        String currentLocale = LocaleUtils.getVoiceSearchLanguage(getContext()).getId();
         if (currentLocale.equalsIgnoreCase(systemLocale)) {
             setLanguage(LocaleUtils.getIndexForSupportedLocale(systemLocale), false);
-            return false;
 
         } else {
             setLanguage(LocaleUtils.getIndexForSupportedLocale(systemLocale), true);
             SettingsStore.getInstance(getContext()).setVoiceSearchLocale(null);
-            return true;
         }
+
+        return false;
     }
 
     private RadioGroupSetting.OnCheckedChangeListener mLanguageListener = (radioGroup, checkedId, doApply) -> {