Add v7.4.0 release notes

- updated existing strings based on english updates
- added new strings

.gitignore

@@ -2,8 +2,8 @@ out
 *.zip
 *.jks
 *.apk
-config.prop
-update.sh
+/config.prop
+/update.sh
 
 # Built binaries
 native/out

README.MD

@@ -30,13 +30,12 @@ Furthermore, Magisk provides a **Systemless Interface** to alter the system (or
 
 ## Translations
 
-Default string resources for Magisk Manager are scattered throughout
+Default string resources for Magisk Manager and its stub APK are located here:
 
 - `app/src/main/res/values/strings.xml`
 - `stub/src/main/res/values/strings.xml`
-- `shared/src/main/res/values/strings.xml`
 
-Translate each and place them in the respective locations (`<module>/src/main/res/values-<lang>/strings.xml`).
+Translate each and place them in the respective locations (`[module]/src/main/res/values-[lang]/strings.xml`).
 
 ## Signature Verification
 

app/build.gradle

@@ -60,14 +60,26 @@ dependencies {
 
     implementation 'com.github.topjohnwu:jtar:1.0.0'
     implementation 'com.jakewharton.timber:timber:4.7.1'
-    implementation 'com.github.skoumalcz:teanity:0.3.3'
     implementation 'com.ncapdevi:frag-nav:3.2.0'
     implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.6'
 
-    def vMarkwon = '3.1.0'
-    implementation "ru.noties.markwon:core:${vMarkwon}"
-    implementation "ru.noties.markwon:html:${vMarkwon}"
-    implementation "ru.noties.markwon:image-svg:${vMarkwon}"
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.13'
+    implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${vKotlin}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${vKotlin}"
+
+    def vBAdapt = '3.1.1'
+    def bindingAdapter = 'me.tatarka.bindingcollectionadapter2:bindingcollectionadapter'
+    implementation "${bindingAdapter}:${vBAdapt}"
+    implementation "${bindingAdapter}-recyclerview:${vBAdapt}"
+
+    def vMarkwon = '4.1.2'
+    implementation "io.noties.markwon:core:${vMarkwon}"
+    implementation "io.noties.markwon:html:${vMarkwon}"
+    implementation "io.noties.markwon:image:${vMarkwon}"
+    implementation 'com.caverock:androidsvg:1.4'
 
     def vLibsu = '2.5.1'
     implementation "com.github.topjohnwu.libsu:core:${vLibsu}"
@@ -78,13 +90,13 @@ dependencies {
     implementation "org.koin:koin-android:${vKoin}"
     implementation "org.koin:koin-androidx-viewmodel:${vKoin}"
 
-    def vRetrofit = '2.6.1'
+    def vRetrofit = '2.6.2'
     implementation "com.squareup.retrofit2:retrofit:${vRetrofit}"
     implementation "com.squareup.retrofit2:converter-moshi:${vRetrofit}"
     implementation "com.squareup.retrofit2:converter-scalars:${vRetrofit}"
     implementation "com.squareup.retrofit2:adapter-rxjava2:${vRetrofit}"
 
-    def vOkHttp = '3.12.2'
+    def vOkHttp = '3.12.6'
     implementation "com.squareup.okhttp3:okhttp:${vOkHttp}"
     implementation "com.squareup.okhttp3:logging-interceptor:${vOkHttp}"
 
@@ -100,20 +112,23 @@ dependencies {
             replacedBy('com.github.topjohnwu:room-runtime')
         }
     }
-    def vRoom = "2.1.0"
+    def vRoom = "2.2.1"
     implementation "com.github.topjohnwu:room-runtime:${vRoom}"
     kapt "androidx.room:room-compiler:${vRoom}"
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVer}"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinVer}"
+    def vNav = "2.1.0"
+    implementation "androidx.navigation:navigation-fragment-ktx:$vNav"
+    implementation "androidx.navigation:navigation-ui-ktx:$vNav"
 
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.browser:browser:1.0.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03'
     implementation 'androidx.preference:preference:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta04'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01'
+    implementation 'androidx.fragment:fragment-ktx:1.2.0-rc01'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.work:work-runtime:2.2.0'
-    implementation 'androidx.transition:transition:1.2.0-rc01'
+    implementation 'androidx.transition:transition:1.3.0-rc01'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'com.google.android.material:material:1.1.0-alpha10'
+    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'com.google.android.material:material:1.2.0-alpha01'
 }

app/proguard-rules.pro

@@ -29,10 +29,14 @@
 }
 
 # DelegateWorker
--keep,allowobfuscation class * extends com.topjohnwu.magisk.model.worker.DelegateWorker
+-keep,allowobfuscation class * extends com.topjohnwu.magisk.base.DelegateWorker
 
 # BootSigner
--keepclassmembers class com.topjohnwu.signing.BootSigner { *; }
+-keep class a.a { *; }
+
+# Workaround R8 bug
+-keep,allowobfuscation class com.topjohnwu.magisk.model.receiver.GeneralReceiver
+-keepclassmembers class a.e { *; }
 
 # Strip logging
 -assumenosideeffects class timber.log.Timber.Tree { *; }

app/res-ids.txt

@@ -0,0 +1,5 @@
+com.topjohnwu.magisk:color/xxxxxxxx = 0x7f010000
+com.topjohnwu.magisk:drawable/xxxxxxxx = 0x7f020000
+com.topjohnwu.magisk:string/xxxxxxxx = 0x7f030000
+com.topjohnwu.magisk:style/xxxxxxxx = 0x7f040000
+com.topjohnwu.magisk:xml/xxxxxxxx = 0x7f050000

app/src/main/AndroidManifest.xml

@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    ** Special Requirements **
+
+    This AndroidManifest.xml will be copied into the stub
+    APK to allow APK delegation. This is why these special
+    requirements exist.
+
+    * Class names *
+    Class names a.a, a.c, a.e should not be changed as they are used
+    externally. All other class names can be changed.
+
+    * Resource IDs *
+    All resource IDs referred in AndroidManifest.xml is required to be
+    included into the "shared" module to make the ID match with stub.
+
+-->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
@@ -11,41 +29,46 @@
 
     <application
         android:name="a.e"
+        android:appComponentFactory="a.a"
         android:allowBackup="true"
-        android:theme="@style/MagiskTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
+        tools:ignore="UnusedAttribute,GoogleAppIndexingWarning"
+        tools:replace="android:appComponentFactory">
 
-        <!-- Activities -->
+        <!-- Splash -->
 
-        <activity
-            android:name="a.b"
-            android:configChanges="orientation|screenSize"
-            android:exported="true" />
         <activity
             android:name="a.c"
             android:configChanges="orientation|screenSize"
-            android:exported="true"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <!-- Main -->
+
+        <activity
+            android:name="a.b"
+            android:configChanges="orientation|screenSize"
+            android:exported="true" />
+
+        <!-- Flashing  -->
+
         <activity
             android:name="a.f"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="nosensor"
-            android:theme="@style/MagiskTheme.Flashing" />
+            android:screenOrientation="nosensor" />
 
         <!-- Superuser -->
 
         <activity
             android:name="a.m"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:directBootAware="true"
             android:excludeFromRecents="true"
-            android:exported="false"
-            android:theme="@style/MagiskTheme.SU" />
+            android:exported="false" />
 
         <!-- Receiver -->
 
@@ -53,6 +76,7 @@
             android:name="a.h"
             android:directBootAware="true">
             <intent-filter>
+                <action android:name="android.intent.action.REBOOT" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
             </intent-filter>
@@ -64,9 +88,10 @@
             </intent-filter>
         </receiver>
 
-        <!-- Service -->
+        <!-- DownloadService -->
 
-        <service android:name="a.j"
+        <service
+            android:name="a.j"
             android:exported="false" />
 
         <!-- Hardcode GMS version -->
@@ -74,6 +99,12 @@
             android:name="com.google.android.gms.version"
             android:value="12451000" />
 
+        <!-- Initialize WorkManager on-demand -->
+        <provider
+            android:name="androidx.work.impl.WorkManagerInitializer"
+            android:authorities="${applicationId}.workmanager-init"
+            tools:node="remove" />
+
     </application>
 
 </manifest>

app/src/main/java/a/a.java

@@ -1,13 +1,22 @@
 package a;
 
+import androidx.core.app.AppComponentFactory;
+
 import com.topjohnwu.magisk.utils.PatchAPK;
 import com.topjohnwu.signing.BootSigner;
 
