Attempt to set/reset locale without requiring restart

Author: nbradbury

WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java

@@ -367,7 +367,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
                 InstallationReferrerServiceStarter.startService(this, null);
             }
 
-            mLocaleHelper.performMigrationIfNecessary(this);
+            mLocaleHelper.performMigrationIfNecessary();
 
             if (FluxCUtils.isSignedInWPComOrHasWPOrgSite(mAccountStore, mSiteStore)
                 && !AppPrefs.getIsJetpackMigrationInProgress()) {

WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsFragment.java

@@ -13,7 +13,6 @@
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
-import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.MenuItem;

WordPress/src/main/java/org/wordpress/android/ui/prefs/ExperimentalFeaturesActivity.kt

@@ -32,6 +32,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dagger.hilt.android.AndroidEntryPoint
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -41,6 +42,7 @@ import org.wordpress.android.ui.compose.theme.AppThemeM3
 import org.wordpress.android.ui.compose.unit.Margin
 import org.wordpress.android.ui.prefs.language.LocaleHelper
 import org.wordpress.android.util.extensions.setContent
+import javax.inject.Inject
 
 val experimentalFeatures = listOf(
     Feature(key = "experimental_block_editor"),
@@ -53,7 +55,10 @@ data class Feature(
     val key: String,
 )
 
-class FeatureViewModel : ViewModel() {
+@HiltViewModel
+class FeatureViewModel @Inject constructor(
+    private val localeHelper: LocaleHelper
+) : ViewModel() {
     private val _switchStates = MutableStateFlow<Map<String, Feature>>(emptyMap())
     val switchStates: StateFlow<Map<String, Feature>> = _switchStates.asStateFlow()
 
@@ -71,6 +76,14 @@ class FeatureViewModel : ViewModel() {
                 AppPrefs.setManualFeatureConfig(enabled, key)
             }
         }
+
+        if (key == LocaleHelper.EXPERIMENTAL_PER_APP_LANGUAGE_PREF_KEY) {
+            if (enabled) {
+                localeHelper.performMigrationIfNecessary()
+            } else {
+                localeHelper.resetApplicationLocale()
+            }
+        }
     }
 }
 

WordPress/src/main/java/org/wordpress/android/ui/prefs/language/LocaleHelper.kt

@@ -8,6 +8,7 @@ import android.provider.Settings
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
 import org.wordpress.android.R
+import org.wordpress.android.WordPress
 import org.wordpress.android.fluxc.utils.AppLogWrapper
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.util.AppLog
@@ -60,9 +61,10 @@ class LocaleHelper @Inject constructor(
     /**
      * Previously the app locale was stored in SharedPreferences, so here we migrate to AndroidX per-app language prefs
      */
-    fun performMigrationIfNecessary(context: Context) {
+    fun performMigrationIfNecessary() {
+        resetApplicationLocale() // TODO remove
         if (isPerAppLanguagePrefsEnabled() && isApplicationLocaleEmpty()) {
-            val languagePrefKey = context.getString(R.string.pref_key_language)
+            val languagePrefKey = WordPress.getContext().getString(R.string.pref_key_language)
             val previousLanguage = appPrefsWrapper.prefs().getString(languagePrefKey, "")
             if (previousLanguage?.isNotEmpty() == true) {
                 appLogWrapper.d(