Cleanup more code

app/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.kt

@@ -4,133 +4,65 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.content.res.Configuration
 import android.content.res.Resources
-import android.os.Build
 import androidx.annotation.StringRes
-import com.topjohnwu.magisk.App
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.extensions.get
 import com.topjohnwu.magisk.extensions.inject
+import com.topjohnwu.magisk.extensions.langTagToLocale
 import com.topjohnwu.superuser.internal.InternalUtils
 import io.reactivex.Single
 import java.util.*
 
-object LocaleManager {
-    @JvmStatic
-    var locale = Locale.getDefault()
-    @JvmStatic
-    val defaultLocale = Locale.getDefault()
+var currentLocale = Locale.getDefault()!!
+    private set
 
-    @JvmStatic
-    val availableLocales = Single.fromCallable {
-        val compareId = R.string.app_changelog
-        val res: Resources by inject()
-        mutableListOf<Locale>().apply {
-            // Add default locale
-            add(Locale.ENGLISH)
+val defaultLocale = Locale.getDefault()!!
 
-            // Add some special locales
-            add(Locale.TAIWAN)
-            add(Locale("pt", "BR"))
+val availableLocales = Single.fromCallable {
+    val compareId = R.string.app_changelog
+    val res: Resources by inject()
+    mutableListOf<Locale>().apply {
+        // Add default locale
+        add(Locale.ENGLISH)
 
-            // Other locales
-            val otherLocales = res.assets.locales
-                .map { forLanguageTag(it) }
-                .distinctBy { getString(it, compareId) }
+        // Add some special locales
+        add(Locale.TAIWAN)
+        add(Locale("pt", "BR"))
 
-            listOf("", "").toTypedArray()
+        // Other locales
+        val otherLocales = res.assets.locales
+                .map { it.langTagToLocale() }
+                .distinctBy { LocaleManager.getString(it, compareId) }
 
-            addAll(otherLocales)
-        }.sortedWith(Comparator { a, b ->
-            a.getDisplayName(a).toLowerCase(a)
+        listOf("", "").toTypedArray()
+
+        addAll(otherLocales)
+    }.sortedWith(Comparator { a, b ->
+        a.getDisplayName(a).toLowerCase(a)
                 .compareTo(b.getDisplayName(b).toLowerCase(b))
-        })
-    }.cache()
+    })
+}.cache()!!
 
-    private fun forLanguageTag(tag: String): Locale {
-        if (Build.VERSION.SDK_INT >= 21) {
-            return Locale.forLanguageTag(tag)
-        } else {
-            val tok = tag.split("-".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-            if (tok.isEmpty()) {
-                return Locale("")
-            }
-            val language = when (tok[0]) {
-                "und" -> "" // Undefined
-                "fil" -> "tl" // Filipino
-                else -> tok[0]
-            }
-            if (language.length != 2 && language.length != 3)
-                return Locale("")
-            if (tok.size == 1)
-                return Locale(language)
-            val country = tok[1]
+object LocaleManager {
 
-            return if (country.length != 2 && country.length != 3) Locale(language)
-            else Locale(language, country)
-        }
-    }
-
-    @JvmStatic
-    fun toLanguageTag(loc: Locale): String {
-        if (Build.VERSION.SDK_INT >= 21) {
-            return loc.toLanguageTag()
-        } else {
-            var language = loc.language
-            var country = loc.country
-            var variant = loc.variant
-            when {
-                language.isEmpty() || !language.matches("\\p{Alpha}{2,8}".toRegex()) ->
-                    language = "und"       // Follow the Locale#toLanguageTag() implementation
-                language == "iw" -> language = "he"        // correct deprecated "Hebrew"
-                language == "in" -> language = "id"        // correct deprecated "Indonesian"
-                language == "ji" -> language = "yi"        // correct deprecated "Yiddish"
-            }
-            // ensure valid country code, if not well formed, it's omitted
-
-            // variant subtags that begin with a letter must be at least 5 characters long
-            // ensure valid country code, if not well formed, it's omitted
-            if (!country.matches("\\p{Alpha}{2}|\\p{Digit}{3}".toRegex())) {
-                country = ""
-            }
-
-            // variant subtags that begin with a letter must be at least 5 characters long
-            if (!variant.matches("\\p{Alnum}{5,8}|\\p{Digit}\\p{Alnum}{3}".toRegex())) {
-                variant = ""
-            }
-            val tag = StringBuilder(language)
-            if (country.isNotEmpty())
-                tag.append('-').append(country)
-            if (variant.isNotEmpty())
-                tag.append('-').append(variant)
-            return tag.toString()
-        }
-    }
-
-    @JvmStatic
     fun setLocale(wrapper: ContextWrapper) {
         val localeConfig = Config.locale
-        locale = when {
+        currentLocale = when {
             localeConfig.isEmpty() -> defaultLocale
-            else -> forLanguageTag(localeConfig)
+            else -> localeConfig.langTagToLocale()
         }
-        Locale.setDefault(locale)
-        InternalUtils.replaceBaseContext(wrapper, getLocaleContext(locale))
+        Locale.setDefault(currentLocale)
+        InternalUtils.replaceBaseContext(wrapper, getLocaleContext(wrapper, currentLocale))
     }
 
-    @JvmStatic
-    fun getLocaleContext(context: Context, locale: Locale): Context {
+    fun getLocaleContext(context: Context, locale: Locale = currentLocale): Context {
         val config = Configuration(context.resources.configuration)
         config.setLocale(locale)
         return context.createConfigurationContext(config)
     }
 
-    @JvmStatic
-    fun getLocaleContext(locale: Locale): Context {
-        return getLocaleContext(App.self.baseContext, locale)
-    }
-
-    @JvmStatic
     fun getString(locale: Locale, @StringRes id: Int): String {
-        return getLocaleContext(locale).getString(id)
+        return getLocaleContext(get(), locale).getString(id)
     }
 }

app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt

@@ -15,7 +15,6 @@ import com.topjohnwu.magisk.*
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.extensions.get
 import com.topjohnwu.magisk.model.update.UpdateCheckService
-import com.topjohnwu.net.Networking
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.internal.UiThreadHandler
 import java.io.File
@@ -24,8 +23,7 @@ import java.util.concurrent.TimeUnit
 
 object Utils {
 
-    val isCanary: Boolean
-        get() = BuildConfig.VERSION_NAME.contains("-")
+    val isCanary: Boolean = BuildConfig.VERSION_NAME.contains("-")
 
     fun toast(msg: CharSequence, duration: Int) {
         UiThreadHandler.run { Toast.makeText(get(), msg, duration).show() }
@@ -35,11 +33,6 @@ object Utils {
         UiThreadHandler.run { Toast.makeText(get(), resId, duration).show() }
     }
 
-    fun dlString(url: String): String {
-        val s = Networking.get(url).execForString().result
-        return s ?: ""
-    }
-
     fun getPrefsInt(prefs: SharedPreferences, key: String, def: Int = 0): Int {
         return prefs.getString(key, def.toString())!!.toInt()
     }
@@ -58,7 +51,7 @@ object Utils {
             if (info.labelRes > 0) {
                 val res = pm.getResourcesForApplication(info)
                 val config = Configuration()
-                config.setLocale(LocaleManager.locale)
+                config.setLocale(currentLocale)
                 res.updateConfiguration(config, res.displayMetrics)
                 return res.getString(info.labelRes)
             }