Move call to setApplicationLocales

Author: mileskrell

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -190,6 +190,8 @@ protected void onCreate(final Bundle savedInstanceState) {
                 && ReleaseVersionUtil.INSTANCE.isReleaseApk()) {
             UpdateSettingsFragment.askForConsentToUpdateChecks(this);
         }
+
+        Localization.migrateAppLanguageSettingIfNecessary(getApplicationContext());
     }
 
     @Override

app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java

@@ -6,12 +6,9 @@
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Environment;
-import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.core.os.LocaleListCompat;
 import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.App;
@@ -45,7 +42,6 @@
  * Helper class for global settings.
  */
 public final class NewPipeSettings {
-    private static final String TAG = NewPipeSettings.class.toString();
     private NewPipeSettings() { }
 
     public static void initSettings(final Context context) {
@@ -68,7 +64,6 @@ public static void initSettings(final Context context) {
         saveDefaultAudioDownloadDirectory(context);
 
         disableMediaTunnelingIfNecessary(context);
-        migrateAppLanguageSettingIfNecessary(context);
     }
 
     static void saveDefaultVideoDownloadDirectory(final Context context) {
@@ -189,32 +184,4 @@ public static void setMediaTunneling(@NonNull final Context context) {
                             DeviceUtils.MEDIA_TUNNELING_DEVICE_BLACKLIST_VERSION).apply();
         }
     }
-
-    private static void migrateAppLanguageSettingIfNecessary(@NonNull final Context context) {
-        // Starting with pull request #12093, NewPipe on Android 13+ exclusively uses Android's
-        // public per-app language APIs to read and set the UI language for NewPipe.
-        // If running on Android 13+, the following migration will move any existing custom
-        // app language in SharedPreferences to use the public per-app language APIs instead.
-        if (Build.VERSION.SDK_INT >= 33) {
-            final SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-            final String appLanguageKey = context.getString(R.string.app_language_key);
-            final String appLanguageValue = sp.getString(appLanguageKey, null);
-            if (appLanguageValue != null) {
-                sp.edit().remove(appLanguageKey).apply();
-                final String appLanguageDefaultValue =
-                        context.getString(R.string.default_localization_key);
-                if (!appLanguageValue.equals(appLanguageDefaultValue)) {
-                    try {
-                        AppCompatDelegate.setApplicationLocales(
-                                LocaleListCompat.forLanguageTags(appLanguageValue)
-                        );
-                    } catch (final RuntimeException e) {
-                        Log.e(TAG, "Failed to migrate previous custom app language "
-                                + "setting to public per-app language APIs"
-                        );
-                    }
-                }
-            }
-        }
-    }
 }

app/src/main/java/org/schabi/newpipe/util/Localization.java

@@ -12,13 +12,15 @@
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.DisplayMetrics;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.PluralsRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.math.MathUtils;
+import androidx.core.os.LocaleListCompat;
 import androidx.preference.PreferenceManager;
 
 import org.ocpsoft.prettytime.PrettyTime;
@@ -65,6 +67,7 @@
  */
 
 public final class Localization {
+    private static final String TAG = Localization.class.toString();
     public static final String DOT_SEPARATOR = " • ";
     private static PrettyTime prettyTime;
 
@@ -433,4 +436,32 @@ private static String getQuantity(@NonNull final Context context,
         final int safeCount = (int) MathUtils.clamp(count, Integer.MIN_VALUE, Integer.MAX_VALUE);
         return context.getResources().getQuantityString(pluralId, safeCount, formattedCount);
     }
+
+    public static void migrateAppLanguageSettingIfNecessary(@NonNull final Context context) {
+        // Starting with pull request #12093, NewPipe on Android 13+ exclusively uses Android's
+        // public per-app language APIs to read and set the UI language for NewPipe.
+        // If running on Android 13+, the following code will migrate any existing custom
+        // app language in SharedPreferences to use the public per-app language APIs instead.
+        if (Build.VERSION.SDK_INT >= 33) {
+            final SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+            final String appLanguageKey = context.getString(R.string.app_language_key);
+            final String appLanguageValue = sp.getString(appLanguageKey, null);
+            if (appLanguageValue != null) {
+                sp.edit().remove(appLanguageKey).apply();
+                final String appLanguageDefaultValue =
+                        context.getString(R.string.default_localization_key);
+                if (!appLanguageValue.equals(appLanguageDefaultValue)) {
+                    try {
+                        AppCompatDelegate.setApplicationLocales(
+                                LocaleListCompat.forLanguageTags(appLanguageValue)
+                        );
+                    } catch (final RuntimeException e) {
+                        Log.e(TAG, "Failed to migrate previous custom app language "
+                                + "setting to public per-app language APIs"
+                        );
+                    }
+                }
+            }
+        }
+    }
 }