Cleanup more code

app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt

@@ -32,6 +32,7 @@ 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 com.topjohnwu.magisk.utils.currentLocale
 import timber.log.Timber
 import kotlin.reflect.KClass
 
@@ -68,12 +69,12 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
 
     override fun applyOverrideConfiguration(config: Configuration?) {
         // Force applying our preferred local
-        config?.setLocale(LocaleManager.locale)
+        config?.setLocale(currentLocale)
         super.applyOverrideConfiguration(config)
     }
 
     override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(LocaleManager.getLocaleContext(base, LocaleManager.locale))
+        super.attachBaseContext(LocaleManager.getLocaleContext(base))
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt

@@ -1,12 +1,17 @@
 package com.topjohnwu.magisk.ui.home
 
 import android.app.Activity
+import android.content.Context
 import android.os.Bundle
 import com.skoumal.teanity.extensions.subscribeK
 import com.skoumal.teanity.viewevents.ViewEvent
-import com.topjohnwu.magisk.*
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.Info
+import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.data.repository.MagiskRepository
 import com.topjohnwu.magisk.databinding.FragmentMagiskBinding
+import com.topjohnwu.magisk.extensions.get
 import com.topjohnwu.magisk.extensions.inject
 import com.topjohnwu.magisk.extensions.writeTo
 import com.topjohnwu.magisk.model.events.*
@@ -114,7 +119,7 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
     }
 
     companion object {
-        val EXT_APK = File("${App.self.filesDir.parent}/snet", "snet.apk")
+        val EXT_APK by lazy { File("${get<Context>().filesDir.parent}/snet", "snet.apk") }
     }
 }
 

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt

@@ -21,15 +21,13 @@ import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.data.database.RepoDao
 import com.topjohnwu.magisk.databinding.CustomDownloadDialogBinding
+import com.topjohnwu.magisk.extensions.toLangTag
 import com.topjohnwu.magisk.model.download.DownloadService
 import com.topjohnwu.magisk.model.entity.internal.Configuration
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.observer.Observer
 import com.topjohnwu.magisk.ui.base.BasePreferenceFragment
-import com.topjohnwu.magisk.utils.FingerprintHelper
-import com.topjohnwu.magisk.utils.LocaleManager
-import com.topjohnwu.magisk.utils.PatchAPK
-import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.magisk.utils.*
 import com.topjohnwu.magisk.view.dialogs.FingerprintAuthDialog
 import com.topjohnwu.net.Networking
 import com.topjohnwu.superuser.Shell
@@ -226,21 +224,18 @@ class SettingsFragment : BasePreferenceFragment() {
 
     private fun setLocalePreference(lp: ListPreference) {
         lp.isEnabled = false
-        LocaleManager.availableLocales
-            .map {
+        availableLocales.map {
                 val names = mutableListOf<String>()
                 val values = mutableListOf<String>()
 
                 names.add(
-                    LocaleManager.getString(
-                        LocaleManager.defaultLocale, R.string.system_default
-                    )
+                    LocaleManager.getString(defaultLocale, R.string.system_default)
                 )
                 values.add("")
 
                 it.forEach { locale ->
                     names.add(locale.getDisplayName(locale))
-                    values.add(LocaleManager.toLanguageTag(locale))
+                    values.add(locale.toLangTag())
                 }
 
                 Pair(names.toTypedArray(), values.toTypedArray())
@@ -248,7 +243,7 @@ class SettingsFragment : BasePreferenceFragment() {
                 lp.isEnabled = true
                 lp.entries = names
                 lp.entryValues = values
-                lp.summary = LocaleManager.locale.getDisplayName(LocaleManager.locale)
+                lp.summary = currentLocale.getDisplayName(currentLocale)
             }
     }