Cleanup more code

app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt

@@ -55,7 +55,7 @@ val ApplicationInfo.packageInfo: PackageInfo?
 val Uri.fileName: String
     get() {
         var name: String? = null
-        App.self.contentResolver.query(this, null, null, null, null)?.use { c ->
+        get<Context>().contentResolver.query(this, null, null, null, null)?.use { c ->
             val nameIndex = c.getColumnIndex(OpenableColumns.DISPLAY_NAME)
             if (nameIndex != -1) {
                 c.moveToFirst()

app/src/main/java/com/topjohnwu/magisk/extensions/XJava.kt

@@ -1,12 +1,15 @@
 package com.topjohnwu.magisk.extensions
 
 import android.net.Uri
+import android.os.Build
 import androidx.core.net.toFile
 import java.io.File
 import java.io.InputStream
 import java.io.OutputStream
+import java.util.*
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
+import kotlin.NoSuchElementException
 
 fun ZipInputStream.forEach(callback: (ZipEntry) -> Unit) {
     var entry: ZipEntry? = nextEntry
@@ -38,4 +41,63 @@ inline fun <T, R> List<T>.firstMap(mapper: (T) -> R?): R {
         return mapper(item) ?: continue
     }
     throw NoSuchElementException("Collection contains no element matching the predicate.")
+}
+
+fun String.langTagToLocale(): Locale {
+    if (Build.VERSION.SDK_INT >= 21) {
+        return Locale.forLanguageTag(this)
+    } else {
+        val tok = 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]
+
+        return if (country.length != 2 && country.length != 3) Locale(language)
+        else Locale(language, country)
+    }
+}
+
+fun Locale.toLangTag(): String {
+    if (Build.VERSION.SDK_INT >= 21) {
+        return toLanguageTag()
+    } else {
+        var language = language
+        var country = country
+        var variant = 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()
+    }
 }

app/src/main/java/com/topjohnwu/magisk/extensions/XTime.kt

@@ -1,6 +1,6 @@
 package com.topjohnwu.magisk.extensions
 
-import com.topjohnwu.magisk.utils.LocaleManager
+import com.topjohnwu.magisk.utils.currentLocale
 import java.text.DateFormat
 import java.text.ParseException
 import java.text.SimpleDateFormat
@@ -14,8 +14,7 @@ fun String.toTime(format: DateFormat) = try {
     -1L
 }
 
-private val locale get() = LocaleManager.locale
-val timeFormatFull by lazy { SimpleDateFormat("yyyy/MM/dd_HH:mm:ss", locale) }
-val timeFormatStandard by lazy { SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", locale) }
-val timeFormatMedium by lazy { DateFormat.getDateInstance(DateFormat.MEDIUM, LocaleManager.locale) }
-val timeFormatTime by lazy { SimpleDateFormat("h:mm a", LocaleManager.locale) }
+val timeFormatFull by lazy { SimpleDateFormat("yyyy/MM/dd_HH:mm:ss", currentLocale) }
+val timeFormatStandard by lazy { SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", currentLocale) }
+val timeFormatMedium by lazy { DateFormat.getDateInstance(DateFormat.MEDIUM, currentLocale) }
+val timeFormatTime by lazy { SimpleDateFormat("h:mm a", currentLocale) }