-import androidx.annotation.Keep;
+public class a extends AppComponentFactory {
 
-@Keep
-public class a extends BootSigner {
+    @Deprecated
     public static boolean patchAPK(String in, String out, String pkg) {
         return PatchAPK.patch(in, out, pkg);
     }
+
+    public static boolean patchAPK(String in, String out, String pkg, String label) {
+        return PatchAPK.patch(in, out, pkg, label);
+    }
+
+    public static void main(String[] args) throws Exception {
+        BootSigner.main(args);
+    }
 }

app/src/main/java/a/e.java

@@ -3,5 +3,11 @@ package a;
 import com.topjohnwu.magisk.App;
 
 public class e extends App {
-    /* stub */
+    public e() {
+        super();
+    }
+
+    public e(Object o) {
+        super(o);
+    }
 }

app/src/main/java/a/w.java

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
 
-import com.topjohnwu.magisk.model.worker.DelegateWorker;
+import com.topjohnwu.magisk.base.DelegateWorker;
 
 import java.lang.reflect.ParameterizedType;
 

app/src/main/java/com/topjohnwu/magisk/App.kt

@@ -6,6 +6,7 @@ import android.content.res.Configuration
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.multidex.MultiDex
 import androidx.room.Room
+import androidx.work.WorkManager
 import androidx.work.impl.WorkDatabase
 import androidx.work.impl.WorkDatabase_Impl
 import com.topjohnwu.magisk.data.database.RepoDatabase
@@ -13,21 +14,25 @@ import com.topjohnwu.magisk.data.database.RepoDatabase_Impl
 import com.topjohnwu.magisk.di.ActivityTracker
 import com.topjohnwu.magisk.di.koinModules
 import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.net.Networking
-import com.topjohnwu.magisk.utils.LocaleManager
-import com.topjohnwu.magisk.utils.RootUtils
+import com.topjohnwu.magisk.extensions.unwrap
+import com.topjohnwu.magisk.utils.RootInit
+import com.topjohnwu.magisk.utils.updateConfig
 import com.topjohnwu.superuser.Shell
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 import timber.log.Timber
 
-open class App : Application() {
+open class App() : Application() {
+
+    constructor(o: Any) : this() {
+        Info.stub = DynAPK.load(o)
+    }
 
     init {
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
         Shell.Config.setFlags(Shell.FLAG_MOUNT_MASTER or Shell.FLAG_USE_MAGISK_BUSYBOX)
         Shell.Config.verboseLogging(BuildConfig.DEBUG)
-        Shell.Config.addInitializers(RootUtils::class.java)
+        Shell.Config.addInitializers(RootInit::class.java)
         Shell.Config.setTimeout(2)
         Room.setFactory {
             when (it) {
@@ -39,24 +44,42 @@ open class App : Application() {
     }
 
     override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base)
+        // Basic setup
         if (BuildConfig.DEBUG)
             MultiDex.install(base)
         Timber.plant(Timber.DebugTree())
 
+        // Some context magic
+        val app: Application
+        val impl: Context
+        if (base is Application) {
+            app = base
+            impl = base.baseContext
+        } else {
+            app = this
+            impl = base
+        }
+        val wrapped = impl.wrap()
+        super.attachBaseContext(wrapped)
+
+        // Normal startup
         startKoin {
-            androidContext(this@App)
+            androidContext(wrapped)
             modules(koinModules)
         }
+        ResourceMgr.init(impl)
+        app.registerActivityLifecycleCallbacks(get<ActivityTracker>())
+        WorkManager.initialize(impl.wrapJob(), androidx.work.Configuration.Builder().build())
+    }
 
-        registerActivityLifecycleCallbacks(get<ActivityTracker>())
-
-        Networking.init(base)
-        LocaleManager.setLocale(this)
+    // This is required as some platforms expect ContextImpl
+    override fun getBaseContext(): Context {
+        return super.getBaseContext().unwrap()
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        LocaleManager.setLocale(this)
+        resources.updateConfig(newConfig)
+        if (!isRunningAsStub)
+            super.onConfigurationChanged(newConfig)
     }
 }

app/src/main/java/com/topjohnwu/magisk/ClassMap.kt

@@ -1,26 +0,0 @@
-package com.topjohnwu.magisk
-
-import com.topjohnwu.magisk.model.download.DownloadService
-import com.topjohnwu.magisk.model.receiver.GeneralReceiver
-import com.topjohnwu.magisk.model.update.UpdateCheckService
-import com.topjohnwu.magisk.ui.MainActivity
-import com.topjohnwu.magisk.ui.SplashActivity
-import com.topjohnwu.magisk.ui.flash.FlashActivity
-import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
-
-object ClassMap {
-    private val map = mapOf(
-        App::class.java to a.e::class.java,
-        MainActivity::class.java to a.b::class.java,
-        SplashActivity::class.java to a.c::class.java,
-        FlashActivity::class.java to a.f::class.java,
-        UpdateCheckService::class.java to a.g::class.java,
-        GeneralReceiver::class.java to a.h::class.java,
-        DownloadService::class.java to a.j::class.java,
-        SuRequestActivity::class.java to a.m::class.java
-    )
-
-    operator fun <T : Class<*>>get(c: Class<*>): T {
-        return map.getOrElse(c) { throw IllegalArgumentException() } as T
-    }
-}

app/src/main/java/com/topjohnwu/magisk/Config.kt

@@ -32,8 +32,9 @@ object Config : PreferenceModel, DBConfig {
         const val ROOT_ACCESS = "root_access"
         const val SU_MULTIUSER_MODE = "multiuser_mode"
         const val SU_MNT_NS = "mnt_ns"
-        const val SU_MANAGER = "requester"
         const val SU_FINGERPRINT = "su_fingerprint"
+        const val SU_MANAGER = "requester"
+        const val KEYSTORE = "keystore"
 
         // prefs
         const val SU_REQUEST_TIMEOUT = "su_request_timeout"
@@ -97,7 +98,12 @@ object Config : PreferenceModel, DBConfig {
     }
 
     private val defaultChannel =
-        if (Utils.isCanary) Value.CANARY_DEBUG_CHANNEL
+        if (Utils.isCanary) {
+            if (BuildConfig.DEBUG)
+                Value.CANARY_DEBUG_CHANNEL
+            else
+                Value.CANARY_CHANNEL
+        }
         else Value.DEFAULT_CHANNEL
 
     var downloadPath by preference(Key.DOWNLOAD_PATH, Environment.DIRECTORY_DOWNLOADS)
@@ -123,6 +129,7 @@ object Config : PreferenceModel, DBConfig {
     var suMultiuserMode by dbSettings(Key.SU_MULTIUSER_MODE, Value.MULTIUSER_MODE_OWNER_ONLY)
     var suFingerprint by dbSettings(Key.SU_FINGERPRINT, false)
     var suManager by dbStrings(Key.SU_MANAGER, "", true)
+    var keyStoreRaw by dbStrings(Key.KEYSTORE, "", true)
 
     // Always return a path in external storage where we can write
     val downloadDirectory get() =
@@ -131,9 +138,6 @@ object Config : PreferenceModel, DBConfig {
     fun initialize() = prefs.edit {
         parsePrefs(this)
 
-        if (!prefs.contains(Key.UPDATE_CHANNEL))
-            putString(Key.UPDATE_CHANNEL, defaultChannel.toString())
-
         // Get actual state
         putBoolean(Key.COREONLY, Const.MAGISK_DISABLE_FILE.exists())
 
@@ -142,6 +146,9 @@ object Config : PreferenceModel, DBConfig {
         putString(Key.SU_MNT_NS, suMntNamespaceMode.toString())
         putString(Key.SU_MULTIUSER_MODE, suMultiuserMode.toString())
         putBoolean(Key.SU_FINGERPRINT, FingerprintHelper.useFingerprint())
+    }.also {
+        if (!prefs.contains(Key.UPDATE_CHANNEL))
+            prefs.edit().putString(Key.UPDATE_CHANNEL, defaultChannel.toString()).apply()
     }
 
     private fun parsePrefs(editor: SharedPreferences.Editor) = editor.apply {
@@ -205,4 +212,4 @@ object Config : PreferenceModel, DBConfig {
         Shell.su("cat $xml > /data/adb/${Const.MANAGER_CONFIGS}").exec()
     }
 
-}
+}

app/src/main/java/com/topjohnwu/magisk/Const.kt

@@ -13,8 +13,8 @@ object Const {
 
     // Versions
     const val SNET_EXT_VER = 13
-    const val SNET_REVISION = "5adbc435ce93ded953c30ebe587edfd50b5503bc"
-    const val BOOTCTL_REVISION = "9c5dfc1b8245c0b5b524901ef0ff0f8335757b77"
+    const val SNET_REVISION = "a6c47f86f10b310358afa9dbe837037dd5d561df"
+    const val BOOTCTL_REVISION = "a6c47f86f10b310358afa9dbe837037dd5d561df"
 
     // Misc
     const val ANDROID_MANIFEST = "AndroidManifest.xml"
@@ -22,8 +22,9 @@ object Const {
     const val MANAGER_CONFIGS = ".tmp.magisk.config"
     val USER_ID = Process.myUid() / 100000
 
-    object MagiskVersion {
+    object Version {
         const val MIN_SUPPORT = 18000
+        const val CONNECT_MODE = 20002
     }
 
     object ID {

app/src/main/java/com/topjohnwu/magisk/Hacks.kt

@@ -0,0 +1,199 @@
+@file:Suppress("DEPRECATION")
+
+package com.topjohnwu.magisk
+
+import android.annotation.SuppressLint
+import android.app.job.JobInfo
+import android.app.job.JobScheduler
+import android.app.job.JobWorkItem
+import android.content.ComponentName
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
+import android.content.res.AssetManager
+import android.content.res.Configuration
+import android.content.res.Resources
+import androidx.annotation.RequiresApi
+import androidx.annotation.StringRes
+import com.topjohnwu.magisk.extensions.langTagToLocale
+import com.topjohnwu.magisk.model.download.DownloadService
+import com.topjohnwu.magisk.model.receiver.GeneralReceiver
+import com.topjohnwu.magisk.model.update.UpdateCheckService
+import com.topjohnwu.magisk.ui.MainActivity
+import com.topjohnwu.magisk.ui.SplashActivity
+import com.topjohnwu.magisk.ui.flash.FlashActivity
+import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
+import com.topjohnwu.magisk.utils.currentLocale
+import com.topjohnwu.magisk.utils.defaultLocale
+import com.topjohnwu.magisk.utils.refreshLocale
+import com.topjohnwu.magisk.utils.updateConfig
+import java.util.*
+
+fun AssetManager.addAssetPath(path: String) {
+    DynAPK.addAssetPath(this, path)
+}
+
+fun Context.wrap(global: Boolean = true): Context
+        = if (global) GlobalResContext(this) else ResContext(this)
+
+fun Context.wrapJob(): Context = object : GlobalResContext(this) {
+
+    override fun getApplicationContext(): Context {
+        return this
+    }
+
+    @SuppressLint("NewApi")
+    override fun getSystemService(name: String): Any? {
+        return if (!isRunningAsStub) super.getSystemService(name) else
+            when (name) {
+                Context.JOB_SCHEDULER_SERVICE ->
+                    JobSchedulerWrapper(super.getSystemService(name) as JobScheduler)
+                else -> super.getSystemService(name)
+            }
+    }
+}
+
+fun Class<*>.cmp(pkg: String = BuildConfig.APPLICATION_ID): ComponentName {
+    val name = ClassMap[this].name
+    return ComponentName(pkg, Info.stub?.componentMap?.get(name) ?: name)
+}
+
+fun Context.intent(c: Class<*>): Intent {
+    val cls = ClassMap[c]
+    return Info.stub?.let {
+        val className = it.componentMap.getOrElse(cls.name) { cls.name }
+        Intent().setComponent(ComponentName(this, className))
+    } ?: Intent(this, cls)
+}
+
+private open class GlobalResContext(base: Context) : ContextWrapper(base) {
+    open val mRes: Resources get() = ResourceMgr.resource
+    private val loader by lazy { javaClass.classLoader!! }
+
+    override fun getResources(): Resources {
+        return mRes
+    }
+
+    override fun getClassLoader(): ClassLoader {
+        return loader
+    }
+
+    override fun createConfigurationContext(config: Configuration): Context {
+        return ResContext(super.createConfigurationContext(config))
+    }
+}
+
+private class ResContext(base: Context) : GlobalResContext(base) {
+    override val mRes by lazy { base.resources.patch() }
+
+    private fun Resources.patch(): Resources {
+        updateConfig()
+        if (isRunningAsStub)
+            assets.addAssetPath(ResourceMgr.resApk)
+        return this
+    }
+}
+
+object ResourceMgr {
+
+    lateinit var resource: Resources
+    lateinit var resApk: String
+
+    fun init(context: Context) {
+        resource = context.resources
+        refreshLocale()
+        if (isRunningAsStub) {
+            resApk = DynAPK.current(context).path
+            resource.assets.addAssetPath(resApk)
+        }
+    }
+}
+
+@RequiresApi(api = 28)
+private class JobSchedulerWrapper(private val base: JobScheduler) : JobScheduler() {
+
+    override fun schedule(job: JobInfo): Int {
+        return base.schedule(job.patch())
+    }
+
+    override fun enqueue(job: JobInfo, work: JobWorkItem): Int {
+        return base.enqueue(job.patch(), work)
+    }
+
+    override fun cancel(jobId: Int) {
+        base.cancel(jobId)
+    }
+
+    override fun cancelAll() {
+        base.cancelAll()
+    }
+
+    override fun getAllPendingJobs(): List<JobInfo> {
+        return base.allPendingJobs
+    }
+
+    override fun getPendingJob(jobId: Int): JobInfo? {
+        return base.getPendingJob(jobId)
+    }
+
+    private fun JobInfo.patch(): JobInfo {
+        // We need to patch the component of JobInfo to access WorkManager SystemJobService
+
+        val name = service.className
+        val component = ComponentName(
+            service.packageName,
+            Info.stub!!.componentMap[name] ?: name)
+
+        // Clone the JobInfo except component
+        val builder = JobInfo.Builder(id, component)
+            .setExtras(extras)
+            .setTransientExtras(transientExtras)
+            .setClipData(clipData, clipGrantFlags)
+            .setRequiredNetwork(requiredNetwork)
+            .setEstimatedNetworkBytes(estimatedNetworkDownloadBytes, estimatedNetworkUploadBytes)
+            .setRequiresCharging(isRequireCharging)
+            .setRequiresDeviceIdle(isRequireDeviceIdle)
+            .setRequiresBatteryNotLow(isRequireBatteryNotLow)
+            .setRequiresStorageNotLow(isRequireStorageNotLow)
+            .also {
+                triggerContentUris?.let { uris ->
+                    for (uri in uris)
+                        it.addTriggerContentUri(uri)
+                }
+            }
+            .setTriggerContentUpdateDelay(triggerContentUpdateDelay)
+            .setTriggerContentMaxDelay(triggerContentMaxDelay)
+            .setImportantWhileForeground(isImportantWhileForeground)
+            .setPrefetch(isPrefetch)
+            .setPersisted(isPersisted)
+
+        if (isPeriodic) {
+            builder.setPeriodic(intervalMillis, flexMillis)
+        } else {
+            if (minLatencyMillis > 0)
+                builder.setMinimumLatency(minLatencyMillis)
+            if (maxExecutionDelayMillis > 0)
+                builder.setOverrideDeadline(maxExecutionDelayMillis)
+        }
+        if (!isRequireDeviceIdle)
+            builder.setBackoffCriteria(initialBackoffMillis, backoffPolicy)
+
+        return builder.build()
+    }
+}
+
+object ClassMap {
+
+    private val map = mapOf(
+        App::class.java to a.e::class.java,
+        MainActivity::class.java to a.b::class.java,
+        SplashActivity::class.java to a.c::class.java,
+        FlashActivity::class.java to a.f::class.java,
+        UpdateCheckService::class.java to a.g::class.java,
+        GeneralReceiver::class.java to a.h::class.java,
+        DownloadService::class.java to a.j::class.java,
+        SuRequestActivity::class.java to a.m::class.java
+    )
+
+    operator fun get(c: Class<*>) = map.getOrElse(c) { throw IllegalArgumentException() }
+}

app/src/main/java/com/topjohnwu/magisk/Info.kt

@@ -1,26 +1,62 @@
 package com.topjohnwu.magisk
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.topjohnwu.magisk.extensions.get
+import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.model.entity.UpdateInfo
+import com.topjohnwu.magisk.utils.CachedValue
+import com.topjohnwu.magisk.utils.KObservableField
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils
 
+val isRunningAsStub get() = Info.stub != null
+
 object Info {
 
-    var magiskVersionCode = -1
+    val envRef = CachedValue { loadState() }
 
-    var magiskVersionString = ""
-
-    var remote = UpdateInfo()
+    val env by envRef              // Local
+    var remote = UpdateInfo()      // Remote
+    var stub: DynAPK.Data? = null  // Stub
 
     var keepVerity = false
     var keepEnc = false
     var recovery = false
 
-    fun loadMagiskInfo() {
-        runCatching {
-            magiskVersionString = ShellUtils.fastCmd("magisk -v").split(":".toRegex())[0]
-            magiskVersionCode = ShellUtils.fastCmd("magisk -V").toInt()
-            Config.magiskHide = Shell.su("magiskhide --status").exec().isSuccess
+    val isConnected by lazy {
+        KObservableField(false).also { field ->
+            ReactiveNetwork.observeNetworkConnectivity(get())
+                .subscribeK {
+                    field.value = it.available()
+                }
+        }
+    }
+
+    private fun loadState() = runCatching {
+        val str = ShellUtils.fastCmd("magisk -v").split(":".toRegex())[0]
+        val code = ShellUtils.fastCmd("magisk -V").toInt()
+        val hide = Shell.su("magiskhide --status").exec().isSuccess
+        var mode = -1
+        if (code >= Const.Version.CONNECT_MODE) {
+            mode = Shell.su("magisk --connect-mode").exec().code
+            if (mode == 0) {
+                // Manually trigger broadcast test
+                Shell.su("magisk --broadcast-test").exec()
+            }
+        }
+        Env(code, str, hide, mode)
+    }.getOrElse { Env() }
+
+    class Env(
+        val magiskVersionCode: Int = -1,
+        val magiskVersionString: String = "",
+        hide: Boolean = false,
+        var connectionMode: Int = -1
+    ) {
+        val magiskHide get() = Config.magiskHide
+
+        init {
+            Config.magiskHide = hide
         }
     }
 }

app/src/main/java/com/topjohnwu/magisk/base/BaseActivity.kt

@@ -0,0 +1,124 @@
+package com.topjohnwu.magisk.base
+
+import android.Manifest
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.res.Configuration
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.collection.SparseArrayCompat
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
+import com.topjohnwu.magisk.extensions.set
+import com.topjohnwu.magisk.model.events.EventHandler
+import com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder
+import com.topjohnwu.magisk.utils.currentLocale
+import com.topjohnwu.magisk.wrap
+import kotlin.random.Random
+
+typealias RequestCallback = BaseActivity<*, *>.(Int, Intent?) -> Unit
+
+abstract class BaseActivity<ViewModel : BaseViewModel, Binding : ViewDataBinding> :
+        AppCompatActivity(), EventHandler {
+
+    protected lateinit var binding: Binding
+    protected abstract val layoutRes: Int
+    protected abstract val viewModel: ViewModel
+    protected open val themeRes: Int = R.style.MagiskTheme
+    protected open val snackbarView get() = binding.root
+
+    private val resultCallbacks by lazy { SparseArrayCompat<RequestCallback>() }
+
+    init {
+        val theme = if (Config.darkTheme) {
+            AppCompatDelegate.MODE_NIGHT_YES
+        } else {
+            AppCompatDelegate.MODE_NIGHT_NO
+        }
+        AppCompatDelegate.setDefaultNightMode(theme)
+    }
+
+    override fun applyOverrideConfiguration(config: Configuration?) {
+        // Force applying our preferred local
+        config?.setLocale(currentLocale)
+        super.applyOverrideConfiguration(config)
+    }
+
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base.wrap(false))
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setTheme(themeRes)
+        super.onCreate(savedInstanceState)
+
+        viewModel.viewEvents.observe(this, viewEventObserver)
+
+        binding = DataBindingUtil.setContentView<Binding>(this, layoutRes).apply {
+            setVariable(BR.viewModel, viewModel)
+            lifecycleOwner = this@BaseActivity
+        }
+    }
+
+    fun withPermissions(vararg permissions: String, builder: PermissionRequestBuilder.() -> Unit) {
+        val request = PermissionRequestBuilder().apply(builder).build()
+        val ungranted = permissions.filter {
+            ContextCompat.checkSelfPermission(this, it) != PackageManager.PERMISSION_GRANTED
+        }
+
+        if (ungranted.isEmpty()) {
+            request.onSuccess()
+        } else {
+            val requestCode = Random.nextInt(256, 512)
+            resultCallbacks[requestCode] =  { result, _ ->
+                if (result > 0)
+                    request.onSuccess()
+                else
+                    request.onFailure()
+            }
+            ActivityCompat.requestPermissions(this, ungranted.toTypedArray(), requestCode)
+        }
+    }
+
+    fun withExternalRW(builder: PermissionRequestBuilder.() -> Unit) {
+        withPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, builder = builder)
+    }
+
+    override fun onRequestPermissionsResult(
+            requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        var success = true
+        for (res in grantResults) {
+            if (res != PackageManager.PERMISSION_GRANTED) {
+                success = false
+                break
+            }
+        }
+        resultCallbacks[requestCode]?.apply {
+            resultCallbacks.remove(requestCode)
+            invoke(this@BaseActivity, if (success) 1 else -1, null)
+        }
+
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        resultCallbacks[requestCode]?.apply {
+            resultCallbacks.remove(requestCode)
+            invoke(this@BaseActivity, resultCode, data)
+        }
+    }
+
+    fun startActivityForResult(intent: Intent, requestCode: Int, listener: RequestCallback) {
+        resultCallbacks[requestCode] = listener
+        startActivityForResult(intent, requestCode)
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/base/BaseFragment.kt

@@ -0,0 +1,50 @@
+package com.topjohnwu.magisk.base
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.CallSuper
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import androidx.fragment.app.Fragment
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
+import com.topjohnwu.magisk.model.events.EventHandler
+import com.topjohnwu.magisk.model.events.ViewEvent
+
+abstract class BaseFragment<ViewModel : BaseViewModel, Binding : ViewDataBinding> :
+    Fragment(), EventHandler {
+
+    protected val activity get() = requireActivity() as BaseActivity<*, *>
+    protected lateinit var binding: Binding
+    protected abstract val layoutRes: Int
+    protected abstract val viewModel: ViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        viewModel.viewEvents.observe(this, viewEventObserver)
+    }
+
+    override fun onCreateView(
+            inflater: LayoutInflater,
+            container: ViewGroup?,
+            savedInstanceState: Bundle?
+    ): View? {
+        binding = DataBindingUtil.inflate<Binding>(inflater, layoutRes, container, false).apply {
+            setVariable(BR.viewModel, viewModel)
+            lifecycleOwner = this@BaseFragment
+        }
+
+        return binding.root
+    }
+
+    @CallSuper
+    override fun onEventDispatched(event: ViewEvent) {
+        super.onEventDispatched(event)
+        activity.onEventDispatched(event)
+    }
+
+    open fun onBackPressed(): Boolean = false
+
+}

app/src/main/java/com/topjohnwu/magisk/base/BasePreferenceFragment.kt

@@ -0,0 +1,56 @@
+package com.topjohnwu.magisk.base
+
+import android.annotation.SuppressLint
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.preference.*
+import androidx.recyclerview.widget.RecyclerView
+import org.koin.android.ext.android.inject
+
+abstract class BasePreferenceFragment : PreferenceFragmentCompat(),
+    SharedPreferences.OnSharedPreferenceChangeListener {
+
+    protected val prefs: SharedPreferences by inject()
+    protected val activity get() = requireActivity() as BaseActivity<*, *>
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val v = super.onCreateView(inflater, container, savedInstanceState)
+        prefs.registerOnSharedPreferenceChangeListener(this)
+        return v
+    }
+
+    override fun onDestroyView() {
+        prefs.unregisterOnSharedPreferenceChangeListener(this)
+        super.onDestroyView()
+    }
+
+    private fun setAllPreferencesToAvoidHavingExtraSpace(preference: Preference) {
+        preference.isIconSpaceReserved = false
+        if (preference is PreferenceGroup)
+            for (i in 0 until preference.preferenceCount)
+                setAllPreferencesToAvoidHavingExtraSpace(preference.getPreference(i))
+    }
+
+    override fun setPreferenceScreen(preferenceScreen: PreferenceScreen?) {
+        if (preferenceScreen != null)
+            setAllPreferencesToAvoidHavingExtraSpace(preferenceScreen)
+        super.setPreferenceScreen(preferenceScreen)
+    }
+
+    override fun onCreateAdapter(preferenceScreen: PreferenceScreen?): RecyclerView.Adapter<*> =
+            object : PreferenceGroupAdapter(preferenceScreen) {
+                @SuppressLint("RestrictedApi")
+                override fun onPreferenceHierarchyChange(preference: Preference?) {
+                    if (preference != null)
+                        setAllPreferencesToAvoidHavingExtraSpace(preference)
+                    super.onPreferenceHierarchyChange(preference)
+                }
+            }
+}

app/src/main/java/com/topjohnwu/magisk/base/BaseReceiver.kt

@@ -0,0 +1,17 @@
+package com.topjohnwu.magisk.base
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
+import com.topjohnwu.magisk.wrap
+import org.koin.core.KoinComponent
+
+abstract class BaseReceiver : BroadcastReceiver(), KoinComponent {
+
+    final override fun onReceive(context: Context, intent: Intent?) {
+        onReceive(context.wrap() as ContextWrapper, intent)
+    }
+
+    abstract fun onReceive(context: ContextWrapper, intent: Intent?)
+}

app/src/main/java/com/topjohnwu/magisk/base/BaseService.kt

@@ -0,0 +1,12 @@
+package com.topjohnwu.magisk.base
+
+import android.app.Service
+import android.content.Context
+import com.topjohnwu.magisk.wrap
+import org.koin.core.KoinComponent
+
+abstract class BaseService : Service(), KoinComponent {
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base.wrap())
+    }
+}

app/src/main/java/com/topjohnwu/magisk/base/DelegateWorker.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.model.worker
+package com.topjohnwu.magisk.base
 
 import android.content.Context
 import android.net.Network

app/src/main/java/com/topjohnwu/magisk/base/viewmodel/BaseViewModel.kt

@@ -1,29 +1,24 @@
-package com.topjohnwu.magisk.ui.base
+package com.topjohnwu.magisk.base.viewmodel
 
 import android.app.Activity
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.skoumal.teanity.extensions.doOnSubscribeUi
-import com.skoumal.teanity.extensions.subscribeK
-import com.skoumal.teanity.util.KObservableField
-import com.skoumal.teanity.viewmodel.LoadingViewModel
-import com.topjohnwu.magisk.extensions.get
+import com.topjohnwu.magisk.extensions.doOnSubscribeUi
 import com.topjohnwu.magisk.model.events.BackPressEvent
 import com.topjohnwu.magisk.model.events.PermissionEvent
 import com.topjohnwu.magisk.model.events.ViewActionEvent
+import com.topjohnwu.magisk.utils.KObservableField
 import io.reactivex.Observable
 import io.reactivex.subjects.PublishSubject
+import com.topjohnwu.magisk.Info.isConnected as gIsConnected
 
 
-abstract class MagiskViewModel(
+abstract class BaseViewModel(
     initialState: State = State.LOADING
 ) : LoadingViewModel(initialState) {
 
-    val isConnected = KObservableField(true)
-
-    init {
-        ReactiveNetwork.observeNetworkConnectivity(get())
-            .subscribeK { isConnected.value = it.available() }
-            .add()
+    val isConnected = object : KObservableField<Boolean>(gIsConnected.value, gIsConnected) {
+        override fun get(): Boolean {
+            return gIsConnected.value
+        }
     }
 
     fun withView(action: Activity.() -> Unit) {

app/src/main/java/com/topjohnwu/magisk/base/viewmodel/LoadingViewModel.kt

@@ -0,0 +1,78 @@
+package com.topjohnwu.magisk.base.viewmodel
+
+import androidx.databinding.Bindable
+import com.topjohnwu.magisk.BR
+import io.reactivex.*
+
+abstract class LoadingViewModel(defaultState: State = State.LOADING) :
+    StatefulViewModel<LoadingViewModel.State>(defaultState) {
+
+    val loading @Bindable get() = state == State.LOADING
+    val loaded @Bindable get() = state == State.LOADED
+    val loadingFailed @Bindable get() = state == State.LOADING_FAILED
+
+    @Deprecated(
+        "Direct access is recommended since 0.2. This access method will be removed in 1.0",
+        ReplaceWith("state = State.LOADING", "com.topjohnwu.magisk.base.viewmodel.LoadingViewModel.State"),
+        DeprecationLevel.WARNING
+    )
+    fun setLoading() {
+        state = State.LOADING
+    }
+
+    @Deprecated(
+        "Direct access is recommended since 0.2. This access method will be removed in 1.0",
+        ReplaceWith("state = State.LOADED", "com.topjohnwu.magisk.base.viewmodel.LoadingViewModel.State"),
+        DeprecationLevel.WARNING
+    )
+    fun setLoaded() {
+        state = State.LOADED
+    }
+
+    @Deprecated(
+        "Direct access is recommended since 0.2. This access method will be removed in 1.0",
+        ReplaceWith("state = State.LOADING_FAILED", "com.topjohnwu.magisk.base.viewmodel.LoadingViewModel.State"),
+        DeprecationLevel.WARNING
+    )
+    fun setLoadingFailed() {
+        state = State.LOADING_FAILED
+    }
+
+    override fun notifyStateChanged() {
+        notifyPropertyChanged(BR.loading)
+        notifyPropertyChanged(BR.loaded)
+        notifyPropertyChanged(BR.loadingFailed)
+    }
+
+    enum class State {
+        LOADED, LOADING, LOADING_FAILED
+    }
+
+    //region Rx
+    protected fun <T> Observable<T>.applyViewModel(viewModel: LoadingViewModel, allowFinishing: Boolean = true) =
+        doOnSubscribe { viewModel.state = State.LOADING }
+            .doOnError { viewModel.state = State.LOADING_FAILED }
+            .doOnNext { if (allowFinishing) viewModel.state = State.LOADED }
+
+    protected fun <T> Single<T>.applyViewModel(viewModel: LoadingViewModel, allowFinishing: Boolean = true) =
+        doOnSubscribe { viewModel.state = State.LOADING }
+            .doOnError { viewModel.state = State.LOADING_FAILED }
+            .doOnSuccess { if (allowFinishing) viewModel.state = State.LOADED }
+
+    protected fun <T> Maybe<T>.applyViewModel(viewModel: LoadingViewModel, allowFinishing: Boolean = true) =
+        doOnSubscribe { viewModel.state = State.LOADING }
+            .doOnError { viewModel.state = State.LOADING_FAILED }
+            .doOnComplete { if (allowFinishing) viewModel.state = State.LOADED }
+            .doOnSuccess { if (allowFinishing) viewModel.state = State.LOADED }
+
+    protected fun <T> Flowable<T>.applyViewModel(viewModel: LoadingViewModel, allowFinishing: Boolean = true) =
+        doOnSubscribe { viewModel.state = State.LOADING }
+            .doOnError { viewModel.state = State.LOADING_FAILED }
+            .doOnNext { if (allowFinishing) viewModel.state = State.LOADED }
+
+    protected fun Completable.applyViewModel(viewModel: LoadingViewModel, allowFinishing: Boolean = true) =
+        doOnSubscribe { viewModel.state = State.LOADING }
+            .doOnError { viewModel.state = State.LOADING_FAILED }
+            .doOnComplete { if (allowFinishing) viewModel.state = State.LOADED }
+    //endregion
+}

app/src/main/java/com/topjohnwu/magisk/base/viewmodel/ObservableViewModel.kt

@@ -0,0 +1,46 @@
+package com.topjohnwu.magisk.base.viewmodel
+
+import androidx.databinding.Observable
+import androidx.databinding.PropertyChangeRegistry
+import androidx.lifecycle.ViewModel
+
+/**
+ * Copy of [android.databinding.BaseObservable] which extends [ViewModel]
+ */
+abstract class ObservableViewModel : TeanityViewModel(), Observable {
+
+    @Transient
+    private var callbacks: PropertyChangeRegistry? = null
+
+    @Synchronized
+    override fun addOnPropertyChangedCallback(callback: Observable.OnPropertyChangedCallback) {
+        if (callbacks == null) {
+            callbacks = PropertyChangeRegistry()
+        }
+        callbacks?.add(callback)
+    }
+
+    @Synchronized
+    override fun removeOnPropertyChangedCallback(callback: Observable.OnPropertyChangedCallback) {
+        callbacks?.remove(callback)
+    }
+
+    /**
+     * Notifies listeners that all properties of this instance have changed.
+     */
+    @Synchronized
+    fun notifyChange() {
+        callbacks?.notifyCallbacks(this, 0, null)
+    }
+
+    /**
+     * Notifies listeners that a specific property has changed. The getter for the property
+     * that changes should be marked with [android.databinding.Bindable] to generate a field in
+     * `BR` to be used as `fieldId`.
+     *
+     * @param fieldId The generated BR id for the Bindable field.
+     */
+    fun notifyPropertyChanged(fieldId: Int) {
+        callbacks?.notifyCallbacks(this, fieldId, null)
+    }
+}

app/src/main/java/com/topjohnwu/magisk/base/viewmodel/StatefulViewModel.kt

@@ -0,0 +1,15 @@
+package com.topjohnwu.magisk.base.viewmodel
+
+abstract class StatefulViewModel<State : Enum<*>>(
+    val defaultState: State
+) : ObservableViewModel() {
+
+    var state: State = defaultState
+        set(value) {
+            field = value
+            notifyStateChanged()
+        }
+
+    open fun notifyStateChanged() = Unit
+
+}

app/src/main/java/com/topjohnwu/magisk/base/viewmodel/TeanityViewModel.kt

@@ -0,0 +1,33 @@
+package com.topjohnwu.magisk.base.viewmodel
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.topjohnwu.magisk.model.events.SimpleViewEvent
+import com.topjohnwu.magisk.model.events.ViewEvent
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.disposables.Disposable
+
+abstract class TeanityViewModel : ViewModel() {
+
+    private val disposables = CompositeDisposable()
+    private val _viewEvents = MutableLiveData<ViewEvent>()
+    val viewEvents: LiveData<ViewEvent> get() = _viewEvents
+
+    override fun onCleared() {
+        super.onCleared()
+        disposables.clear()
+    }
+
+    fun <Event : ViewEvent> Event.publish() {
+        _viewEvents.value = this
+    }
+
+    fun Int.publish() {
+        _viewEvents.value = SimpleViewEvent(this)
+    }
+
+    fun Disposable.add() {
+        disposables.add(this)
+    }
+}

app/src/main/java/com/topjohnwu/magisk/data/network/GithubServices.kt

@@ -19,10 +19,10 @@ interface GithubRawServices {
     @GET("$MAGISK_FILES/master/beta.json")
     fun fetchBetaUpdate(): Single<UpdateInfo>
 
-    @GET("$MAGISK_FILES/master/canary_builds/release.json")
+    @GET("$MAGISK_FILES/canary/release.json")
     fun fetchCanaryUpdate(): Single<UpdateInfo>
 
-    @GET("$MAGISK_FILES/master/canary_builds/canary.json")
+    @GET("$MAGISK_FILES/canary/debug.json")
     fun fetchCanaryDebugUpdate(): Single<UpdateInfo>
 
     @GET

app/src/main/java/com/topjohnwu/magisk/data/repository/MagiskRepository.kt

@@ -29,7 +29,7 @@ class MagiskRepository(
         else -> throw IllegalArgumentException()
     }.flatMap {
         // If remote version is lower than current installed, try switching to beta
-        if (it.magisk.versionCode < Info.magiskVersionCode
+        if (it.magisk.versionCode < Info.env.magiskVersionCode
                 && Config.updateChannel == Config.Value.DEFAULT_CHANNEL) {
             Config.updateChannel = Config.Value.BETA_CHANNEL
             apiRaw.fetchBetaUpdate()
@@ -74,4 +74,4 @@ class MagiskRepository(
         ) }
     }
 
-}
+}

app/src/main/java/com/topjohnwu/magisk/databinding/AdaptersGeneric.kt

@@ -0,0 +1,26 @@
+package com.topjohnwu.magisk.databinding
+
+import android.view.View
+import androidx.core.view.isGone
+import androidx.core.view.isInvisible
+import androidx.databinding.BindingAdapter
+
+@BindingAdapter("gone")
+fun setGone(view: View, gone: Boolean) {
+    view.isGone = gone
+}
+
+@BindingAdapter("invisible")
+fun setInvisible(view: View, invisible: Boolean) {
+    view.isInvisible = invisible
+}
+
+@BindingAdapter("goneUnless")
+fun setGoneUnless(view: View, goneUnless: Boolean) {
+    setGone(view, goneUnless.not())
+}
+
+@BindingAdapter("invisibleUnless")
+fun setInvisibleUnless(view: View, invisibleUnless: Boolean) {
+    setInvisible(view, invisibleUnless.not())
+}

app/src/main/java/com/topjohnwu/magisk/databinding/AdaptersRecycler.kt

@@ -0,0 +1,57 @@
+package com.topjohnwu.magisk.databinding
+
+import android.graphics.drawable.GradientDrawable
+import android.graphics.drawable.InsetDrawable
+import androidx.databinding.BindingAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.topjohnwu.magisk.extensions.startEndToLeftRight
+import com.topjohnwu.magisk.extensions.toPx
+import com.topjohnwu.magisk.utils.KItemDecoration
+import kotlin.math.roundToInt
+
+@BindingAdapter(
+    "dividerColor",
+    "dividerHorizontal",
+    "dividerSize",
+    "dividerAfterLast",
+    "dividerMarginStart",
+    "dividerMarginEnd",
+    "dividerMarginTop",
+    "dividerMarginBottom",
+    requireAll = false
+)
+fun setDivider(
+    view: RecyclerView,
+    color: Int,
+    horizontal: Boolean,
+    _size: Float,
+    _afterLast: Boolean?,
+    marginStartF: Float,
+    marginEndF: Float,
+    marginTopF: Float,
+    marginBottomF: Float
+) {
+    val orientation = if (horizontal) RecyclerView.HORIZONTAL else RecyclerView.VERTICAL
+    val size = if (_size > 0) _size.roundToInt() else 1.toPx()
+    val (width, height) = if (horizontal) size to 1 else 1 to size
+    val afterLast = _afterLast ?: true
+
+    val marginStart = marginStartF.roundToInt()
+    val marginEnd = marginEndF.roundToInt()
+    val marginTop = marginTopF.roundToInt()
+    val marginBottom = marginBottomF.roundToInt()
+    val (marginLeft, marginRight) = view.context.startEndToLeftRight(marginStart, marginEnd)
+
+    val drawable = GradientDrawable().apply {
+        setSize(width, height)
+        shape = GradientDrawable.RECTANGLE
+        setColor(color)
+    }.let {
+        InsetDrawable(it, marginLeft, marginTop, marginRight, marginBottom)
+    }
+
+    val decoration = KItemDecoration(view.context, orientation)
+        .setDeco(drawable)
+        .apply { showAfterLast = afterLast }
+    view.addItemDecoration(decoration)
+}

app/src/main/java/com/topjohnwu/magisk/databinding/BindingBoundAdapter.kt

@@ -0,0 +1,13 @@
+package com.topjohnwu.magisk.databinding
+
+import androidx.databinding.ViewDataBinding
+import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
+
+open class BindingBoundAdapter : BindingRecyclerViewAdapter<RvItem>() {
+
+    override fun onBindBinding(binding: ViewDataBinding, variableId: Int, layoutRes: Int, position: Int, item: RvItem) {
+        super.onBindBinding(binding, variableId, layoutRes, position, item)
+
+        item.onBindingBound(binding)
+    }
+}

app/src/main/java/com/topjohnwu/magisk/databinding/RecyclerViewItems.kt

@@ -0,0 +1,48 @@
+package com.topjohnwu.magisk.databinding
+
+import androidx.annotation.CallSuper
+import androidx.databinding.ViewDataBinding
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.utils.DiffObservableList
+import me.tatarka.bindingcollectionadapter2.ItemBinding
+
+abstract class RvItem {
+
+    abstract val layoutRes: Int
+
+    @CallSuper
+    open fun bind(binding: ItemBinding<*>) {
+        binding.set(BR.item, layoutRes)
+    }
+
+    /**
+     * This callback is useful if you want to manipulate your views directly.
+     * If you want to use this callback, you must set [me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter]
+     * on your RecyclerView and call it from there. You can use [BindingBoundAdapter] for your convenience.
+     */
+    open fun onBindingBound(binding: ViewDataBinding) {}
+}
+
+abstract class ComparableRvItem<in T> : RvItem() {
+
+    abstract fun itemSameAs(other: T): Boolean
+    abstract fun contentSameAs(other: T): Boolean
+    @Suppress("UNCHECKED_CAST")
+    open fun genericItemSameAs(other: Any): Boolean = other::class == this::class && itemSameAs(other as T)
+    @Suppress("UNCHECKED_CAST")
+    open fun genericContentSameAs(other: Any): Boolean = other::class == this::class && contentSameAs(other as T)
+
+    companion object {
+        val callback = object : DiffObservableList.Callback<ComparableRvItem<*>> {
+            override fun areItemsTheSame(
+                oldItem: ComparableRvItem<*>,
+                newItem: ComparableRvItem<*>
+            ) = oldItem.genericItemSameAs(newItem)
+
+            override fun areContentsTheSame(
+                oldItem: ComparableRvItem<*>,
+                newItem: ComparableRvItem<*>
+            ) = oldItem.genericContentSameAs(newItem)
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/di/ApplicationModule.kt

@@ -7,7 +7,7 @@ import android.content.Context
 import android.os.Build
 import android.os.Bundle
 import androidx.preference.PreferenceManager
-import com.skoumal.teanity.rxbus.RxBus
+import com.topjohnwu.magisk.utils.RxBus
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 

app/src/main/java/com/topjohnwu/magisk/di/NetworkingModule.kt

@@ -1,11 +1,18 @@
 package com.topjohnwu.magisk.di
 
+import android.content.Context
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.data.network.GithubApiServices
 import com.topjohnwu.magisk.data.network.GithubRawServices
+import com.topjohnwu.magisk.net.Networking
+import com.topjohnwu.magisk.net.NoSSLv3SocketFactory
+import io.noties.markwon.Markwon
+import io.noties.markwon.html.HtmlPlugin
+import io.noties.markwon.image.ImagesPlugin
+import io.noties.markwon.image.network.OkHttpNetworkSchemeHandler
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.koin.dsl.module
@@ -16,14 +23,15 @@ import retrofit2.converter.scalars.ScalarsConverterFactory
 import se.ansman.kotshi.KotshiJsonAdapterFactory
 
 val networkingModule = module {
-    single { createOkHttpClient() }
-    single { createMoshiConverterFactory() }
-    single { createRetrofit(get(), get()) }
+    single { createOkHttpClient(get()) }
+    single { createRetrofit(get()) }
     single { createApiService<GithubRawServices>(get(), Const.Url.GITHUB_RAW_URL) }
     single { createApiService<GithubApiServices>(get(), Const.Url.GITHUB_API_URL) }
+    single { createMarkwon(get(), get()) }
 }
 
-fun createOkHttpClient(): OkHttpClient {
+@Suppress("DEPRECATION")
+fun createOkHttpClient(context: Context): OkHttpClient {
     val builder = OkHttpClient.Builder()
 
     if (BuildConfig.DEBUG) {
@@ -33,6 +41,10 @@ fun createOkHttpClient(): OkHttpClient {
         builder.addInterceptor(httpLoggingInterceptor)
     }
 
+    if (!Networking.init(context)) {
+        builder.sslSocketFactory(NoSSLv3SocketFactory())
+    }
+
     return builder.build()
 }
 
@@ -43,13 +55,10 @@ fun createMoshiConverterFactory(): MoshiConverterFactory {
     return MoshiConverterFactory.create(moshi)
 }
 
-fun createRetrofit(
-    okHttpClient: OkHttpClient,
-    converterFactory: MoshiConverterFactory
-): Retrofit.Builder {
+fun createRetrofit(okHttpClient: OkHttpClient): Retrofit.Builder {
     return Retrofit.Builder()
         .addConverterFactory(ScalarsConverterFactory.create())
-        .addConverterFactory(converterFactory)
+        .addConverterFactory(createMoshiConverterFactory())
         .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
         .client(okHttpClient)
 }
@@ -62,4 +71,13 @@ inline fun <reified T> createApiService(retrofitBuilder: Retrofit.Builder, baseU
         .baseUrl(baseUrl)
         .build()
         .create(T::class.java)
-}
+}
+
+fun createMarkwon(context: Context, okHttpClient: OkHttpClient): Markwon {
+    return Markwon.builder(context)
+            .usePlugin(HtmlPlugin.create())
+            .usePlugin(ImagesPlugin.create {
+                it.addSchemeHandler(OkHttpNetworkSchemeHandler.create(okHttpClient))
+            })
+            .build()
+}

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

@@ -0,0 +1,57 @@
+package com.topjohnwu.magisk.extensions
+
+import androidx.databinding.Observable
+import androidx.databinding.ObservableBoolean
+import androidx.databinding.ObservableField
+import androidx.databinding.ObservableInt
+
+fun <T> ObservableField<T>.addOnPropertyChangedCallback(
+    removeAfterChanged: Boolean = false,
+    callback: (T?) -> Unit
+) {
+    addOnPropertyChangedCallback(object : Observable.OnPropertyChangedCallback() {
+        override fun onPropertyChanged(sender: Observable?, propertyId: Int) {
+            callback(get())
+            if (removeAfterChanged) removeOnPropertyChangedCallback(this)
+        }
+    })
+}
+
+fun ObservableInt.addOnPropertyChangedCallback(
+    removeAfterChanged: Boolean = false,
+    callback: (Int) -> Unit
+) {
+    addOnPropertyChangedCallback(object : Observable.OnPropertyChangedCallback() {
+        override fun onPropertyChanged(sender: Observable?, propertyId: Int) {
+            callback(get())
+            if (removeAfterChanged) removeOnPropertyChangedCallback(this)
+        }
+    })
+}
+
+fun ObservableBoolean.addOnPropertyChangedCallback(
+    removeAfterChanged: Boolean = false,
+    callback: (Boolean) -> Unit
+) {
+    addOnPropertyChangedCallback(object : Observable.OnPropertyChangedCallback() {
+        override fun onPropertyChanged(sender: Observable?, propertyId: Int) {
+            callback(get())
+            if (removeAfterChanged) removeOnPropertyChangedCallback(this)
+        }
+    })
+}
+
+inline fun <T> ObservableField<T>.update(block: (T?) -> Unit) {
+    set(get().apply(block))
+}
+
+inline fun <T> ObservableField<T>.updateNonNull(block: (T) -> Unit) {
+    update {
+        it ?: return@update
+        block(it)
+    }
+}
+
+inline fun ObservableInt.update(block: (Int) -> Unit) {
+    set(get().apply(block))
+}

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

@@ -0,0 +1,9 @@
+package com.topjohnwu.magisk.extensions
+
+import android.content.res.Resources
+import kotlin.math.ceil
+import kotlin.math.roundToInt
+
+fun Int.toDp(): Int = ceil(this / Resources.getSystem().displayMetrics.density).roundToInt()
+
+fun Int.toPx(): Int = (this * Resources.getSystem().displayMetrics.density).roundToInt()

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

@@ -0,0 +1,6 @@
+package com.topjohnwu.magisk.extensions
+
+import android.os.Handler
+import android.os.Looper
+
+fun ui(body: () -> Unit) = Handler(Looper.getMainLooper()).post(body)

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

@@ -0,0 +1,201 @@
+package com.topjohnwu.magisk.extensions
+
+import androidx.databinding.ObservableField
+import com.topjohnwu.magisk.utils.KObservableField
+import io.reactivex.*
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.Disposables
+import io.reactivex.functions.BiFunction
+import io.reactivex.schedulers.Schedulers
+import androidx.databinding.Observable as BindingObservable
+
+fun <T> Observable<T>.applySchedulers(
+    subscribeOn: Scheduler = Schedulers.io(),
+    observeOn: Scheduler = AndroidSchedulers.mainThread()
+): Observable<T> = this.subscribeOn(subscribeOn).observeOn(observeOn)
+
+fun <T> Flowable<T>.applySchedulers(
+    subscribeOn: Scheduler = Schedulers.io(),
+    observeOn: Scheduler = AndroidSchedulers.mainThread()
+): Flowable<T> = this.subscribeOn(subscribeOn).observeOn(observeOn)
+
+fun <T> Single<T>.applySchedulers(
+    subscribeOn: Scheduler = Schedulers.io(),
+    observeOn: Scheduler = AndroidSchedulers.mainThread()
+): Single<T> = this.subscribeOn(subscribeOn).observeOn(observeOn)
+
+fun <T> Maybe<T>.applySchedulers(
+    subscribeOn: Scheduler = Schedulers.io(),
+    observeOn: Scheduler = AndroidSchedulers.mainThread()
+): Maybe<T> = this.subscribeOn(subscribeOn).observeOn(observeOn)
+
+fun Completable.applySchedulers(
+    subscribeOn: Scheduler = Schedulers.io(),
+    observeOn: Scheduler = AndroidSchedulers.mainThread()
+): Completable = this.subscribeOn(subscribeOn).observeOn(observeOn)
+
+/*=== ALIASES FOR OBSERVABLES ===*/
+
+typealias OnCompleteListener = () -> Unit
+typealias OnSuccessListener<T> = (T) -> Unit
+typealias OnErrorListener = (Throwable) -> Unit
+
+/*=== ALIASES FOR OBSERVABLES ===*/
+
+fun <T> Observable<T>.subscribeK(
+        onError: OnErrorListener = { it.printStackTrace() },
+        onComplete: OnCompleteListener = {},
+        onNext: OnSuccessListener<T> = {}
+) = applySchedulers()
+    .subscribe(onNext, onError, onComplete)
+
+fun <T> Single<T>.subscribeK(
+        onError: OnErrorListener = { it.printStackTrace() },
+        onNext: OnSuccessListener<T> = {}
+) = applySchedulers()
+    .subscribe(onNext, onError)
+
+fun <T> Maybe<T>.subscribeK(
+        onError: OnErrorListener = { it.printStackTrace() },
+        onComplete: OnCompleteListener = {},
+        onNext: OnSuccessListener<T> = {}
+) = applySchedulers()
+    .subscribe(onNext, onError, onComplete)
+
+fun <T> Flowable<T>.subscribeK(
+        onError: OnErrorListener = { it.printStackTrace() },
+        onComplete: OnCompleteListener = {},
+        onNext: OnSuccessListener<T> = {}
+) = applySchedulers()
+    .subscribe(onNext, onError, onComplete)
+
+fun Completable.subscribeK(
+        onError: OnErrorListener = { it.printStackTrace() },
+        onComplete: OnCompleteListener = {}
+) = applySchedulers()
+    .subscribe(onComplete, onError)
+
+
+fun <T> Observable<out T>.updateBy(
+    field: KObservableField<T?>
+) = doOnNextUi { field.value = it }
+    .doOnErrorUi { field.value = null }
+
+fun <T> Single<out T>.updateBy(
+    field: KObservableField<T?>
+) = doOnSuccessUi { field.value = it }
+    .doOnErrorUi { field.value = null }
+
+fun <T> Maybe<out T>.updateBy(
+    field: KObservableField<T?>
+) = doOnSuccessUi { field.value = it }
+    .doOnErrorUi { field.value = null }
+    .doOnComplete { field.value = field.value }
+
+fun <T> Flowable<out T>.updateBy(
+    field: KObservableField<T?>
+) = doOnNextUi { field.value = it }
+    .doOnErrorUi { field.value = null }
+
+fun Completable.updateBy(
+    field: KObservableField<Boolean>
+) = doOnCompleteUi { field.value = true }
+    .doOnErrorUi { field.value = false }
+
+
+fun <T> Observable<T>.doOnSubscribeUi(body: () -> Unit) =
+    doOnSubscribe { ui { body() } }
+
+fun <T> Single<T>.doOnSubscribeUi(body: () -> Unit) =
+    doOnSubscribe { ui { body() } }
+
+fun <T> Maybe<T>.doOnSubscribeUi(body: () -> Unit) =
+    doOnSubscribe { ui { body() } }
+
+fun <T> Flowable<T>.doOnSubscribeUi(body: () -> Unit) =
+    doOnSubscribe { ui { body() } }
+
+fun Completable.doOnSubscribeUi(body: () -> Unit) =
+    doOnSubscribe { ui { body() } }
+
+
+fun <T> Observable<T>.doOnErrorUi(body: (Throwable) -> Unit) =
+    doOnError { ui { body(it) } }
+
+fun <T> Single<T>.doOnErrorUi(body: (Throwable) -> Unit) =
+    doOnError { ui { body(it) } }
+
+fun <T> Maybe<T>.doOnErrorUi(body: (Throwable) -> Unit) =
+    doOnError { ui { body(it) } }
+
+fun <T> Flowable<T>.doOnErrorUi(body: (Throwable) -> Unit) =
+    doOnError { ui { body(it) } }
+
+fun Completable.doOnErrorUi(body: (Throwable) -> Unit) =
+    doOnError { ui { body(it) } }
+
+
+fun <T> Observable<T>.doOnNextUi(body: (T) -> Unit) =
+    doOnNext { ui { body(it) } }
+
+fun <T> Flowable<T>.doOnNextUi(body: (T) -> Unit) =
+    doOnNext { ui { body(it) } }
+
+fun <T> Single<T>.doOnSuccessUi(body: (T) -> Unit) =
+    doOnSuccess { ui { body(it) } }
+
+fun <T> Maybe<T>.doOnSuccessUi(body: (T) -> Unit) =
+    doOnSuccess { ui { body(it) } }
+
+fun <T> Maybe<T>.doOnCompleteUi(body: () -> Unit) =
+    doOnComplete { ui { body() } }
+
+fun Completable.doOnCompleteUi(body: () -> Unit) =
+    doOnComplete { ui { body() } }
+
+
+fun <T, R> Observable<List<T>>.mapList(
+    transformer: (T) -> R
+) = flatMapIterable { it }
+    .map(transformer)
+    .toList()
+
+fun <T, R> Single<List<T>>.mapList(
+    transformer: (T) -> R
+) = flattenAsFlowable { it }
+    .map(transformer)
+    .toList()
+
+fun <T, R> Maybe<List<T>>.mapList(
+    transformer: (T) -> R
+) = flattenAsFlowable { it }
+    .map(transformer)
+    .toList()
+
+fun <T, R> Flowable<List<T>>.mapList(
+    transformer: (T) -> R
+) = flatMapIterable { it }
+    .map(transformer)
+    .toList()
+
+fun <T> ObservableField<T>.toObservable(): Observable<T> {
+    val observableField = this
+    return Observable.create { emitter ->
+        observableField.get()?.let { emitter.onNext(it) }
+
+        val callback = object : BindingObservable.OnPropertyChangedCallback() {
+            override fun onPropertyChanged(sender: BindingObservable?, propertyId: Int) {
+                observableField.get()?.let { emitter.onNext(it) }
+            }
+        }
+        observableField.addOnPropertyChangedCallback(callback)
+        emitter.setDisposable(Disposables.fromAction {
+            observableField.removeOnPropertyChangedCallback(callback)
+        })
+    }
+}
+
+fun <T : Any> T.toSingle() = Single.just(this)
+
+fun <T1, T2, R> zip(t1: Single<T1>, t2: Single<T2>, zipper: (T1, T2) -> R) =
+        Single.zip(t1, t2, BiFunction<T1, T2, R> { rt1, rt2 -> zipper(rt1, rt2) })

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

@@ -0,0 +1,126 @@
+package com.topjohnwu.magisk.extensions
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.view.View
+import android.widget.TextView
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.fragment.app.Fragment
+import com.google.android.material.snackbar.Snackbar
+
+fun AppCompatActivity.snackbar(
+    view: View,
+    @StringRes messageRes: Int,
+    length: Int = Snackbar.LENGTH_SHORT,
+    f: Snackbar.() -> Unit = {}
+) {
+    snackbar(view, getString(messageRes), length, f)
+}
+
+fun AppCompatActivity.snackbar(
+    view: View,
+    message: String,
+    length: Int = Snackbar.LENGTH_SHORT,
+    f: Snackbar.() -> Unit = {}
+) = Snackbar.make(view, message, length)
+    .apply(f)
+    .show()
+
+fun Fragment.snackbar(
+    view: View,
+    @StringRes messageRes: Int,
+    length: Int = Snackbar.LENGTH_SHORT,
+    f: Snackbar.() -> Unit = {}
+) {
+    snackbar(view, getString(messageRes), length, f)
+}
+
+fun Fragment.snackbar(
+    view: View,
+    message: String,
+    length: Int = Snackbar.LENGTH_SHORT,
+    f: Snackbar.() -> Unit = {}
+) = Snackbar.make(view, message, length)
+    .apply(f)
+    .show()
+
+fun Snackbar.action(init: KSnackbar.() -> Unit) = apply {
+    val config = KSnackbar().apply(init)
+
+    setAction(config.title(context), config.onClickListener)
+
+    when {
+        config.hasValidColor -> setActionTextColor(config.color(context) ?: return@apply)
+        config.hasValidColorStateList -> setActionTextColor(config.colorStateList(context) ?: return@apply)
+    }
+}
+
+class KSnackbar {
+    var colorRes: Int = -1
+    var colorStateListRes: Int = -1
+
+    var title: CharSequence = ""
+    var titleRes: Int = -1
+
+    internal var onClickListener: (View) -> Unit = {}
+    internal val hasValidColor get() = colorRes != -1
+    internal val hasValidColorStateList get() = colorStateListRes != -1
+
+    fun onClicked(listener: (View) -> Unit) {
+        onClickListener = listener
+    }
+
+    internal fun title(context: Context) = if (title.isBlank()) context.getString(titleRes) else title
+    internal fun colorStateList(context: Context) = context.colorStateListCompat(colorStateListRes)
+    internal fun color(context: Context) = context.colorCompat(colorRes)
+}
+
+@Deprecated("Kotlin DSL version is preferred", ReplaceWith("action {}"))
+fun Snackbar.action(
+    @StringRes actionRes: Int,
+    @ColorRes colorRes: Int? = null,
+    listener: (View) -> Unit
+) {
+    view.resources.getString(actionRes)
+    colorRes?.let { ContextCompat.getColor(view.context, colorRes) }
+    action {}
+}
+
+@Deprecated("Kotlin DSL version is preferred", ReplaceWith("action {}"))
+fun Snackbar.action(action: String, @ColorInt color: Int? = null, listener: (View) -> Unit) {
+    setAction(action, listener)
+    color?.let { setActionTextColor(color) }
+}
+
+fun Snackbar.textColorRes(@ColorRes colorRes: Int) {
+    textColor(context.colorCompat(colorRes) ?: return)
+}
+
+fun Snackbar.textColor(@ColorInt color: Int) {
+    val tv = view.findViewById<TextView>(com.google.android.material.R.id.snackbar_text)
+    tv.setTextColor(color)
+}
+
+fun Snackbar.backgroundColorRes(@ColorRes colorRes: Int) {
+    backgroundColor(context.colorCompat(colorRes) ?: return)
+}
+
+fun Snackbar.backgroundColor(@ColorInt color: Int) {
+    ViewCompat.setBackgroundTintList(
+        view,
+        ColorStateList.valueOf(color)
+    )
+}
+
+fun Snackbar.alert() {
+    textColor(0xF44336)
+}
+
+fun Snackbar.success() {
+    textColor(0x4CAF50)
+}

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

@@ -1,6 +1,8 @@
 package com.topjohnwu.magisk.extensions
 
+import android.content.ComponentName
 import android.content.Context
+import android.content.ContextWrapper
 import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.pm.ComponentInfo
@@ -8,13 +10,32 @@ import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.pm.PackageManager.*
 import android.content.res.Configuration
+import android.content.res.Resources
 import android.database.Cursor
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.AdaptiveIconDrawable
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.LayerDrawable
 import android.net.Uri
+import android.os.Build
+import android.os.Build.VERSION.SDK_INT
 import android.provider.OpenableColumns
-import com.topjohnwu.magisk.utils.FileProvider
+import android.view.View
+import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
+import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.FileProvider
+import com.topjohnwu.magisk.utils.DynamicClassLoader
+import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.utils.currentLocale
+import com.topjohnwu.superuser.Shell
 import java.io.File
 import java.io.FileNotFoundException
+import java.lang.reflect.Array as JArray
 
 val packageName: String get() = get<Context>().packageName
 
@@ -83,8 +104,129 @@ fun Context.rawResource(id: Int) = resources.openRawResource(id)
 fun Context.readUri(uri: Uri) =
     contentResolver.openInputStream(uri) ?: throw FileNotFoundException()
 
+fun Context.getBitmap(id: Int): Bitmap {
+    var drawable = AppCompatResources.getDrawable(this, id)!!
+    if (drawable is BitmapDrawable)
+        return drawable.bitmap
+    if (SDK_INT >= 26 && drawable is AdaptiveIconDrawable) {
+        drawable = LayerDrawable(arrayOf(drawable.background, drawable.foreground))
+    }
+    val bitmap = Bitmap.createBitmap(
+        drawable.intrinsicWidth, drawable.intrinsicHeight,
+        Bitmap.Config.ARGB_8888
+    )
+    val canvas = Canvas(bitmap)
+    drawable.setBounds(0, 0, canvas.width, canvas.height)
+    drawable.draw(canvas)
+    return bitmap
+}
+
 fun Intent.startActivity(context: Context) = context.startActivity(this)
 
+fun Intent.startActivityWithRoot() {
+    val args = mutableListOf("am", "start", "--user", Const.USER_ID.toString())
+    val cmd = toCommand(args).joinToString(" ")
+    Shell.su(cmd).submit()
+}
+
+fun Intent.toCommand(args: MutableList<String> = mutableListOf()): MutableList<String> {
+    action?.also {
+        args.add("-a")
+        args.add(it)
+    }
+    component?.also {
+        args.add("-n")
+        args.add(it.flattenToString())
+    }
+    data?.also {
+        args.add("-d")
+        args.add(it.toString())
+    }
+    categories?.also {
+        for (cat in it) {
+            args.add("-c")
+            args.add(cat)
+        }
+    }
+    type?.also {
+        args.add("-t")
+        args.add(it)
+    }
+    extras?.also {
+        loop@ for (key in it.keySet()) {
+            val v = it[key] ?: continue
+            var value: Any = v
+            val arg: String
+            when {
+                v is String -> arg = "--es"
+                v is Boolean -> arg = "--ez"
+                v is Int -> arg = "--ei"
+                v is Long -> arg = "--el"
+                v is Float -> arg = "--ef"
+                v is Uri -> arg = "--eu"
+                v is ComponentName -> {
+                    arg = "--ecn"
+                    value = v.flattenToString()
+                }
+                v is List<*> -> {
+                    if (v.isEmpty())
+                        continue@loop
+
+                    arg = if (v[0] is Int)
+                        "--eial"
+                    else if (v[0] is Long)
+                        "--elal"
+                    else if (v[0] is Float)
+                        "--efal"
+                    else if (v[0] is String)
+                        "--esal"
+                    else
+                        continue@loop  /* Unsupported */
+
+                    val sb = StringBuilder()
+                    for (o in v) {
+                        sb.append(o.toString().replace(",", "\\,"))
+                        sb.append(',')
+                    }
+                    // Remove trailing comma
+                    sb.deleteCharAt(sb.length - 1)
+                    value = sb
+                }
+                v.javaClass.isArray -> {
+                    arg = if (v is IntArray)
+                        "--eia"
+                    else if (v is LongArray)
+                        "--ela"
+                    else if (v is FloatArray)
+                        "--efa"
+                    else if (v is Array<*> && v.isArrayOf<String>())
+                        "--esa"
+                    else
+                        continue@loop  /* Unsupported */
+
+                    val sb = StringBuilder()
+                    val len = JArray.getLength(v)
+                    for (i in 0 until len) {
+                        sb.append(JArray.get(v, i)!!.toString().replace(",", "\\,"))
+                        sb.append(',')
+                    }
+                    // Remove trailing comma
+                    sb.deleteCharAt(sb.length - 1)
+                    value = sb
+                }
+                else -> continue@loop
+            }  /* Unsupported */
+
+            args.add(arg)
+            args.add(key)
+            args.add(value.toString())
+        }
+    }
+    args.add("-f")
+    args.add(flags.toString())
+    return args
+}
+
 fun File.provide(context: Context = get()): Uri {
     return FileProvider.getUriForFile(context, context.packageName + ".provider", this)
 }
@@ -119,3 +261,48 @@ fun ApplicationInfo.getLabel(pm: PackageManager): String {
 
     return loadLabel(pm).toString()
 }
+
+fun Intent.exists(packageManager: PackageManager) = resolveActivity(packageManager) != null
+
+fun Context.colorCompat(@ColorRes id: Int) = try {
+    ContextCompat.getColor(this, id)
+} catch (e: Resources.NotFoundException) {
+    null
+}
+
+fun Context.colorStateListCompat(@ColorRes id: Int) = try {
+    ContextCompat.getColorStateList(this, id)
+} catch (e: Resources.NotFoundException) {
+    null
+}
+
+fun Context.drawableCompat(@DrawableRes id: Int) = ContextCompat.getDrawable(this, id)
+/**
+ * Pass [start] and [end] dimensions, function will return left and right
+ * with respect to RTL layout direction
+ */
+fun Context.startEndToLeftRight(start: Int, end: Int): Pair<Int, Int> {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 &&
+        resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL
+    ) {
+        return end to start
+    }
+    return start to end
+}
+
+fun Context.openUrl(url: String) = Utils.openLink(this, url.toUri())
+
+@Suppress("FunctionName")
+inline fun <reified T> T.DynamicClassLoader(apk: File)
+        = DynamicClassLoader(apk, T::class.java.classLoader)
+
+fun Context.unwrap() : Context {
+    var context = this
+    while (true) {
+        if (context is ContextWrapper)
+            context = context.baseContext
+        else
+            break
+    }
+    return context
+}

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

@@ -1,6 +1,6 @@
 package com.topjohnwu.magisk.extensions
 
-import com.skoumal.teanity.util.KObservableField
+import com.topjohnwu.magisk.utils.KObservableField
 
 
 fun KObservableField<Boolean>.toggle() {

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

@@ -2,8 +2,7 @@ package com.topjohnwu.magisk.extensions
 
 import androidx.collection.SparseArrayCompat
 import androidx.databinding.ObservableList
-import com.skoumal.teanity.extensions.subscribeK
-import com.skoumal.teanity.util.DiffObservableList
+import com.topjohnwu.magisk.utils.DiffObservableList
 import io.reactivex.disposables.Disposable
 
 fun <T> MutableList<T>.update(newList: List<T>) {
@@ -26,8 +25,8 @@ fun List<String>.toShellCmd(): String {
 }
 
 fun <T1, T2> ObservableList<T1>.sendUpdatesTo(
-    target: DiffObservableList<T2>,
-    mapper: (List<T1>) -> List<T2>
+        target: DiffObservableList<T2>,
+        mapper: (List<T1>) -> List<T2>
 ) = addOnListChangedCallback(object :
     ObservableList.OnListChangedCallback<ObservableList<T1>>() {
     override fun onChanged(sender: ObservableList<T1>?) {

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

@@ -1,9 +0,0 @@
-package com.topjohnwu.magisk.extensions
-
-import io.reactivex.Single
-import io.reactivex.functions.BiFunction
-
-fun <T : Any> T.toSingle() = Single.just(this)
-
-fun <T1, T2, R> zip(t1: Single<T1>, t2: Single<T2>, zipper: (T1, T2) -> R) =
-    Single.zip(t1, t2, BiFunction<T1, T2, R> { rt1, rt2 -> zipper(rt1, rt2) })

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

@@ -25,3 +25,5 @@ fun String.trimEmptyToNull(): String? = if (isBlank()) null else this
 fun String.legalFilename() = replace(" ", "_").replace("'", "").replace("\"", "")
         .replace("$", "").replace("`", "").replace("*", "").replace("/", "_")
         .replace("#", "").replace("@", "").replace("\\", "_")
+
+fun String.isEmptyInternal() = isNullOrBlank()

app/src/main/java/com/topjohnwu/magisk/model/binding/BindingAdapter.kt

@@ -2,7 +2,7 @@ package com.topjohnwu.magisk.model.binding
 
 import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
-import com.skoumal.teanity.databinding.ComparableRvItem
+import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.model.entity.recycler.LenientRvItem
 import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
 

app/src/main/java/com/topjohnwu/magisk/model/download/DownloadService.kt

@@ -1,22 +1,24 @@
 package com.topjohnwu.magisk.model.download
 
 import android.annotation.SuppressLint
+import android.app.Notification
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.webkit.MimeTypeMap
-import androidx.core.app.NotificationCompat
-import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.extensions.chooser
+import com.topjohnwu.magisk.extensions.exists
 import com.topjohnwu.magisk.extensions.provide
+import com.topjohnwu.magisk.intent
 import com.topjohnwu.magisk.model.entity.internal.Configuration.*
 import com.topjohnwu.magisk.model.entity.internal.Configuration.Flash.Secondary
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.*
 import com.topjohnwu.magisk.ui.flash.FlashActivity
 import com.topjohnwu.magisk.utils.APKInstall
+import org.koin.core.get
 import java.io.File
 import kotlin.random.Random.Default.nextInt
 
@@ -61,50 +63,62 @@ open class DownloadService : RemoteFileService() {
         remove(id)
         when (subject.configuration)  {
             is APK.Upgrade -> APKInstall.install(this, subject.file)
-            else -> Unit
+            is APK.Restore -> Unit
         }
     }
 
     // ---
 
-    override fun NotificationCompat.Builder.addActions(subject: DownloadSubject)
+    override fun Notification.Builder.addActions(subject: DownloadSubject)
     = when (subject) {
         is Magisk -> addActionsInternal(subject)
         is Module -> addActionsInternal(subject)
         is Manager -> addActionsInternal(subject)
     }
 
-    private fun NotificationCompat.Builder.addActionsInternal(subject: Magisk)
+    private fun Notification.Builder.addActionsInternal(subject: Magisk)
     = when (val conf = subject.configuration) {
-        Download -> addAction(0, R.string.download_open_parent, fileIntent(subject.file.parentFile!!))
-            .addAction(0, R.string.download_open_self, fileIntent(subject.file))
+        Download -> this.apply {
+            fileIntent(subject.file.parentFile!!)
+                .takeIf { it.exists(get()) }
+                ?.let { addAction(0, R.string.download_open_parent, it.chooser()) }
+            fileIntent(subject.file)
+                .takeIf { it.exists(get()) }
+                ?.let { addAction(0, R.string.download_open_self, it.chooser()) }
+        }
         Uninstall -> setContentIntent(FlashActivity.uninstallIntent(context, subject.file))
         is Flash -> setContentIntent(FlashActivity.flashIntent(context, subject.file, conf is Secondary))
         is Patch -> setContentIntent(FlashActivity.patchIntent(context, subject.file, conf.fileUri))
         else -> this
     }
 
-    private fun NotificationCompat.Builder.addActionsInternal(subject: Module)
+    private fun Notification.Builder.addActionsInternal(subject: Module)
     = when (subject.configuration) {
-        Download -> addAction(0, R.string.download_open_parent, fileIntent(subject.file.parentFile!!))
-            .addAction(0, R.string.download_open_self, fileIntent(subject.file))
+        Download -> this.apply {
+            fileIntent(subject.file.parentFile!!)
+                .takeIf { it.exists(get()) }
+                ?.let { addAction(0, R.string.download_open_parent, it.chooser()) }
+            fileIntent(subject.file)
+                .takeIf { it.exists(get()) }
+                ?.let { addAction(0, R.string.download_open_self, it.chooser()) }
+        }
         is Flash -> setContentIntent(FlashActivity.installIntent(context, subject.file))
         else -> this
     }
 
-    private fun NotificationCompat.Builder.addActionsInternal(subject: Manager)
+    private fun Notification.Builder.addActionsInternal(subject: Manager)
     = when (subject.configuration) {
         APK.Upgrade -> setContentIntent(APKInstall.installIntent(context, subject.file))
         else -> this
     }
 
     @Suppress("ReplaceSingleLineLet")
-    private fun NotificationCompat.Builder.setContentIntent(intent: Intent) =
+    private fun Notification.Builder.setContentIntent(intent: Intent) =
         PendingIntent.getActivity(context, nextInt(), intent, PendingIntent.FLAG_ONE_SHOT)
             .let { setContentIntent(it) }
 
     @Suppress("ReplaceSingleLineLet")
-    private fun NotificationCompat.Builder.addAction(icon: Int, title: Int, intent: Intent) =
+    private fun Notification.Builder.addAction(icon: Int, title: Int, intent: Intent) =
         PendingIntent.getActivity(context, nextInt(), intent, PendingIntent.FLAG_ONE_SHOT)
             .let { addAction(icon, getString(title), it) }
 
@@ -115,7 +129,6 @@ open class DownloadService : RemoteFileService() {
             .setDataAndType(file.provide(this), file.type)
             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            .chooser()
     }
 
     class Builder {
@@ -127,8 +140,7 @@ open class DownloadService : RemoteFileService() {
         inline operator fun invoke(context: Context, argBuilder: Builder.() -> Unit) {
             val app = context.applicationContext
             val builder = Builder().apply(argBuilder)
-            val intent = Intent(app, ClassMap[DownloadService::class.java])
-                .putExtra(ARG_URL, builder.subject)
+            val intent = app.intent(DownloadService::class.java).putExtra(ARG_URL, builder.subject)
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 app.startForegroundService(intent)
@@ -139,4 +151,4 @@ open class DownloadService : RemoteFileService() {
 
     }
 
-}
+}

app/src/main/java/com/topjohnwu/magisk/model/download/ManagerUpgrade.kt

@@ -1,43 +1,47 @@
 package com.topjohnwu.magisk.model.download
 
-import android.content.ComponentName
-import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.ClassMap
-import com.topjohnwu.magisk.Config
-import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.*
+import com.topjohnwu.magisk.extensions.writeTo
 import com.topjohnwu.magisk.model.entity.internal.Configuration.APK.Restore
 import com.topjohnwu.magisk.model.entity.internal.Configuration.APK.Upgrade
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
-import com.topjohnwu.magisk.ui.SplashActivity
-import com.topjohnwu.magisk.utils.DynamicClassLoader
 import com.topjohnwu.magisk.utils.PatchAPK
-import com.topjohnwu.magisk.utils.RootUtils
 import com.topjohnwu.superuser.Shell
-import timber.log.Timber
 import java.io.File
 
-private fun RemoteFileService.patchPackage(apk: File, id: Int) {
-    if (packageName != BuildConfig.APPLICATION_ID) {
-        update(id) { notification ->
-            notification.setProgress(0, 0, true)
-                    .setProgress(0, 0, true)
-                    .setContentTitle(getString(R.string.hide_manager_title))
-                    .setContentText("")
-        }
-        val patched = File(apk.parent, "patched.apk")
-        try {
-            // Try using the new APK to patch itself
-            val loader = DynamicClassLoader(apk)
-            loader.loadClass("a.a")
-                    .getMethod("patchAPK", String::class.java, String::class.java, String::class.java)
-                    .invoke(null, apk.path, patched.path, packageName)
-        } catch (e: Exception) {
-            Timber.e(e)
-            // Fallback to use the current implementation
-            PatchAPK.patch(apk.path, patched.path, packageName)
-        }
+private fun RemoteFileService.patch(apk: File, id: Int) {
+    if (packageName == BuildConfig.APPLICATION_ID)
+        return
+
+    update(id) { notification ->
+        notification.setProgress(0, 0, true)
+            .setProgress(0, 0, true)
+            .setContentTitle(getString(R.string.hide_manager_title))
+            .setContentText("")
+    }
+    val patched = File(apk.parent, "patched.apk")
+    PatchAPK.patch(apk, patched, packageName, applicationInfo.nonLocalizedLabel.toString())
+    apk.delete()
+    patched.renameTo(apk)
+}
+
+private fun RemoteFileService.upgrade(apk: File, id: Int) {
+    if (isRunningAsStub) {
+        // Move to upgrade location
+        apk.copyTo(DynAPK.update(this), overwrite = true)
         apk.delete()
-        patched.renameTo(apk)
+        if (Info.stub!!.version < Info.remote.stub.versionCode) {
+            // We also want to upgrade stub
+            service.fetchFile(Info.remote.stub.link).blockingGet().byteStream().use {
+                it.writeTo(apk)
+            }
+            patch(apk, id)
+        } else {
+            // Simply relaunch the app
+            ProcessPhoenix.triggerRebirth(this)
+        }
+    } else {
+        patch(apk, id)
     }
 }
 
@@ -51,15 +55,11 @@ private fun RemoteFileService.restore(apk: File, id: Int) {
     Config.export()
     // Make it world readable
     apk.setReadable(true, false)
-    if (Shell.su("pm install $apk").exec().isSuccess) {
-        val component = ComponentName(BuildConfig.APPLICATION_ID,
-                ClassMap.get<Class<*>>(SplashActivity::class.java).name)
-        RootUtils.rmAndLaunch(packageName, component)
-    }
+    Shell.su("pm install $apk && pm uninstall $packageName").exec()
 }
 
 fun RemoteFileService.handleAPK(subject: DownloadSubject.Manager)
     = when (subject.configuration) {
-        is Upgrade -> patchPackage(subject.file, subject.hashCode())
+        is Upgrade -> upgrade(subject.file, subject.hashCode())
         is Restore -> restore(subject.file, subject.hashCode())
     }

app/src/main/java/com/topjohnwu/magisk/model/download/NotificationService.kt

@@ -1,23 +1,22 @@
 package com.topjohnwu.magisk.model.download
 
 import android.app.Notification
-import android.app.Service
 import android.content.Intent
 import android.os.IBinder
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
+import com.topjohnwu.magisk.base.BaseService
+import com.topjohnwu.magisk.view.Notifications
+import org.koin.core.KoinComponent
 import java.util.*
 import kotlin.random.Random.Default.nextInt
 
-abstract class NotificationService : Service() {
+abstract class NotificationService : BaseService(), KoinComponent {
 
-    abstract val defaultNotification: NotificationCompat.Builder
+    abstract val defaultNotification: Notification.Builder
 
-    private val manager by lazy { NotificationManagerCompat.from(this) }
     private val hasNotifications get() = notifications.isNotEmpty()
 
     private val notifications =
-        Collections.synchronizedMap(mutableMapOf<Int, NotificationCompat.Builder>())
+        Collections.synchronizedMap(mutableMapOf<Int, Notification.Builder>())
 
     override fun onTaskRemoved(rootIntent: Intent?) {
         super.onTaskRemoved(rootIntent)
@@ -29,7 +28,7 @@ abstract class NotificationService : Service() {
 
     fun update(
         id: Int,
-        body: (NotificationCompat.Builder) -> Unit = {}
+        body: (Notification.Builder) -> Unit = {}
     ) {
         val notification = notifications.getOrPut(id) { defaultNotification }
 
@@ -42,7 +41,7 @@ abstract class NotificationService : Service() {
 
     protected fun finishNotify(
         id: Int,
-        editBody: (NotificationCompat.Builder) -> NotificationCompat.Builder? = { null }
+        editBody: (Notification.Builder) -> Notification.Builder? = { null }
     ) : Int {
         val currentNotification = remove(id)?.run(editBody)
 
@@ -61,11 +60,11 @@ abstract class NotificationService : Service() {
     // ---
 
     private fun notify(id: Int, notification: Notification) {
-        manager.notify(id, notification)
+        Notifications.mgr.notify(id, notification)
     }
 
     private fun cancel(id: Int) {
-        manager.cancel(id)
+        Notifications.mgr.cancel(id)
     }
 
     protected fun remove(id: Int) = notifications.remove(id).also {
@@ -83,4 +82,4 @@ abstract class NotificationService : Service() {
     // --
 
     override fun onBind(p0: Intent?): IBinder? = null
-}
+}

app/src/main/java/com/topjohnwu/magisk/model/download/RemoteFileService.kt

@@ -1,13 +1,13 @@
 package com.topjohnwu.magisk.model.download
 
 import android.app.Activity
+import android.app.Notification
 import android.content.Intent
-import androidx.core.app.NotificationCompat
-import com.skoumal.teanity.extensions.subscribeK
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.data.network.GithubRawServices
 import com.topjohnwu.magisk.di.NullActivity
 import com.topjohnwu.magisk.extensions.get
+import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.extensions.writeTo
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.*
@@ -22,9 +22,9 @@ import java.io.InputStream
 
 abstract class RemoteFileService : NotificationService() {
 
-    private val service: GithubRawServices by inject()
+    val service: GithubRawServices by inject()
 
-    override val defaultNotification: NotificationCompat.Builder
+    override val defaultNotification
         get() = Notifications.progress(this, "")
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
@@ -108,11 +108,11 @@ abstract class RemoteFileService : NotificationService() {
     @Throws(Throwable::class)
     protected abstract fun onFinished(subject: DownloadSubject, id: Int)
 
-    protected abstract fun NotificationCompat.Builder.addActions(subject: DownloadSubject)
-            : NotificationCompat.Builder
+    protected abstract fun Notification.Builder.addActions(subject: DownloadSubject)
+            : Notification.Builder
 
     companion object {
         const val ARG_URL = "arg_url"
     }
 
-}
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/UpdateInfo.kt

@@ -8,7 +8,8 @@ import se.ansman.kotshi.JsonSerializable
 data class UpdateInfo(
     val app: ManagerJson = ManagerJson(),
     val uninstaller: UninstallerJson = UninstallerJson(),
-    val magisk: MagiskJson = MagiskJson()
+    val magisk: MagiskJson = MagiskJson(),
+    val stub: StubJson = StubJson()
 )
 
 @JsonSerializable
@@ -33,3 +34,9 @@ data class ManagerJson(
     val link: String = "",
     val note: String = ""
 ) : Parcelable
+
+@JsonSerializable
+data class StubJson(
+    val versionCode: Int = -1,
+    val link: String = ""
+)

app/src/main/java/com/topjohnwu/magisk/model/entity/Version.kt

@@ -1,3 +0,0 @@
-package com.topjohnwu.magisk.model.entity
-
-data class Version(val version: String, val versionCode: Int)

app/src/main/java/com/topjohnwu/magisk/model/entity/module/Module.kt

@@ -48,7 +48,7 @@ class Module(path: String) : BaseModule() {
         }
 
         if (name.isEmpty()) {
-            name = id;
+            name = id
         }
     }
 
@@ -65,7 +65,7 @@ class Module(path: String) : BaseModule() {
                 val module = Module(Const.MAGISK_PATH + "/" + file.name)
                 moduleList.add(module)
             }
-            return moduleList
+            return moduleList.sortedBy { it.name }
         }
     }
 }

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt

@@ -1,17 +1,17 @@
 package com.topjohnwu.magisk.model.entity.recycler
 
-import com.skoumal.teanity.databinding.ComparableRvItem
-import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
-import com.skoumal.teanity.rxbus.RxBus
-import com.skoumal.teanity.util.DiffObservableList
-import com.skoumal.teanity.util.KObservableField
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ComparableRvItem
+import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
 import com.topjohnwu.magisk.extensions.inject
 import com.topjohnwu.magisk.extensions.toggle
 import com.topjohnwu.magisk.model.entity.HideAppInfo
 import com.topjohnwu.magisk.model.entity.HideTarget
 import com.topjohnwu.magisk.model.entity.state.IndeterminateState
 import com.topjohnwu.magisk.model.events.HideProcessEvent
+import com.topjohnwu.magisk.utils.DiffObservableList
+import com.topjohnwu.magisk.utils.KObservableField
+import com.topjohnwu.magisk.utils.RxBus
 
 class HideRvItem(val item: HideAppInfo, targets: List<HideTarget>) :
     ComparableRvItem<HideRvItem>() {

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LenientRvItem.kt

@@ -2,7 +2,7 @@ package com.topjohnwu.magisk.model.entity.recycler
 
 import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
-import com.skoumal.teanity.databinding.ComparableRvItem
+import com.topjohnwu.magisk.databinding.ComparableRvItem
 
 /**
  * This item addresses issues where enclosing recycler has to be invalidated or generally

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt

@@ -1,14 +1,14 @@
 package com.topjohnwu.magisk.model.entity.recycler
 
-import com.skoumal.teanity.databinding.ComparableRvItem
-import com.skoumal.teanity.util.DiffObservableList
-import com.skoumal.teanity.util.KObservableField
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.timeFormatMedium
 import com.topjohnwu.magisk.extensions.toTime
 import com.topjohnwu.magisk.extensions.toggle
 import com.topjohnwu.magisk.model.entity.MagiskLog
 import com.topjohnwu.magisk.model.entity.WrappedMagiskLog
+import com.topjohnwu.magisk.utils.DiffObservableList
+import com.topjohnwu.magisk.utils.KObservableField
 
 class LogRvItem : ComparableRvItem<LogRvItem>() {
     override val layoutRes: Int = R.layout.item_page_log

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt

@@ -2,14 +2,14 @@ package com.topjohnwu.magisk.model.entity.recycler
 
 import android.content.res.Resources
 import androidx.annotation.StringRes
-import com.skoumal.teanity.databinding.ComparableRvItem
-import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
-import com.skoumal.teanity.util.KObservableField
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ComparableRvItem
+import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
 import com.topjohnwu.magisk.extensions.get
 import com.topjohnwu.magisk.extensions.toggle
 import com.topjohnwu.magisk.model.entity.module.Module
 import com.topjohnwu.magisk.model.entity.module.Repo
+import com.topjohnwu.magisk.utils.KObservableField
 
 class ModuleRvItem(val item: Module) : ComparableRvItem<ModuleRvItem>() {
 

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt

@@ -1,16 +1,16 @@
 package com.topjohnwu.magisk.model.entity.recycler
 
 import android.graphics.drawable.Drawable
-import com.skoumal.teanity.databinding.ComparableRvItem
-import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
-import com.skoumal.teanity.rxbus.RxBus
-import com.skoumal.teanity.util.KObservableField
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ComparableRvItem
+import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
 import com.topjohnwu.magisk.extensions.inject
 import com.topjohnwu.magisk.extensions.toggle
 import com.topjohnwu.magisk.model.entity.MagiskPolicy
 import com.topjohnwu.magisk.model.events.PolicyEnableEvent
 import com.topjohnwu.magisk.model.events.PolicyUpdateEvent
+import com.topjohnwu.magisk.utils.KObservableField
+import com.topjohnwu.magisk.utils.RxBus
 
 class PolicyRvItem(val item: MagiskPolicy, val icon: Drawable) : ComparableRvItem<PolicyRvItem>() {
 

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/SectionRvItem.kt

@@ -1,7 +1,7 @@
 package com.topjohnwu.magisk.model.entity.recycler
 
-import com.skoumal.teanity.databinding.ComparableRvItem
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ComparableRvItem
 
 class SectionRvItem(val text: String) : ComparableRvItem<SectionRvItem>() {
     override val layoutRes: Int = R.layout.item_section

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/SpinnerRvItem.kt

@@ -1,7 +1,7 @@
 package com.topjohnwu.magisk.model.entity.recycler
 
-import com.skoumal.teanity.databinding.ComparableRvItem
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ComparableRvItem
 
 class SpinnerRvItem(val item: String) : ComparableRvItem<SpinnerRvItem>() {
 

app/src/main/java/com/topjohnwu/magisk/model/events/EventHandler.kt

@@ -0,0 +1,25 @@
+package com.topjohnwu.magisk.model.events
+
+internal interface EventHandler {
+
+    /**
+     * Called for all [ViewEvent]s published by associated viewModel.
+     * For [SimpleViewEvent]s, both this and [onSimpleEventDispatched]
+     * methods are called - you can choose the way how you handle them.
+     */
+    fun onEventDispatched(event: ViewEvent) {}
+
+    /**
+     * Called for all [SimpleViewEvent]s published by associated viewModel.
+     * Both this and [onEventDispatched] methods are called - you can choose
+     * the way how you handle them.
+     */
+    fun onSimpleEventDispatched(event: Int) {}
+
+    val viewEventObserver get() = ViewEventObserver {
+        onEventDispatched(it)
+        if (it is SimpleViewEvent) {
+            onSimpleEventDispatched(it.event)
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/model/events/RxEvents.kt

@@ -1,10 +1,10 @@
 package com.topjohnwu.magisk.model.events
 
-import com.skoumal.teanity.rxbus.RxBus
 import com.topjohnwu.magisk.model.entity.MagiskPolicy
 import com.topjohnwu.magisk.model.entity.recycler.HideProcessRvItem
 import com.topjohnwu.magisk.model.entity.recycler.ModuleRvItem
 import com.topjohnwu.magisk.model.entity.recycler.PolicyRvItem
+import com.topjohnwu.magisk.utils.RxBus
 
 class HideProcessEvent(val item: HideProcessRvItem) : RxBus.Event
 

app/src/main/java/com/topjohnwu/magisk/model/events/SimpleViewEvent.kt

@@ -0,0 +1,5 @@
+package com.topjohnwu.magisk.model.events
+
+class SimpleViewEvent(
+    val event: Int
+) : ViewEvent()

app/src/main/java/com/topjohnwu/magisk/model/events/SnackbarEvent.kt

@@ -0,0 +1,27 @@
+package com.topjohnwu.magisk.model.events
+
+import android.content.Context
+import androidx.annotation.StringRes
+import com.google.android.material.snackbar.Snackbar
+
+class SnackbarEvent private constructor(
+    @StringRes private val messageRes: Int,
+    private val messageString: String?,
+    val length: Int,
+    val f: Snackbar.() -> Unit
+) : ViewEvent() {
+
+    constructor(
+        @StringRes messageRes: Int,
+        length: Int = Snackbar.LENGTH_SHORT,
+        f: Snackbar.() -> Unit = {}
+    ) : this(messageRes, null, length, f)
+
+    constructor(
+        message: String,
+        length: Int = Snackbar.LENGTH_SHORT,
+        f: Snackbar.() -> Unit = {}
+    ) : this(-1, message, length, f)
+
+    fun message(context: Context): String = messageString ?: context.getString(messageRes)
+}

app/src/main/java/com/topjohnwu/magisk/model/events/ViewEventObserver.kt

@@ -0,0 +1,17 @@
+package com.topjohnwu.magisk.model.events
+
+import androidx.lifecycle.Observer
+
+/**
+ * Observer for [ViewEvent]s, which automatically checks if event was handled
+ */
+class ViewEventObserver(private val onEventUnhandled: (ViewEvent) -> Unit) : Observer<ViewEvent> {
+    override fun onChanged(event: ViewEvent?) {
+        event?.let {
+            if (!it.handled) {
+                it.handled = true
+                onEventUnhandled(it)
+            }
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt

@@ -1,10 +1,19 @@
 package com.topjohnwu.magisk.model.events
 
 import android.app.Activity
-import com.skoumal.teanity.viewevents.ViewEvent
 import com.topjohnwu.magisk.model.entity.module.Repo
 import io.reactivex.subjects.PublishSubject
 
+/**
+ * Class for passing events from ViewModels to Activities/Fragments
+ * Variable [handled] used so each event is handled only once
+ * (see https://medium.com/google-developers/livedata-with-snackbar-navigation-and-other-events-the-singleliveevent-case-ac2622673150)
+ * Use [ViewEventObserver] for observing these events
+ */
+abstract class ViewEvent {
+
+    var handled = false
+}
 
 data class OpenLinkEvent(val url: String) : ViewEvent()
 
@@ -35,4 +44,4 @@ class PermissionEvent(
 
 class BackPressEvent : ViewEvent()
 
-class DieEvent : ViewEvent()
+class DieEvent : ViewEvent()

app/src/main/java/com/topjohnwu/magisk/model/navigation/MagiskNavigationEvent.kt

@@ -4,10 +4,12 @@ import android.os.Bundle
 import androidx.annotation.AnimRes
 import androidx.annotation.AnimatorRes
 import androidx.fragment.app.Fragment
-import com.skoumal.teanity.viewevents.NavigationDslMarker
-import com.skoumal.teanity.viewevents.ViewEvent
+import com.topjohnwu.magisk.model.events.ViewEvent
 import kotlin.reflect.KClass
 
+@DslMarker
+annotation class NavigationDslMarker
+
 class MagiskNavigationEvent(
     val navDirections: MagiskNavDirectionsBuilder,
     val navOptions: MagiskNavOptions,

app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt

@@ -1,16 +1,15 @@
 package com.topjohnwu.magisk.model.receiver
 
-import android.content.BroadcastReceiver
-import android.content.Context
+import android.content.ContextWrapper
 import android.content.Intent
-import com.topjohnwu.magisk.ClassMap
-import com.topjohnwu.magisk.Config
-import com.topjohnwu.magisk.Const
-import com.topjohnwu.magisk.Info
+import android.os.Build.VERSION.SDK_INT
+import com.topjohnwu.magisk.*
+import com.topjohnwu.magisk.base.BaseReceiver
 import com.topjohnwu.magisk.data.database.PolicyDao
 import com.topjohnwu.magisk.data.database.base.su
-import com.topjohnwu.magisk.extensions.inject
 import com.topjohnwu.magisk.extensions.reboot
+import com.topjohnwu.magisk.extensions.startActivity
+import com.topjohnwu.magisk.extensions.startActivityWithRoot
 import com.topjohnwu.magisk.model.download.DownloadService
 import com.topjohnwu.magisk.model.entity.ManagerJson
 import com.topjohnwu.magisk.model.entity.internal.Configuration
@@ -20,8 +19,10 @@ import com.topjohnwu.magisk.utils.SuLogger
 import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
+import org.koin.core.inject
+import timber.log.Timber
 
-open class GeneralReceiver : BroadcastReceiver() {
+open class GeneralReceiver : BaseReceiver() {
 
     private val policyDB: PolicyDao by inject()
 
@@ -36,8 +37,19 @@ open class GeneralReceiver : BroadcastReceiver() {
         return intent.data?.encodedSchemeSpecificPart.orEmpty()
     }
 
-    override fun onReceive(context: Context, intent: Intent?) {
+    override fun onReceive(context: ContextWrapper, intent: Intent?) {
         intent ?: return
+
+        // Debug messages
+        if (BuildConfig.DEBUG) {
+            Timber.d(intent.action)
+            intent.extras?.let { bundle ->
+                bundle.keySet().forEach {
+                    Timber.d("[%s]=[%s]", it, bundle[it])
+                }
+            }
+        }
+
         when (intent.action ?: return) {
             Intent.ACTION_REBOOT, Intent.ACTION_BOOT_COMPLETED -> {
                 val action = intent.getStringExtra("action")
@@ -51,16 +63,26 @@ open class GeneralReceiver : BroadcastReceiver() {
                 }
                 when (action) {
                     REQUEST -> {
-                        val i = Intent(context, ClassMap[SuRequestActivity::class.java])
+                        val i = context.intent(SuRequestActivity::class.java)
                                 .setAction(action)
                                 .putExtra("socket", intent.getStringExtra("socket"))
                                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                                 .addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
-                        context.startActivity(i)
+                        if (SDK_INT >= 29) {
+                            // Android Q does not allow starting activity from background
+                            i.startActivityWithRoot()
+                        } else {
+                            i.startActivity(context)
+                        }
+                    }
+                    LOG -> SuLogger.handleLogs(context, intent)
+                    NOTIFY -> SuLogger.handleNotify(context, intent)
+                    TEST -> {
+                        val mode = intent.getIntExtra("mode", 1 shl 1)
+                        if (mode > Info.env.connectionMode)
+                            Info.env.connectionMode = mode
+                        Shell.su("magisk --connect-mode $mode").submit()
                     }
-                    LOG -> SuLogger.handleLogs(intent)
-                    NOTIFY -> SuLogger.handleNotify(intent)
-                    TEST -> Shell.su("magisk --use-broadcast").submit()
                 }
             }
             Intent.ACTION_PACKAGE_REPLACED ->

app/src/main/java/com/topjohnwu/magisk/model/update/UpdateCheckService.kt

@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.model.update
 import androidx.work.ListenableWorker
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.Info
+import com.topjohnwu.magisk.base.DelegateWorker
 import com.topjohnwu.magisk.data.repository.MagiskRepository
 import com.topjohnwu.magisk.extensions.inject
-import com.topjohnwu.magisk.model.worker.DelegateWorker
 import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.superuser.Shell
 
@@ -20,7 +20,7 @@ class UpdateCheckService : DelegateWorker() {
             magiskRepo.fetchUpdate().blockingGet()
             if (BuildConfig.VERSION_CODE < Info.remote.app.versionCode)
                 Notifications.managerUpdate(applicationContext)
-            else if (Info.magiskVersionCode < Info.remote.magisk.versionCode)
+            else if (Info.env.magiskVersionCode < Info.remote.magisk.versionCode)
                 Notifications.magiskUpdate(applicationContext)
             ListenableWorker.Result.success()
         }.getOrElse {

app/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.kt

@@ -2,11 +2,11 @@ package com.topjohnwu.magisk.tasks
 
 import android.content.Context
 import android.net.Uri
-import com.skoumal.teanity.extensions.subscribeK
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.extensions.fileName
 import com.topjohnwu.magisk.extensions.inject
 import com.topjohnwu.magisk.extensions.readUri
+import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.utils.unzip
 import com.topjohnwu.superuser.Shell
 import io.reactivex.Single

app/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.kt

@@ -6,7 +6,6 @@ import android.os.Build
 import android.text.TextUtils
 import androidx.annotation.MainThread
 import androidx.annotation.WorkerThread
-import com.skoumal.teanity.extensions.subscribeK
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.Info
 import com.topjohnwu.magisk.data.network.GithubRawServices
@@ -25,9 +24,11 @@ import org.kamranzafar.jtar.TarHeader
 import org.kamranzafar.jtar.TarInputStream
 import org.kamranzafar.jtar.TarOutputStream
 import timber.log.Timber
-import java.io.*
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import java.io.InputStream
 import java.nio.ByteBuffer
-import java.util.*
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 
@@ -40,7 +41,7 @@ abstract class MagiskInstaller {
 
     private val console: MutableList<String>
     private val logs: MutableList<String>
-    private var isTar = false
+    private var tarOut: TarOutputStream? = null
 
     private val service: GithubRawServices by inject()
     private val context: Context by inject()
@@ -151,7 +152,9 @@ abstract class MagiskInstaller {
     private fun handleTar(input: InputStream) {
         console.add("- Processing tar file")
         var vbmeta = false
-        withStreams(TarInputStream(input), TarOutputStream(destFile)) { tarIn, tarOut ->
+        val tarOut = TarOutputStream(destFile)
+        this.tarOut = tarOut
+        TarInputStream(input).use { tarIn ->
             lateinit var entry: TarEntry
             while (tarIn.nextEntry?.let { entry = it } != null) {
                 if (entry.name.contains("boot.img") || entry.name.contains("recovery.img")) {
@@ -215,8 +218,7 @@ abstract class MagiskInstaller {
                     return false
                 }
                 it.reset()
-                if (Arrays.equals(magic, "ustar".toByteArray())) {
-                    isTar = true
+                if (magic.contentEquals("ustar".toByteArray())) {
                     destFile = File(Config.downloadDirectory, "magisk_patched.tar")
                     handleTar(it)
                 } else {
@@ -264,7 +266,7 @@ abstract class MagiskInstaller {
 
         val patched = File(installDir, "new-boot.img")
         if (isSigned) {
-            console.add("- Signing boot image with test keys")
+            console.add("- Signing boot image with verity keys")
             val signed = File(installDir, "signed.img")
             try {
                 withStreams(SuFileInputStream(patched), signed.outputStream().buffered()) {
@@ -293,15 +295,13 @@ abstract class MagiskInstaller {
     protected fun storeBoot(): Boolean {
         val patched = SuFile.open(installDir, "new-boot.img")
         try {
-            val os: OutputStream
-            if (isTar) {
-                os = TarOutputStream(destFile, true)
-                os.putNextEntry(newEntry(
+            val os = tarOut?.let {
+                it.putNextEntry(newEntry(
                         if (srcBoot.contains("recovery")) "recovery.img" else "boot.img",
                         patched.length()))
-            } else {
-                os = destFile.outputStream()
-            }
+                tarOut = null
+                it
+            } ?: destFile.outputStream()
             patched.suInputStream().use { it.copyTo(os); os.close() }
         } catch (e: IOException) {
             console.add("! Failed to output to $destFile")

app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt

@@ -4,15 +4,23 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.core.view.GravityCompat
 import androidx.fragment.app.Fragment
-import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
-import com.topjohnwu.magisk.ClassMap
-import com.topjohnwu.magisk.Config
+import androidx.fragment.app.FragmentTransaction
+import com.ncapdevi.fragnav.FragNavController
+import com.ncapdevi.fragnav.FragNavTransactionOptions
 import com.topjohnwu.magisk.Const.Key.OPEN_SECTION
 import com.topjohnwu.magisk.Info
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.BaseActivity
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.ActivityMainBinding
+import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
+import com.topjohnwu.magisk.extensions.snackbar
+import com.topjohnwu.magisk.intent
+import com.topjohnwu.magisk.model.events.*
+import com.topjohnwu.magisk.model.navigation.MagiskAnimBuilder
+import com.topjohnwu.magisk.model.navigation.MagiskNavigationEvent
 import com.topjohnwu.magisk.model.navigation.Navigation
-import com.topjohnwu.magisk.ui.base.MagiskActivity
+import com.topjohnwu.magisk.model.navigation.Navigator
 import com.topjohnwu.magisk.ui.hide.MagiskHideFragment
 import com.topjohnwu.magisk.ui.home.HomeFragment
 import com.topjohnwu.magisk.ui.log.LogFragment
@@ -23,15 +31,22 @@ import com.topjohnwu.magisk.ui.superuser.SuperuserFragment
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.superuser.Shell
 import org.koin.androidx.viewmodel.ext.android.viewModel
+import timber.log.Timber
 import kotlin.reflect.KClass
 
-
-open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
+open class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Navigator,
+        FragNavController.RootFragmentListener, FragNavController.TransactionListener {
 
     override val layoutRes: Int = R.layout.activity_main
     override val viewModel: MainViewModel by viewModel()
-    override val navHostId: Int = R.id.main_nav_host
-    override val defaultPosition: Int = 0
+    private val navHostId: Int = R.id.main_nav_host
+    private val defaultPosition: Int = 0
+
+    private val navigationController by lazy {
+        FragNavController(supportFragmentManager, navHostId)
+    }
+    private val isRootFragment get() =
+        navigationController.currentStackIndex != defaultPosition
 
     override val baseFragments: List<KClass<out Fragment>> = listOf(
         HomeFragment::class,
@@ -43,17 +58,20 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
         SettingsFragment::class
     )
 
-    /*override fun getDarkTheme(): Int {
-        return R.style.AppTheme_Dark
-    }*/
-
     override fun onCreate(savedInstanceState: Bundle?) {
         if (!SplashActivity.DONE) {
-            startActivity(Intent(this, ClassMap[SplashActivity::class.java]))
+            startActivity(intent(SplashActivity::class.java))
             finish()
         }
 
         super.onCreate(savedInstanceState)
+
+        navigationController.apply {
+            rootFragmentListener = this@MainActivity
+            transactionListener = this@MainActivity
+            initialize(defaultPosition, savedInstanceState)
+        }
+
         checkHideSection()
         setSupportActionBar(binding.mainInclude.mainToolbar)
 
@@ -68,6 +86,11 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        navigationController.onSaveInstanceState(outState)
+    }
+
     override fun setTitle(title: CharSequence?) {
         supportActionBar?.title = title
     }
@@ -76,25 +99,46 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
         supportActionBar?.setTitle(titleId)
     }
 
-    override fun onTabTransaction(fragment: Fragment?, index: Int) {
-        val fragmentId = when (fragment) {
-            is HomeFragment -> R.id.magiskFragment
-            is SuperuserFragment -> R.id.superuserFragment
-            is MagiskHideFragment -> R.id.magiskHideFragment
-            is ModulesFragment -> R.id.modulesFragment
-            is ReposFragment -> R.id.reposFragment
-            is LogFragment -> R.id.logFragment
-            is SettingsFragment -> R.id.settings
-            else -> return
-        }
-        binding.navView.setCheckedItem(fragmentId)
-    }
-
     override fun onBackPressed() {
         if (binding.drawerLayout.isDrawerOpen(binding.navView)) {
             binding.drawerLayout.closeDrawer(binding.navView)
         } else {
-            super.onBackPressed()
+            val fragment = navigationController.currentFrag as? BaseFragment<*, *>
+
+            if (fragment?.onBackPressed() == true) {
+                return
+            }
+
+            try {
+                navigationController.popFragment()
+            } catch (e: UnsupportedOperationException) {
+                when {
+                    isRootFragment -> {
+                        val options = FragNavTransactionOptions.newBuilder()
+                                .transition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
+                                .build()
+                        navigationController.switchTab(defaultPosition, options)
+                    }
+                    else -> super.onBackPressed()
+                }
+            }
+        }
+    }
+
+    override fun onEventDispatched(event: ViewEvent) {
+        super.onEventDispatched(event)
+        when (event) {
+            is SnackbarEvent -> snackbar(snackbarView, event.message(this), event.length, event.f)
+            is BackPressEvent -> onBackPressed()
+            is MagiskNavigationEvent -> navigateTo(event)
+            is ViewActionEvent -> event.action(this)
+            is PermissionEvent -> withPermissions(*event.permissions.toTypedArray()) {
+                onSuccess { event.callback.onNext(true) }
+                onFailure {
+                    event.callback.onNext(false)
+                    event.callback.onError(SecurityException("User refused permissions"))
+                }
+            }
         }
     }
 
@@ -110,14 +154,94 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
     private fun checkHideSection() {
         val menu = binding.navView.menu
         menu.findItem(R.id.magiskHideFragment).isVisible =
-            Shell.rootAccess() && Config.magiskHide
+            Shell.rootAccess() && Info.env.magiskHide
         menu.findItem(R.id.modulesFragment).isVisible =
-            Shell.rootAccess() && Info.magiskVersionCode >= 0
+            Shell.rootAccess() && Info.env.magiskVersionCode >= 0
         menu.findItem(R.id.reposFragment).isVisible =
-            (viewModel.isConnected.value && Shell.rootAccess() && Info.magiskVersionCode >= 0)
+            (viewModel.isConnected.value && Shell.rootAccess() && Info.env.magiskVersionCode >= 0)
         menu.findItem(R.id.logFragment).isVisible =
             Shell.rootAccess()
         menu.findItem(R.id.superuserFragment).isVisible =
             Utils.showSuperUser()
     }
+
+    private fun FragNavTransactionOptions.Builder.customAnimations(options: MagiskAnimBuilder) =
+            customAnimations(options.enter, options.exit, options.popEnter, options.popExit).apply {
+                if (!options.anySet) {
+                    transition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
+                }
+            }
+
+    override val numberOfRootFragments: Int get() = baseFragments.size
+
+    override fun getRootFragment(index: Int) = baseFragments[index].java.newInstance()
+
+    override fun onTabTransaction(fragment: Fragment?, index: Int) {
+        val fragmentId = when (fragment) {
+            is HomeFragment -> R.id.magiskFragment
+            is SuperuserFragment -> R.id.superuserFragment
+            is MagiskHideFragment -> R.id.magiskHideFragment
+            is ModulesFragment -> R.id.modulesFragment
+            is ReposFragment -> R.id.reposFragment
+            is LogFragment -> R.id.logFragment
+            is SettingsFragment -> R.id.settings
+            else -> return
+        }
+        binding.navView.setCheckedItem(fragmentId)
+    }
+
+    override fun navigateTo(event: MagiskNavigationEvent) {
+        val directions = event.navDirections
+
+        navigationController.defaultTransactionOptions = FragNavTransactionOptions.newBuilder()
+                .customAnimations(event.animOptions)
+                .build()
+
+        navigationController.currentStack
+                ?.indexOfFirst { it.javaClass == event.navOptions.popUpTo }
+                ?.let { if (it == -1) null else it } // invalidate if class is not found
+                ?.let { if (event.navOptions.inclusive) it + 1 else it }
+                ?.let { navigationController.popFragments(it) }
+
+        when (directions.isActivity) {
+            true -> navigateToActivity(event)
+            else -> navigateToFragment(event)
+        }
+    }
+
+    private fun navigateToActivity(event: MagiskNavigationEvent) {
+        val destination = event.navDirections.destination?.java ?: let {
+            Timber.e("Cannot navigate to null destination")
+            return
+        }
+        val options = event.navOptions
+
+        Intent(this, destination)
+                .putExtras(event.navDirections.args)
+                .apply {
+                    if (options.singleTop) addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+                    if (options.clearTask) addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                }
+                .let { startActivity(it) }
+    }
+
+    private fun navigateToFragment(event: MagiskNavigationEvent) {
+        val destination = event.navDirections.destination?.java ?: let {
+            Timber.e("Cannot navigate to null destination")
+            return
+        }
+
+        when (val index = baseFragments.indexOfFirst { it.java.name == destination.name }) {
+            -1 -> destination.newInstance()
+                    .apply { arguments = event.navDirections.args }
+                    .let { navigationController.pushFragment(it) }
+            // When it's desired that fragments of same class are put on top of one another edit this
+            else -> navigationController.switchTab(index)
+        }
+    }
+
+    override fun onFragmentTransaction(
+            fragment: Fragment?,
+            transactionType: FragNavController.TransactionType
+    ) = Unit
 }

app/src/main/java/com/topjohnwu/magisk/ui/MainViewModel.kt

@@ -2,11 +2,11 @@ package com.topjohnwu.magisk.ui
 
 import android.view.MenuItem
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.model.navigation.Navigation
-import com.topjohnwu.magisk.ui.base.MagiskViewModel
 
 
-class MainViewModel : MagiskViewModel() {
+class MainViewModel : BaseViewModel() {
 
     fun navPressed() = Navigation.Main.OPEN_NAV.publish()
 

app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt

@@ -1,27 +1,31 @@
 package com.topjohnwu.magisk.ui
 
-import android.content.Intent
+import android.app.Activity
+import android.content.Context
 import android.os.Bundle
 import android.text.TextUtils
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
 import com.topjohnwu.magisk.*
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
 
-open class SplashActivity : AppCompatActivity() {
+open class SplashActivity : Activity() {
+
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base.wrap())
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         Shell.getShell {
-            if (Info.magiskVersionCode > 0 && Info.magiskVersionCode < Const.MagiskVersion.MIN_SUPPORT) {
+            if (Info.env.magiskVersionCode > 0 && Info.env.magiskVersionCode < Const.Version.MIN_SUPPORT) {
                 AlertDialog.Builder(this)
                     .setTitle(R.string.unsupport_magisk_title)
                     .setMessage(R.string.unsupport_magisk_message)
-                    .setNegativeButton(R.string.ok, null)
+                    .setNegativeButton(android.R.string.ok, null)
                     .setOnDismissListener { finish() }
                     .show()
             } else {
@@ -56,7 +60,7 @@ open class SplashActivity : AppCompatActivity() {
         // Setup shortcuts
         Shortcuts.setup(this)
 
-        val intent = Intent(this, ClassMap[MainActivity::class.java])
+        val intent = intent(MainActivity::class.java)
         intent.putExtra(Const.Key.OPEN_SECTION, getIntent().getStringExtra(Const.Key.OPEN_SECTION))
         DONE = true
         startActivity(intent)

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

@@ -1,62 +0,0 @@
-package com.topjohnwu.magisk.ui.base
-
-import android.annotation.SuppressLint
-import android.content.SharedPreferences
-import android.os.Build
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.children
-import androidx.core.view.isVisible
-import androidx.preference.*
-import androidx.recyclerview.widget.RecyclerView
-import com.topjohnwu.magisk.R
-import org.koin.android.ext.android.inject
-
-abstract class BasePreferenceFragment : PreferenceFragmentCompat(),
-    SharedPreferences.OnSharedPreferenceChangeListener {
-
-    protected val prefs: SharedPreferences by inject()
-    protected val activity get() = requireActivity() as MagiskActivity<*, *>
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val v = super.onCreateView(inflater, container, savedInstanceState)
-        prefs.registerOnSharedPreferenceChangeListener(this)
-        return v
-    }
-
-    override fun onDestroyView() {
-        prefs.unregisterOnSharedPreferenceChangeListener(this)
-        super.onDestroyView()
-    }
-
-    override fun onCreateAdapter(preferenceScreen: PreferenceScreen): RecyclerView.Adapter<*> {
-        return object : PreferenceGroupAdapter(preferenceScreen) {
-            @SuppressLint("RestrictedApi")
-            override fun onBindViewHolder(holder: PreferenceViewHolder, position: Int) {
-                super.onBindViewHolder(holder, position)
-                when (val preference = getItem(position)) {
-                    is PreferenceCategory -> setZeroPaddingToLayoutChildren(holder.itemView)
-                    else -> holder.itemView.findViewById<View>(R.id.icon_frame)?.isVisible =
-                        preference.icon != null
-                }
-            }
-        }
-    }
-
-    private fun setZeroPaddingToLayoutChildren(view: View) {
-        (view as? ViewGroup)?.children?.forEach {
-            setZeroPaddingToLayoutChildren(it)
-        } ?: return
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
-            view.setPaddingRelative(0, view.paddingTop, view.paddingEnd, view.paddingBottom)
-        else
-            view.setPadding(0, view.paddingTop, view.paddingRight, view.paddingBottom)
-    }
-}

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

@@ -1,242 +0,0 @@
-package com.topjohnwu.magisk.ui.base
-
-import android.Manifest
-import android.content.Context
-import android.content.Intent
-import android.content.res.Configuration
-import android.os.Bundle
-import androidx.annotation.CallSuper
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.collection.SparseArrayCompat
-import androidx.core.net.toUri
-import androidx.databinding.ViewDataBinding
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentTransaction
-import com.karumi.dexter.Dexter
-import com.karumi.dexter.MultiplePermissionsReport
-import com.karumi.dexter.PermissionToken
-import com.karumi.dexter.listener.PermissionRequest
-import com.karumi.dexter.listener.multi.MultiplePermissionsListener
-import com.ncapdevi.fragnav.FragNavController
-import com.ncapdevi.fragnav.FragNavTransactionOptions
-import com.skoumal.teanity.view.TeanityActivity
-import com.skoumal.teanity.viewevents.ViewEvent
-import com.topjohnwu.magisk.Config
-import com.topjohnwu.magisk.extensions.set
-import com.topjohnwu.magisk.model.events.BackPressEvent
-import com.topjohnwu.magisk.model.events.PermissionEvent
-import com.topjohnwu.magisk.model.events.ViewActionEvent
-import com.topjohnwu.magisk.model.navigation.MagiskAnimBuilder
-import com.topjohnwu.magisk.model.navigation.MagiskNavigationEvent
-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
-
-typealias RequestCallback = MagiskActivity<*, *>.(Int, Intent?) -> Unit
-
-abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBinding> :
-        TeanityActivity<ViewModel, Binding>(), FragNavController.RootFragmentListener,
-        Navigator, FragNavController.TransactionListener {
-
-    override val numberOfRootFragments: Int get() = baseFragments.size
-    override val baseFragments: List<KClass<out Fragment>> = listOf()
-    private val resultCallbacks = SparseArrayCompat<RequestCallback>()
-
-
-    protected open val defaultPosition: Int = 0
-
-    protected val navigationController get() = if (navHostId == 0) null else _navigationController
-    private val _navigationController by lazy {
-        if (navHostId == 0) throw IllegalStateException("Did you forget to override \"navHostId\"?")
-        FragNavController(supportFragmentManager, navHostId)
-    }
-
-    private val isRootFragment
-        get() = navigationController?.let { it.currentStackIndex != defaultPosition } ?: false
-
-    init {
-        val theme = if (Config.darkTheme) {
-            AppCompatDelegate.MODE_NIGHT_YES
-        } else {
-            AppCompatDelegate.MODE_NIGHT_NO
-        }
-        AppCompatDelegate.setDefaultNightMode(theme)
-    }
-
-    override fun applyOverrideConfiguration(config: Configuration?) {
-        // Force applying our preferred local
-        config?.setLocale(currentLocale)
-        super.applyOverrideConfiguration(config)
-    }
-
-    override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(LocaleManager.getLocaleContext(base))
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        navigationController?.apply {
-            rootFragmentListener = this@MagiskActivity
-            transactionListener = this@MagiskActivity
-            initialize(defaultPosition, savedInstanceState)
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        navigationController?.onSaveInstanceState(outState)
-    }
-
-    @CallSuper
-    override fun onEventDispatched(event: ViewEvent) {
-        super.onEventDispatched(event)
-        when (event) {
-            is BackPressEvent -> onBackPressed()
-            is MagiskNavigationEvent -> navigateTo(event)
-            is ViewActionEvent -> event.action(this)
-            is PermissionEvent -> withPermissions(*event.permissions.toTypedArray()) {
-                onSuccess { event.callback.onNext(true) }
-                onFailure {
-                    event.callback.onNext(false)
-                    event.callback.onError(SecurityException("User refused permissions"))
-                }
-            }
-        }
-    }
-
-    override fun getRootFragment(index: Int) = baseFragments[index].java.newInstance()
-
-    override fun navigateTo(event: MagiskNavigationEvent) {
-        val directions = event.navDirections
-
-        navigationController?.defaultTransactionOptions = FragNavTransactionOptions.newBuilder()
-            .customAnimations(event.animOptions)
-            .build()
-
-        navigationController?.currentStack
-            ?.indexOfFirst { it.javaClass == event.navOptions.popUpTo }
-            ?.let { if (it == -1) null else it } // invalidate if class is not found
-            ?.let { if (event.navOptions.inclusive) it + 1 else it }
-            ?.let { navigationController?.popFragments(it) }
-
-        when (directions.isActivity) {
-            true -> navigateToActivity(event)
-            else -> navigateToFragment(event)
-        }
-    }
-
-    private fun navigateToActivity(event: MagiskNavigationEvent) {
-        val destination = event.navDirections.destination?.java ?: let {
-            Timber.e("Cannot navigate to null destination")
-            return
-        }
-        val options = event.navOptions
-
-        Intent(this, destination)
-            .putExtras(event.navDirections.args)
-            .apply {
-                if (options.singleTop) addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
-                if (options.clearTask) addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
-            }
-            .let { startActivity(it) }
-    }
-
-    private fun navigateToFragment(event: MagiskNavigationEvent) {
-        val destination = event.navDirections.destination?.java ?: let {
-            Timber.e("Cannot navigate to null destination")
-            return
-        }
-
-        when (val index = baseFragments.indexOfFirst { it.java.name == destination.name }) {
-            -1 -> destination.newInstance()
-                .apply { arguments = event.navDirections.args }
-                .let { navigationController?.pushFragment(it) }
-            // When it's desired that fragments of same class are put on top of one another edit this
-            else -> navigationController?.switchTab(index)
-        }
-    }
-
-    override fun onBackPressed() {
-        val fragment = navigationController?.currentFrag as? MagiskFragment<*, *>
-
-        if (fragment?.onBackPressed() == true) {
-            return
-        }
-
-        try {
-            navigationController?.popFragment() ?: throw UnsupportedOperationException()
-        } catch (e: UnsupportedOperationException) {
-            when {
-                isRootFragment -> {
-                    val options = FragNavTransactionOptions.newBuilder()
-                        .transition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
-                        .build()
-                    navigationController?.switchTab(defaultPosition, options)
-                }
-                else -> super.onBackPressed()
-            }
-        }
-    }
-
-    override fun onFragmentTransaction(
-        fragment: Fragment?,
-        transactionType: FragNavController.TransactionType
-    ) = Unit
-
-    override fun onTabTransaction(fragment: Fragment?, index: Int) = Unit
-
-    fun openUrl(url: String) = Utils.openLink(this, url.toUri())
-
-    fun withPermissions(vararg permissions: String, builder: PermissionRequestBuilder.() -> Unit) {
-        val request = PermissionRequestBuilder().apply(builder).build()
-        Dexter.withActivity(this)
-            .withPermissions(*permissions)
-            .withListener(object : MultiplePermissionsListener {
-                override fun onPermissionsChecked(report: MultiplePermissionsReport) {
-                    if (report.areAllPermissionsGranted()) {
-                        request.onSuccess()
-                    } else {
-                        request.onFailure()
-                    }
-                }
-
-                override fun onPermissionRationaleShouldBeShown(
-                    permissions: MutableList<PermissionRequest>,
-                    token: PermissionToken
-                ) = token.continuePermissionRequest()
-            }).check()
-    }
-
-    fun withExternalRW(builder: PermissionRequestBuilder.() -> Unit) {
-        withPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, builder = builder)
-    }
-
-    private fun FragNavTransactionOptions.Builder.customAnimations(options: MagiskAnimBuilder) =
-        customAnimations(options.enter, options.exit, options.popEnter, options.popExit).apply {
-            if (!options.anySet) {
-                transition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
-            }
-        }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        resultCallbacks[requestCode]?.apply {
-            resultCallbacks.remove(requestCode)
-            invoke(this@MagiskActivity, resultCode, data)
-        }
-    }
-
-    fun startActivityForResult(
-            intent: Intent,
-            requestCode: Int,
-            listener: RequestCallback
-    ) {
-        resultCallbacks[requestCode] = listener
-        startActivityForResult(intent, requestCode)
-    }
-
-}

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

@@ -1,52 +0,0 @@
-package com.topjohnwu.magisk.ui.base
-
-import androidx.annotation.CallSuper
-import androidx.databinding.ViewDataBinding
-import androidx.fragment.app.Fragment
-import com.skoumal.teanity.view.TeanityFragment
-import com.skoumal.teanity.viewevents.ViewEvent
-import com.topjohnwu.magisk.model.events.BackPressEvent
-import com.topjohnwu.magisk.model.events.PermissionEvent
-import com.topjohnwu.magisk.model.events.ViewActionEvent
-import com.topjohnwu.magisk.model.navigation.MagiskNavigationEvent
-import com.topjohnwu.magisk.model.navigation.Navigator
-import com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder
-import kotlin.reflect.KClass
-
-
-abstract class MagiskFragment<ViewModel : MagiskViewModel, Binding : ViewDataBinding> :
-    TeanityFragment<ViewModel, Binding>(), Navigator {
-
-    protected val activity get() = requireActivity() as MagiskActivity<*, *>
-
-    // We don't need nested fragments
-    override val baseFragments: List<KClass<Fragment>> = listOf()
-
-    override fun navigateTo(event: MagiskNavigationEvent) = activity.navigateTo(event)
-
-    @CallSuper
-    override fun onEventDispatched(event: ViewEvent) {
-        super.onEventDispatched(event)
-        when (event) {
-            is BackPressEvent -> activity.onBackPressed()
-            is MagiskNavigationEvent -> navigateTo(event)
-            is ViewActionEvent -> event.action(requireActivity())
-            is PermissionEvent -> activity.withPermissions(*event.permissions.toTypedArray()) {
-                onSuccess { event.callback.onNext(true) }
-                onFailure {
-                    event.callback.onNext(false)
-                    event.callback.onError(SecurityException("User refused permissions"))
-                }
-            }
-        }
-    }
-
-    fun withPermissions(vararg permissions: String, builder: PermissionRequestBuilder.() -> Unit) {
-        activity.withPermissions(*permissions, builder = builder)
-    }
-
-    fun openLink(url: String) = activity.openUrl(url)
-
-    open fun onBackPressed(): Boolean = false
-
-}

app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt

@@ -6,18 +6,24 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.toUri
-import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.databinding.ActivityFlashBinding
-import com.topjohnwu.magisk.ui.base.MagiskActivity
+import com.topjohnwu.magisk.extensions.snackbar
+import com.topjohnwu.magisk.intent
+import com.topjohnwu.magisk.model.events.BackPressEvent
+import com.topjohnwu.magisk.model.events.PermissionEvent
+import com.topjohnwu.magisk.model.events.SnackbarEvent
+import com.topjohnwu.magisk.model.events.ViewEvent
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import java.io.File
 
-open class FlashActivity : MagiskActivity<FlashViewModel, ActivityFlashBinding>() {
+open class FlashActivity : BaseActivity<FlashViewModel, ActivityFlashBinding>() {
 
     override val layoutRes: Int = R.layout.activity_flash
+    override val themeRes: Int = R.style.MagiskTheme_Flashing
     override val viewModel: FlashViewModel by viewModel {
         val uri = intent.data ?: let { finish(); Uri.EMPTY }
         val additionalUri = intent.getParcelableExtra(Const.Key.FLASH_DATA) ?: uri
@@ -37,9 +43,24 @@ open class FlashActivity : MagiskActivity<FlashViewModel, ActivityFlashBinding>(
         super.onBackPressed()
     }
 
+    override fun onEventDispatched(event: ViewEvent) {
+        super.onEventDispatched(event)
+        when (event) {
+            is SnackbarEvent -> snackbar(snackbarView, event.message(this), event.length, event.f)
+            is BackPressEvent -> onBackPressed()
+            is PermissionEvent -> withPermissions(*event.permissions.toTypedArray()) {
+                onSuccess { event.callback.onNext(true) }
+                onFailure {
+                    event.callback.onNext(false)
+                    event.callback.onError(SecurityException("User refused permissions"))
+                }
+            }
+        }
+    }
+
     companion object {
 
-        private fun intent(context: Context) = Intent(context, ClassMap[FlashActivity::class.java])
+        private fun intent(context: Context) = context.intent(FlashActivity::class.java)
             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         private fun intent(context: Context, file: File) = intent(context).setData(file.toUri())
 

app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt

@@ -7,21 +7,20 @@ import android.net.Uri
 import android.os.Handler
 import androidx.core.os.postDelayed
 import androidx.databinding.ObservableArrayList
-import com.skoumal.teanity.databinding.ComparableRvItem
-import com.skoumal.teanity.extensions.subscribeK
-import com.skoumal.teanity.util.DiffObservableList
-import com.skoumal.teanity.util.KObservableField
-import com.skoumal.teanity.viewevents.SnackbarEvent
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
+import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.*
 import com.topjohnwu.magisk.model.entity.recycler.ConsoleRvItem
+import com.topjohnwu.magisk.model.events.SnackbarEvent
 import com.topjohnwu.magisk.model.flash.FlashResultListener
 import com.topjohnwu.magisk.model.flash.Flashing
 import com.topjohnwu.magisk.model.flash.Patching
-import com.topjohnwu.magisk.ui.base.MagiskViewModel
+import com.topjohnwu.magisk.utils.DiffObservableList
+import com.topjohnwu.magisk.utils.KObservableField
 import com.topjohnwu.superuser.Shell
 import me.tatarka.bindingcollectionadapter2.ItemBinding
 import java.io.File
@@ -32,7 +31,7 @@ class FlashViewModel(
     installer: Uri,
     uri: Uri,
     private val resources: Resources
-) : MagiskViewModel(), FlashResultListener {
+) : BaseViewModel(), FlashResultListener {
 
     val canShowReboot = Shell.rootAccess()
     val showRestartTitle = KObservableField(false)

app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt

@@ -1,28 +1,28 @@
 package com.topjohnwu.magisk.ui.hide
 
 import android.content.pm.ApplicationInfo
-import com.skoumal.teanity.databinding.ComparableRvItem
-import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
-import com.skoumal.teanity.extensions.subscribeK
-import com.skoumal.teanity.rxbus.RxBus
-import com.skoumal.teanity.util.DiffObservableList
-import com.skoumal.teanity.util.KObservableField
 import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.repository.MagiskRepository
+import com.topjohnwu.magisk.databinding.ComparableRvItem
+import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
+import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.extensions.toSingle
 import com.topjohnwu.magisk.extensions.update
 import com.topjohnwu.magisk.model.entity.recycler.HideProcessRvItem
 import com.topjohnwu.magisk.model.entity.recycler.HideRvItem
 import com.topjohnwu.magisk.model.entity.state.IndeterminateState
 import com.topjohnwu.magisk.model.events.HideProcessEvent
-import com.topjohnwu.magisk.ui.base.MagiskViewModel
+import com.topjohnwu.magisk.utils.DiffObservableList
+import com.topjohnwu.magisk.utils.KObservableField
+import com.topjohnwu.magisk.utils.RxBus
 import me.tatarka.bindingcollectionadapter2.OnItemBind
 import timber.log.Timber
 
 class HideViewModel(
     private val magiskRepo: MagiskRepository,
     rxBus: RxBus
-) : MagiskViewModel() {
+) : BaseViewModel() {
 
     val query = KObservableField("")
     val isShowSystem = KObservableField(false)

app/src/main/java/com/topjohnwu/magisk/ui/hide/MagiskHideFragment.kt

@@ -6,11 +6,11 @@ import android.view.MenuItem
 import android.widget.SearchView
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentMagiskHideBinding
-import com.topjohnwu.magisk.ui.base.MagiskFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class MagiskHideFragment : MagiskFragment<HideViewModel, FragmentMagiskHideBinding>(),
+class MagiskHideFragment : BaseFragment<HideViewModel, FragmentMagiskHideBinding>(),
     SearchView.OnQueryTextListener {
 
     override val layoutRes: Int = R.layout.fragment_magisk_hide

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

@@ -1,31 +1,31 @@
 package com.topjohnwu.magisk.ui.home
 
 import android.content.Context
-import com.skoumal.teanity.extensions.subscribeK
-import com.skoumal.teanity.viewevents.ViewEvent
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.Info
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.BaseActivity
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.data.repository.MagiskRepository
 import com.topjohnwu.magisk.databinding.FragmentMagiskBinding
-import com.topjohnwu.magisk.extensions.inject
+import com.topjohnwu.magisk.extensions.DynamicClassLoader
+import com.topjohnwu.magisk.extensions.openUrl
+import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.extensions.writeTo
 import com.topjohnwu.magisk.model.events.*
-import com.topjohnwu.magisk.ui.base.MagiskActivity
-import com.topjohnwu.magisk.ui.base.MagiskFragment
-import com.topjohnwu.magisk.utils.DynamicClassLoader
 import com.topjohnwu.magisk.utils.SafetyNetHelper
 import com.topjohnwu.magisk.view.MarkDownWindow
 import com.topjohnwu.magisk.view.dialogs.*
 import com.topjohnwu.superuser.Shell
 import dalvik.system.DexFile
 import io.reactivex.Completable
+import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import java.io.File
 import java.lang.reflect.InvocationHandler
 
-class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
+class HomeFragment : BaseFragment<HomeViewModel, FragmentMagiskBinding>(),
     SafetyNetHelper.Callback {
 
     override val layoutRes: Int = R.layout.fragment_magisk
@@ -33,13 +33,14 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
 
     private val magiskRepo: MagiskRepository by inject()
     private val EXT_APK by lazy { File("${activity.filesDir.parent}/snet", "snet.jar") }
+    private val EXT_DEX by lazy { File(EXT_APK.parent, "snet.dex") }
 
     override fun onResponse(responseCode: Int) = viewModel.finishSafetyNetCheck(responseCode)
 
     override fun onEventDispatched(event: ViewEvent) {
         super.onEventDispatched(event)
         when (event) {
-            is OpenLinkEvent -> openLink(event.url)
+            is OpenLinkEvent -> activity.openUrl(event.url)
             is ManagerInstallEvent -> installManager()
             is MagiskInstallEvent -> installMagisk()
             is UninstallEvent -> uninstall()
@@ -62,7 +63,7 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
             return
         }
 
-        MagiskInstallDialog(requireActivity() as MagiskActivity<*, *>).show()
+        MagiskInstallDialog(requireActivity() as BaseActivity<*, *>).show()
     }
 
     private fun installManager() = ManagerInstallDialog(requireActivity()).show()
@@ -86,15 +87,15 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
             .setTitle(R.string.proprietary_title)
             .setMessage(R.string.proprietary_notice)
             .setCancelable(false)
-            .setPositiveButton(R.string.yes) { _, _ -> download() }
-            .setNegativeButton(R.string.no_thanks) { _, _ -> viewModel.finishSafetyNetCheck(-2) }
+            .setPositiveButton(android.R.string.yes) { _, _ -> download() }
+            .setNegativeButton(android.R.string.no) { _, _ -> viewModel.finishSafetyNetCheck(-2) }
             .show()
     }
 
     private fun updateSafetyNet(dieOnError: Boolean) {
         Completable.fromAction {
             val loader = DynamicClassLoader(EXT_APK)
-            val dex = DexFile.loadDex(EXT_APK.path, EXT_APK.parent, 0)
+            val dex = DexFile.loadDex(EXT_APK.path, EXT_DEX.path, 0)
 
             // Scan through the dex and find our helper class
             var helperClass: Class<*>? = null

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

@@ -1,28 +1,23 @@
 package com.topjohnwu.magisk.ui.home
 
 import android.content.pm.PackageManager
-import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
-import com.skoumal.teanity.extensions.doOnSubscribeUi
-import com.skoumal.teanity.extensions.subscribeK
-import com.skoumal.teanity.util.KObservableField
 import com.topjohnwu.magisk.*
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.repository.MagiskRepository
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.packageName
-import com.topjohnwu.magisk.extensions.res
-import com.topjohnwu.magisk.extensions.toggle
+import com.topjohnwu.magisk.extensions.*
 import com.topjohnwu.magisk.model.events.*
 import com.topjohnwu.magisk.model.observer.Observer
-import com.topjohnwu.magisk.ui.base.MagiskViewModel
+import com.topjohnwu.magisk.utils.KObservableField
 import com.topjohnwu.magisk.utils.SafetyNetHelper
 import com.topjohnwu.superuser.Shell
+import io.reactivex.Completable
 
 enum class SafetyNetState {
     LOADING, PASS, FAILED, IDLE
 }
 
 enum class MagiskState {
-    NO_ROOT, NOT_INSTALLED, UP_TO_DATE, OBSOLETE, LOADING
+    NOT_INSTALLED, UP_TO_DATE, OBSOLETE, LOADING
 }
 
 enum class MagiskItem {
@@ -31,7 +26,7 @@ enum class MagiskItem {
 
 class HomeViewModel(
     private val magiskRepo: MagiskRepository
-) : MagiskViewModel(State.LOADED) {
+) : BaseViewModel(State.LOADED) {
 
     val hasGMS = runCatching {
         get<PackageManager>().getPackageInfo("com.google.android.gms", 0); true
@@ -43,13 +38,9 @@ class HomeViewModel(
     val isKeepVerity = KObservableField(Info.keepVerity)
     val isRecovery = KObservableField(Info.recovery)
 
-    private val _magiskState = KObservableField(MagiskState.LOADING)
-    val magiskState = Observer(_magiskState, isConnected) {
-        if (isConnected.value) _magiskState.value else MagiskState.UP_TO_DATE
-    }
+    val magiskState = KObservableField(MagiskState.LOADING)
     val magiskStateText = Observer(magiskState) {
         when (magiskState.value) {
-            MagiskState.NO_ROOT -> TODO()
             MagiskState.NOT_INSTALLED -> R.string.magisk_version_error.res()
             MagiskState.UP_TO_DATE -> R.string.magisk_up_to_date.res()
             MagiskState.LOADING -> R.string.checking_for_updates.res()
@@ -71,7 +62,6 @@ class HomeViewModel(
     }
     val managerStateText = Observer(managerState) {
         when (managerState.value) {
-            MagiskState.NO_ROOT -> "wtf"
             MagiskState.NOT_INSTALLED -> R.string.invalid_update_channel.res()
             MagiskState.UP_TO_DATE -> R.string.manager_up_to_date.res()
             MagiskState.LOADING -> R.string.checking_for_updates.res()
@@ -87,7 +77,7 @@ class HomeViewModel(
             ""
     }
 
-    val safetyNetTitle = KObservableField(R.string.safetyNet_check_text)
+    val safetyNetTitle = KObservableField(R.string.safetyNet_check_text.res())
     val ctsState = KObservableField(SafetyNetState.IDLE)
     val basicIntegrityState = KObservableField(SafetyNetState.IDLE)
     val safetyNetState = Observer(ctsState, basicIntegrityState) {
@@ -117,10 +107,10 @@ class HomeViewModel(
             Info.recovery = it ?: return@addOnPropertyChangedCallback
         }
         isConnected.addOnPropertyChangedCallback {
-            if (it == true) refresh()
+            if (it == true) refresh(false)
         }
 
-        refresh()
+        refresh(false)
     }
 
     fun paypalPressed() = OpenLinkEvent(Const.Url.PAYPAL_URL).publish()
@@ -145,7 +135,7 @@ class HomeViewModel(
     fun safetyNetPressed() {
         ctsState.value = SafetyNetState.LOADING
         basicIntegrityState.value = SafetyNetState.LOADING
-        safetyNetTitle.value = R.string.checking_safetyNet_status
+        safetyNetTitle.value = R.string.checking_safetyNet_status.res()
 
         UpdateSafetyNetEvent().publish()
     }
@@ -154,7 +144,7 @@ class HomeViewModel(
         response and 0x0F == 0 -> {
             val hasCtsPassed = response and SafetyNetHelper.CTS_PASS != 0
             val hasBasicIntegrityPassed = response and SafetyNetHelper.BASIC_PASS != 0
-            safetyNetTitle.value = R.string.safetyNet_check_success
+            safetyNetTitle.value = R.string.safetyNet_check_success.res()
             ctsState.value = if (hasCtsPassed) {
                 SafetyNetState.PASS
             } else {
@@ -174,67 +164,83 @@ class HomeViewModel(
             ctsState.value = SafetyNetState.IDLE
             basicIntegrityState.value = SafetyNetState.IDLE
             safetyNetTitle.value = when (response) {
-                SafetyNetHelper.RESPONSE_ERR -> R.string.safetyNet_res_invalid
-                else -> R.string.safetyNet_api_error
+                SafetyNetHelper.RESPONSE_ERR -> R.string.safetyNet_res_invalid.res()
+                else -> R.string.safetyNet_api_error.res()
             }
         }
     }
 
-    fun refresh() {
-        refreshVersions()
-
-        magiskRepo.fetchUpdate()
-            .applyViewModel(this)
-            .doOnSubscribeUi {
-                _magiskState.value = MagiskState.LOADING
-                _managerState.value = MagiskState.LOADING
-                ctsState.value = SafetyNetState.IDLE
-                basicIntegrityState.value = SafetyNetState.IDLE
-                safetyNetTitle.value = R.string.safetyNet_check_text
-            }
-            .subscribeK {
-                updateSelf()
-                ensureEnv()
-                refreshVersions()
-            }
+    @JvmOverloads
+    fun refresh(invalidate: Boolean = true) {
+        if (invalidate)
+            Info.envRef.invalidate()
 
         hasRoot.value = Shell.rootAccess()
+
+        val fetchUpdate = if (isConnected.value)
+            magiskRepo.fetchUpdate().ignoreElement()
+        else
+            Completable.complete()
+
+        Completable.fromAction {
+            // Ensure value is ready
+            Info.env
+        }.andThen(fetchUpdate)
+        .applyViewModel(this)
+        .doOnSubscribeUi {
+            magiskState.value = MagiskState.LOADING
+            _managerState.value = MagiskState.LOADING
+            ctsState.value = SafetyNetState.IDLE
+            basicIntegrityState.value = SafetyNetState.IDLE
+            safetyNetTitle.value = R.string.safetyNet_check_text.res()
+        }.subscribeK {
+            updateSelf()
+            ensureEnv()
+            refreshVersions()
+        }
     }
 
     private fun refreshVersions() {
         magiskCurrentVersion.value = if (magiskState.value != MagiskState.NOT_INSTALLED) {
-            version.format(Info.magiskVersionString, Info.magiskVersionCode)
+            VERSION_FMT.format(Info.env.magiskVersionString, Info.env.magiskVersionCode)
         } else {
             ""
         }
 
-        managerCurrentVersion.value = version
-            .format(BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)
+        managerCurrentVersion.value = if (isRunningAsStub) MGR_VER_FMT
+            .format(BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, Info.stub!!.version)
+        else
+            VERSION_FMT.format(BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)
     }
 
     private fun updateSelf() {
-        _magiskState.value = when (Info.magiskVersionCode) {
-            in Int.MIN_VALUE until 0 -> MagiskState.NOT_INSTALLED
-            !in Info.remote.magisk.versionCode..Int.MAX_VALUE -> MagiskState.OBSOLETE
+        magiskState.value = when (Info.env.magiskVersionCode) {
+            in Int.MIN_VALUE .. 0 -> MagiskState.NOT_INSTALLED
+            in 1 until Info.remote.magisk.versionCode -> MagiskState.OBSOLETE
             else -> MagiskState.UP_TO_DATE
         }
 
-        magiskLatestVersion.value = version
-            .format(Info.remote.magisk.version, Info.remote.magisk.versionCode)
+        magiskLatestVersion.value =
+            VERSION_FMT.format(Info.remote.magisk.version, Info.remote.magisk.versionCode)
 
         _managerState.value = when (Info.remote.app.versionCode) {
-            in Int.MIN_VALUE until 0 -> MagiskState.NOT_INSTALLED //wrong update channel
-            in (BuildConfig.VERSION_CODE + 1)..Int.MAX_VALUE -> MagiskState.OBSOLETE
-            else -> MagiskState.UP_TO_DATE
+            in Int.MIN_VALUE .. 0 -> MagiskState.NOT_INSTALLED //wrong update channel
+            in (BuildConfig.VERSION_CODE + 1) .. Int.MAX_VALUE -> MagiskState.OBSOLETE
+            else -> {
+                if (Info.stub?.version ?: Int.MAX_VALUE < Info.remote.stub.versionCode)
+                    MagiskState.OBSOLETE
+                else
+                    MagiskState.UP_TO_DATE
+            }
         }
 
-        managerLatestVersion.value = version
-            .format(Info.remote.app.version, Info.remote.app.versionCode)
+        managerLatestVersion.value = MGR_VER_FMT
+            .format(Info.remote.app.version, Info.remote.app.versionCode, Info.remote.stub.versionCode)
     }
 
     private fun ensureEnv() {
         val invalidStates =
-            listOf(MagiskState.NOT_INSTALLED, MagiskState.NO_ROOT, MagiskState.LOADING)
+            listOf(MagiskState.NOT_INSTALLED, MagiskState.LOADING)
 
         // Don't bother checking env when magisk is not installed, loading or already has been shown
         if (invalidStates.any { it == magiskState.value } || shownDialog) return
@@ -246,7 +252,8 @@ class HomeViewModel(
     }
 
     companion object {
-        private const val version = "%s (%d)"
+        private const val VERSION_FMT = "%s (%d)"
+        private const val MGR_VER_FMT = "%s (%d) (%d)"
     }
 
 }

app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt

@@ -6,14 +6,14 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import com.skoumal.teanity.viewevents.ViewEvent
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentLogBinding
 import com.topjohnwu.magisk.model.events.PageChangedEvent
-import com.topjohnwu.magisk.ui.base.MagiskFragment
+import com.topjohnwu.magisk.model.events.ViewEvent
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class LogFragment : MagiskFragment<LogViewModel, FragmentLogBinding>() {
+class LogFragment : BaseFragment<LogViewModel, FragmentLogBinding>() {
 
     override val layoutRes: Int = R.layout.fragment_log
     override val viewModel: LogViewModel by viewModel()

app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt

@@ -1,25 +1,25 @@
 package com.topjohnwu.magisk.ui.log
 
 import android.content.res.Resources
-import com.skoumal.teanity.databinding.ComparableRvItem
-import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
-import com.skoumal.teanity.extensions.doOnSubscribeUi
-import com.skoumal.teanity.extensions.subscribeK
-import com.skoumal.teanity.util.DiffObservableList
-import com.skoumal.teanity.util.KObservableField
-import com.skoumal.teanity.viewevents.SnackbarEvent
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.repository.LogRepository
+import com.topjohnwu.magisk.databinding.ComparableRvItem
+import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
+import com.topjohnwu.magisk.extensions.doOnSubscribeUi
+import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.model.binding.BindingAdapter
 import com.topjohnwu.magisk.model.entity.recycler.ConsoleRvItem
 import com.topjohnwu.magisk.model.entity.recycler.LogItemRvItem
 import com.topjohnwu.magisk.model.entity.recycler.LogRvItem
 import com.topjohnwu.magisk.model.entity.recycler.MagiskLogRvItem
 import com.topjohnwu.magisk.model.events.PageChangedEvent
-import com.topjohnwu.magisk.ui.base.MagiskViewModel
+import com.topjohnwu.magisk.model.events.SnackbarEvent
+import com.topjohnwu.magisk.utils.DiffObservableList
+import com.topjohnwu.magisk.utils.KObservableField
 import com.topjohnwu.superuser.Shell
 import me.tatarka.bindingcollectionadapter2.BindingViewPagerAdapter
 import me.tatarka.bindingcollectionadapter2.OnItemBind
@@ -30,7 +30,7 @@ import java.util.*
 class LogViewModel(
     private val resources: Resources,
     private val logRepo: LogRepository
-) : MagiskViewModel(), BindingViewPagerAdapter.PageTitles<ComparableRvItem<*>> {
+) : BaseViewModel(), BindingViewPagerAdapter.PageTitles<ComparableRvItem<*>> {
 
     val itemsAdapter = BindingAdapter()
     val items = DiffObservableList(ComparableRvItem.callback)

app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt

@@ -1,17 +1,12 @@
 package com.topjohnwu.magisk.ui.module
 
 import android.content.res.Resources
-import com.skoumal.teanity.databinding.ComparableRvItem
-import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
-import com.skoumal.teanity.extensions.doOnSuccessUi
-import com.skoumal.teanity.extensions.subscribeK
-import com.skoumal.teanity.util.DiffObservableList
-import com.skoumal.teanity.util.KObservableField
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.database.RepoDao
-import com.topjohnwu.magisk.extensions.toSingle
-import com.topjohnwu.magisk.extensions.update
+import com.topjohnwu.magisk.databinding.ComparableRvItem
+import com.topjohnwu.magisk.extensions.*
 import com.topjohnwu.magisk.model.entity.module.Module
 import com.topjohnwu.magisk.model.entity.recycler.ModuleRvItem
 import com.topjohnwu.magisk.model.entity.recycler.RepoRvItem
@@ -20,7 +15,8 @@ import com.topjohnwu.magisk.model.events.InstallModuleEvent
 import com.topjohnwu.magisk.model.events.OpenChangelogEvent
 import com.topjohnwu.magisk.model.events.OpenFilePickerEvent
 import com.topjohnwu.magisk.tasks.RepoUpdater
-import com.topjohnwu.magisk.ui.base.MagiskViewModel
+import com.topjohnwu.magisk.utils.DiffObservableList
+import com.topjohnwu.magisk.utils.KObservableField
 import io.reactivex.Single
 import io.reactivex.disposables.Disposable
 import me.tatarka.bindingcollectionadapter2.OnItemBind
@@ -29,7 +25,7 @@ class ModuleViewModel(
     private val resources: Resources,
     private val repoUpdater: RepoUpdater,
     private val repoDB: RepoDao
-) : MagiskViewModel() {
+) : BaseViewModel() {
 
     val query = KObservableField("")
 

app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt

@@ -8,19 +8,19 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
-import com.skoumal.teanity.viewevents.ViewEvent
-import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentModulesBinding
 import com.topjohnwu.magisk.extensions.reboot
+import com.topjohnwu.magisk.intent
 import com.topjohnwu.magisk.model.events.OpenFilePickerEvent
-import com.topjohnwu.magisk.ui.base.MagiskFragment
+import com.topjohnwu.magisk.model.events.ViewEvent
 import com.topjohnwu.magisk.ui.flash.FlashActivity
 import com.topjohnwu.superuser.Shell
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
-class ModulesFragment : MagiskFragment<ModuleViewModel, FragmentModulesBinding>() {
+class ModulesFragment : BaseFragment<ModuleViewModel, FragmentModulesBinding>() {
 
     override val layoutRes: Int = R.layout.fragment_modules
     override val viewModel: ModuleViewModel by sharedViewModel()
@@ -28,7 +28,7 @@ class ModulesFragment : MagiskFragment<ModuleViewModel, FragmentModulesBinding>(
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == Const.ID.FETCH_ZIP && resultCode == Activity.RESULT_OK && data != null) {
             // Get the URI of the selected file
-            val intent = Intent(activity, ClassMap[FlashActivity::class.java])
+            val intent = activity.intent(FlashActivity::class.java)
             intent.setData(data.data).putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP)
             startActivity(intent)
         }

app/src/main/java/com/topjohnwu/magisk/ui/module/ReposFragment.kt

@@ -6,9 +6,9 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.widget.SearchView
-import com.skoumal.teanity.viewevents.ViewEvent
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentReposBinding
 import com.topjohnwu.magisk.model.download.DownloadService
 import com.topjohnwu.magisk.model.entity.internal.Configuration
@@ -16,12 +16,12 @@ import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.entity.module.Repo
 import com.topjohnwu.magisk.model.events.InstallModuleEvent
 import com.topjohnwu.magisk.model.events.OpenChangelogEvent
-import com.topjohnwu.magisk.ui.base.MagiskFragment
+import com.topjohnwu.magisk.model.events.ViewEvent
 import com.topjohnwu.magisk.view.MarkDownWindow
 import com.topjohnwu.magisk.view.dialogs.CustomAlertDialog
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
-class ReposFragment : MagiskFragment<ModuleViewModel, FragmentReposBinding>(),
+class ReposFragment : BaseFragment<ModuleViewModel, FragmentReposBinding>(),
     SearchView.OnQueryTextListener {
 
     override val layoutRes: Int = R.layout.fragment_repos

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

@@ -13,21 +13,16 @@ import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
 import androidx.preference.SwitchPreferenceCompat
-import com.skoumal.teanity.extensions.subscribeK
-import com.skoumal.teanity.util.KObservableField
-import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.Config
-import com.topjohnwu.magisk.Const
-import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.*
+import com.topjohnwu.magisk.base.BasePreferenceFragment
 import com.topjohnwu.magisk.data.database.RepoDao
 import com.topjohnwu.magisk.databinding.CustomDownloadDialogBinding
-import com.topjohnwu.magisk.extensions.toLangTag
+import com.topjohnwu.magisk.databinding.DialogCustomNameBinding
+import com.topjohnwu.magisk.extensions.subscribeK
 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.net.Networking
-import com.topjohnwu.magisk.ui.base.BasePreferenceFragment
 import com.topjohnwu.magisk.utils.*
 import com.topjohnwu.magisk.view.dialogs.FingerprintAuthDialog
 import com.topjohnwu.superuser.Shell
@@ -57,6 +52,7 @@ class SettingsFragment : BasePreferenceFragment() {
         preferenceManager.setStorageDeviceProtected()
         setPreferencesFromResource(R.xml.app_settings, rootKey)
 
+        // Get preferences
         updateChannel = findPreference(Config.Key.UPDATE_CHANNEL)!!
         rootConfig = findPreference(Config.Key.ROOT_ACCESS)!!
         autoRes = findPreference(Config.Key.SU_AUTO_RESPONSE)!!
@@ -70,17 +66,68 @@ class SettingsFragment : BasePreferenceFragment() {
         val magiskCategory = findPreference<PreferenceCategory>("magisk")!!
         val suCategory = findPreference<PreferenceCategory>("superuser")!!
         val hideManager = findPreference<Preference>("hide")!!
-        hideManager.setOnPreferenceClickListener {
-            PatchAPK.hideManager(requireContext())
-            true
+        val restoreManager = findPreference<Preference>("restore")!!
+
+        // Remove/Disable entries
+
+        // Only show canary channels if user is already on canary channel
+        // or the user have already chosen canary channel
+        if (!Utils.isCanary && Config.updateChannel < Config.Value.CANARY_CHANNEL) {
+            // Remove the last 2 entries
+            val entries = updateChannel.entries
+            updateChannel.entries = entries.copyOf(entries.size - 2)
         }
-        val restoreManager = findPreference<Preference>("restore")
-        restoreManager?.setOnPreferenceClickListener {
-            DownloadService(requireContext()) {
-                subject = DownloadSubject.Manager(Configuration.APK.Restore)
+
+        // Remove dangerous settings in secondary user
+        if (Const.USER_ID > 0) {
+            suCategory.removePreference(multiuserConfig)
+        }
+
+        // Remove re-authentication option on Android O, it will not work
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            suCategory.removePreference(reauth)
+        }
+
+        // Disable fingerprint option if not possible
+        if (!FingerprintHelper.canUseFingerprint()) {
+            fingerprint.isEnabled = false
+            fingerprint.isChecked = false
+            fingerprint.setSummary(R.string.disable_fingerprint)
+        }
+
+        if (Const.USER_ID == 0 && Info.isConnected.value && Shell.rootAccess()) {
+            if (activity.packageName == BuildConfig.APPLICATION_ID) {
+                generalCatagory.removePreference(restoreManager)
+                hideManager.setOnPreferenceClickListener {
+                    showManagerNameDialog {
+                        PatchAPK.hideManager(requireContext(), it)
+                    }
+                    true
+                }
+            } else {
+                generalCatagory.removePreference(hideManager)
+                restoreManager.setOnPreferenceClickListener {
+                    DownloadService(requireContext()) {
+                        subject = DownloadSubject.Manager(Configuration.APK.Restore)
+                    }
+                    true
+                }
             }
-            true
+        } else {
+            // Remove if not primary user, no connection, or no root
+            generalCatagory.removePreference(restoreManager)
+            generalCatagory.removePreference(hideManager)
         }
+
+        if (!Utils.showSuperUser()) {
+            preferenceScreen.removePreference(suCategory)
+        }
+
+        if (!Shell.rootAccess()) {
+            preferenceScreen.removePreference(magiskCategory)
+            generalCatagory.removePreference(hideManager)
+        }
+
         findPreference<Preference>("clear")?.setOnPreferenceClickListener {
             Completable.fromAction { repoDB.clear() }.subscribeK {
                 Utils.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT)
@@ -124,58 +171,7 @@ class SettingsFragment : BasePreferenceFragment() {
 
         setLocalePreference(findPreference(Config.Key.LOCALE)!!)
 
-        /* We only show canary channels if user is already on canary channel
-         * or the user have already chosen canary channel */
-        if (!Utils.isCanary && Config.updateChannel < Config.Value.CANARY_CHANNEL) {
-            // Remove the last 2 entries
-            val entries = updateChannel.entries
-            updateChannel.entries = entries.copyOf(entries.size - 2)
-
-        }
-
         setSummary()
-
-        // Disable dangerous settings in secondary user
-        if (Const.USER_ID > 0) {
-            suCategory.removePreference(multiuserConfig)
-        }
-
-        // Disable re-authentication option on Android O, it will not work
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            reauth.isEnabled = false
-            reauth.isChecked = false
-            reauth.setSummary(R.string.android_o_not_support)
-        }
-
-        // Disable fingerprint option if not possible
-        if (!FingerprintHelper.canUseFingerprint()) {
-            fingerprint.isEnabled = false
-            fingerprint.isChecked = false
-            fingerprint.setSummary(R.string.disable_fingerprint)
-        }
-
-        if (Shell.rootAccess() && Const.USER_ID == 0) {
-            if (activity.packageName == BuildConfig.APPLICATION_ID) {
-                generalCatagory.removePreference(restoreManager)
-            } else {
-                if (!Networking.checkNetworkStatus(requireContext())) {
-                    generalCatagory.removePreference(restoreManager)
-                }
-                generalCatagory.removePreference(hideManager)
-            }
-        } else {
-            generalCatagory.removePreference(restoreManager)
-            generalCatagory.removePreference(hideManager)
-        }
-
-        if (!Utils.showSuperUser()) {
-            preferenceScreen.removePreference(suCategory)
-        }
-
-        if (!Shell.rootAccess()) {
-            preferenceScreen.removePreference(magiskCategory)
-            generalCatagory.removePreference(hideManager)
-        }
     }
 
     override fun onSharedPreferenceChanged(prefs: SharedPreferences, key: String) {
@@ -202,7 +198,7 @@ class SettingsFragment : BasePreferenceFragment() {
                 Shell.su("magiskhide --disable").submit()
             }
             Config.Key.LOCALE -> {
-                LocaleManager.setLocale(activity.application)
+                refreshLocale()
                 activity.recreate()
             }
             Config.Key.CHECK_UPDATES -> Utils.scheduleUpdateCheck(activity)
@@ -226,27 +222,12 @@ class SettingsFragment : BasePreferenceFragment() {
 
     private fun setLocalePreference(lp: ListPreference) {
         lp.isEnabled = false
-        availableLocales.map {
-                val names = mutableListOf<String>()
-                val values = mutableListOf<String>()
-
-                names.add(
-                    LocaleManager.getString(defaultLocale, R.string.system_default)
-                )
-                values.add("")
-
-                it.forEach { locale ->
-                    names.add(locale.getDisplayName(locale))
-                    values.add(locale.toLangTag())
-                }
-
-                Pair(names.toTypedArray(), values.toTypedArray())
-            }.subscribeK { (names, values) ->
-                lp.isEnabled = true
-                lp.entries = names
-                lp.entryValues = values
-                lp.summary = currentLocale.getDisplayName(currentLocale)
-            }
+        availableLocales.subscribeK { (names, values) ->
+            lp.isEnabled = true
+            lp.entries = names
+            lp.entryValues = values
+            lp.summary = currentLocale.getDisplayName(currentLocale)
+        }
     }
 
     private fun setSummary(key: String) {
@@ -298,8 +279,8 @@ class SettingsFragment : BasePreferenceFragment() {
         AlertDialog.Builder(requireActivity())
             .setTitle(R.string.settings_update_custom)
             .setView(v)
-            .setPositiveButton(R.string.ok) { _, _ -> onSuccess(url.text.toString()) }
-            .setNegativeButton(R.string.close) { _, _ -> onCancel() }
+            .setPositiveButton(android.R.string.ok) { _, _ -> onSuccess(url.text.toString()) }
+            .setNegativeButton(android.R.string.cancel) { _, _ -> onCancel() }
             .setOnCancelListener { onCancel() }
             .show()
     }
@@ -323,11 +304,35 @@ class SettingsFragment : BasePreferenceFragment() {
         AlertDialog.Builder(requireActivity())
             .setTitle(R.string.settings_download_path_title)
             .setView(binding.root)
-            .setPositiveButton(R.string.ok) { _, _ ->
+            .setPositiveButton(android.R.string.ok) { _, _ ->
                 Utils.ensureDownloadPath(data.text.value)?.let { onSuccess(data.text.value) }
                     ?: Utils.toast(R.string.settings_download_path_error, Toast.LENGTH_SHORT)
             }
-            .setNegativeButton(R.string.close, null)
+            .setNegativeButton(android.R.string.cancel, null)
             .show()
     }
-}
+
+    private inline fun showManagerNameDialog(
+        crossinline onSuccess: (String) -> Unit
+    ) {
+        val data = ManagerNameData()
+        val view = DialogCustomNameBinding
+            .inflate(LayoutInflater.from(requireContext()))
+            .also { it.data = data }
+
+        AlertDialog.Builder(requireActivity())
+            .setTitle(R.string.settings_app_name)
+            .setView(view.root)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                if (view.dialogNameInput.error.isNullOrBlank()) {
+                    onSuccess(data.name.value)
+                }
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .show()
+    }
+
+    inner class ManagerNameData {
+        val name = KObservableField(resources.getString(R.string.re_app_name))
+    }
+}

app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt

@@ -1,12 +1,12 @@
 package com.topjohnwu.magisk.ui.superuser
 
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentSuperuserBinding
-import com.topjohnwu.magisk.ui.base.MagiskFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SuperuserFragment :
-    MagiskFragment<SuperuserViewModel, FragmentSuperuserBinding>() {
+    BaseFragment<SuperuserViewModel, FragmentSuperuserBinding>() {
 
     override val layoutRes: Int = R.layout.fragment_superuser
     override val viewModel: SuperuserViewModel by viewModel()

app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt

@@ -2,22 +2,22 @@ package com.topjohnwu.magisk.ui.superuser
 
 import android.content.pm.PackageManager
 import android.content.res.Resources
-import com.skoumal.teanity.databinding.ComparableRvItem
-import com.skoumal.teanity.extensions.applySchedulers
-import com.skoumal.teanity.extensions.subscribeK
-import com.skoumal.teanity.rxbus.RxBus
-import com.skoumal.teanity.util.DiffObservableList
-import com.skoumal.teanity.viewevents.SnackbarEvent
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.database.PolicyDao
+import com.topjohnwu.magisk.databinding.ComparableRvItem
+import com.topjohnwu.magisk.extensions.applySchedulers
+import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.extensions.toggle
 import com.topjohnwu.magisk.model.entity.MagiskPolicy
 import com.topjohnwu.magisk.model.entity.recycler.PolicyRvItem
 import com.topjohnwu.magisk.model.events.PolicyEnableEvent
 import com.topjohnwu.magisk.model.events.PolicyUpdateEvent
-import com.topjohnwu.magisk.ui.base.MagiskViewModel
+import com.topjohnwu.magisk.model.events.SnackbarEvent
+import com.topjohnwu.magisk.utils.DiffObservableList
 import com.topjohnwu.magisk.utils.FingerprintHelper
+import com.topjohnwu.magisk.utils.RxBus
 import com.topjohnwu.magisk.view.dialogs.CustomAlertDialog
 import com.topjohnwu.magisk.view.dialogs.FingerprintAuthDialog
 import io.reactivex.Single
@@ -29,7 +29,7 @@ class SuperuserViewModel(
     private val packageManager: PackageManager,
     private val resources: Resources,
     rxBus: RxBus
-) : MagiskViewModel() {
+) : BaseViewModel() {
 
     val items = DiffObservableList(ComparableRvItem.callback)
     val itemBinding = ItemBinding.of<ComparableRvItem<*>> { itemBinding, _, item ->
@@ -42,6 +42,11 @@ class SuperuserViewModel(
 
     init {
         rxBus.register<PolicyEnableEvent>()
+            .filter {
+                val isIgnored = it.item == ignoreNext
+                if (isIgnored) ignoreNext = null
+                !isIgnored
+            }
             .subscribeK { togglePolicy(it.item, it.enable) }
             .add()
         rxBus.register<PolicyUpdateEvent>()
@@ -84,8 +89,8 @@ class SuperuserViewModel(
                 CustomAlertDialog(this)
                     .setTitle(R.string.su_revoke_title)
                     .setMessage(getString(R.string.su_revoke_msg, item.item.appName))
-                    .setPositiveButton(R.string.yes) { _, _ -> updateState() }
-                    .setNegativeButton(R.string.no_thanks, null)
+                    .setPositiveButton(android.R.string.yes) { _, _ -> updateState() }
+                    .setNegativeButton(android.R.string.no, null)
                     .setCancelable(true)
                     .show()
             }
@@ -144,4 +149,4 @@ class SuperuserViewModel(
     private fun deletePolicy(policy: MagiskPolicy) =
         policyDB.delete(policy.uid).andThen(Single.just(policy))
 
-}
+}

app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt

@@ -3,21 +3,21 @@ package com.topjohnwu.magisk.ui.surequest
 import android.content.pm.ActivityInfo
 import android.os.Build
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.Window
-import com.skoumal.teanity.viewevents.ViewEvent
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.databinding.ActivityRequestBinding
 import com.topjohnwu.magisk.model.entity.MagiskPolicy
 import com.topjohnwu.magisk.model.events.DieEvent
+import com.topjohnwu.magisk.model.events.ViewEvent
 import com.topjohnwu.magisk.model.receiver.GeneralReceiver
-import com.topjohnwu.magisk.ui.base.MagiskActivity
 import com.topjohnwu.magisk.utils.SuLogger
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-open class SuRequestActivity : MagiskActivity<SuRequestViewModel, ActivityRequestBinding>() {
+open class SuRequestActivity : BaseActivity<SuRequestViewModel, ActivityRequestBinding>() {
 
     override val layoutRes: Int = R.layout.activity_request
+    override val themeRes: Int = R.style.MagiskTheme_SU
     override val viewModel: SuRequestViewModel by viewModel()
 
     override fun onBackPressed() {
@@ -30,19 +30,17 @@ open class SuRequestActivity : MagiskActivity<SuRequestViewModel, ActivityReques
         super.onCreate(savedInstanceState)
 
         val intent = intent
-        val action = intent.action
 
-        if (TextUtils.equals(action, GeneralReceiver.REQUEST)) {
-            if (!viewModel.handleRequest(intent))
-                finish()
-            return
+        when (intent?.action) {
+            GeneralReceiver.REQUEST -> {
+                if (!viewModel.handleRequest(intent))
+                    finish()
+                return
+            }
+            GeneralReceiver.LOG -> SuLogger.handleLogs(this, intent)
+            GeneralReceiver.NOTIFY -> SuLogger.handleNotify(this, intent)
         }
 
-        if (TextUtils.equals(action, GeneralReceiver.LOG))
-            SuLogger.handleLogs(intent)
-        else if (TextUtils.equals(action, GeneralReceiver.NOTIFY))
-            SuLogger.handleNotify(intent)
-
         finish()
     }
 

app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt

@@ -9,21 +9,21 @@ import android.graphics.drawable.Drawable
 import android.hardware.fingerprint.FingerprintManager
 import android.os.CountDownTimer
 import android.text.TextUtils
-import com.skoumal.teanity.databinding.ComparableRvItem
-import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
-import com.skoumal.teanity.util.DiffObservableList
-import com.skoumal.teanity.util.KObservableField
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.database.PolicyDao
+import com.topjohnwu.magisk.databinding.ComparableRvItem
+import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
 import com.topjohnwu.magisk.extensions.now
 import com.topjohnwu.magisk.model.entity.MagiskPolicy
 import com.topjohnwu.magisk.model.entity.recycler.SpinnerRvItem
 import com.topjohnwu.magisk.model.entity.toPolicy
 import com.topjohnwu.magisk.model.events.DieEvent
-import com.topjohnwu.magisk.ui.base.MagiskViewModel
+import com.topjohnwu.magisk.utils.DiffObservableList
 import com.topjohnwu.magisk.utils.FingerprintHelper
+import com.topjohnwu.magisk.utils.KObservableField
 import com.topjohnwu.magisk.utils.SuConnector
 import me.tatarka.bindingcollectionadapter2.BindingListViewAdapter
 import me.tatarka.bindingcollectionadapter2.ItemBinding
@@ -36,7 +36,7 @@ class SuRequestViewModel(
     private val policyDB: PolicyDao,
     private val timeoutPrefs: SharedPreferences,
     private val resources: Resources
-) : MagiskViewModel() {
+) : BaseViewModel() {
 
     val icon = KObservableField<Drawable?>(null)
     val title = KObservableField("")

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

@@ -0,0 +1,22 @@
+package com.topjohnwu.magisk.utils
+
+class CachedValue<T>(private val factory: () -> T) : Lazy<T> {
+
+    private var _val : T? = null
+
+    override val value: T
+        get() {
+            val local = _val
+            return local ?: synchronized(this) {
+                _val ?: factory().also { _val = it }
+            }
+        }
+
+    override fun isInitialized() = _val != null
+
+    fun invalidate() {
+        synchronized(this) {
+            _val = null
+        }
+    }
+}

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

@@ -16,9 +16,10 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager.widget.ViewPager
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.navigation.NavigationView
-import com.skoumal.teanity.extensions.subscribeK
+import com.google.android.material.textfield.TextInputLayout
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.extensions.replaceRandomWithSpecial
+import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.model.entity.state.IndeterminateState
 import io.reactivex.Observable
 import io.reactivex.disposables.Disposable
@@ -220,4 +221,11 @@ fun getScrollPosition(view: RecyclerView) = (view.layoutManager as? LinearLayout
 @BindingAdapter("isEnabled")
 fun setEnabled(view: View, isEnabled: Boolean) {
     view.isEnabled = isEnabled
+}
+
+@BindingAdapter("error")
+fun TextInputLayout.setErrorString(error: String) {
+    val newError = error.let { if (it.isEmpty()) null else it }
+    if (this.error == null && newError == null) return
+    this.error = newError
 }

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

@@ -0,0 +1,234 @@
+package com.topjohnwu.magisk.utils
+
+import androidx.annotation.MainThread
+import androidx.databinding.ListChangeRegistry
+import androidx.databinding.ObservableList
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListUpdateCallback
+import java.util.*
+import kotlin.collections.ArrayList
+
+/**
+ * @param callback    The callback that controls the behavior of the DiffObservableList.
+ * @param detectMoves True if DiffUtil should try to detect moved items, false otherwise.
+ */
+open class DiffObservableList<T>(
+        private val callback: Callback<T>,
+        private val detectMoves: Boolean = true
+) : AbstractList<T>(), ObservableList<T> {
+
+    private val LIST_LOCK = Object()
+    private var list: MutableList<T> = ArrayList()
+    private val listeners = ListChangeRegistry()
+    private val listCallback = ObservableListUpdateCallback()
+
+    override val size: Int get() = list.size
+
+    /**
+     * Calculates the list of update operations that can convert this list into the given one.
+     *
+     * @param newItems The items that this list will be set to.
+     * @return A DiffResult that contains the information about the edit sequence to covert this
+     * list into the given one.
+     */
+    fun calculateDiff(newItems: List<T>): DiffUtil.DiffResult {
+        val frozenList = synchronized(LIST_LOCK) {
+            ArrayList(list)
+        }
+        return doCalculateDiff(frozenList, newItems)
+    }
+
+    private fun doCalculateDiff(oldItems: List<T>, newItems: List<T>?): DiffUtil.DiffResult {
+        return DiffUtil.calculateDiff(object : DiffUtil.Callback() {
+            override fun getOldListSize() = oldItems.size
+
+            override fun getNewListSize() = newItems?.size ?: 0
+
+            override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+                val oldItem = oldItems[oldItemPosition]
+                val newItem = newItems!![newItemPosition]
+                return callback.areItemsTheSame(oldItem, newItem)
+            }
+
+            override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+                val oldItem = oldItems[oldItemPosition]
+                val newItem = newItems!![newItemPosition]
+                return callback.areContentsTheSame(oldItem, newItem)
+            }
+        }, detectMoves)
+    }
+
+    /**
+     * Updates the contents of this list to the given one using the DiffResults to dispatch change
+     * notifications.
+     *
+     * @param newItems   The items to set this list to.
+     * @param diffResult The diff results to dispatch change notifications.
+     */
+    @MainThread
+    fun update(newItems: List<T>, diffResult: DiffUtil.DiffResult) {
+        synchronized(LIST_LOCK) {
+            list = newItems.toMutableList()
+        }
+        diffResult.dispatchUpdatesTo(listCallback)
+    }
+
+    /**
+     * Sets this list to the given items. This is a convenience method for calling [ ][.calculateDiff] followed by [.update].
+     *
+     *
+     * **Warning!** If the lists are large this operation may be too slow for the main thread. In
+     * that case, you should call [.calculateDiff] on a background thread and then
+     * [.update] on the main thread.
+     *
+     * @param newItems The items to set this list to.
+     */
+    @MainThread
+    fun update(newItems: List<T>) {
+        val diffResult = doCalculateDiff(list, newItems)
+        list = newItems.toMutableList()
+        diffResult.dispatchUpdatesTo(listCallback)
+    }
+
+    override fun addOnListChangedCallback(listener: ObservableList.OnListChangedCallback<out ObservableList<T>>) {
+        listeners.add(listener)
+    }
+
+    override fun removeOnListChangedCallback(listener: ObservableList.OnListChangedCallback<out ObservableList<T>>) {
+        listeners.remove(listener)
+    }
+
+    override fun get(index: Int): T {
+        return list[index]
+    }
+
+    override fun add(element: T): Boolean {
+        list.add(element)
+        notifyAdd(size - 1, 1)
+        return true
+    }
+
+    override fun add(index: Int, element: T) {
+        list.add(index, element)
+        notifyAdd(index, 1)
+    }
+
+    override fun addAll(elements: Collection<T>): Boolean {
+        val oldSize = size
+        val added = list.addAll(elements)
+        if (added) {
+            notifyAdd(oldSize, size - oldSize)
+        }
+        return added
+    }
+
+    override fun addAll(index: Int, elements: Collection<T>): Boolean {
+        val added = list.addAll(index, elements)
+        if (added) {
+            notifyAdd(index, elements.size)
+        }
+        return added
+    }
+
+    override fun clear() {
+        val oldSize = size
+        list.clear()
+        if (oldSize != 0) {
+            notifyRemove(0, oldSize)
+        }
+    }
+
+    override fun remove(element: T): Boolean {
+        val index = indexOf(element)
+        return if (index >= 0) {
+            removeAt(index)
+            true
+        } else {
+            false
+        }
+    }
+
+    override fun removeAt(index: Int): T {
+        val element = list.removeAt(index)
+        notifyRemove(index, 1)
+        return element
+    }
+
+    fun removeLast(): T? {
+        if (size > 0) {
+            val index = size - 1
+            return removeAt(index)
+        }
+        return null
+    }
+
+    override fun set(index: Int, element: T): T {
+        val old = list.set(index, element)
+        listeners.notifyChanged(this, index, 1)
+        return old
+    }
+
+    private fun notifyAdd(start: Int, count: Int) {
+        listeners.notifyInserted(this, start, count)
+    }
+
+    private fun notifyRemove(start: Int, count: Int) {
+        listeners.notifyRemoved(this, start, count)
+    }
+
+    /**
+     * A Callback class used by DiffUtil while calculating the diff between two lists.
+     */
+    interface Callback<T> {
+        /**
+         * Called by the DiffUtil to decide whether two object represent the same Item.
+         *
+         *
+         * For example, if your items have unique ids, this method should check their id equality.
+         *
+         * @param oldItem The old item.
+         * @param newItem The new item.
+         * @return True if the two items represent the same object or false if they are different.
+         */
+        fun areItemsTheSame(oldItem: T, newItem: T): Boolean
+
+        /**
+         * Called by the DiffUtil when it wants to check whether two items have the same data.
+         * DiffUtil uses this information to detect if the contents of an item has changed.
+         *
+         *
+         * DiffUtil uses this method to check equality instead of [Object.equals] so
+         * that you can change its behavior depending on your UI.
+         *
+         *
+         * This method is called only if [.areItemsTheSame] returns `true` for
+         * these items.
+         *
+         * @param oldItem The old item.
+         * @param newItem The new item which replaces the old item.
+         * @return True if the contents of the items are the same or false if they are different.
+         */
+        fun areContentsTheSame(oldItem: T, newItem: T): Boolean
+    }
+
+    inner class ObservableListUpdateCallback : ListUpdateCallback {
+        override fun onChanged(position: Int, count: Int, payload: Any?) {
+            listeners.notifyChanged(this@DiffObservableList, position, count)
+        }
+
+        override fun onMoved(fromPosition: Int, toPosition: Int) {
+            listeners.notifyMoved(this@DiffObservableList, fromPosition, toPosition, 1)
+        }
+
+        override fun onInserted(position: Int, count: Int) {
+            modCount += 1
+            listeners.notifyInserted(this@DiffObservableList, position, count)
+        }
+
+        override fun onRemoved(position: Int, count: Int) {
+            modCount += 1
+            listeners.notifyRemoved(this@DiffObservableList, position, count)
+        }
+
+    }
+}

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

@@ -1,61 +0,0 @@
-package com.topjohnwu.magisk.utils
-
-import dalvik.system.DexClassLoader
-import java.io.File
-import java.io.IOException
-import java.net.URL
-import java.util.*
-
-@Suppress("FunctionName")
-inline fun <reified T> T.DynamicClassLoader(apk: File) = DynamicClassLoader(apk, T::class.java.classLoader)
-
-class DynamicClassLoader(apk: File, parent: ClassLoader?)
-    : DexClassLoader(apk.path, apk.parent, null, parent) {
-
-    private val base by lazy { Any::class.java.classLoader!! }
-
-    @Throws(ClassNotFoundException::class)
-    override fun loadClass(name: String, resolve: Boolean) : Class<*>
-        = findLoadedClass(name) ?: runCatching {
-            base.loadClass(name)
-        }.getOrElse {
-            runCatching {
-                findClass(name)
-            }.getOrElse { err ->
-                runCatching {
-                    parent.loadClass(name)
-                }.getOrElse { throw err }
-            }
-        }
-
-    override fun getResource(name: String) = base.getResource(name)
-            ?: findResource(name)
-            ?: parent?.getResource(name)
-
-    @Throws(IOException::class)
-    override fun getResources(name: String): Enumeration<URL> {
-        val resources = mutableListOf(
-                base.getResources(name),
-                findResources(name), parent.getResources(name))
-        return object : Enumeration<URL> {
-            override fun hasMoreElements(): Boolean {
-                while (true) {
-                    if (resources.isEmpty())
-                        return false
-                    if (!resources[0].hasMoreElements()) {
-                        resources.removeAt(0)
-                    } else {
-                        return true
-                    }
-                }
-            }
-
-            override fun nextElement(): URL {
-                if (!hasMoreElements())
-                    throw NoSuchElementException()
-                return resources[0].nextElement()
-            }
-        }
-    }
-
-}

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

@@ -0,0 +1,117 @@
+package com.topjohnwu.magisk.utils
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
+import android.view.View
+import androidx.annotation.DrawableRes
+import androidx.core.view.get
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.RecyclerView
+import com.topjohnwu.magisk.extensions.drawableCompat
+
+class KItemDecoration(
+    private val context: Context,
+    @RecyclerView.Orientation private val orientation: Int
+) :
+    RecyclerView.ItemDecoration() {
+
+    private val bounds = Rect()
+    private var divider: Drawable? = null
+    var showAfterLast = true
+
+    fun setDeco(@DrawableRes drawable: Int) = apply {
+        setDeco(context.drawableCompat(drawable))
+    }
+
+    fun setDeco(drawable: Drawable?) = apply {
+        divider = drawable
+    }
+
+    override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        parent.layoutManager ?: return
+
+        divider?.let {
+            if (orientation == DividerItemDecoration.VERTICAL) {
+                drawVertical(canvas, parent, it)
+            } else {
+                drawHorizontal(canvas, parent, it)
+            }
+        }
+    }
+
+    private fun drawVertical(canvas: Canvas, parent: RecyclerView, drawable: Drawable) {
+        canvas.save()
+        val left: Int
+        val right: Int
+        if (parent.clipToPadding) {
+            left = parent.paddingLeft
+            right = parent.width - parent.paddingRight
+            canvas.clipRect(
+                left, parent.paddingTop, right,
+                parent.height - parent.paddingBottom
+            )
+        } else {
+            left = 0
+            right = parent.width
+        }
+
+        val to = if (showAfterLast) parent.childCount else parent.childCount - 1
+
+        (0 until to)
+            .map { parent[it] }
+            .forEach { child ->
+                parent.getDecoratedBoundsWithMargins(child, bounds)
+                val bottom = bounds.bottom + Math.round(child.translationY)
+                val top = bottom - drawable.intrinsicHeight
+                drawable.setBounds(left, top, right, bottom)
+                drawable.draw(canvas)
+            }
+        canvas.restore()
+    }
+
+    private fun drawHorizontal(canvas: Canvas, parent: RecyclerView, drawable: Drawable) {
+        canvas.save()
+        val top: Int
+        val bottom: Int
+        if (parent.clipToPadding) {
+            top = parent.paddingTop
+            bottom = parent.height - parent.paddingBottom
+            canvas.clipRect(
+                parent.paddingLeft, top,
+                parent.width - parent.paddingRight, bottom
+            )
+        } else {
+            top = 0
+            bottom = parent.height
+        }
+
+        val to = if (showAfterLast) parent.childCount else parent.childCount - 1
+
+        (0 until to)
+            .map { parent[it] }
+            .forEach { child ->
+                parent.layoutManager!!.getDecoratedBoundsWithMargins(child, bounds)
+                val right = bounds.right + Math.round(child.translationX)
+                val left = right - drawable.intrinsicWidth
+                drawable.setBounds(left, top, right, bottom)
+                drawable.draw(canvas)
+            }
+        canvas.restore()
+    }
+
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+        if (parent.getChildAdapterPosition(view) == state.itemCount - 1) {
+            outRect.setEmpty()
+            return
+        }
+
+        if (orientation == RecyclerView.VERTICAL) {
+            outRect.set(0, 0, 0, divider?.intrinsicHeight ?: 0)
+        } else {
+            outRect.set(0, 0, divider?.intrinsicWidth ?: 0, 0)
+        }
+    }
+
+}

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

@@ -0,0 +1,30 @@
+package com.topjohnwu.magisk.utils
+
+import androidx.databinding.Observable
+import androidx.databinding.ObservableField
+import java.io.Serializable
+
+/**
+ * Kotlin version of [ObservableField].
+ * You can define if wrapped type is Nullable or not.
+ * You can use kotlin get/set syntax for value
+ */
+open class KObservableField<T> : ObservableField<T>, Serializable {
+
+    var value: T
+        get() = get()
+        set(value) { set(value) }
+
+    constructor(init: T) {
+        value = init
+    }
+
+    constructor(init: T, vararg dependencies: Observable) : super(*dependencies) {
+        value = init
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun get(): T {
+        return super.get() as T
+    }
+}

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

@@ -0,0 +1,143 @@
+package com.topjohnwu.magisk.utils
+
+import android.content.pm.PackageManager
+import android.util.Base64
+import android.util.Base64OutputStream
+import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.di.koinModules
+import com.topjohnwu.signing.CryptoUtils.readCertificate
+import com.topjohnwu.signing.CryptoUtils.readPrivateKey
+import com.topjohnwu.superuser.internal.InternalUtils
+import org.bouncycastle.asn1.x500.X500Name
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter
+import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder
+import org.koin.core.context.GlobalContext
+import org.koin.core.context.startKoin
+import timber.log.Timber
+import java.io.ByteArrayOutputStream
+import java.math.BigInteger
+import java.security.KeyPairGenerator
+import java.security.KeyStore
+import java.security.MessageDigest
+import java.security.PrivateKey
+import java.security.cert.X509Certificate
+import java.util.*
+import java.util.zip.GZIPInputStream
+import java.util.zip.GZIPOutputStream
+
+private interface CertKeyProvider {
+    val cert: X509Certificate
+    val key: PrivateKey
+}
+
+@Suppress("DEPRECATION")
+class Keygen: CertKeyProvider {
+
+    companion object {
+        private const val ALIAS = "magisk"
+        private val PASSWORD get() = "magisk".toCharArray()
+        private const val TESTKEY_CERT = "61ed377e85d386a8dfee6b864bd85b0bfaa5af81"
+        private const val ALPHANUM = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+        private const val BASE64_FLAG = Base64.NO_PADDING or Base64.NO_WRAP
+    }
+
+    private val start = Calendar.getInstance()
+    private val end = Calendar.getInstance().apply { add(Calendar.YEAR, 30) }
+
+    override val cert get() = provider.cert
+    override val key get() = provider.key
+
+    private val provider: CertKeyProvider
+
+    inner class KeyStoreProvider : CertKeyProvider {
+        private val ks by lazy { init() }
+        override val cert by lazy { ks.getCertificate(ALIAS) as X509Certificate }
+        override val key by lazy { ks.getKey(ALIAS, PASSWORD) as PrivateKey }
+    }
+
+    class TestProvider : CertKeyProvider {
+        override val cert by lazy {
+            readCertificate(javaClass.getResourceAsStream("/keys/testkey.x509.pem"))
+        }
+        override val key by lazy {
+            readPrivateKey(javaClass.getResourceAsStream("/keys/testkey.pk8"))
+        }
+    }
+
+    init {
+        // This object could possibly be accessed from an external app
+        // Get context from reflection into Android's framework
+        val context = InternalUtils.getContext()
+        val pm = context.packageManager
+        val info = pm.getPackageInfo(context.packageName, PackageManager.GET_SIGNATURES)
+        val sig = info.signatures[0]
+        val digest = MessageDigest.getInstance("SHA1")
+        val chksum = digest.digest(sig.toByteArray())
+
+        val sb = StringBuilder()
+        for (b in chksum) {
+            sb.append("%02x".format(0xFF and b.toInt()))
+        }
+
+        provider = if (sb.toString() == TESTKEY_CERT) {
+            // The app was signed by the test key, continue to use it (legacy mode)
+            TestProvider()
+        } else {
+            KeyStoreProvider()
+        }
+    }
+
+    private fun randomString(): String {
+        val rand = kotlin.random.Random.Default
+        val len = rand.nextInt(5, 10)
+        val sb = StringBuilder(len)
+        for (i in 0..len) {
+            val idx = rand.nextInt(ALPHANUM.length)
+            sb.append(ALPHANUM[idx])
+        }
+        return sb.toString()
+    }
+
+    private fun init(): KeyStore {
+        GlobalContext.getOrNull() ?: {
+            // Invoked externally, do some basic initialization
+            startKoin {
+                modules(koinModules)
+            }
+            Timber.plant(Timber.DebugTree())
+        }()
+
+        val raw = Config.keyStoreRaw
+        val ks = KeyStore.getInstance("PKCS12")
+        if (raw.isEmpty()) {
+            ks.load(null)
+        } else {
+            GZIPInputStream(Base64.decode(raw, BASE64_FLAG).inputStream()).use {
+                ks.load(it, PASSWORD)
+            }
+        }
+
+        // Keys already exist
+        if (ks.containsAlias(ALIAS))
+            return ks
+
+        // Generate new private key and certificate
+        val kp = KeyPairGenerator.getInstance("RSA").apply { initialize(4096) }.genKeyPair()
+        val dname = X500Name("CN=${randomString()}")
+        val builder = JcaX509v3CertificateBuilder(dname, BigInteger(160, Random()),
+            start.time, end.time, dname, kp.public)
+        val signer = JcaContentSignerBuilder("SHA256WithRSA").build(kp.private)
+        val cert = JcaX509CertificateConverter().getCertificate(builder.build(signer))
+
+        // Store them into keystore
+        ks.setKeyEntry(ALIAS, kp.private, PASSWORD, arrayOf(cert))
+        val bytes = ByteArrayOutputStream()
+        GZIPOutputStream(Base64OutputStream(bytes, BASE64_FLAG)).use {
+            ks.store(it, PASSWORD)
+        }
+        Config.keyStoreRaw = bytes.toString("UTF-8")
+
+        return ks
+    }
+}

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

@@ -1,68 +0,0 @@
-package com.topjohnwu.magisk.utils
-
-import android.content.Context
-import android.content.ContextWrapper
-import android.content.res.Configuration
-import android.content.res.Resources
-import androidx.annotation.StringRes
-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.*
-
-var currentLocale = Locale.getDefault()!!
-    private set
-
-val defaultLocale = Locale.getDefault()!!
-
-val availableLocales = Single.fromCallable {
-    val compareId = R.string.app_changelog
-    val res: Resources by inject()
-    mutableListOf<Locale>().apply {
-        // Add default locale
-        add(Locale.ENGLISH)
-
-        // Add some special locales
-        add(Locale.TAIWAN)
-        add(Locale("pt", "BR"))
-
-        // Other locales
-        val otherLocales = res.assets.locales
-                .map { it.langTagToLocale() }
-                .distinctBy { LocaleManager.getString(it, compareId) }
-
-        listOf("", "").toTypedArray()
-
-        addAll(otherLocales)
-    }.sortedWith(Comparator { a, b ->
-        a.getDisplayName(a).toLowerCase(a)
-                .compareTo(b.getDisplayName(b).toLowerCase(b))
-    })
-}.cache()!!
-
-object LocaleManager {
-
-    fun setLocale(wrapper: ContextWrapper) {
-        val localeConfig = Config.locale
-        currentLocale = when {
-            localeConfig.isEmpty() -> defaultLocale
-            else -> localeConfig.langTagToLocale()
-        }
-        Locale.setDefault(currentLocale)
-        InternalUtils.replaceBaseContext(wrapper, getLocaleContext(wrapper, currentLocale))
-    }
-
-    fun getLocaleContext(context: Context, locale: Locale = currentLocale): Context {
-        val config = Configuration(context.resources.configuration)
-        config.setLocale(locale)
-        return context.createConfigurationContext(config)
-    }
-
-    fun getString(locale: Locale, @StringRes id: Int): String {
-        return getLocaleContext(get(), locale).getString(id)
-    }
-}