Fix language picker language switch.

Author: Fox2Code

app/src/main/java/com/fox2code/mmm/Constants.java

@@ -26,7 +26,7 @@ public class Constants {
     public static final String EXTRA_MARKDOWN_CHANGE_BOOT = "extra_markdown_change_boot";
     public static final String EXTRA_MARKDOWN_NEEDS_RAMDISK = "extra_markdown_needs_ramdisk";
     public static final String EXTRA_MARKDOWN_MIN_MAGISK = "extra_markdown_min_magisk";
-    public static final String EXTRA_MARKDOWN_MIN_API= "extra_markdown_min_api";
+    public static final String EXTRA_MARKDOWN_MIN_API = "extra_markdown_min_api";
     public static final String EXTRA_MARKDOWN_MAX_API = "extra_markdown_max_api";
     public static final String EXTRA_FADE_OUT = "extra_fade_out";
     public static final String EXTRA_FROM_MANAGER = "extra_from_manager";

app/src/main/java/com/fox2code/mmm/compat/CompatActivity.java

@@ -1,11 +1,11 @@
 package com.fox2code.mmm.compat;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
@@ -37,7 +37,6 @@
 import androidx.core.graphics.ColorUtils;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
-import androidx.preference.PreferenceManager;
 
 import com.fox2code.mmm.Constants;
 import com.fox2code.mmm.R;
@@ -277,8 +276,8 @@ public void setActionBarBackground(Drawable drawable) {
         }
     }
 
-    @Dimension
-    @Px
+    @Dimension @Px
+    @SuppressLint("InternalInsetResource")
     public int getStatusBarHeight() {
         int height = WindowInsetsCompat.CONSUMED.getInsets(
                 WindowInsetsCompat.Type.statusBars()).top;
@@ -289,6 +288,8 @@ public int getStatusBarHeight() {
                 Resources.getSystem().getDimensionPixelSize(id));
     }
 
+    @Dimension @Px
+    @SuppressLint("InternalInsetResource")
     public int getNavigationBarHeight() {
         int height = WindowInsetsCompat.CONSUMED.getInsets(
                 WindowInsetsCompat.Type.navigationBars()).bottom;
@@ -548,14 +549,6 @@ public static CompatActivity getCompatActivity(Context context) {
         return (CompatActivity) context;
     }
 
-    @Override
-    protected void attachBaseContext(Context newBase) {
-        SharedPreferences mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(newBase);
-        Locale locale = new Locale(mSharedPreferences.getString("user_preferred_country", "en"));
-        Context context = CompatWrapper.setLocale(newBase, locale);
-        super.attachBaseContext(context);
-    }
-
     public WeakReference<CompatActivity> asWeakReference() {
         return this.selfReference;
     }

app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java

@@ -1,5 +1,10 @@
 package com.fox2code.mmm.settings;
 
+import android.annotation.SuppressLint;
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
@@ -16,6 +21,7 @@
 import com.fox2code.mmm.AppUpdateManager;
 import com.fox2code.mmm.BuildConfig;
 import com.fox2code.mmm.Constants;
+import com.fox2code.mmm.MainActivity;
 import com.fox2code.mmm.MainApplication;
 import com.fox2code.mmm.OverScrollManager;
 import com.fox2code.mmm.R;
@@ -26,13 +32,14 @@
 import com.fox2code.mmm.utils.Http;
 import com.fox2code.mmm.utils.IntentHelper;
 
+import com.fox2code.rosettax.LanguageActivity;
 import com.fox2code.rosettax.LanguageSwitcher;
 import com.mikepenz.aboutlibraries.LibsBuilder;
 import com.topjohnwu.superuser.internal.UiThreadHandler;
 
 import java.util.HashSet;
 
-public class SettingsActivity extends CompatActivity {
+public class SettingsActivity extends CompatActivity implements LanguageActivity {
     private static int devModeStep = 0;
 
     @Override
@@ -51,6 +58,18 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
 
+    @Override
+    public void refreshRosettaX() {
+        Intent mStartActivity = new Intent(this, MainActivity.class);
+        mStartActivity.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+        int mPendingIntentId = 123456;
+        @SuppressLint("InlinedApi") PendingIntent mPendingIntent = PendingIntent.getActivity(this, mPendingIntentId,
+                mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+        AlarmManager mgr = (AlarmManager)this.getSystemService(Context.ALARM_SERVICE);
+        mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent);
+        System.exit(0); // Exit app process
+    }
+
     public static class SettingsFragment extends PreferenceFragmentCompat
             implements CompatActivity.OnBackPressedCallback {
         @Override