gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2026-01-14 05:47:07 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix pre 21 support

Browse Source
This commit is contained in:
topjohnwu
2021-02-20 03:38:39 -08:00
parent 9cc91b30b3
commit ccb55205e6
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/topjohnwu/magisk/core/utils/Locales.kt
View File

@@ -38,7 +38,7 @@ withContext(Dispatchers.Default) {
add("pt-BR")
// Then add all supported locales
addAll(res.assets.locales)
addAll(Resources.getSystem().assets.locales)
}.map {
it.langTagToLocale()
}.distinctBy {

2
app/src/main/java/com/topjohnwu/magisk/ktx/XJava.kt
View File

@@ -51,7 +51,7 @@ fun String.langTagToLocale(): Locale {
if (Build.VERSION.SDK_INT >= 21) {
return Locale.forLanguageTag(this)
} else {
val tok = split("-".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
val tok = split("[-_]".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
if (tok.isEmpty()) {
return Locale("")
}