From 03b7e59f4be1530dd00cb845de98007e3a862f40 Mon Sep 17 00:00:00 2001 From: Android-Artisan Date: Thu, 10 Sep 2026 17:34:14 +0200 Subject: [PATCH 1/4] Fix language change for Android 13+ by not calling recreate() on API 33+ --- .../io/github/vvb2060/keyattestation/util/LocaleManager.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/github/vvb2060/keyattestation/util/LocaleManager.kt b/app/src/main/java/io/github/vvb2060/keyattestation/util/LocaleManager.kt index 45b9c72..38174fb 100644 --- a/app/src/main/java/io/github/vvb2060/keyattestation/util/LocaleManager.kt +++ b/app/src/main/java/io/github/vvb2060/keyattestation/util/LocaleManager.kt @@ -3,6 +3,7 @@ package io.github.vvb2060.keyattestation.util import android.app.Activity import android.content.Context import android.content.res.Resources +import android.os.Build import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatDelegate import androidx.core.os.LocaleListCompat @@ -58,7 +59,9 @@ object LocaleManager { .setSingleChoiceItems(languages.toTypedArray(), currentIndex) { dialog, which -> updateLocale(context, languageCodes[which]) dialog.dismiss() - if (context is Activity) context.recreate() + if (context is Activity && Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { + context.recreate() + } } .show() } From 921ffad1af883a5e33015aaa77c64eca2a94eb78 Mon Sep 17 00:00:00 2001 From: Android-Artisan Date: Thu, 10 Sep 2026 18:09:35 +0200 Subject: [PATCH 2/4] Fix language change: kill and relaunch app after locale change, add attachBaseContext to apply locale to context --- .../vvb2060/keyattestation/app/AppActivity.kt | 16 ++++++++++++++++ .../vvb2060/keyattestation/util/LocaleManager.kt | 16 +++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/github/vvb2060/keyattestation/app/AppActivity.kt b/app/src/main/java/io/github/vvb2060/keyattestation/app/AppActivity.kt index 601c3ea..574af81 100644 --- a/app/src/main/java/io/github/vvb2060/keyattestation/app/AppActivity.kt +++ b/app/src/main/java/io/github/vvb2060/keyattestation/app/AppActivity.kt @@ -1,13 +1,29 @@ package io.github.vvb2060.keyattestation.app +import android.content.Context +import android.content.res.Configuration import android.content.res.Resources import android.graphics.Color import android.os.Build +import androidx.appcompat.app.AppCompatDelegate import rikka.core.res.resolveColor import rikka.material.app.MaterialActivity +import java.util.Locale open class AppActivity : MaterialActivity() { + override fun attachBaseContext(newBase: Context) { + val locales = AppCompatDelegate.getApplicationLocales() + if (locales.size() > 0) { + val locale = locales[0]!! + val config = Configuration(newBase.resources.configuration) + config.setLocale(locale) + super.attachBaseContext(newBase.createConfigurationContext(config)) + } else { + super.attachBaseContext(newBase) + } + } + override fun shouldApplyTranslucentSystemBars(): Boolean { return true } diff --git a/app/src/main/java/io/github/vvb2060/keyattestation/util/LocaleManager.kt b/app/src/main/java/io/github/vvb2060/keyattestation/util/LocaleManager.kt index 38174fb..8e7735f 100644 --- a/app/src/main/java/io/github/vvb2060/keyattestation/util/LocaleManager.kt +++ b/app/src/main/java/io/github/vvb2060/keyattestation/util/LocaleManager.kt @@ -1,9 +1,10 @@ package io.github.vvb2060.keyattestation.util -import android.app.Activity import android.content.Context +import android.content.Intent import android.content.res.Resources -import android.os.Build +import android.os.Handler +import android.os.Looper import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatDelegate import androidx.core.os.LocaleListCompat @@ -16,6 +17,7 @@ object LocaleManager { Locale("en"), Locale("el"), Locale("it"), + Locale("iw"), Locale("pt", "BR"), Locale("uk", "UA"), Locale("zh", "CN"), @@ -35,7 +37,7 @@ object LocaleManager { fun updateLocale(context: Context, code: String): String { context.getSharedPreferences("locale_prefs", Context.MODE_PRIVATE) - .edit().putString("app_locale", code).apply() + .edit().putString("app_locale", code).commit() AppCompatDelegate.setApplicationLocales( if (code.isEmpty()) LocaleListCompat.getEmptyLocaleList() else LocaleListCompat.create(Locale.forLanguageTag(code)) @@ -59,8 +61,12 @@ object LocaleManager { .setSingleChoiceItems(languages.toTypedArray(), currentIndex) { dialog, which -> updateLocale(context, languageCodes[which]) dialog.dismiss() - if (context is Activity && Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { - context.recreate() + Handler(Looper.getMainLooper()).post { + val pm = context.packageManager + val intent = pm.getLaunchIntentForPackage(context.packageName) + intent?.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) + context.startActivity(intent) + Runtime.getRuntime().exit(0) } } .show() From b72757f2ce8a2c1ed502bf68ae0b7b3fcdde1074 Mon Sep 17 00:00:00 2001 From: Android-Artisan Date: Thu, 10 Sep 2026 18:18:39 +0200 Subject: [PATCH 3/4] Remove unused import for Locale Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .../java/io/github/vvb2060/keyattestation/app/AppActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/io/github/vvb2060/keyattestation/app/AppActivity.kt b/app/src/main/java/io/github/vvb2060/keyattestation/app/AppActivity.kt index 574af81..4f6d643 100644 --- a/app/src/main/java/io/github/vvb2060/keyattestation/app/AppActivity.kt +++ b/app/src/main/java/io/github/vvb2060/keyattestation/app/AppActivity.kt @@ -8,7 +8,6 @@ import android.os.Build import androidx.appcompat.app.AppCompatDelegate import rikka.core.res.resolveColor import rikka.material.app.MaterialActivity -import java.util.Locale open class AppActivity : MaterialActivity() { From c2a199117e337bdcfe68cbd45c5156c51525dd43 Mon Sep 17 00:00:00 2001 From: Android-Artisan Date: Tue, 15 Sep 2026 10:42:35 +0200 Subject: [PATCH 4/4] Fix language change for Android 13+ by not calling recreate() on API 33+ Co-authored-by: VisionR1 <25982450+VisionR1@users.noreply.github.com> --- .../vvb2060/keyattestation/app/AppActivity.kt | 16 ++++++++++------ .../keyattestation/util/LocaleManager.kt | 19 +++++++++++++------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/io/github/vvb2060/keyattestation/app/AppActivity.kt b/app/src/main/java/io/github/vvb2060/keyattestation/app/AppActivity.kt index 4f6d643..9613e14 100644 --- a/app/src/main/java/io/github/vvb2060/keyattestation/app/AppActivity.kt +++ b/app/src/main/java/io/github/vvb2060/keyattestation/app/AppActivity.kt @@ -12,12 +12,16 @@ import rikka.material.app.MaterialActivity open class AppActivity : MaterialActivity() { override fun attachBaseContext(newBase: Context) { - val locales = AppCompatDelegate.getApplicationLocales() - if (locales.size() > 0) { - val locale = locales[0]!! - val config = Configuration(newBase.resources.configuration) - config.setLocale(locale) - super.attachBaseContext(newBase.createConfigurationContext(config)) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + val locales = AppCompatDelegate.getApplicationLocales() + if (locales.size() > 0) { + val locale = locales[0]!! + val config = Configuration(newBase.resources.configuration) + config.setLocale(locale) + super.attachBaseContext(newBase.createConfigurationContext(config)) + } else { + super.attachBaseContext(newBase) + } } else { super.attachBaseContext(newBase) } diff --git a/app/src/main/java/io/github/vvb2060/keyattestation/util/LocaleManager.kt b/app/src/main/java/io/github/vvb2060/keyattestation/util/LocaleManager.kt index 8e7735f..f838d94 100644 --- a/app/src/main/java/io/github/vvb2060/keyattestation/util/LocaleManager.kt +++ b/app/src/main/java/io/github/vvb2060/keyattestation/util/LocaleManager.kt @@ -1,8 +1,10 @@ package io.github.vvb2060.keyattestation.util +import android.app.Activity import android.content.Context import android.content.Intent import android.content.res.Resources +import android.os.Build import android.os.Handler import android.os.Looper import androidx.appcompat.app.AlertDialog @@ -61,12 +63,17 @@ object LocaleManager { .setSingleChoiceItems(languages.toTypedArray(), currentIndex) { dialog, which -> updateLocale(context, languageCodes[which]) dialog.dismiss() - Handler(Looper.getMainLooper()).post { - val pm = context.packageManager - val intent = pm.getLaunchIntentForPackage(context.packageName) - intent?.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) - context.startActivity(intent) - Runtime.getRuntime().exit(0) + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + Handler(Looper.getMainLooper()).post { + val pm = context.packageManager + val intent = pm.getLaunchIntentForPackage(context.packageName) + intent?.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) + context.startActivity(intent) + Runtime.getRuntime().exit(0) + } + } else { + if (context is Activity) context.recreate() } } .show()