From ff7a0ba59957967a1376248a7dcb1a2ea9dbbf6f Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 10 May 2019 00:19:28 -0700
Subject: [PATCH] Force apply preferred locale in applyOverrideConfiguration

Close #1442
---
 .../java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt
index 20384d02f..dc37ae9b2 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt
@@ -1,6 +1,7 @@
 package com.topjohnwu.magisk.ui.base
 
 import android.content.Intent
+import android.content.res.Configuration
 import android.os.Bundle
 import androidx.annotation.CallSuper
 import androidx.appcompat.app.AppCompatDelegate
@@ -24,6 +25,7 @@ import com.topjohnwu.magisk.model.navigation.MagiskAnimBuilder
 import com.topjohnwu.magisk.model.navigation.MagiskNavigationEvent
 import com.topjohnwu.magisk.model.navigation.Navigator
 import com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder
+import com.topjohnwu.magisk.utils.LocaleManager
 import com.topjohnwu.magisk.utils.Utils
 import timber.log.Timber
 import kotlin.reflect.KClass
@@ -58,6 +60,12 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
     }
 
+    override fun applyOverrideConfiguration(config: Configuration?) {
+        // Force applying our preferred local
+        config!!.setLocale(LocaleManager.locale)
+        super.applyOverrideConfiguration(config)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         navigationController?.apply {