Add v21.3 release notes

update czech strings.xml

.gitattributes

@@ -17,3 +17,8 @@ tools/** binary
 *.apk binary
 *.png binary
 *.jpg binary
+*.ttf binary
+
+# Help GitHub detect languages
+native/jni/external/** linguist-vendored
+native/jni/systemproperties/** linguist-language=C++

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## READ BEFORE OPENING ISSUES
+
+All bug reports require you to **USE CANARY BUILDS**. Please include the version name and version code in the bug report.
+
+If you experience a bootloop, attach a `dmesg` (kernel logs) when the device refuse to boot. This may very likely require a custom kernel on some devices as `last_kmsg` or `pstore ramoops` are usually not enabled by default. In addition, please also upload the result of `cat /proc/mounts` when your device is working correctly **WITHOUT ROOT**.
+
+If you experience issues during installation, in recovery, upload the recovery logs, or in Magisk Manager, upload the install logs. Please also upload the `boot.img` or `recovery.img` that you are using for patching.
+
+If you experience a crash of Magisk Manager, dump the full `logcat` **when the crash happens**. **DO NOT** upload `magisk.log`.
+
+If you experience other issues related to Magisk, upload `magisk.log`, and preferably also include a boot `logcat` (start dumping `logcat` when the device boots up)
+
+**DO NOT** open issues regarding root detection.
+
+**DO NOT** ask for instructions.
+
+**DO NOT** report issues if you have any modules installed.
+
+Without following the rules above, your issue will be closed without explanation.

.github/workflows/build.yml

@@ -0,0 +1,94 @@
+name: Magisk Build
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - 'app/**'
+      - 'native/**'
+      - 'stub/**'
+      - 'buildSrc/**'
+      - 'build.py'
+      - 'gradle.properties'
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macOS-latest ]
+
+    steps:
+      - name: Check out
+        uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+          fetch-depth: 0
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: '11'
+
+      - name: Set up Python 3
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Set up GitHub env (Windows)
+        if: runner.os == 'Windows'
+        run: |
+          $oldAndroidPath = $env:ANDROID_SDK_ROOT
+          $sdk_root = "C:\Android"
+          New-Item -Path $sdk_root -ItemType SymbolicLink -Value $oldAndroidPath
+          $ndk_ver = Select-String -Path "gradle.properties" -Pattern "^magisk.fullNdkVersion=" | % { $_ -replace ".*=" }
+          echo "ANDROID_SDK_ROOT=$sdk_root" >> $env:GITHUB_ENV
+          echo "ANDROID_HOME=$sdk_root" >> $env:GITHUB_ENV
+          echo "MAGISK_NDK_VERSION=$ndk_ver" >> $env:GITHUB_ENV
+          echo "GRADLE_OPTS=-Dorg.gradle.daemon=false" >> $env:GITHUB_ENV
+
+      - name: Set up GitHub env (Unix)
+        if: runner.os != 'Windows'
+        run: |
+          ndk_ver=$(sed -n 's/^magisk.fullNdkVersion=//p' gradle.properties)
+          echo ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT >> $GITHUB_ENV
+          echo MAGISK_NDK_VERSION=$ndk_ver >> $GITHUB_ENV
+
+      - name: Cache Gradle
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+          restore-keys: ${{ runner.os }}-gradle-
+
+      - name: Cache NDK
+        id: ndk-cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.ANDROID_SDK_ROOT }}/ndk/magisk
+          key: ${{ runner.os }}-ndk-${{ env.MAGISK_NDK_VERSION }}
+
+      - name: Set up NDK
+        if: steps.ndk-cache.outputs.cache-hit != 'true'
+        run: python build.py ndk
+
+      - name: Build release
+        run: python build.py -vr all
+
+      - name: Build debug
+        run: python build.py -v all
+
+      # Only upload artifacts built on Linux
+      - name: Upload build artifact
+        if: runner.os == 'Linux'
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ github.sha }}
+          path: out

.gitmodules

@@ -22,6 +22,12 @@
 [submodule "mincrypt"]
 	path = native/jni/external/mincrypt
 	url = https://github.com/topjohnwu/mincrypt.git
+[submodule "pcre"]
+	path = native/jni/external/pcre
+	url = https://android.googlesource.com/platform/external/pcre
+[submodule "xhook"]
+	path = native/jni/external/xhook
+	url = https://github.com/iqiyi/xHook.git
 [submodule "termux-elf-cleaner"]
 	path = tools/termux-elf-cleaner
 	url = https://github.com/termux/termux-elf-cleaner.git

README.MD

@@ -1,34 +1,70 @@
-# Magisk
+![](docs/images/logo.png)
 
-[Downloads](https://github.com/topjohnwu/Magisk/releases) \| [Documentation](https://topjohnwu.github.io/Magisk/) \| [XDA Thread](https://forum.xda-developers.com/apps/magisk/official-magisk-v7-universal-systemless-t3473445)
+![ZIP Downloads](https://img.shields.io/badge/dynamic/json?color=blue&label=ZIP%20Downloads&query=magisk&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk_files%2Fcount%2Fcount.json&cacheSeconds=1800)
+![APK Downloads](https://img.shields.io/badge/dynamic/json?color=green&label=APK%20Downloads&query=manager&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk_files%2Fcount%2Fcount.json&cacheSeconds=1800)
 
 ## Introduction
 
-Magisk is a suite of open source tools for customizing Android, supporting devices higher than Android 4.2 (API 17). It covers the fundamental parts for Android customization: root, boot scripts, SELinux patches, AVB2.0 / dm-verity / forceencrypt removals etc.
+Magisk is a suite of open source tools for customizing Android, supporting devices higher than Android 4.2. It covers fundamental parts of Android customization: root, boot scripts, SELinux patches, AVB2.0 / dm-verity / forceencrypt removals etc.
 
-Furthermore, Magisk provides a **Systemless Interface** to alter the system (or vendor) arbitrarily while the actual partitions stay completely intact. With its systemless nature along with several other hacks, Magisk can hide modifications from nearly any system integrity verifications used in banking apps, corporation monitoring apps, game cheat detections, and most importantly [Google's SafetyNet API](https://developer.android.com/training/safetynet/index.html).
+Here are some feature highlights:
+
+- **MagiskSU**: Provide root access to your device
+- **Magisk Modules**: Modify read-only partitions by installing modules
+- **MagiskHide**: Hide Magisk from root detections / system integrity checks
+
+## Downloads
+
+[![](https://img.shields.io/badge/Magisk%20Manager-v8.0.5-green)](https://github.com/topjohnwu/Magisk/releases/download/manager-v8.0.5/MagiskManager-v8.0.5.apk)
+[![](https://img.shields.io/badge/Magisk%20Manager-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk_files/canary/app-debug.apk)
+<br>
+[![](https://img.shields.io/badge/Magisk-v21.2-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v21.2)
+[![](https://img.shields.io/badge/Magisk%20Beta-v21.2-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v21.2)
+
+## Useful Links
+
+- [Installation Instruction](https://topjohnwu.github.io/Magisk/install.html)
+- [Frequently Asked Questions](https://topjohnwu.github.io/Magisk/faq.html)
+- [Magisk Documentation](https://topjohnwu.github.io/Magisk/)
+- [Magisk Troubleshoot Wiki](https://www.didgeridoohan.com/magisk/HomePage) (by [@Didgeridoohan](https://github.com/Didgeridoohan))
+
+## Android Version Support
+
+- Android 4.2+: MagiskSU and Magisk Modules Only
+- Android 4.4+: All core features available
+- Android 6.0+: Guaranteed MagiskHide support
+- Android 7.0+: Full MagiskHide protection
+- Android 9.0+: Magisk Manager stealth mode
 
 ## Bug Reports
 
-**Make sure to install the latest [Canary Build](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337) before reporting any bugs!** **DO NOT** report bugs that are already fixed upstream. Follow the instructions in the [Canary Channel XDA Thread](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337), and report a bug either by [opening an issue on GitHub](https://github.com/topjohnwu/Magisk/issues) or directly in the thread.
+Canary Channels are cutting edge builds for those adventurous. To access canary builds, install the Canary Magisk Manager, switch to the Canary Channel in settings and upgrade.
 
-## Building Environment Requirements
+**Only bug reports from Canary builds will be accepted.**
 
--  Python 3: run `build.py` script
--  Java Development Kit (JDK) 8: Compile Magisk Manager and sign zips
--  Latest Android SDK: set `ANDROID_HOME` environment variable to the path to Android SDK
--  Android NDK: Install NDK along with SDK (`$ANDROID_HOME/ndk-bundle`), or optionally specify a custom path `ANDROID_NDK_HOME`
--  (Windows Only) Python package Colorama: Install with `pip install colorama`, used for ANSI color codes
+For installation issues, upload both boot image and install logs.<br>
+For Magisk issues, upload boot logcat or dmesg.<br>
+For Magisk Manager crashes, record and upload the logcat when the crash occurs.
 
-## Building Notes and Instructions
+## Building and Development
 
--  Clone sources with submodules: `git clone --recurse-submodules https://github.com/topjohnwu/Magisk.git`
--  Building is supported on macOS, Linux, and Windows. Official releases are built and tested with [FrankeNDK](https://github.com/topjohnwu/FrankeNDK); point `ANDROID_NDK_HOME` to FrankeNDK if you want to use it for compiling.
--  Set configurations in `config.prop`. A sample file `config.prop.sample` is provided as an example.
--  Run `build.py` with argument `-h` to see the built-in help message. The `-h` option also works for each supported actions, e.g. `./build.py binary -h`
--  By default, `build.py` build binaries and Magisk Manager in debug mode. If you want to build Magisk Manager in release mode (via the `-r, --release` flag), you need a Java Keystore file `release-key.jks` (only `JKS` format is supported) to sign APKs and zips. For more information, check out [Google's Official Documentation](https://developer.android.com/studio/publish/app-signing.html#signing-manually).
+- Magisk builds on any OS Android Studio supports. Install Android Studio and do the initial setups.
+- Clone sources: `git clone --recurse-submodules https://github.com/topjohnwu/Magisk.git`
+- Install Python 3.6+ \
+(Windows only: select **'Add Python to PATH'** in installer, and run `pip install colorama` after install)
+- Configure to use the JDK bundled in Android Studio:
+	- macOS: `export JAVA_HOME="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home"`
+	- Linux: `export PATH="/path/to/androidstudio/jre/bin:$PATH"`
+	- Windows: Add `C:\Path\To\Android Studio\jre\bin` to environment variable `PATH`
+- Set environment variable `ANDROID_SDK_ROOT` to the Android SDK folder (can be found in Android Studio settings)
+- Run `./build.py ndk` to let the script download and install NDK for you
+- To start building, run `build.py` to see your options. \
+For each action, use `-h` to access help (e.g. `./build.py all -h`)
+- To start development, open the project in Android Studio. Both app (Kotlin/Java) and native (C++/C) source code can be properly developed using the IDE, but *always* use `build.py` for building.
+- Optionally, set custom configs with `config.prop`. A sample `config.prop.sample` is provided.
+- To sign APKs and zips with your own private keys, set signing configs in `config.prop`. For more info, check [Google's Documentation](https://developer.android.com/studio/publish/app-signing.html#generate-key).
 
-## Translations
+## Translation Contributions
 
 Default string resources for Magisk Manager and its stub APK are located here:
 
@@ -37,27 +73,6 @@ Default string resources for Magisk Manager and its stub APK are located here:
 
 Translate each and place them in the respective locations (`[module]/src/main/res/values-[lang]/strings.xml`).
 
-## Signature Verification
-
-Official release zips and APKs are signed with my personal private key. You can verify the key certificate to make sure the binaries you downloaded are not manipulated in anyway.
-
-``` bash
-# Use the keytool command from JDK to print certificates
-keytool -printcert -jarfile <APK or Magisk zip>
-
-# The output should contain the following signature
-Owner: CN=John Wu, L=Taipei, C=TW
-Issuer: CN=John Wu, L=Taipei, C=TW
-Serial number: 50514879
-Valid from: Sun Aug 14 13:23:44 EDT 2016 until: Tue Jul 21 13:23:44 EDT 2116
-Certificate fingerprints:
-	 MD5:  CE:DA:68:C1:E1:74:71:0A:EF:58:89:7D:AE:6E:AB:4F
-	 SHA1: DC:0F:2B:61:CB:D7:E9:D3:DB:BE:06:0B:2B:87:0D:46:BB:06:02:11
-	 SHA256: B4:CB:83:B4:DA:D9:9F:99:7D:BE:87:2F:01:3A:A1:6C:14:EE:C4:1D:16:70:21:F3:71:F7:E1:33:0F:27:3E:E6
-	 Signature algorithm name: SHA256withRSA
-	 Version: 3
-```
-
 ## License
 
     Magisk, including all git submodules are free software:

app/build.gradle

@@ -1,135 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-
-kapt {
-    correctErrorTypes = true
-    useBuildCache = true
-    mapDiagnosticLocations = true
-    javacOptions {
-        option("-Xmaxerrs", 1000)
-    }
-}
-
-android {
-    defaultConfig {
-        applicationId 'com.topjohnwu.magisk'
-        vectorDrawables.useSupportLibrary = true
-        multiDexEnabled true
-        versionName props['appVersion']
-        versionCode props['appVersionCode'] as Integer
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),
-                    'proguard-rules.pro', 'proguard-kotlin.pro'
-        }
-    }
-
-    dataBinding {
-        enabled = true
-    }
-
-    packagingOptions {
-        exclude '/META-INF/**'
-        exclude '/androidsupportmultidexversion.txt'
-        exclude '/org/bouncycastle/**'
-        exclude '/kotlin/**'
-        exclude '/kotlinx/**'
-        exclude '/okhttp3/**'
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-}
-
-androidExtensions {
-    experimental = true
-}
-
-dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation project(':shared')
-    implementation project(':signing')
-
-    implementation 'com.github.topjohnwu:jtar:1.0.0'
-    implementation 'com.jakewharton.timber:timber:4.7.1'
-    implementation 'com.ncapdevi:frag-nav:3.2.0'
-    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.6'
-
-    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.2.0'
-    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}"
-    implementation "com.github.topjohnwu.libsu:io:${vLibsu}"
-
-    def vKoin = '2.0.1'
-    implementation "org.koin:koin-core:${vKoin}"
-    implementation "org.koin:koin-android:${vKoin}"
-    implementation "org.koin:koin-androidx-viewmodel:${vKoin}"
-
-    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.6'
-    implementation "com.squareup.okhttp3:okhttp:${vOkHttp}"
-    implementation "com.squareup.okhttp3:logging-interceptor:${vOkHttp}"
-
-    def vMoshi = '1.9.2'
-    implementation "com.squareup.moshi:moshi:${vMoshi}"
-
-    def vKotshi = '2.0.2'
-    implementation "se.ansman.kotshi:api:${vKotshi}"
-    kapt "se.ansman.kotshi:compiler:${vKotshi}"
-
-    modules {
-        module('androidx.room:room-runtime') {
-            replacedBy('com.github.topjohnwu:room-runtime')
-        }
-    }
-    def vRoom = '2.2.2'
-    implementation "com.github.topjohnwu:room-runtime:${vRoom}"
-    implementation "androidx.room:room-rxjava2:${vRoom}"
-    kapt "androidx.room:room-compiler:${vRoom}"
-
-    def vNav = '2.1.0'
-    implementation "androidx.navigation:navigation-fragment-ktx:${vNav}"
-    implementation "androidx.navigation:navigation-ui-ktx:${vNav}"
-
-    implementation 'androidx.biometric:biometric:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03'
-    implementation 'androidx.preference:preference:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.fragment:fragment-ktx:1.2.0-rc03'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.work:work-runtime:2.2.0'
-    implementation 'androidx.transition:transition:1.3.0-rc02'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.core:core-ktx:1.1.0'
-    implementation 'com.google.android.material:material:1.2.0-alpha02'
-}

app/build.gradle.kts

@@ -0,0 +1,183 @@
+import java.io.PrintStream
+
+plugins {
+    id("com.android.application")
+    kotlin("android")
+    kotlin("plugin.parcelize")
+    kotlin("kapt")
+    id("androidx.navigation.safeargs.kotlin")
+}
+
+kapt {
+    correctErrorTypes = true
+    useBuildCache = true
+    mapDiagnosticLocations = true
+    javacOptions {
+        option("-Xmaxerrs", 1000)
+    }
+}
+
+android {
+    defaultConfig {
+        applicationId = "com.topjohnwu.magisk"
+        vectorDrawables.useSupportLibrary = true
+        multiDexEnabled = true
+        versionName = Config.appVersion
+        versionCode = Config.appVersionCode
+
+        javaCompileOptions.annotationProcessorOptions.arguments(
+            mapOf("room.incremental" to "true")
+        )
+    }
+
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+
+    buildFeatures {
+        dataBinding = true
+    }
+
+    dependenciesInfo {
+        includeInApk = false
+        includeInBundle = false
+    }
+
+    packagingOptions {
+        exclude("/META-INF/**")
+        exclude("/org/bouncycastle/**")
+        exclude("/kotlin/**")
+        exclude("/kotlinx/**")
+        exclude("/okhttp3/**")
+        exclude("/*.txt")
+        exclude("/*.bin")
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+tasks["preBuild"]?.dependsOn(tasks.register("copyUtils", Copy::class) {
+    from(rootProject.file("scripts/util_functions.sh"))
+    into("src/main/res/raw")
+})
+
+android.applicationVariants.all {
+    val keysDir = rootProject.file("tools/keys")
+    val outSrcDir = File(buildDir, "generated/source/keydata/$name")
+    val outSrc = File(outSrcDir, "com/topjohnwu/signing/KeyData.java")
+
+    fun PrintStream.newField(name: String, file: File) {
+        println("public static byte[] $name() {")
+        print("byte[] buf = {")
+        val bytes = file.readBytes()
+        print(bytes.joinToString(",") { "(byte)(${it.toInt() and 0xff})" })
+        println("};")
+        println("return buf;")
+        println("}")
+    }
+
+    val genSrcTask = tasks.register("generate${name.capitalize()}KeyData") {
+        inputs.dir(keysDir)
+        outputs.file(outSrc)
+        doLast {
+            outSrc.parentFile.mkdirs()
+            PrintStream(outSrc).use {
+                it.println("package com.topjohnwu.signing;")
+                it.println("public final class KeyData {")
+
+                it.newField("testCert", File(keysDir, "testkey.x509.pem"))
+                it.newField("testKey", File(keysDir, "testkey.pk8"))
+                it.newField("verityCert", File(keysDir, "verity.x509.pem"))
+                it.newField("verityKey", File(keysDir, "verity.pk8"))
+
+                it.println("}")
+            }
+        }
+    }
+    registerJavaGeneratingTask(genSrcTask.get(), outSrcDir)
+}
+
+dependencies {
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+    implementation(kotlin("stdlib"))
+    implementation(project(":app:shared"))
+
+    implementation("com.github.topjohnwu:jtar:1.0.0")
+    implementation("com.github.topjohnwu:indeterminate-checkbox:1.0.7")
+    implementation("com.github.topjohnwu:lz4-java:1.7.1")
+    implementation("com.jakewharton.timber:timber:4.7.1")
+
+    val vBC = "1.68"
+    implementation("org.bouncycastle:bcprov-jdk15on:${vBC}")
+    implementation("org.bouncycastle:bcpkix-jdk15on:${vBC}")
+
+    val vBAdapt = "4.0.0"
+    val bindingAdapter = "me.tatarka.bindingcollectionadapter2:bindingcollectionadapter"
+    implementation("${bindingAdapter}:${vBAdapt}")
+    implementation("${bindingAdapter}-recyclerview:${vBAdapt}")
+
+    val vMarkwon = "4.6.0"
+    implementation("io.noties.markwon:core:${vMarkwon}")
+    implementation("io.noties.markwon:html:${vMarkwon}")
+    implementation("io.noties.markwon:image:${vMarkwon}")
+    implementation("com.caverock:androidsvg:1.4")
+
+    val vLibsu = "3.0.2"
+    implementation("com.github.topjohnwu.libsu:core:${vLibsu}")
+    implementation("com.github.topjohnwu.libsu:io:${vLibsu}")
+
+    val vKoin = "2.1.6"
+    implementation("org.koin:koin-core:${vKoin}")
+    implementation("org.koin:koin-android:${vKoin}")
+    implementation("org.koin:koin-androidx-viewmodel:${vKoin}")
+
+    val vRetrofit = "2.9.0"
+    implementation("com.squareup.retrofit2:retrofit:${vRetrofit}")
+    implementation("com.squareup.retrofit2:converter-moshi:${vRetrofit}")
+    implementation("com.squareup.retrofit2:converter-scalars:${vRetrofit}")
+
+    val vOkHttp = "3.12.12"
+    implementation("com.squareup.okhttp3:okhttp") {
+        version {
+            strictly(vOkHttp)
+        }
+    }
+    implementation("com.squareup.okhttp3:logging-interceptor:${vOkHttp}")
+    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:${vOkHttp}")
+
+    val vMoshi = "1.11.0"
+    implementation("com.squareup.moshi:moshi:${vMoshi}")
+    kapt("com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}")
+
+    val vRoom = "2.3.0-alpha04"
+    implementation("androidx.room:room-runtime:${vRoom}")
+    implementation("androidx.room:room-ktx:${vRoom}")
+    kapt("androidx.room:room-compiler:${vRoom}")
+
+    val vNav: String by rootProject.extra
+    implementation("androidx.navigation:navigation-fragment-ktx:${vNav}")
+    implementation("androidx.navigation:navigation-ui-ktx:${vNav}")
+
+    implementation("androidx.biometric:biometric:1.0.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.0.4")
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
+    implementation("androidx.browser:browser:1.3.0")
+    implementation("androidx.preference:preference:1.1.1")
+    implementation("androidx.recyclerview:recyclerview:1.1.0")
+    implementation("androidx.fragment:fragment-ktx:1.2.5")
+    implementation("androidx.work:work-runtime-ktx:2.4.0")
+    implementation("androidx.transition:transition:1.3.1")
+    implementation("androidx.multidex:multidex:2.0.1")
+    implementation("androidx.core:core-ktx:1.3.2")
+    implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.0.0")
+    implementation("com.google.android.material:material:1.2.1")
+}

app/proguard-kotlin.pro

@@ -1,20 +0,0 @@
-## So every class is case insensitive to avoid some bizare problems
--dontusemixedcaseclassnames
-
-## If reflection issues come up uncomment this, that should temporarily fix it
-#-keep class kotlin.** { *; }
-#-keep class kotlin.Metadata { *; }
-#-keepclassmembers class kotlin.Metadata {
-#    public <methods>;
-#}
-
-## Never warn about Kotlin, it should work as-is
--dontwarn kotlin.**
-
-## Removes runtime null checks - doesn't really matter if it crashes on kotlin or java NPE
--assumenosideeffects class kotlin.jvm.internal.Intrinsics {
-    static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
-}
-
-## Useless option for dex
--dontpreverify

app/proguard-rules.pro

@@ -16,33 +16,33 @@
 #   public *;
 #}
 
+# Kotlin
+-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
+	public static void checkExpressionValueIsNotNull(...);
+	public static void checkNotNullExpressionValue(...);
+	public static void checkReturnedValueIsNotNull(...);
+	public static void checkFieldIsNotNull(...);
+	public static void checkParameterIsNotNull(...);
+}
+
+# Stubs
+-keep class a.* { *; }
+
 # Snet
--keepclassmembers class com.topjohnwu.magisk.utils.SafetyNetHelper { *; }
--keep,allowobfuscation interface com.topjohnwu.magisk.utils.SafetyNetHelper$Callback
--keepclassmembers class * implements com.topjohnwu.magisk.utils.SafetyNetHelper$Callback {
-  void onResponse(int);
+-keepclassmembers class com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper { *; }
+-keep,allowobfuscation interface com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper$Callback
+-keepclassmembers class * implements com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper$Callback {
+  void onResponse(org.json.JSONObject);
 }
 
-# Keep all fragment constructors
--keepclassmembers class * extends androidx.fragment.app.Fragment {
-  public <init>(...);
+# Strip Timber verbose and debug logging
+-assumenosideeffects class timber.log.Timber.Tree {
+  public void v(**);
+  public void d(**);
 }
 
-# DelegateWorker
--keep,allowobfuscation class * extends com.topjohnwu.magisk.base.DelegateWorker
-
-# 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 { *; }
-
 # Excessive obfuscation
--repackageclasses 'a'
+-repackageclasses
 -allowaccessmodification
 
 # QOL

app/res-ids.txt

@@ -1,5 +0,0 @@
-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/shared/build.gradle.kts

@@ -0,0 +1,14 @@
+plugins {
+    id("com.android.library")
+}
+
+android {
+    defaultConfig {
+        vectorDrawables.useSupportLibrary = true
+        consumerProguardFiles("proguard-rules.pro")
+    }
+}
+
+dependencies {
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+}

app/shared/src/main/AndroidManifest.xml

@@ -4,26 +4,14 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
-        android:icon="@drawable/ic_launcher"
         android:label="Magisk Manager"
         android:installLocation="internalOnly"
         android:usesCleartextTraffic="true"
         android:supportsRtl="true"
+        android:theme="@android:style/Theme.Translucent.NoTitleBar"
         tools:ignore="UnusedAttribute">
-
-        <activity
-            android:name="a.r"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:process=":remote" />
-
-        <provider
-            android:name="a.p"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-        </provider>
     </application>
+
 </manifest>

app/shared/src/main/java/com/topjohnwu/magisk/DynAPK.java

@@ -11,8 +11,6 @@ import static android.os.Build.VERSION.SDK_INT;
 
 public class DynAPK {
 
-    private static final int STUB_VERSION = 6;
-
     // Indices of the object array
     private static final int STUB_VERSION_ENTRY = 0;
     private static final int CLASS_COMPONENT_MAP = 1;
@@ -64,7 +62,7 @@ public class DynAPK {
     }
 
     public static class Data {
-        public int version = STUB_VERSION;
+        public int version;
         public Map<String, String> classToComponent;
     }
 }

app/shared/src/main/java/com/topjohnwu/magisk/FileProvider.java

@@ -4,31 +4,22 @@ import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.pm.ProviderInfo;
-import android.content.res.XmlResourceParser;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.Environment;
 import android.os.ParcelFileDescriptor;
 import android.provider.OpenableColumns;
 import android.text.TextUtils;
 import android.webkit.MimeTypeMap;
 
-import com.topjohnwu.shared.R;
-
-import org.xmlpull.v1.XmlPullParserException;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
-
 /**
  * Modified from androidx.core.content.FileProvider
  */
@@ -36,25 +27,12 @@ public class FileProvider extends ContentProvider {
     private static final String[] COLUMNS = {
             OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE };
 
-    private static final String TAG_ROOT_PATH = "root-path";
-    private static final String TAG_FILES_PATH = "files-path";
-    private static final String TAG_CACHE_PATH = "cache-path";
-    private static final String TAG_EXTERNAL = "external-path";
-    private static final String TAG_EXTERNAL_FILES = "external-files-path";
-    private static final String TAG_EXTERNAL_CACHE = "external-cache-path";
-    private static final String TAG_EXTERNAL_MEDIA = "external-media-path";
-
-    private static final String ATTR_NAME = "name";
-    private static final String ATTR_PATH = "path";
-
     private static final File DEVICE_ROOT = new File("/");
 
     private static HashMap<String, PathStrategy> sCache = new HashMap<>();
 
     private PathStrategy mStrategy;
 
-    public static ProviderCallHandler callHandler;
-
     @Override
     public boolean onCreate() {
         return true;
@@ -150,13 +128,6 @@ public class FileProvider extends ContentProvider {
         return file.delete() ? 1 : 0;
     }
 
-    @Override
-    public Bundle call(String method, String arg, Bundle extras) {
-        if (callHandler != null)
-            return callHandler.call(getContext(), method, arg, extras);
-        return Bundle.EMPTY;
-    }
-
     @Override
     public ParcelFileDescriptor openFile(Uri uri, String mode)
             throws FileNotFoundException {
@@ -171,63 +142,36 @@ public class FileProvider extends ContentProvider {
         synchronized (sCache) {
             strat = sCache.get(authority);
             if (strat == null) {
-                try {
-                    strat = parsePathStrategy(context, authority);
-                } catch (IOException e) {
-                    throw new IllegalArgumentException("Failed to parse xml", e);
-                } catch (XmlPullParserException e) {
-                    throw new IllegalArgumentException("Failed to parse xml", e);
-                }
+                strat = createPathStrategy(context, authority);
                 sCache.put(authority, strat);
             }
         }
         return strat;
     }
 
-    private static PathStrategy parsePathStrategy(Context context, String authority)
-            throws IOException, XmlPullParserException {
+    private static PathStrategy createPathStrategy(Context context, String authority) {
         final SimplePathStrategy strat = new SimplePathStrategy(authority);
 
-        final XmlResourceParser in = context.getResources().getXml(R.xml.file_paths);
-
-        int type;
-        while ((type = in.next()) != END_DOCUMENT) {
-            if (type == START_TAG) {
-                final String tag = in.getName();
-
-                final String name = in.getAttributeValue(null, ATTR_NAME);
-                String path = in.getAttributeValue(null, ATTR_PATH);
-
-                File target = null;
-                if (TAG_ROOT_PATH.equals(tag)) {
-                    target = DEVICE_ROOT;
-                } else if (TAG_FILES_PATH.equals(tag)) {
-                    target = context.getFilesDir();
-                } else if (TAG_CACHE_PATH.equals(tag)) {
-                    target = context.getCacheDir();
-                } else if (TAG_EXTERNAL.equals(tag)) {
-                    target = Environment.getExternalStorageDirectory();
-                } else if (TAG_EXTERNAL_FILES.equals(tag)) {
-                    File[] externalFilesDirs = getExternalFilesDirs(context, null);
-                    if (externalFilesDirs.length > 0) {
-                        target = externalFilesDirs[0];
-                    }
-                } else if (TAG_EXTERNAL_CACHE.equals(tag)) {
-                    File[] externalCacheDirs = getExternalCacheDirs(context);
-                    if (externalCacheDirs.length > 0) {
-                        target = externalCacheDirs[0];
-                    }
-                } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
-                        && TAG_EXTERNAL_MEDIA.equals(tag)) {
-                    File[] externalMediaDirs = context.getExternalMediaDirs();
-                    if (externalMediaDirs.length > 0) {
-                        target = externalMediaDirs[0];
-                    }
-                }
-
-                if (target != null) {
-                    strat.addRoot(name, buildPath(target, path));
-                }
+        strat.addRoot("root_files", buildPath(DEVICE_ROOT, "."));
+        strat.addRoot("internal_files", buildPath(context.getFilesDir(), "."));
+        strat.addRoot("cache_files", buildPath(context.getCacheDir(), "."));
+        strat.addRoot("external_files", buildPath(Environment.getExternalStorageDirectory(), "."));
+        {
+            File[] externalFilesDirs = getExternalFilesDirs(context, null);
+            if (externalFilesDirs.length > 0) {
+                strat.addRoot("external_file_files", buildPath(externalFilesDirs[0], "."));
+            }
+        }
+        {
+            File[] externalCacheDirs = getExternalCacheDirs(context);
+            if (externalCacheDirs.length > 0) {
+                strat.addRoot("external_cache_files", buildPath(externalCacheDirs[0], "."));
+            }
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            File[] externalMediaDirs = context.getExternalMediaDirs();
+            if (externalMediaDirs.length > 0) {
+                strat.addRoot("external_media_files", buildPath(externalMediaDirs[0], "."));
             }
         }
 

app/shared/src/main/java/com/topjohnwu/magisk/net/Networking.java

@@ -47,10 +47,9 @@ public class Networking {
         } catch (Exception e) {
             if (Build.VERSION.SDK_INT < 21) {
                 // Failed to update SSL provider, use NoSSLv3SocketFactory on SDK < 21
-                // and return false to notify potential issues
                 HttpsURLConnection.setDefaultSSLSocketFactory(new NoSSLv3SocketFactory());
-                return false;
             }
+            return false;
         }
         return true;
     }

app/src/main/AndroidManifest.xml

@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
 
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="29" />
 
     <application
+        android:icon="@drawable/ic_launcher"
         android:name="a.e"
-        android:allowBackup="true"
+        android:allowBackup="false"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
 
         <!-- Splash -->
@@ -21,21 +23,21 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
 
         <!-- Main -->
         <activity android:name="a.b" />
 
-        <!-- Flashing  -->
-        <activity android:name="a.f" />
-
         <!-- Superuser -->
         <activity
             android:name="a.m"
             android:directBootAware="true"
             android:excludeFromRecents="true"
             android:exported="false"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
             tools:ignore="AppLinkUrlError">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -62,6 +64,15 @@
         <!-- DownloadService -->
         <service android:name="a.j" />
 
+        <!-- FileProvider -->
+        <provider
+            android:name="a.p"
+            android:authorities="${applicationId}.provider"
+            android:directBootAware="true"
+            android:exported="false"
+            android:grantUriPermissions="true">
+        </provider>
+
         <!-- Hardcode GMS version -->
         <meta-data
             android:name="com.google.android.gms.version"

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

@@ -1,20 +0,0 @@
-package a;
-
-import com.topjohnwu.magisk.utils.PatchAPK;
-import com.topjohnwu.signing.BootSigner;
-
-public class a {
-
-    @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/b.java

@@ -1,7 +0,0 @@
-package a;
-
-import com.topjohnwu.magisk.ui.MainActivity;
-
-public class b extends MainActivity {
-    /* stub */
-}

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

@@ -1,7 +0,0 @@
-package a;
-
-import com.topjohnwu.magisk.ui.SplashActivity;
-
-public class c extends SplashActivity {
-    /* stub */
-}

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

@@ -1,13 +0,0 @@
-package a;
-
-import com.topjohnwu.magisk.App;
-
-public class e extends App {
-    public e() {
-        super();
-    }
-
-    public e(Object o) {
-        super(o);
-    }
-}

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

@@ -1,7 +0,0 @@
-package a;
-
-import com.topjohnwu.magisk.ui.flash.FlashActivity;
-
-public class f extends FlashActivity {
-    /* stub */
-}

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

@@ -1,15 +0,0 @@
-package a;
-
-import android.content.Context;
-
-import com.topjohnwu.magisk.model.update.UpdateCheckService;
-
-import androidx.annotation.NonNull;
-import androidx.work.WorkerParameters;
-
-public class g extends w<UpdateCheckService> {
-    /* Stub */
-    public g(@NonNull Context context, @NonNull WorkerParameters workerParams) {
-        super(context, workerParams);
-    }
-}

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

@@ -1,7 +0,0 @@
-package a;
-
-import com.topjohnwu.magisk.model.receiver.GeneralReceiver;
-
-public class h extends GeneralReceiver {
-    /* stub */
-}

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

@@ -1,7 +0,0 @@
-package a;
-
-import com.topjohnwu.magisk.model.download.DownloadService;
-
-public class j extends DownloadService {
-    /* stub */
-}

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

@@ -1,7 +0,0 @@
-package a;
-
-import com.topjohnwu.magisk.ui.surequest.SuRequestActivity;
-
-public class m extends SuRequestActivity {
-    /* stub */
-}

app/src/main/java/a/stubs.kt

@@ -0,0 +1,32 @@
+@file:JvmName("a")
+package a
+
+import com.topjohnwu.magisk.core.App
+import com.topjohnwu.magisk.core.Provider
+import com.topjohnwu.magisk.core.Receiver
+import com.topjohnwu.magisk.core.SplashActivity
+import com.topjohnwu.magisk.core.download.DownloadService
+import com.topjohnwu.magisk.ui.MainActivity
+import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
+import com.topjohnwu.signing.SignBoot
+
+fun main(args: Array<String>) {
+    SignBoot.main(args)
+}
+
+class b : MainActivity()
+
+class c : SplashActivity()
+
+class e : App {
+    constructor() : super()
+    constructor(o: Any) : super(o)
+}
+
+class h : Receiver()
+
+class j : DownloadService()
+
+class m : SuRequestActivity()
+
+class p : Provider()

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

@@ -1,42 +0,0 @@
-package a;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-import androidx.work.Worker;
-import androidx.work.WorkerParameters;
-
-import com.topjohnwu.magisk.base.DelegateWorker;
-
-import java.lang.reflect.ParameterizedType;
-
-public abstract class w<T extends DelegateWorker> extends Worker {
-
-    /* Wrapper class to workaround Proguard -keep class * extends Worker */
-
-    private T base;
-
-    @SuppressWarnings("unchecked")
-    w(@NonNull Context context, @NonNull WorkerParameters workerParams) {
-        super(context, workerParams);
-        try {
-            base = ((Class<T>) ((ParameterizedType) getClass().getGenericSuperclass())
-                    .getActualTypeArguments()[0]).newInstance();
-            base.attachWorker(this);
-        } catch (Exception ignored) {}
-    }
-
-    @NonNull
-    @Override
-    public Result doWork() {
-        if (base == null)
-            return Result.failure();
-        return base.doWork();
-    }
-
-    @Override
-    public void onStopped() {
-        if (base != null)
-            base.onStopped();
-    }
-}

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

@@ -1,81 +0,0 @@
-package com.topjohnwu.magisk
-
-import android.os.Process
-import java.io.File
-
-object Const {
-
-    // Paths
-    const val MAGISK_PATH = "/sbin/.magisk/img"
-    var MAGISK_DISABLE_FILE = File("xxx")
-    const val TMP_FOLDER_PATH = "/dev/tmp"
-    const val MAGISK_LOG = "/cache/magisk.log"
-
-    // Versions
-    const val SNET_EXT_VER = 13
-    const val SNET_REVISION = "a6c47f86f10b310358afa9dbe837037dd5d561df"
-    const val BOOTCTL_REVISION = "a6c47f86f10b310358afa9dbe837037dd5d561df"
-
-    // Misc
-    const val ANDROID_MANIFEST = "AndroidManifest.xml"
-    const val MAGISK_INSTALL_LOG_FILENAME = "magisk_install_log_%s.log"
-    const val MANAGER_CONFIGS = ".tmp.magisk.config"
-    val USER_ID = Process.myUid() / 100000
-
-    object Version {
-        const val MIN_VERSION = "v18.0"
-        const val MIN_VERCODE = 18000
-        const val CONNECT_MODE = 20100
-        const val PROVIDER_CONNECT = 20102
-    }
-
-    object ID {
-        const val FETCH_ZIP = 2
-        const val SELECT_BOOT = 3
-
-        // notifications
-        const val MAGISK_UPDATE_NOTIFICATION_ID = 4
-        const val APK_UPDATE_NOTIFICATION_ID = 5
-        const val DTBO_NOTIFICATION_ID = 7
-        const val HIDE_MANAGER_NOTIFICATION_ID = 8
-        const val UPDATE_NOTIFICATION_CHANNEL = "update"
-        const val PROGRESS_NOTIFICATION_CHANNEL = "progress"
-        const val CHECK_MAGISK_UPDATE_WORKER_ID = "magisk_update"
-    }
-
-    object Url {
-        const val ZIP_URL = "https://github.com/Magisk-Modules-Repo/%s/archive/master.zip"
-        const val PAYPAL_URL = "https://www.paypal.me/topjohnwu"
-        const val PATREON_URL = "https://www.patreon.com/topjohnwu"
-        const val TWITTER_URL = "https://twitter.com/topjohnwu"
-        const val XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382"
-        const val SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk"
-
-        const val GITHUB_RAW_URL = "https://raw.githubusercontent.com/"
-        const val GITHUB_API_URL = "https://api.github.com/users/Magisk-Modules-Repo/"
-    }
-
-    object Key {
-        // others
-        const val LINK_KEY = "Link"
-        const val IF_NONE_MATCH = "If-None-Match"
-        const val ETAG_KEY = "ETag"
-        // intents
-        const val OPEN_SECTION = "section"
-        const val INTENT_SET_APP = "app_json"
-        const val FLASH_ACTION = "action"
-        const val FLASH_DATA = "additional_data"
-        const val DISMISS_ID = "dismiss_id"
-        const val BROADCAST_MANAGER_UPDATE = "manager_update"
-        const val BROADCAST_REBOOT = "reboot"
-    }
-
-    object Value {
-        const val FLASH_ZIP = "flash"
-        const val PATCH_FILE = "patch"
-        const val FLASH_MAGISK = "magisk"
-        const val FLASH_INACTIVE_SLOT = "slot"
-        const val UNINSTALL = "uninstall"
-    }
-
-}

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

@@ -1,77 +0,0 @@
-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
-import java.io.FileInputStream
-import java.io.IOException
-
-val isRunningAsStub get() = Info.stub != null
-
-object Info {
-
-    val envRef = CachedValue { loadState() }
-
-    val env by envRef              // Local
-    var remote = UpdateInfo()      // Remote
-    var stub: DynAPK.Data? = null  // Stub
-
-    var keepVerity = false
-    var keepEnc = false
-    var recovery = false
-
-    val isConnected by lazy {
-        KObservableField(false).also { field ->
-            ReactiveNetwork.observeNetworkConnectivity(get())
-                .subscribeK {
-                    field.value = it.available()
-                }
-        }
-    }
-
-    val isNewReboot by lazy {
-        try {
-            FileInputStream("/proc/sys/kernel/random/boot_id").bufferedReader().use {
-                val id = it.readLine()
-                if (id != Config.bootId) {
-                    Config.bootId = id
-                    true
-                } else {
-                    false
-                }
-            }
-        } catch (e: IOException) {
-            false
-        }
-    }
-
-    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
-        Env(str, code, hide)
-    }.getOrElse { Env() }
-
-    class Env(
-        val magiskVersionString: String = "",
-        code: Int = -1,
-        hide: Boolean = false
-    ) {
-        val magiskHide get() = Config.magiskHide
-        val magiskVersionCode = when (code) {
-            in Int.MIN_VALUE..Const.Version.MIN_VERCODE -> -1
-            else -> if(Shell.rootAccess()) code else -1
-        }
-        val isUnsupported = code > 0 && code < Const.Version.MIN_VERCODE
-        val isActive = magiskVersionCode >= 0
-
-        init {
-            Config.magiskHide = hide
-        }
-    }
-}

app/src/main/java/com/topjohnwu/magisk/arch/BaseUIActivity.kt

@@ -0,0 +1,140 @@
+package com.topjohnwu.magisk.arch
+
+import android.content.res.Resources
+import android.graphics.Color
+import android.os.Build
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.View
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.content.res.use
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import androidx.lifecycle.MutableLiveData
+import androidx.navigation.NavController
+import androidx.navigation.NavDirections
+import androidx.navigation.fragment.NavHostFragment
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.base.BaseActivity
+import com.topjohnwu.magisk.ui.inflater.LayoutInflaterFactory
+import com.topjohnwu.magisk.ui.theme.Theme
+
+abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
+    BaseActivity(), BaseUIComponent<VM> {
+
+    protected lateinit var binding: Binding
+    protected abstract val layoutRes: Int
+    protected open val themeRes: Int = Theme.selected.themeRes
+
+    private val navHostFragment by lazy {
+        supportFragmentManager.findFragmentById(navHost) as? NavHostFragment
+    }
+    private val topFragment get() = navHostFragment?.childFragmentManager?.fragments?.getOrNull(0)
+    protected val currentFragment get() = topFragment as? BaseUIFragment<*, *>
+
+    override val viewRoot: View get() = binding.root
+    open val navigation: NavController? get() = navHostFragment?.navController
+
+    open val navHost: Int = 0
+    open val snackbarView get() = binding.root
+
+    init {
+        val theme = Config.darkTheme
+        AppCompatDelegate.setDefaultNightMode(theme)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        layoutInflater.factory2 = LayoutInflaterFactory(delegate)
+
+        setTheme(themeRes)
+        super.onCreate(savedInstanceState)
+
+        startObserveEvents()
+
+        // We need to set the window background explicitly since for whatever reason it's not
+        // propagated upstream
+        obtainStyledAttributes(intArrayOf(android.R.attr.windowBackground))
+            .use { it.getDrawable(0) }
+            .also { window.setBackgroundDrawable(it) }
+
+        directionsDispatcher.observe(this) {
+            it?.navigate()
+            // we don't want the directions to be re-dispatched, so we preemptively set them to null
+            if (it != null) {
+                directionsDispatcher.value = null
+            }
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            window?.decorView?.let {
+                it.systemUiVisibility = (it.systemUiVisibility
+                        or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                        or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                        or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION)
+            }
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                window?.decorView?.post {
+                    // If navigation bar is short enough (gesture navigation enabled), make it transparent
+                    if (window.decorView.rootWindowInsets?.systemWindowInsetBottom ?: 0 < Resources.getSystem().displayMetrics.density * 40) {
+                        window.navigationBarColor = Color.TRANSPARENT
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                            window.navigationBarDividerColor = Color.TRANSPARENT
+                        }
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                            window.isNavigationBarContrastEnforced = false
+                            window.isStatusBarContrastEnforced = false
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    fun setContentView() {
+        binding = DataBindingUtil.setContentView<Binding>(this, layoutRes).also {
+            it.setVariable(BR.viewModel, viewModel)
+            it.lifecycleOwner = this
+        }
+    }
+
+    fun setAccessibilityDelegate(delegate: View.AccessibilityDelegate?) {
+        viewRoot.rootView.accessibilityDelegate = delegate
+    }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.requestRefresh()
+    }
+
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        return currentFragment?.onKeyEvent(event) == true || super.dispatchKeyEvent(event)
+    }
+
+    override fun onEventDispatched(event: ViewEvent) = when (event) {
+        is ContextExecutor -> event(this)
+        is ActivityExecutor -> event(this)
+        else -> Unit
+    }
+
+    override fun onBackPressed() {
+        if (navigation == null || currentFragment?.onBackPressed()?.not() == true) {
+            super.onBackPressed()
+        }
+    }
+
+    fun NavDirections.navigate() {
+        navigation?.navigate(this)
+    }
+
+    companion object {
+
+        private val directionsDispatcher = MutableLiveData<NavDirections?>()
+
+        fun postDirections(navDirections: NavDirections) =
+            directionsDispatcher.postValue(navDirections)
+
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/arch/BaseUIComponent.kt

@@ -0,0 +1,21 @@
+package com.topjohnwu.magisk.arch
+
+import android.view.View
+import androidx.lifecycle.LifecycleOwner
+
+interface BaseUIComponent<VM : BaseViewModel> : LifecycleOwner {
+
+    val viewRoot: View
+    val viewModel: VM
+
+    fun startObserveEvents() {
+        viewModel.viewEvents.observe(this) {
+            onEventDispatched(it)
+        }
+    }
+
+    /**
+     * Called for all [ViewEvent]s published by associated viewModel.
+     */
+    fun onEventDispatched(event: ViewEvent) {}
+}

app/src/main/java/com/topjohnwu/magisk/arch/BaseUIFragment.kt

@@ -0,0 +1,92 @@
+package com.topjohnwu.magisk.arch
+
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.graphics.Insets
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.OnRebindCallback
+import androidx.databinding.ViewDataBinding
+import androidx.fragment.app.Fragment
+import androidx.navigation.NavDirections
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.ktx.startAnimations
+
+abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
+    Fragment(), BaseUIComponent<VM> {
+
+    val activity get() = requireActivity() as BaseUIActivity<*, *>
+    protected lateinit var binding: Binding
+    protected abstract val layoutRes: Int
+
+    override val viewRoot: View get() = binding.root
+    private val navigation get() = activity.navigation
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        startObserveEvents()
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        binding = DataBindingUtil.inflate<Binding>(inflater, layoutRes, container, false).also {
+            it.setVariable(BR.viewModel, viewModel)
+            it.lifecycleOwner = this
+        }
+        return binding.root
+    }
+
+    override fun onStart() {
+        super.onStart()
+        activity.supportActionBar?.subtitle = null
+    }
+
+    override fun onEventDispatched(event: ViewEvent) = when(event) {
+        is ContextExecutor -> event(requireContext())
+        is ActivityExecutor -> event(activity)
+        is FragmentExecutor -> event(this)
+        else -> Unit
+    }
+
+    open fun onKeyEvent(event: KeyEvent): Boolean {
+        return false
+    }
+
+    open fun onBackPressed(): Boolean = false
+
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.addOnRebindCallback(object : OnRebindCallback<Binding>() {
+            override fun onPreBind(binding: Binding): Boolean {
+                this@BaseUIFragment.onPreBind(binding)
+                return true
+            }
+        })
+    }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.requestRefresh()
+    }
+
+    protected open fun onPreBind(binding: Binding) {
+        (binding.root as? ViewGroup)?.startAnimations()
+    }
+
+    fun NavDirections.navigate() {
+        navigation?.navigate(this)
+    }
+
+}
+
+interface ReselectionTarget {
+
+    fun onReselected()
+
+}

app/src/main/java/com/topjohnwu/magisk/arch/BaseViewModel.kt

@@ -0,0 +1,114 @@
+package com.topjohnwu.magisk.arch
+
+import android.Manifest
+import android.os.Build
+import androidx.annotation.CallSuper
+import androidx.core.graphics.Insets
+import androidx.databinding.Bindable
+import androidx.databinding.Observable
+import androidx.databinding.PropertyChangeRegistry
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import androidx.navigation.NavDirections
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.base.BaseActivity
+import com.topjohnwu.magisk.events.*
+import com.topjohnwu.magisk.utils.ObservableHost
+import com.topjohnwu.magisk.utils.set
+import kotlinx.coroutines.Job
+import org.koin.core.KoinComponent
+
+abstract class BaseViewModel(
+    initialState: State = State.LOADING
+) : ViewModel(), ObservableHost, KoinComponent {
+
+    override var callbacks: PropertyChangeRegistry? = null
+
+    enum class State {
+        LOADED, LOADING, LOADING_FAILED
+    }
+
+    @get:Bindable
+    val loading get() = state == State.LOADING
+    @get:Bindable
+    val loaded get() = state == State.LOADED
+    @get:Bindable
+    val loadFailed get() = state == State.LOADING_FAILED
+
+    val isConnected get() = Info.isConnected
+    val viewEvents: LiveData<ViewEvent> get() = _viewEvents
+
+    @get:Bindable
+    var insets = Insets.NONE
+        set(value) = set(value, field, { field = it }, BR.insets)
+
+    var state= initialState
+        set(value) = set(value, field, { field = it }, BR.loading, BR.loaded, BR.loadFailed)
+
+    private val _viewEvents = MutableLiveData<ViewEvent>()
+    private var runningJob: Job? = null
+    private val refreshCallback = object : Observable.OnPropertyChangedCallback() {
+        override fun onPropertyChanged(sender: Observable?, propertyId: Int) {
+            requestRefresh()
+        }
+    }
+
+    init {
+        isConnected.addOnPropertyChangedCallback(refreshCallback)
+    }
+
+    /** This should probably never be called manually, it's called manually via delegate. */
+    @Synchronized
+    fun requestRefresh() {
+        if (runningJob?.isActive == true) {
+            return
+        }
+        runningJob = refresh()
+    }
+
+    protected open fun refresh(): Job? = null
+
+    @CallSuper
+    override fun onCleared() {
+        isConnected.removeOnPropertyChangedCallback(refreshCallback)
+        super.onCleared()
+    }
+
+    fun withView(action: BaseActivity.() -> Unit) {
+        ViewActionEvent(action).publish()
+    }
+
+    fun withPermission(permission: String, callback: (Boolean) -> Unit) {
+        PermissionEvent(permission, callback).publish()
+    }
+
+    fun withExternalRW(callback: () -> Unit) {
+        withPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) {
+            if (!it) {
+                SnackbarEvent(R.string.external_rw_permission_denied).publish()
+            } else {
+                callback()
+            }
+        }
+    }
+
+    fun back() = BackPressEvent().publish()
+
+    fun <Event : ViewEvent> Event.publish() {
+        _viewEvents.postValue(this)
+    }
+
+    fun <Event : ViewEventWithScope> Event.publish() {
+        scope = viewModelScope
+        _viewEvents.postValue(this)
+    }
+
+    fun NavDirections.publish() {
+        _viewEvents.postValue(NavigationEvent(this))
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/arch/Helpers.kt

@@ -0,0 +1,48 @@
+package com.topjohnwu.magisk.arch
+
+import androidx.databinding.ViewDataBinding
+import com.topjohnwu.magisk.databinding.ComparableRvItem
+import com.topjohnwu.magisk.databinding.RvItem
+import com.topjohnwu.magisk.utils.DiffObservableList
+import com.topjohnwu.magisk.utils.FilterableDiffObservableList
+import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
+import me.tatarka.bindingcollectionadapter2.ItemBinding
+import me.tatarka.bindingcollectionadapter2.OnItemBind
+
+fun <T : ComparableRvItem<*>> diffListOf(
+    vararg newItems: T
+) = diffListOf(newItems.toList())
+
+fun <T : ComparableRvItem<*>> diffListOf(
+    newItems: List<T>
+) = DiffObservableList(object : DiffObservableList.Callback<T> {
+    override fun areItemsTheSame(oldItem: T, newItem: T) = oldItem.genericItemSameAs(newItem)
+    override fun areContentsTheSame(oldItem: T, newItem: T) = oldItem.genericContentSameAs(newItem)
+}).also { it.update(newItems) }
+
+fun <T : ComparableRvItem<*>> filterableListOf(
+    vararg newItems: T
+) = FilterableDiffObservableList(object : DiffObservableList.Callback<T> {
+    override fun areItemsTheSame(oldItem: T, newItem: T) = oldItem.genericItemSameAs(newItem)
+    override fun areContentsTheSame(oldItem: T, newItem: T) = oldItem.genericContentSameAs(newItem)
+}).also { it.update(newItems.toList()) }
+
+fun <T : RvItem> adapterOf() = object : BindingRecyclerViewAdapter<T>() {
+    override fun onBindBinding(
+        binding: ViewDataBinding,
+        variableId: Int,
+        layoutRes: Int,
+        position: Int,
+        item: T
+    ) {
+        super.onBindBinding(binding, variableId, layoutRes, position, item)
+        item.onBindingBound(binding)
+    }
+}
+
+inline fun <T : RvItem> itemBindingOf(
+    crossinline body: (ItemBinding<*>) -> Unit = {}
+) = OnItemBind<T> { itemBinding, _, item ->
+    item.bind(itemBinding)
+    body(itemBinding)
+}

app/src/main/java/com/topjohnwu/magisk/arch/Queryable.kt

@@ -0,0 +1,17 @@
+package com.topjohnwu.magisk.arch
+
+import android.os.Handler
+import androidx.core.os.postDelayed
+import com.topjohnwu.superuser.internal.UiThreadHandler
+
+interface Queryable {
+
+    val queryDelay: Long
+    val queryHandler: Handler get() = UiThreadHandler.handler
+
+    fun submitQuery() {
+        queryHandler.postDelayed(queryDelay) { query() }
+    }
+
+    fun query()
+}

app/src/main/java/com/topjohnwu/magisk/arch/ViewEvent.kt

@@ -0,0 +1,26 @@
+package com.topjohnwu.magisk.arch
+
+import android.content.Context
+import kotlinx.coroutines.CoroutineScope
+
+/**
+ * Class for passing events from ViewModels to Activities/Fragments
+ * (see https://medium.com/google-developers/livedata-with-snackbar-navigation-and-other-events-the-singleliveevent-case-ac2622673150)
+ */
+abstract class ViewEvent
+
+abstract class ViewEventWithScope: ViewEvent() {
+    lateinit var scope: CoroutineScope
+}
+
+interface ContextExecutor {
+    operator fun invoke(context: Context)
+}
+
+interface ActivityExecutor {
+    operator fun invoke(activity: BaseUIActivity<*, *>)
+}
+
+interface FragmentExecutor {
+    operator fun invoke(fragment: BaseUIFragment<*, *>)
+}

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

@@ -1,124 +0,0 @@
-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

@@ -1,50 +0,0 @@
-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

@@ -1,56 +0,0 @@
-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/viewmodel/BaseViewModel.kt

@@ -1,35 +0,0 @@
-package com.topjohnwu.magisk.base.viewmodel
-
-import com.topjohnwu.magisk.base.BaseActivity
-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 BaseViewModel(
-    initialState: State = State.LOADING
-) : LoadingViewModel(initialState) {
-
-    val isConnected = object : KObservableField<Boolean>(gIsConnected.value, gIsConnected) {
-        override fun get(): Boolean {
-            return gIsConnected.value
-        }
-    }
-
-    fun withView(action: BaseActivity<*, *>.() -> Unit) {
-        ViewActionEvent(action).publish()
-    }
-
-    fun withPermissions(vararg permissions: String): Observable<Boolean> {
-        val subject = PublishSubject.create<Boolean>()
-        return subject.doOnSubscribeUi { PermissionEvent(permissions.toList(), subject).publish() }
-    }
-
-    fun back() = BackPressEvent().publish()
-
-}

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

@@ -1,78 +0,0 @@
-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

@@ -1,46 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,33 +0,0 @@
-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/core/App.kt

@@ -1,29 +1,25 @@
-package com.topjohnwu.magisk
+package com.topjohnwu.magisk.core
 
+import android.app.Activity
 import android.app.Application
 import android.content.Context
 import android.content.res.Configuration
+import android.os.Bundle
 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
-import com.topjohnwu.magisk.data.database.RepoDatabase_Impl
-import com.topjohnwu.magisk.data.database.SuLogDatabase
-import com.topjohnwu.magisk.data.database.SuLogDatabase_Impl
-import com.topjohnwu.magisk.di.ActivityTracker
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.DynAPK
+import com.topjohnwu.magisk.core.utils.IODispatcherExecutor
+import com.topjohnwu.magisk.core.utils.RootInit
+import com.topjohnwu.magisk.core.utils.updateConfig
 import com.topjohnwu.magisk.di.koinModules
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.unwrap
-import com.topjohnwu.magisk.utils.RootInit
-import com.topjohnwu.magisk.utils.SuHandler
-import com.topjohnwu.magisk.utils.updateConfig
+import com.topjohnwu.magisk.ktx.unwrap
 import com.topjohnwu.superuser.Shell
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 import timber.log.Timber
+import kotlin.system.exitProcess
 
 open class App() : Application() {
 
@@ -33,18 +29,17 @@ open class App() : Application() {
 
     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(RootInit::class.java)
-        Shell.Config.setTimeout(2)
-        FileProvider.callHandler = SuHandler
-        Room.setFactory {
-            when (it) {
-                WorkDatabase::class.java -> WorkDatabase_Impl()
-                RepoDatabase::class.java -> RepoDatabase_Impl()
-                SuLogDatabase::class.java -> SuLogDatabase_Impl()
-                else -> null
-            }
+        Shell.setDefaultBuilder(Shell.Builder.create()
+            .setFlags(Shell.FLAG_MOUNT_MASTER)
+            .setInitializers(RootInit::class.java)
+            .setTimeout(2))
+        Shell.EXECUTOR = IODispatcherExecutor()
+
+        // Always log full stack trace with Timber
+        Timber.plant(Timber.DebugTree())
+        Thread.setDefaultUncaughtExceptionHandler { _, e ->
+            Timber.e(e)
+            exitProcess(1)
         }
     }
 
@@ -52,7 +47,6 @@ open class App() : Application() {
         // Basic setup
         if (BuildConfig.DEBUG)
             MultiDex.install(base)
-        Timber.plant(Timber.DebugTree())
 
         // Some context magic
         val app: Application
@@ -72,8 +66,8 @@ open class App() : Application() {
             androidContext(wrapped)
             modules(koinModules)
         }
-        ResourceMgr.init(impl)
-        app.registerActivityLifecycleCallbacks(get<ActivityTracker>())
+        ResMgr.init(impl)
+        app.registerActivityLifecycleCallbacks(ForegroundTracker)
         WorkManager.initialize(impl.wrapJob(), androidx.work.Configuration.Builder().build())
     }
 
@@ -88,3 +82,25 @@ open class App() : Application() {
             super.onConfigurationChanged(newConfig)
     }
 }
+
+object ForegroundTracker : Application.ActivityLifecycleCallbacks {
+
+    @Volatile
+    var foreground: Activity? = null
+
+    val hasForeground get() = foreground != null
+
+    override fun onActivityResumed(activity: Activity) {
+        foreground = activity
+    }
+
+    override fun onActivityPaused(activity: Activity) {
+        foreground = null
+    }
+
+    override fun onActivityCreated(activity: Activity, bundle: Bundle?) {}
+    override fun onActivityStarted(activity: Activity) {}
+    override fun onActivityStopped(activity: Activity) {}
+    override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) {}
+    override fun onActivityDestroyed(activity: Activity) {}
+}

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

@@ -1,24 +1,24 @@
-package com.topjohnwu.magisk
+package com.topjohnwu.magisk.core
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
-import android.os.Environment
 import android.util.Xml
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.edit
-import com.topjohnwu.magisk.data.database.SettingsDao
-import com.topjohnwu.magisk.data.database.StringDao
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.core.magiskdb.SettingsDao
+import com.topjohnwu.magisk.core.magiskdb.StringDao
+import com.topjohnwu.magisk.core.utils.BiometricHelper
+import com.topjohnwu.magisk.core.utils.refreshLocale
+import com.topjohnwu.magisk.data.preference.PreferenceModel
 import com.topjohnwu.magisk.data.repository.DBConfig
 import com.topjohnwu.magisk.di.Protected
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.inject
-import com.topjohnwu.magisk.model.preference.PreferenceModel
-import com.topjohnwu.magisk.utils.BiometricHelper
-import com.topjohnwu.magisk.utils.Utils
-import com.topjohnwu.superuser.Shell
-import com.topjohnwu.superuser.io.SuFile
-import com.topjohnwu.superuser.io.SuFileInputStream
+import com.topjohnwu.magisk.ktx.inject
+import com.topjohnwu.magisk.ui.theme.Theme
 import org.xmlpull.v1.XmlPullParser
 import java.io.File
+import java.io.InputStream
 
 object Config : PreferenceModel, DBConfig {
 
@@ -26,6 +26,15 @@ object Config : PreferenceModel, DBConfig {
     override val settingsDao: SettingsDao by inject()
     override val context: Context by inject(Protected)
 
+    @get:SuppressLint("ApplySharedPref")
+    val prefsFile: File get() {
+        // Flush prefs to disk
+        prefs.edit().apply {
+            remove(Key.ASKED_HOME)
+        }.commit()
+        return File("${context.filesDir.parent}/shared_prefs", "${fileName}.xml")
+    }
+
     object Key {
         // db configs
         const val ROOT_ACCESS = "root_access"
@@ -40,19 +49,23 @@ object Config : PreferenceModel, DBConfig {
         const val SU_AUTO_RESPONSE = "su_auto_response"
         const val SU_NOTIFICATION = "su_notification"
         const val SU_REAUTH = "su_reauth"
+        const val SU_TAPJACK = "su_tapjack"
         const val CHECK_UPDATES = "check_update"
         const val UPDATE_CHANNEL = "update_channel"
         const val CUSTOM_CHANNEL = "custom_channel"
         const val LOCALE = "locale"
-        const val DARK_THEME = "dark_theme"
+        const val DARK_THEME = "dark_theme_extended"
         const val REPO_ORDER = "repo_order"
         const val SHOW_SYSTEM_APP = "show_system"
-        const val DOWNLOAD_PATH = "download_path"
+        const val DOWNLOAD_DIR = "download_dir"
+        const val SAFETY = "safety_notice"
+        const val THEME_ORDINAL = "theme_ordinal"
         const val BOOT_ID = "boot_id"
+        const val ASKED_HOME = "asked_home"
+        const val DOH = "doh"
 
         // system state
         const val MAGISKHIDE = "magiskhide"
-        const val COREONLY = "disable"
     }
 
     object Value {
@@ -62,7 +75,6 @@ object Config : PreferenceModel, DBConfig {
         const val BETA_CHANNEL = 1
         const val CUSTOM_CHANNEL = 2
         const val CANARY_CHANNEL = 3
-        const val CANARY_DEBUG_CHANNEL = 4
 
         // root access mode
         const val ROOT_ACCESS_DISABLED = 0
@@ -98,33 +110,44 @@ object Config : PreferenceModel, DBConfig {
     }
 
     private val defaultChannel =
-        if (Utils.isCanary) {
-            if (BuildConfig.DEBUG)
-                Value.CANARY_DEBUG_CHANNEL
-            else
-                Value.CANARY_CHANNEL
-        }
-        else Value.DEFAULT_CHANNEL
+        if (BuildConfig.DEBUG)
+            Value.CANARY_CHANNEL
+        else
+            Value.DEFAULT_CHANNEL
+
+    @JvmStatic var keepVerity = false
+    @JvmStatic var keepEnc = false
+    @JvmStatic var recovery = false
 
     var bootId by preference(Key.BOOT_ID, "")
+    var askedHome by preference(Key.ASKED_HOME, false)
 
-    var downloadPath by preference(Key.DOWNLOAD_PATH, Environment.DIRECTORY_DOWNLOADS)
+    var downloadDir by preference(Key.DOWNLOAD_DIR, "")
     var repoOrder by preference(Key.REPO_ORDER, Value.ORDER_DATE)
 
     var suDefaultTimeout by preferenceStrInt(Key.SU_REQUEST_TIMEOUT, 10)
-    var suAutoReponse by preferenceStrInt(Key.SU_AUTO_RESPONSE, Value.SU_PROMPT)
+    var suAutoResponse by preferenceStrInt(Key.SU_AUTO_RESPONSE, Value.SU_PROMPT)
     var suNotification by preferenceStrInt(Key.SU_NOTIFICATION, Value.NOTIFICATION_TOAST)
     var updateChannel by preferenceStrInt(Key.UPDATE_CHANNEL, defaultChannel)
 
-    var darkTheme by preference(Key.DARK_THEME, true)
+    var safetyNotice by preference(Key.SAFETY, true)
+    var darkTheme by preference(Key.DARK_THEME, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+    var themeOrdinal by preference(Key.THEME_ORDINAL, Theme.Piplup.ordinal)
     var suReAuth by preference(Key.SU_REAUTH, false)
+    var suTapjack by preference(Key.SU_TAPJACK, true)
     var checkUpdate by preference(Key.CHECK_UPDATES, true)
+    var doh by preference(Key.DOH, false)
     var magiskHide by preference(Key.MAGISKHIDE, true)
-    var coreOnly by preference(Key.COREONLY, false)
     var showSystemApp by preference(Key.SHOW_SYSTEM_APP, false)
 
     var customChannelUrl by preference(Key.CUSTOM_CHANNEL, "")
-    var locale by preference(Key.LOCALE, "")
+    private var localePrefs by preference(Key.LOCALE, "")
+    var locale
+        get() = localePrefs
+        set(value) {
+            localePrefs = value
+            refreshLocale()
+        }
 
     var rootMode by dbSettings(Key.ROOT_ACCESS, Value.ROOT_ACCESS_APPS_AND_ADB)
     var suMntNamespaceMode by dbSettings(Key.SU_MNT_NS, Value.NAMESPACE_MODE_REQUESTER)
@@ -133,39 +156,38 @@ object Config : PreferenceModel, DBConfig {
     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() =
-        Utils.ensureDownloadPath(downloadPath) ?: get<Context>().getExternalFilesDir(null)!!
-
     private const val SU_FINGERPRINT = "su_fingerprint"
 
-    fun initialize() = prefs.also {
-        if (it.getBoolean(SU_FINGERPRINT, false)) {
-            suBiometric = true
+    fun load(pkg: String?) {
+        // Only try to load prefs when fresh install and a previous package name is set
+        if (pkg != null && prefs.all.isEmpty()) runCatching {
+            context.contentResolver.openInputStream(Provider.PREFS_URI(pkg))?.use {
+                prefs.edit { parsePrefs(it) }
+            }
         }
-    }.edit {
-        parsePrefs(this)
 
-        // Legacy stuff
-        remove(SU_FINGERPRINT)
+        prefs.edit {
+            // Settings migration
+            if (prefs.getBoolean(SU_FINGERPRINT, false))
+                suBiometric = true
+            remove(SU_FINGERPRINT)
+            prefs.getString(Key.UPDATE_CHANNEL, null).also {
+                if (it == null)
+                    putString(Key.UPDATE_CHANNEL, defaultChannel.toString())
+                else if (it.toInt() > Value.CANARY_CHANNEL)
+                    putString(Key.UPDATE_CHANNEL, Value.CANARY_CHANNEL.toString())
+            }
 
-        // Get actual state
-        putBoolean(Key.COREONLY, Const.MAGISK_DISABLE_FILE.exists())
-
-        // Write database configs
-        putString(Key.ROOT_ACCESS, rootMode.toString())
-        putString(Key.SU_MNT_NS, suMntNamespaceMode.toString())
-        putString(Key.SU_MULTIUSER_MODE, suMultiuserMode.toString())
-        putBoolean(Key.SU_BIOMETRIC, BiometricHelper.isEnabled)
-    }.also {
-        if (!prefs.contains(Key.UPDATE_CHANNEL))
-            prefs.edit().putString(Key.UPDATE_CHANNEL, defaultChannel.toString()).apply()
+            // Write database configs
+            putString(Key.ROOT_ACCESS, rootMode.toString())
+            putString(Key.SU_MNT_NS, suMntNamespaceMode.toString())
+            putString(Key.SU_MULTIUSER_MODE, suMultiuserMode.toString())
+            putBoolean(Key.SU_BIOMETRIC, BiometricHelper.isEnabled)
+        }
     }
 
-    private fun parsePrefs(editor: SharedPreferences.Editor) = editor.apply {
-        val config = SuFile.open("/data/adb", Const.MANAGER_CONFIGS)
-        if (config.exists()) runCatching {
-            val input = SuFileInputStream(config)
+    private fun SharedPreferences.Editor.parsePrefs(input: InputStream) {
+        runCatching {
             val parser = Xml.newPullParser()
             parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false)
             parser.setInput(input, "UTF-8")
@@ -209,19 +231,6 @@ object Config : PreferenceModel, DBConfig {
                     else -> parser.next()
                 }
             }
-            config.delete()
         }
     }
-
-    fun export() {
-        // Flush prefs to disk
-        prefs.edit().commit()
-        val context = get<Context>(Protected)
-        val xml = File(
-            "${context.filesDir.parent}/shared_prefs",
-            "${context.packageName}_preferences.xml"
-        )
-        Shell.su("cat $xml > /data/adb/${Const.MANAGER_CONFIGS}").exec()
-    }
-
 }

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

@@ -0,0 +1,77 @@
+package com.topjohnwu.magisk.core
+
+import android.os.Process
+
+object Const {
+
+    // Paths
+    lateinit var MAGISKTMP: String
+    val MAGISK_PATH get() = "$MAGISKTMP/modules"
+    const val TMP_FOLDER_PATH = "/dev/tmp"
+    const val MAGISK_LOG = "/cache/magisk.log"
+
+    // Versions
+    const val SNET_EXT_VER = 15
+    const val SNET_REVISION = "18ab78817087c337ae0edd1ecac38aec49217880"
+    const val BOOTCTL_REVISION = "18ab78817087c337ae0edd1ecac38aec49217880"
+
+    // Misc
+    val USER_ID = Process.myUid() / 100000
+
+    object Version {
+        const val MIN_VERSION = "v19.0"
+        const val MIN_VERCODE = 19000
+
+        fun atLeast_20_2() = Info.env.magiskVersionCode >= 20200 || isCanary()
+        fun atLeast_20_4() = Info.env.magiskVersionCode >= 20400 || isCanary()
+        fun atLeast_21_0() = Info.env.magiskVersionCode >= 21000 || isCanary()
+        fun atLeast_21_2() = Info.env.magiskVersionCode >= 21200 || isCanary()
+        fun isCanary() = Info.env.magiskVersionCode % 100 != 0
+    }
+
+    object ID {
+        const val FETCH_ZIP = 2
+        const val SELECT_FILE = 3
+        const val MAX_ACTIVITY_RESULT = 10
+
+        // notifications
+        const val MAGISK_UPDATE_NOTIFICATION_ID = 4
+        const val APK_UPDATE_NOTIFICATION_ID = 5
+        const val UPDATE_NOTIFICATION_CHANNEL = "update"
+        const val PROGRESS_NOTIFICATION_CHANNEL = "progress"
+        const val CHECK_MAGISK_UPDATE_WORKER_ID = "magisk_update"
+    }
+
+    object Url {
+        const val PATREON_URL = "https://www.patreon.com/topjohnwu"
+        const val SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk"
+
+        const val GITHUB_RAW_URL = "https://raw.githubusercontent.com/"
+        const val GITHUB_API_URL = "https://api.github.com/"
+        const val GITHUB_PAGE_URL = "https://topjohnwu.github.io/magisk_files/"
+        const val JS_DELIVR_URL = "https://cdn.jsdelivr.net/gh/"
+        const val OFFICIAL_REPO = "https://magisk-modules-repo.github.io/submission/modules.json"
+    }
+
+    object Key {
+        // intents
+        const val OPEN_SECTION = "section"
+        const val PREV_PKG = "prev_pkg"
+    }
+
+    object Value {
+        const val FLASH_ZIP = "flash"
+        const val PATCH_FILE = "patch"
+        const val FLASH_MAGISK = "magisk"
+        const val FLASH_INACTIVE_SLOT = "slot"
+        const val UNINSTALL = "uninstall"
+    }
+
+    object Nav {
+        const val HOME = "home"
+        const val SETTINGS = "settings"
+        const val HIDE = "hide"
+        const val MODULES = "modules"
+        const val SUPERUSER = "superuser"
+    }
+}

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

@@ -1,8 +1,9 @@
 @file:Suppress("DEPRECATION")
 
-package com.topjohnwu.magisk
+package com.topjohnwu.magisk.core
 
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.app.job.JobInfo
 import android.app.job.JobScheduler
 import android.app.job.JobWorkItem
@@ -14,23 +15,21 @@ import android.content.res.AssetManager
 import android.content.res.Configuration
 import android.content.res.Resources
 import androidx.annotation.RequiresApi
-import com.topjohnwu.magisk.extensions.forceGetDeclaredField
-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.DynAPK
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.download.DownloadService
+import com.topjohnwu.magisk.core.utils.refreshLocale
+import com.topjohnwu.magisk.core.utils.updateConfig
+import com.topjohnwu.magisk.ktx.forceGetDeclaredField
 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.refreshLocale
-import com.topjohnwu.magisk.utils.updateConfig
 
 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.wrap(global: Boolean = true): Context =
+    if (global) GlobalResContext(this) else ResContext(this)
 
 fun Context.wrapJob(): Context = object : GlobalResContext(this) {
 
@@ -54,10 +53,14 @@ fun Class<*>.cmp(pkg: String): ComponentName {
     return ComponentName(pkg, Info.stub?.classToComponent?.get(name) ?: name)
 }
 
+inline fun <reified T> Activity.redirect() = Intent(intent)
+    .setComponent(T::class.java.cmp(packageName))
+    .setFlags(0)
+
 inline fun <reified T> Context.intent() = Intent().setComponent(T::class.java.cmp(packageName))
 
 private open class GlobalResContext(base: Context) : ContextWrapper(base) {
-    open val mRes: Resources get() = ResourceMgr.resource
+    open val mRes: Resources get() = ResMgr.resource
 
     override fun getResources(): Resources {
         return mRes
@@ -78,22 +81,24 @@ private class ResContext(base: Context) : GlobalResContext(base) {
     private fun Resources.patch(): Resources {
         updateConfig()
         if (isRunningAsStub)
-            assets.addAssetPath(ResourceMgr.resApk)
+            assets.addAssetPath(ResMgr.apk)
         return this
     }
 }
 
-object ResourceMgr {
+object ResMgr {
 
     lateinit var resource: Resources
-    lateinit var resApk: String
+    lateinit var apk: String
 
     fun init(context: Context) {
         resource = context.resources
         refreshLocale()
         if (isRunningAsStub) {
-            resApk = DynAPK.current(context).path
-            resource.assets.addAssetPath(resApk)
+            apk = DynAPK.current(context).path
+            resource.assets.addAssetPath(apk)
+        } else {
+            apk = context.packageResourcePath
         }
     }
 }
@@ -130,26 +135,39 @@ private class JobSchedulerWrapper(private val base: JobScheduler) : JobScheduler
         val name = service.className
         val component = ComponentName(
             service.packageName,
-            Info.stub!!.classToComponent[name] ?: name)
+            Info.stubChk.classToComponent[name] ?: name
+        )
 
         javaClass.forceGetDeclaredField("service")?.set(this, component)
         return this
     }
 }
 
-object ClassMap {
+private 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,
+        Receiver::class.java to a.h::class.java,
         DownloadService::class.java to a.j::class.java,
-        SuRequestActivity::class.java to a.m::class.java,
-        ProcessPhoenix::class.java to a.r::class.java
+        SuRequestActivity::class.java to a.m::class.java
     )
 
     operator fun get(c: Class<*>) = map.getOrElse(c) { c }
 }
+
+// Keep a reference to these resources to prevent it from
+// being removed when running "remove unused resources"
+val shouldKeepResources = listOf(
+    R.string.no_info_provided,
+    R.string.release_notes,
+    R.string.invalid_update_channel,
+    R.string.update_available,
+    R.string.safetynet_api_error,
+    R.raw.changelog,
+    R.drawable.ic_device,
+    R.drawable.ic_hide_select_md2,
+    R.drawable.ic_more,
+    R.drawable.ic_magisk_delete
+)

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

@@ -0,0 +1,87 @@
+package com.topjohnwu.magisk.core
+
+import androidx.databinding.ObservableBoolean
+import com.topjohnwu.magisk.DynAPK
+import com.topjohnwu.magisk.core.model.UpdateInfo
+import com.topjohnwu.magisk.core.utils.net.NetworkObserver
+import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.utils.CachedValue
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.ShellUtils.fastCmd
+import com.topjohnwu.superuser.internal.UiThreadHandler
+import java.io.FileInputStream
+import java.io.IOException
+import java.util.*
+
+val isRunningAsStub get() = Info.stub != null
+
+object Info {
+
+    val envRef = CachedValue { loadState() }
+
+    @JvmStatic val env by envRef
+
+    var stub: DynAPK.Data? = null
+    val stubChk: DynAPK.Data
+        get() = stub as DynAPK.Data
+
+    var remote = UpdateInfo()
+
+    // Device state
+    var crypto = ""
+    @JvmStatic var isSAR = false
+    @JvmStatic var isAB = false
+    @JvmStatic val isFDE get() = crypto == "block"
+    @JvmStatic var ramdisk = false
+    @JvmStatic var hasGMS = true
+    @JvmStatic var isPixel = false
+    @JvmStatic val cryptoText get() = crypto.capitalize(Locale.US)
+
+    val isConnected by lazy {
+        ObservableBoolean(false).also { field ->
+            NetworkObserver.observe(get()) {
+                UiThreadHandler.run { field.set(it) }
+            }
+        }
+    }
+
+    val isNewReboot by lazy {
+        try {
+            FileInputStream("/proc/sys/kernel/random/boot_id").bufferedReader().use {
+                val id = it.readLine()
+                if (id != Config.bootId) {
+                    Config.bootId = id
+                    true
+                } else {
+                    false
+                }
+            }
+        } catch (e: IOException) {
+            false
+        }
+    }
+
+    private fun loadState() = Env(
+        fastCmd("magisk -v").split(":".toRegex())[0],
+        runCatching { fastCmd("magisk -V").toInt() }.getOrDefault(-1),
+        Shell.su("magiskhide --status").exec().isSuccess
+    )
+
+    class Env(
+        val magiskVersionString: String = "",
+        code: Int = -1,
+        hide: Boolean = false
+    ) {
+        val magiskHide get() = Config.magiskHide
+        val magiskVersionCode = when (code) {
+            in Int.MIN_VALUE..Const.Version.MIN_VERCODE -> -1
+            else -> if (Shell.rootAccess()) code else -1
+        }
+        val isUnsupported = code > 0 && code < Const.Version.MIN_VERCODE
+        val isActive = magiskVersionCode >= 0
+
+        init {
+            Config.magiskHide = hide
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/core/Provider.kt

@@ -0,0 +1,39 @@
+package com.topjohnwu.magisk.core
+
+import android.content.Context
+import android.content.pm.ProviderInfo
+import android.net.Uri
+import android.os.Bundle
+import android.os.ParcelFileDescriptor
+import android.os.ParcelFileDescriptor.MODE_READ_ONLY
+import com.topjohnwu.magisk.FileProvider
+import com.topjohnwu.magisk.core.su.SuCallbackHandler
+import java.io.File
+
+open class Provider : FileProvider() {
+
+    override fun attachInfo(context: Context, info: ProviderInfo?) {
+        super.attachInfo(context.wrap(), info)
+    }
+
+    override fun call(method: String, arg: String?, extras: Bundle?): Bundle? {
+        SuCallbackHandler(context!!, method, extras)
+        return Bundle.EMPTY
+    }
+
+    override fun openFile(uri: Uri, mode: String): ParcelFileDescriptor? {
+        return when (uri.encodedPath ?: return null) {
+            "/apk_file" -> ParcelFileDescriptor.open(File(context!!.packageCodePath), MODE_READ_ONLY)
+            "/prefs_file" -> ParcelFileDescriptor.open(Config.prefsFile, MODE_READ_ONLY)
+            else -> super.openFile(uri, mode)
+        }
+    }
+
+    companion object {
+        fun APK_URI(pkg: String) =
+            Uri.Builder().scheme("content").authority("$pkg.provider").path("apk_file").build()
+
+        fun PREFS_URI(pkg: String) =
+            Uri.Builder().scheme("content").authority("$pkg.provider").path("prefs_file").build()
+    }
+}

app/src/main/java/com/topjohnwu/magisk/core/Receiver.kt

@@ -0,0 +1,46 @@
+package com.topjohnwu.magisk.core
+
+import android.content.ContextWrapper
+import android.content.Intent
+import com.topjohnwu.magisk.core.base.BaseReceiver
+import com.topjohnwu.magisk.core.magiskdb.PolicyDao
+import com.topjohnwu.magisk.core.su.SuCallbackHandler
+import com.topjohnwu.magisk.view.Shortcuts
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import org.koin.core.inject
+
+open class Receiver : BaseReceiver() {
+
+    private val policyDB: PolicyDao by inject()
+
+    private fun getPkg(intent: Intent): String {
+        return intent.data?.encodedSchemeSpecificPart.orEmpty()
+    }
+
+    override fun onReceive(context: ContextWrapper, intent: Intent?) {
+        intent ?: return
+
+        fun rmPolicy(pkg: String) = GlobalScope.launch {
+            policyDB.delete(pkg)
+        }
+
+        when (intent.action ?: return) {
+            Intent.ACTION_REBOOT -> {
+                SuCallbackHandler(context, intent.getStringExtra("action"), intent.extras)
+            }
+            Intent.ACTION_PACKAGE_REPLACED -> {
+                // This will only work pre-O
+                if (Config.suReAuth)
+                    rmPolicy(getPkg(intent))
+            }
+            Intent.ACTION_PACKAGE_FULLY_REMOVED -> {
+                val pkg = getPkg(intent)
+                rmPolicy(pkg)
+                Shell.su("magiskhide --rm $pkg").submit()
+            }
+            Intent.ACTION_LOCALE_CHANGED -> Shortcuts.setupDynamic(context)
+        }
+    }
+}

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

@@ -0,0 +1,71 @@
+package com.topjohnwu.magisk.core
+
+import android.app.Activity
+import android.content.Context
+import android.os.Bundle
+import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.ui.MainActivity
+import com.topjohnwu.magisk.view.Notifications
+import com.topjohnwu.magisk.view.Shortcuts
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+
+open class SplashActivity : Activity() {
+
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base.wrap())
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setTheme(R.style.SplashTheme)
+        super.onCreate(savedInstanceState)
+        GlobalScope.launch(Dispatchers.IO) {
+            initAndStart()
+        }
+    }
+
+    private fun handleRepackage(pkg: String?) {
+        if (packageName != APPLICATION_ID) {
+            runCatching {
+                // Hidden, remove com.topjohnwu.magisk if exist as it could be malware
+                packageManager.getApplicationInfo(APPLICATION_ID, 0)
+                Shell.su("(pm uninstall $APPLICATION_ID)& >/dev/null 2>&1").exec()
+            }
+        } else {
+            if (Config.suManager.isNotEmpty())
+                Config.suManager = ""
+            pkg ?: return
+            Shell.su("(pm uninstall $pkg)& >/dev/null 2>&1").exec()
+        }
+    }
+
+    private fun initAndStart() {
+        // Pre-initialize root shell
+        Shell.getShell()
+
+        val prevPkg = intent.getStringExtra(Const.Key.PREV_PKG)
+
+        Config.load(prevPkg)
+        handleRepackage(prevPkg)
+        Notifications.setup(this)
+        UpdateCheckService.schedule(this)
+        Shortcuts.setupDynamic(this)
+
+        // Pre-fetch network services
+        get<NetworkService>()
+
+        DONE = true
+
+        redirect<MainActivity>().also { startActivity(it) }
+        finish()
+    }
+
+    companion object {
+        var DONE = false
+    }
+}

app/src/main/java/com/topjohnwu/magisk/core/UpdateCheckService.kt

@@ -0,0 +1,53 @@
+package com.topjohnwu.magisk.core
+
+import android.content.Context
+import androidx.work.*
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.view.Notifications
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.koin.core.KoinComponent
+import org.koin.core.inject
+import java.util.concurrent.TimeUnit
+
+class UpdateCheckService(context: Context, workerParams: WorkerParameters)
+    : CoroutineWorker(context, workerParams), KoinComponent {
+
+    private val svc: NetworkService by inject()
+
+    override suspend fun doWork(): Result {
+        // Make sure shell initializer was ran
+        withContext(Dispatchers.IO) {
+            Shell.getShell()
+        }
+        return svc.fetchUpdate()?.let {
+            if (BuildConfig.VERSION_CODE < it.app.versionCode)
+                Notifications.managerUpdate(applicationContext)
+            else if (Info.env.isActive && Info.env.magiskVersionCode < it.magisk.versionCode)
+                Notifications.magiskUpdate(applicationContext)
+            Result.success()
+        } ?: Result.failure()
+    }
+
+    companion object {
+        fun schedule(context: Context) {
+            if (Config.checkUpdate) {
+                val constraints = Constraints.Builder()
+                    .setRequiredNetworkType(NetworkType.CONNECTED)
+                    .setRequiresDeviceIdle(true)
+                    .build()
+                val request = PeriodicWorkRequestBuilder<UpdateCheckService>(12, TimeUnit.HOURS)
+                    .setConstraints(constraints)
+                    .build()
+                WorkManager.getInstance(context).enqueueUniquePeriodicWork(
+                    Const.ID.CHECK_MAGISK_UPDATE_WORKER_ID,
+                    ExistingPeriodicWorkPolicy.REPLACE, request)
+            } else {
+                WorkManager.getInstance(context)
+                    .cancelUniqueWork(Const.ID.CHECK_MAGISK_UPDATE_WORKER_ID)
+            }
+        }
+    }
+}

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

@@ -0,0 +1,109 @@
+package com.topjohnwu.magisk.core.base
+
+import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.res.Configuration
+import android.os.Build
+import android.widget.Toast
+import androidx.annotation.CallSuper
+import androidx.appcompat.app.AppCompatActivity
+import androidx.collection.SparseArrayCompat
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.utils.currentLocale
+import com.topjohnwu.magisk.core.wrap
+import com.topjohnwu.magisk.ktx.set
+import com.topjohnwu.magisk.utils.Utils
+import kotlin.random.Random
+
+typealias ActivityResultCallback = BaseActivity.(Int, Intent?) -> Unit
+
+abstract class BaseActivity : AppCompatActivity() {
+
+    private val resultCallbacks by lazy { SparseArrayCompat<ActivityResultCallback>() }
+
+    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))
+    }
+
+    fun withPermission(permission: String, builder: PermissionRequestBuilder.() -> Unit) {
+        val request = PermissionRequestBuilder().apply(builder).build()
+
+        if (permission == WRITE_EXTERNAL_STORAGE && Build.VERSION.SDK_INT >= 30) {
+            // We do not need external rw on 30+
+            request.onSuccess()
+            return
+        }
+
+        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
+            request.onSuccess()
+        } else {
+            var requestCode: Int
+            do {
+                requestCode = Random.nextInt(Const.ID.MAX_ACTIVITY_RESULT + 1, 1 shl 15)
+            } while (resultCallbacks.containsKey(requestCode))
+            resultCallbacks[requestCode] = { result, _ ->
+                if (result > 0)
+                    request.onSuccess()
+                else
+                    request.onFailure()
+            }
+            ActivityCompat.requestPermissions(this, arrayOf(permission), requestCode)
+        }
+    }
+
+    fun withExternalRW(builder: PermissionRequestBuilder.() -> Unit) {
+        withPermission(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]?.also {
+            resultCallbacks.remove(requestCode)
+            it(this, if (success) 1 else -1, null)
+        }
+
+    }
+
+    @CallSuper
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        resultCallbacks[requestCode]?.also { callback ->
+            resultCallbacks.remove(requestCode)
+            callback(this, resultCode, data)
+        }
+    }
+
+    fun startActivityForResult(intent: Intent, requestCode: Int, callback: ActivityResultCallback) {
+        resultCallbacks[requestCode] = callback
+        try {
+            startActivityForResult(intent, requestCode)
+        } catch (e: ActivityNotFoundException) {
+            Utils.toast(R.string.app_not_found, Toast.LENGTH_SHORT)
+        }
+    }
+
+    override fun recreate() {
+        startActivity(Intent().setComponent(intent.component))
+        finish()
+    }
+
+}

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

@@ -1,10 +1,10 @@
-package com.topjohnwu.magisk.base
+package com.topjohnwu.magisk.core.base
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
-import com.topjohnwu.magisk.wrap
+import com.topjohnwu.magisk.core.wrap
 import org.koin.core.KoinComponent
 
 abstract class BaseReceiver : BroadcastReceiver(), KoinComponent {

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

@@ -1,8 +1,8 @@
-package com.topjohnwu.magisk.base
+package com.topjohnwu.magisk.core.base
 
 import android.app.Service
 import android.content.Context
-import com.topjohnwu.magisk.wrap
+import com.topjohnwu.magisk.core.wrap
 import org.koin.core.KoinComponent
 
 abstract class BaseService : Service(), KoinComponent {

app/src/main/java/com/topjohnwu/magisk/core/base/BaseWorkerWrapper.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.base
+package com.topjohnwu.magisk.core.base
 
 import android.content.Context
 import android.net.Network
@@ -10,7 +10,7 @@ import androidx.work.ListenableWorker
 import com.google.common.util.concurrent.ListenableFuture
 import java.util.*
 
-abstract class DelegateWorker {
+abstract class BaseWorkerWrapper {
 
     private lateinit var worker: ListenableWorker
 

app/src/main/java/com/topjohnwu/magisk/core/base/PermissionRequestBuilder.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.model.permissions
+package com.topjohnwu.magisk.core.base
 
 typealias SimpleCallback = () -> Unit
 typealias PermissionRationaleCallback = (List<String>) -> Unit
@@ -37,4 +37,4 @@ class PermissionRequest(
     fun onFailure() = onFailureCallback()
     fun onShowRationale(permissions: List<String>) = onShowRationaleCallback(permissions)
 
-}
+}

app/src/main/java/com/topjohnwu/magisk/core/download/Action.kt

@@ -0,0 +1,31 @@
+package com.topjohnwu.magisk.core.download
+
+import android.net.Uri
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+sealed class Action : Parcelable {
+
+    sealed class Flash : Action() {
+
+        @Parcelize
+        object Primary : Flash()
+
+        @Parcelize
+        object Secondary : Flash()
+
+    }
+
+    @Parcelize
+    object Download : Action()
+
+    @Parcelize
+    object Uninstall : Action()
+
+    @Parcelize
+    object EnvFix : Action()
+
+    @Parcelize
+    data class Patch(val fileUri: Uri) : Action()
+
+}

app/src/main/java/com/topjohnwu/magisk/core/download/BaseDownloader.kt

@@ -0,0 +1,204 @@
+package com.topjohnwu.magisk.core.download
+
+import android.app.Notification
+import android.content.Intent
+import android.os.IBinder
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.MutableLiveData
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.ForegroundTracker
+import com.topjohnwu.magisk.core.base.BaseService
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.checkSum
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
+import com.topjohnwu.magisk.core.utils.ProgressInputStream
+import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.ktx.withStreams
+import com.topjohnwu.magisk.view.Notifications
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import okhttp3.ResponseBody
+import org.koin.android.ext.android.inject
+import org.koin.core.KoinComponent
+import timber.log.Timber
+import java.io.IOException
+import java.io.InputStream
+import java.util.*
+import kotlin.collections.HashMap
+import kotlin.random.Random.Default.nextInt
+
+abstract class BaseDownloader : BaseService(), KoinComponent {
+
+    private val hasNotifications get() = notifications.isNotEmpty()
+    private val notifications = Collections.synchronizedMap(HashMap<Int, Notification.Builder>())
+    private val coroutineScope = CoroutineScope(Dispatchers.IO)
+
+    val service: NetworkService by inject()
+
+    // -- Service overrides
+
+    override fun onBind(intent: Intent?): IBinder? = null
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        intent.getParcelableExtra<Subject>(ACTION_KEY)?.let { subject ->
+            update(subject.notifyID())
+            coroutineScope.launch {
+                try {
+                    subject.startDownload()
+                } catch (e: IOException) {
+                    Timber.e(e)
+                    notifyFail(subject)
+                }
+            }
+        }
+        return START_REDELIVER_INTENT
+    }
+
+    override fun onTaskRemoved(rootIntent: Intent?) {
+        super.onTaskRemoved(rootIntent)
+        notifications.forEach { cancel(it.key) }
+        notifications.clear()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        coroutineScope.cancel()
+    }
+
+    // -- Download logic
+
+    private suspend fun Subject.startDownload() {
+        val skip = this is Subject.Magisk && file.checkSum("MD5", magisk.md5)
+        if (!skip) {
+            val stream = service.fetchFile(url).toProgressStream(this)
+            when (this) {
+                is Subject.Module ->  // Download and process on-the-fly
+                    stream.toModule(file, service.fetchInstaller().byteStream())
+                else -> {
+                    withStreams(stream, file.outputStream()) { it, out -> it.copyTo(out) }
+                    if (this is Subject.Manager)
+                        handleAPK(this)
+                }
+            }
+        }
+        val newId = notifyFinish(this)
+        if (ForegroundTracker.hasForeground)
+            onFinish(this, newId)
+        if (!hasNotifications)
+            stopSelf()
+    }
+
+    private fun ResponseBody.toProgressStream(subject: Subject): InputStream {
+        val max = contentLength()
+        val total = max.toFloat() / 1048576
+        val id = subject.notifyID()
+
+        update(id) { it.setContentTitle(subject.title) }
+
+        return ProgressInputStream(byteStream()) {
+            val progress = it.toFloat() / 1048576
+            update(id) { notification ->
+                if (max > 0) {
+                    broadcast(progress / total, subject)
+                    notification
+                        .setProgress(max.toInt(), it.toInt(), false)
+                        .setContentText("%.2f / %.2f MB".format(progress, total))
+                } else {
+                    broadcast(-1f, subject)
+                    notification.setContentText("%.2f MB / ??".format(progress))
+                }
+            }
+        }
+    }
+
+    // --- Notification managements
+
+    fun Subject.notifyID() = hashCode()
+
+    private fun notifyFail(subject: Subject) = lastNotify(subject.notifyID()) {
+        broadcast(-2f, subject)
+        it.setContentText(getString(R.string.download_file_error))
+            .setSmallIcon(android.R.drawable.stat_notify_error)
+            .setOngoing(false)
+    }
+
+    private fun notifyFinish(subject: Subject) = lastNotify(subject.notifyID()) {
+        broadcast(1f, subject)
+        it.setIntent(subject)
+            .setContentTitle(subject.title)
+            .setContentText(getString(R.string.download_complete))
+            .setSmallIcon(android.R.drawable.stat_sys_download_done)
+            .setProgress(0, 0, false)
+            .setOngoing(false)
+            .setAutoCancel(true)
+    }
+
+    private fun create() = Notifications.progress(this, "")
+
+    fun update(id: Int, editor: (Notification.Builder) -> Unit = {}) {
+        val wasEmpty = !hasNotifications
+        val notification = notifications.getOrPut(id, ::create).also(editor)
+        if (wasEmpty)
+            updateForeground()
+        else
+            notify(id, notification.build())
+    }
+
+    private fun lastNotify(
+        id: Int,
+        editor: (Notification.Builder) -> Notification.Builder? = { null }
+    ) : Int {
+        val notification = remove(id)?.run(editor) ?: return -1
+        val newId: Int = nextInt()
+        notify(newId, notification.build())
+        return newId
+    }
+
+    protected fun remove(id: Int) = notifications.remove(id)
+        ?.also { updateForeground(); cancel(id) }
+        ?: { cancel(id); null }()
+
+    private fun notify(id: Int, notification: Notification) {
+        Notifications.mgr.notify(id, notification)
+    }
+
+    private fun cancel(id: Int) {
+        Notifications.mgr.cancel(id)
+    }
+
+    private fun updateForeground() {
+        if (hasNotifications) {
+            val (id, notification) = notifications.entries.first()
+            startForeground(id, notification.build())
+        } else {
+            stopForeground(false)
+        }
+    }
+
+    // --- Implement custom logic
+
+    protected abstract suspend fun onFinish(subject: Subject, id: Int)
+
+    protected abstract fun Notification.Builder.setIntent(subject: Subject): Notification.Builder
+
+    // ---
+
+    companion object : KoinComponent {
+        const val ACTION_KEY = "download_action"
+
+        private val progressBroadcast = MutableLiveData<Pair<Float, Subject>>()
+
+        fun observeProgress(owner: LifecycleOwner, callback: (Float, Subject) -> Unit) {
+            progressBroadcast.value = null
+            progressBroadcast.observe(owner) {
+                val (progress, subject) = it ?: return@observe
+                callback(progress, subject)
+            }
+        }
+
+        private fun broadcast(progress: Float, subject: Subject) {
+            progressBroadcast.postValue(progress to subject)
+        }
+    }
+}

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

@@ -0,0 +1,110 @@
+package com.topjohnwu.magisk.core.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 androidx.core.net.toFile
+import com.topjohnwu.magisk.core.download.Action.*
+import com.topjohnwu.magisk.core.download.Action.Flash.Secondary
+import com.topjohnwu.magisk.core.download.Subject.*
+import com.topjohnwu.magisk.core.intent
+import com.topjohnwu.magisk.core.tasks.EnvFixTask
+import com.topjohnwu.magisk.ui.flash.FlashFragment
+import com.topjohnwu.magisk.utils.APKInstall
+import kotlin.random.Random.Default.nextInt
+
+@SuppressLint("Registered")
+open class DownloadService : BaseDownloader() {
+
+    private val context get() = this
+
+    override suspend fun onFinish(subject: Subject, id: Int) = when (subject) {
+        is Magisk -> subject.onFinish(id)
+        is Module -> subject.onFinish(id)
+        is Manager -> subject.onFinish(id)
+    }
+
+    private suspend fun Magisk.onFinish(id: Int) = when (val action = action) {
+        Uninstall -> FlashFragment.uninstall(file, id)
+        EnvFix -> {
+            remove(id)
+            EnvFixTask(file).exec()
+            Unit
+        }
+        is Patch -> FlashFragment.patch(file, action.fileUri, id)
+        is Flash -> FlashFragment.flash(file, action is Secondary, id)
+        else -> Unit
+    }
+
+    private fun Module.onFinish(id: Int) = when (action) {
+        is Flash -> FlashFragment.install(file, id)
+        else -> Unit
+    }
+
+    private fun Manager.onFinish(id: Int) {
+        remove(id)
+        APKInstall.install(context, file.toFile())
+    }
+
+    // --- Customize finish notification
+
+    override fun Notification.Builder.setIntent(subject: Subject)
+    = when (subject) {
+        is Magisk -> setIntent(subject)
+        is Module -> setIntent(subject)
+        is Manager -> setIntent(subject)
+    }
+
+    private fun Notification.Builder.setIntent(subject: Magisk)
+    = when (val action = subject.action) {
+        Uninstall -> setContentIntent(FlashFragment.uninstallIntent(context, subject.file))
+        is Flash -> setContentIntent(FlashFragment.flashIntent(context, subject.file, action is Secondary))
+        is Patch -> setContentIntent(FlashFragment.patchIntent(context, subject.file, action.fileUri))
+        else -> setContentIntent(Intent())
+    }
+
+    private fun Notification.Builder.setIntent(subject: Module)
+    = when (subject.action) {
+        is Flash -> setContentIntent(FlashFragment.installIntent(context, subject.file))
+        else -> setContentIntent(Intent())
+    }
+
+    private fun Notification.Builder.setIntent(subject: Manager)
+    = setContentIntent(APKInstall.installIntent(context, subject.file.toFile()))
+
+    private fun Notification.Builder.setContentIntent(intent: Intent) =
+        setContentIntent(
+            PendingIntent.getActivity(context, nextInt(), intent, PendingIntent.FLAG_ONE_SHOT)
+        )
+
+    // ---
+
+    companion object {
+
+        private fun intent(context: Context, subject: Subject) =
+            context.intent<DownloadService>().putExtra(ACTION_KEY, subject)
+
+        fun pendingIntent(context: Context, subject: Subject): PendingIntent {
+            return if (Build.VERSION.SDK_INT >= 26) {
+                PendingIntent.getForegroundService(context, nextInt(),
+                    intent(context, subject), PendingIntent.FLAG_UPDATE_CURRENT)
+            } else {
+                PendingIntent.getService(context, nextInt(),
+                    intent(context, subject), PendingIntent.FLAG_UPDATE_CURRENT)
+            }
+        }
+
+        fun start(context: Context, subject: Subject) {
+            val app = context.applicationContext
+            if (Build.VERSION.SDK_INT >= 26) {
+                app.startForegroundService(intent(app, subject))
+            } else {
+                app.startService(intent(app, subject))
+            }
+        }
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/core/download/ManagerHandler.kt

@@ -0,0 +1,51 @@
+package com.topjohnwu.magisk.core.download
+
+import android.content.Context
+import androidx.core.net.toFile
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.DynAPK
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.tasks.HideAPK
+import com.topjohnwu.magisk.ktx.relaunchApp
+import com.topjohnwu.magisk.ktx.writeTo
+import java.io.File
+
+private fun Context.patch(apk: File) {
+    val patched = File(apk.parent, "patched.apk")
+    HideAPK.patch(this, apk.path, patched.path, packageName, applicationInfo.nonLocalizedLabel)
+    apk.delete()
+    patched.renameTo(apk)
+}
+
+private fun BaseDownloader.notifyHide(id: Int) {
+    update(id) {
+        it.setProgress(0, 0, true)
+            .setContentTitle(getString(R.string.hide_manager_title))
+            .setContentText("")
+    }
+}
+
+suspend fun BaseDownloader.handleAPK(subject: Subject.Manager) {
+    val apk = subject.file.toFile()
+    val id = subject.notifyID()
+    if (isRunningAsStub) {
+        // Move to upgrade location
+        apk.copyTo(DynAPK.update(this), overwrite = true)
+        apk.delete()
+        if (Info.stubChk.version < subject.stub.versionCode) {
+            notifyHide(id)
+            // Also upgrade stub
+            service.fetchFile(subject.stub.link).byteStream().use { it.writeTo(apk) }
+            patch(apk)
+        } else {
+            // Simply relaunch the app
+            stopSelf()
+            relaunchApp(this)
+        }
+    } else if (packageName != BuildConfig.APPLICATION_ID) {
+        notifyHide(id)
+        patch(apk)
+    }
+}

app/src/main/java/com/topjohnwu/magisk/core/download/ModuleProcessor.kt

@@ -1,13 +1,14 @@
-package com.topjohnwu.magisk.model.download
+package com.topjohnwu.magisk.core.download
 
-import com.topjohnwu.magisk.extensions.withStreams
-import java.io.File
+import android.net.Uri
+import com.topjohnwu.magisk.ktx.withStreams
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
 import java.io.InputStream
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import java.util.zip.ZipOutputStream
 
-fun InputStream.toModule(file: File, installer: InputStream) {
+fun InputStream.toModule(file: Uri, installer: InputStream) {
 
     val input = ZipInputStream(buffered())
     val output = ZipOutputStream(file.outputStream().buffered())
@@ -41,4 +42,4 @@ fun InputStream.toModule(file: File, installer: InputStream) {
             entry = zin.nextEntry
         }
     }
-}
+}

app/src/main/java/com/topjohnwu/magisk/core/download/Subject.kt

@@ -0,0 +1,109 @@
+package com.topjohnwu.magisk.core.download
+
+import android.content.Context
+import android.net.Uri
+import android.os.Parcelable
+import androidx.core.net.toUri
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.model.MagiskJson
+import com.topjohnwu.magisk.core.model.ManagerJson
+import com.topjohnwu.magisk.core.model.StubJson
+import com.topjohnwu.magisk.core.model.module.OnlineModule
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils
+import com.topjohnwu.magisk.ktx.cachedFile
+import com.topjohnwu.magisk.ktx.get
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
+
+private fun cachedFile(name: String) = get<Context>().cachedFile(name).apply { delete() }.toUri()
+
+sealed class Subject : Parcelable {
+
+    abstract val url: String
+    abstract val file: Uri
+    abstract val action: Action
+    abstract val title: String
+
+    @Parcelize
+    class Module(
+        val module: OnlineModule,
+        override val action: Action
+    ) : Subject() {
+        override val url: String get() = module.zip_url
+        override val title: String get() = module.downloadFilename
+
+        @IgnoredOnParcel
+        override val file by lazy {
+            MediaStoreUtils.getFile(title).uri
+        }
+    }
+
+    @Parcelize
+    class Manager(
+        private val app: ManagerJson = Info.remote.app,
+        val stub: StubJson = Info.remote.stub
+    ) : Subject() {
+        override val action get() = Action.Download
+        override val title: String get() = "MagiskManager-${app.version}(${app.versionCode})"
+        override val url: String get() = app.link
+
+        @IgnoredOnParcel
+        override val file by lazy {
+            cachedFile("manager.apk")
+        }
+
+    }
+
+    abstract class Magisk : Subject() {
+
+        val magisk: MagiskJson = Info.remote.magisk
+
+        @Parcelize
+        private class Internal(
+            override val action: Action
+        ) : Magisk() {
+            override val url: String get() = magisk.link
+            override val title: String get() = "Magisk-${magisk.version}(${magisk.versionCode})"
+
+            @IgnoredOnParcel
+            override val file by lazy {
+                cachedFile("magisk.zip")
+            }
+        }
+
+        @Parcelize
+        private class Uninstall : Magisk() {
+            override val action get() = Action.Uninstall
+            override val url: String get() = Info.remote.uninstaller.link
+            override val title: String get() = "uninstall.zip"
+
+            @IgnoredOnParcel
+            override val file by lazy {
+                cachedFile(title)
+            }
+
+        }
+
+        @Parcelize
+        private class Download : Magisk() {
+            override val action get() = Action.Download
+            override val url: String get() = magisk.link
+            override val title: String get() = "Magisk-${magisk.version}(${magisk.versionCode}).zip"
+
+            @IgnoredOnParcel
+            override val file by lazy {
+                MediaStoreUtils.getFile(title).uri
+            }
+        }
+
+        companion object {
+            operator fun invoke(config: Action) = when (config) {
+                Action.Download -> Download()
+                Action.Uninstall -> Uninstall()
+                Action.EnvFix, is Action.Flash, is Action.Patch -> Internal(config)
+            }
+        }
+
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/core/magiskdb/BaseDao.kt

@@ -0,0 +1,28 @@
+package com.topjohnwu.magisk.core.magiskdb
+
+import androidx.annotation.StringDef
+
+abstract class BaseDao {
+
+    object Table {
+        const val POLICY = "policies"
+        const val LOG = "logs"
+        const val SETTINGS = "settings"
+        const val STRINGS = "strings"
+    }
+
+    @StringDef(Table.POLICY, Table.LOG, Table.SETTINGS, Table.STRINGS)
+    @Retention(AnnotationRetention.SOURCE)
+    annotation class TableStrict
+
+    @TableStrict
+    abstract val table: String
+
+    inline fun <reified Builder : Query.Builder> buildQuery(builder: Builder.() -> Unit = {}) =
+        Builder::class.java.newInstance()
+            .apply { table = this@BaseDao.table }
+            .apply(builder)
+            .toString()
+            .let { Query(it) }
+
+}

app/src/main/java/com/topjohnwu/magisk/core/magiskdb/PolicyDao.kt

@@ -0,0 +1,77 @@
+package com.topjohnwu.magisk.core.magiskdb
+
+import android.content.Context
+import android.content.pm.PackageManager
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.model.su.SuPolicy
+import com.topjohnwu.magisk.core.model.su.toMap
+import com.topjohnwu.magisk.core.model.su.toPolicy
+import com.topjohnwu.magisk.ktx.now
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import java.util.concurrent.TimeUnit
+
+
+class PolicyDao(
+    private val context: Context
+) : BaseDao() {
+
+    override val table: String = Table.POLICY
+
+    suspend fun deleteOutdated() = buildQuery<Delete> {
+        condition {
+            greaterThan("until", "0")
+            and {
+                lessThan("until", TimeUnit.MILLISECONDS.toSeconds(now).toString())
+            }
+            or {
+                lessThan("until", "0")
+            }
+        }
+    }.commit()
+
+    suspend fun delete(packageName: String) = buildQuery<Delete> {
+        condition {
+            equals("package_name", packageName)
+        }
+    }.commit()
+
+    suspend fun delete(uid: Int) = buildQuery<Delete> {
+        condition {
+            equals("uid", uid)
+        }
+    }.commit()
+
+    suspend fun fetch(uid: Int) = buildQuery<Select> {
+        condition {
+            equals("uid", uid)
+        }
+    }.query().first().toPolicyOrNull()
+
+    suspend fun update(policy: SuPolicy) = buildQuery<Replace> {
+        values(policy.toMap())
+    }.commit()
+
+    suspend fun <R: Any> fetchAll(mapper: (SuPolicy) -> R) = buildQuery<Select> {
+        condition {
+            equals("uid/100000", Const.USER_ID)
+        }
+    }.query {
+        it.toPolicyOrNull()?.let(mapper)
+    }
+
+    private fun Map<String, String>.toPolicyOrNull(): SuPolicy? {
+        return runCatching { toPolicy(context.packageManager) }.getOrElse {
+            Timber.e(it)
+            if (it is PackageManager.NameNotFoundException) {
+                val uid = getOrElse("uid") { null } ?: return null
+                GlobalScope.launch {
+                    delete(uid.toInt())
+                }
+            }
+            null
+        }
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/core/magiskdb/Query.kt

@@ -1,6 +1,12 @@
-package com.topjohnwu.magisk.data.database.magiskdb
+package com.topjohnwu.magisk.core.magiskdb
 
 import androidx.annotation.StringDef
+import com.topjohnwu.magisk.ktx.await
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.withContext
 
 class Query(private val _query: String) {
     val query get() = "magisk --sqlite '$_query'"
@@ -9,6 +15,24 @@ class Query(private val _query: String) {
         val requestType: String
         var table: String
     }
+
+    suspend inline fun <R : Any> query(crossinline mapper: (Map<String, String>) -> R?): List<R> =
+        withContext(Dispatchers.Default) {
+            Shell.su(query).await().out.map { line ->
+                async {
+                    line.split("\\|".toRegex())
+                        .map { it.split("=", limit = 2) }
+                        .filter { it.size == 2 }
+                        .map { it[0] to it[1] }
+                        .toMap()
+                        .let(mapper)
+                }
+            }.awaitAll().filterNotNull()
+        }
+
+    suspend inline fun query() = query { it }
+
+    suspend inline fun commit() = Shell.su(query).to(null).await()
 }
 
 class Delete : Query.Builder {

app/src/main/java/com/topjohnwu/magisk/core/magiskdb/SettingsDao.kt

@@ -0,0 +1,22 @@
+package com.topjohnwu.magisk.core.magiskdb
+
+class SettingsDao : BaseDao() {
+
+    override val table = Table.SETTINGS
+
+    suspend fun delete(key: String) = buildQuery<Delete> {
+        condition { equals("key", key) }
+    }.commit()
+
+    suspend fun put(key: String, value: Int) = buildQuery<Replace> {
+        values("key" to key, "value" to value)
+    }.commit()
+
+    suspend fun fetch(key: String, default: Int = -1) = buildQuery<Select> {
+        fields("value")
+        condition { equals("key", key) }
+    }.query {
+        it["value"]?.toIntOrNull()
+    }.firstOrNull() ?: default
+
+}

app/src/main/java/com/topjohnwu/magisk/core/magiskdb/StringDao.kt

@@ -0,0 +1,22 @@
+package com.topjohnwu.magisk.core.magiskdb
+
+class StringDao : BaseDao() {
+
+    override val table = Table.STRINGS
+
+    suspend fun delete(key: String) = buildQuery<Delete> {
+        condition { equals("key", key) }
+    }.commit()
+
+    suspend fun put(key: String, value: String) = buildQuery<Replace> {
+        values("key" to key, "value" to value)
+    }.commit()
+
+    suspend fun fetch(key: String, default: String = "") = buildQuery<Select> {
+        fields("value")
+        condition { equals("key", key) }
+    }.query {
+        it["value"]
+    }.firstOrNull() ?: default
+
+}

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

@@ -0,0 +1,69 @@
+package com.topjohnwu.magisk.core.model
+
+import android.os.Parcelable
+import com.squareup.moshi.JsonClass
+import kotlinx.parcelize.Parcelize
+
+@JsonClass(generateAdapter = true)
+data class UpdateInfo(
+    val app: ManagerJson = ManagerJson(),
+    val uninstaller: UninstallerJson = UninstallerJson(),
+    val magisk: MagiskJson = MagiskJson(),
+    val stub: StubJson = StubJson()
+)
+
+@JsonClass(generateAdapter = true)
+data class UninstallerJson(
+    val link: String = ""
+)
+
+@JsonClass(generateAdapter = true)
+data class MagiskJson(
+    val version: String = "",
+    val versionCode: Int = -1,
+    val link: String = "",
+    val note: String = "",
+    val md5: String = ""
+)
+
+@Parcelize
+@JsonClass(generateAdapter = true)
+data class ManagerJson(
+    val version: String = "",
+    val versionCode: Int = -1,
+    val link: String = "",
+    val note: String = ""
+) : Parcelable
+
+@Parcelize
+@JsonClass(generateAdapter = true)
+data class StubJson(
+    val versionCode: Int = -1,
+    val link: String = ""
+) : Parcelable
+
+@JsonClass(generateAdapter = true)
+data class ModuleJson(
+    val id: String,
+    val last_update: Long,
+    val prop_url: String,
+    val zip_url: String,
+    val notes_url: String
+)
+
+@JsonClass(generateAdapter = true)
+data class RepoJson(
+    val name: String,
+    val last_update: Long,
+    val modules: List<ModuleJson>
+)
+
+@JsonClass(generateAdapter = true)
+data class CommitInfo(
+    val sha: String
+)
+
+@JsonClass(generateAdapter = true)
+data class BranchInfo(
+    val commit: CommitInfo
+)

app/src/main/java/com/topjohnwu/magisk/core/model/module/LocalModule.kt

@@ -0,0 +1,89 @@
+package com.topjohnwu.magisk.core.model.module
+
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.io.SuFile
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class LocalModule(path: String) : Module() {
+    override var id: String = ""
+    override var name: String = ""
+    override var author: String = ""
+    override var version: String = ""
+    override var versionCode: Int = -1
+    override var description: String = ""
+
+    private val removeFile = SuFile(path, "remove")
+    private val disableFile = SuFile(path, "disable")
+    private val updateFile = SuFile(path, "update")
+    private val ruleFile = SuFile(path, "sepolicy.rule")
+
+    val updated: Boolean get() = updateFile.exists()
+
+    var enable: Boolean
+        get() = !disableFile.exists()
+        set(enable) {
+            val dir = "$PERSIST/$id"
+            if (enable) {
+                disableFile.delete()
+                if (Const.Version.atLeast_21_2())
+                    Shell.su("copy_sepolicy_rules").submit()
+                else
+                    Shell.su("mkdir -p $dir", "cp -af $ruleFile $dir").submit()
+            } else {
+                !disableFile.createNewFile()
+                if (Const.Version.atLeast_21_2())
+                    Shell.su("copy_sepolicy_rules").submit()
+                else
+                    Shell.su("rm -rf $dir").submit()
+            }
+        }
+
+    var remove: Boolean
+        get() = removeFile.exists()
+        set(remove) {
+            if (remove) {
+                removeFile.createNewFile()
+                if (Const.Version.atLeast_21_2())
+                    Shell.su("copy_sepolicy_rules").submit()
+                else
+                    Shell.su("rm -rf $PERSIST/$id").submit()
+            } else {
+                !removeFile.delete()
+                if (Const.Version.atLeast_21_2())
+                    Shell.su("copy_sepolicy_rules").submit()
+                else
+                    Shell.su("cp -af $ruleFile $PERSIST/$id").submit()
+            }
+        }
+
+    init {
+        runCatching {
+            parseProps(Shell.su("dos2unix < $path/module.prop").exec().out)
+        }
+
+        if (id.isEmpty()) {
+            val sep = path.lastIndexOf('/')
+            id = path.substring(sep + 1)
+        }
+
+        if (name.isEmpty()) {
+            name = id
+        }
+    }
+
+    companion object {
+
+        private val PERSIST get() = "${Const.MAGISKTMP}/mirror/persist/magisk"
+
+        suspend fun installed() = withContext(Dispatchers.IO) {
+            SuFile(Const.MAGISK_PATH)
+                .listFiles { _, name -> name != "lost+found" && name != ".core" }
+                .orEmpty()
+                .filter { !it.isFile }
+                .map { LocalModule("${Const.MAGISK_PATH}/${it.name}") }
+                .sortedBy { it.name.toLowerCase() }
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
-package com.topjohnwu.magisk.model.entity.module
+package com.topjohnwu.magisk.core.model.module
 
-abstract class BaseModule : Comparable<BaseModule> {
+abstract class Module : Comparable<Module> {
     abstract var id: String
         protected set
     abstract var name: String
@@ -37,5 +37,5 @@ abstract class BaseModule : Comparable<BaseModule> {
         }
     }
 
-    override operator fun compareTo(other: BaseModule) = name.compareTo(other.name, true)
+    override operator fun compareTo(other: Module) = name.compareTo(other.name, true)
 }

app/src/main/java/com/topjohnwu/magisk/core/model/module/OnlineModule.kt

@@ -0,0 +1,66 @@
+package com.topjohnwu.magisk.core.model.module
+
+import android.os.Parcelable
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.topjohnwu.magisk.core.model.ModuleJson
+import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.ktx.legalFilename
+import kotlinx.parcelize.Parcelize
+import java.text.DateFormat
+import java.util.*
+
+@Entity(tableName = "modules")
+@Parcelize
+data class OnlineModule(
+    @PrimaryKey override var id: String,
+    override var name: String = "",
+    override var author: String = "",
+    override var version: String = "",
+    override var versionCode: Int = -1,
+    override var description: String = "",
+    val last_update: Long,
+    val prop_url: String,
+    val zip_url: String,
+    val notes_url: String
+) : Module(), Parcelable {
+
+    private val svc: NetworkService get() = get()
+
+    constructor(info: ModuleJson) : this(
+        id = info.id,
+        last_update = info.last_update,
+        prop_url = info.prop_url,
+        zip_url = info.zip_url,
+        notes_url = info.notes_url
+    )
+
+    val lastUpdate get() = Date(last_update)
+    val lastUpdateString get() = DATE_FORMAT.format(lastUpdate)
+    val downloadFilename get() = "$name-$version($versionCode).zip".legalFilename()
+
+    suspend fun notes() = svc.fetchString(notes_url)
+
+    @Throws(IllegalRepoException::class)
+    suspend fun load() {
+        try {
+            val rawProps = svc.fetchString(prop_url)
+            val props = rawProps.split("\\n".toRegex()).dropLastWhile { it.isEmpty() }
+            parseProps(props)
+        } catch (e: Exception) {
+            throw IllegalRepoException("Repo [$id] parse error:", e)
+        }
+
+        if (versionCode < 0) {
+            throw IllegalRepoException("Repo [$id] does not contain versionCode")
+        }
+    }
+
+    class IllegalRepoException(msg: String, cause: Throwable? = null) : Exception(msg, cause)
+
+    companion object {
+        private val DATE_FORMAT = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM)
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/core/model/su/SuLog.kt

@@ -1,15 +1,15 @@
-package com.topjohnwu.magisk.model.entity
+package com.topjohnwu.magisk.core.model.su
 
 import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.PrimaryKey
-import com.topjohnwu.magisk.extensions.now
-import com.topjohnwu.magisk.extensions.timeFormatTime
-import com.topjohnwu.magisk.extensions.toTime
-import com.topjohnwu.magisk.model.entity.MagiskPolicy.Companion.ALLOW
+import com.topjohnwu.magisk.core.model.su.SuPolicy.Companion.ALLOW
+import com.topjohnwu.magisk.ktx.now
+import com.topjohnwu.magisk.ktx.timeFormatTime
+import com.topjohnwu.magisk.ktx.toTime
 
 @Entity(tableName = "logs")
-data class MagiskLog(
+data class SuLog(
     val fromUid: Int,
     val toUid: Int,
     val fromPid: Int,
@@ -23,13 +23,8 @@ data class MagiskLog(
     @Ignore val timeString = time.toTime(timeFormatTime)
 }
 
-data class WrappedMagiskLog(
-    val time: Long,
-    val items: List<MagiskLog>
-)
-
-fun MagiskPolicy.toLog(
+fun SuPolicy.toLog(
     toUid: Int,
     fromPid: Int,
     command: String
-) = MagiskLog(uid, toUid, fromPid, packageName, appName, command, policy == ALLOW, now)
+) = SuLog(uid, toUid, fromPid, packageName, appName, command, policy == ALLOW, now)

app/src/main/java/com/topjohnwu/magisk/core/model/su/SuPolicy.kt

@@ -1,20 +1,20 @@
-package com.topjohnwu.magisk.model.entity
+package com.topjohnwu.magisk.core.model.su
 
-import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
-import com.topjohnwu.magisk.extensions.getLabel
-import com.topjohnwu.magisk.model.entity.MagiskPolicy.Companion.INTERACTIVE
+import android.graphics.drawable.Drawable
+import com.topjohnwu.magisk.core.model.su.SuPolicy.Companion.INTERACTIVE
+import com.topjohnwu.magisk.ktx.getLabel
 
 
-data class MagiskPolicy(
+data class SuPolicy(
     var uid: Int,
     val packageName: String,
     val appName: String,
+    val icon: Drawable,
     var policy: Int = INTERACTIVE,
     var until: Long = -1L,
     val logging: Boolean = true,
-    val notification: Boolean = true,
-    val applicationInfo: ApplicationInfo
+    val notification: Boolean = true
 ) {
 
     companion object {
@@ -25,7 +25,7 @@ data class MagiskPolicy(
 
 }
 
-fun MagiskPolicy.toMap() = mapOf(
+fun SuPolicy.toMap() = mapOf(
     "uid" to uid,
     "package_name" to packageName,
     "policy" to policy,
@@ -35,7 +35,7 @@ fun MagiskPolicy.toMap() = mapOf(
 )
 
 @Throws(PackageManager.NameNotFoundException::class)
-fun Map<String, String>.toPolicy(pm: PackageManager): MagiskPolicy {
+fun Map<String, String>.toPolicy(pm: PackageManager): SuPolicy {
     val uid = get("uid")?.toIntOrNull() ?: -1
     val packageName = get("package_name").orEmpty()
     val info = pm.getApplicationInfo(packageName, PackageManager.GET_UNINSTALLED_PACKAGES)
@@ -43,28 +43,28 @@ fun Map<String, String>.toPolicy(pm: PackageManager): MagiskPolicy {
     if (info.uid != uid)
         throw PackageManager.NameNotFoundException()
 
-    return MagiskPolicy(
+    return SuPolicy(
         uid = uid,
         packageName = packageName,
+        appName = info.getLabel(pm),
+        icon = info.loadIcon(pm),
         policy = get("policy")?.toIntOrNull() ?: INTERACTIVE,
         until = get("until")?.toLongOrNull() ?: -1L,
         logging = get("logging")?.toIntOrNull() != 0,
-        notification = get("notification")?.toIntOrNull() != 0,
-        applicationInfo = info,
-        appName = info.getLabel(pm)
+        notification = get("notification")?.toIntOrNull() != 0
     )
 }
 
 @Throws(PackageManager.NameNotFoundException::class)
-fun Int.toPolicy(pm: PackageManager, policy: Int = INTERACTIVE): MagiskPolicy {
+fun Int.toPolicy(pm: PackageManager, policy: Int = INTERACTIVE): SuPolicy {
     val pkg = pm.getPackagesForUid(this)?.firstOrNull()
         ?: throw PackageManager.NameNotFoundException()
     val info = pm.getApplicationInfo(pkg, PackageManager.GET_UNINSTALLED_PACKAGES)
-    return MagiskPolicy(
+    return SuPolicy(
         uid = info.uid,
         packageName = pkg,
-        policy = policy,
-        applicationInfo = info,
-        appName = info.getLabel(pm)
+        appName = info.getLabel(pm),
+        icon = info.loadIcon(pm),
+        policy = policy
     )
 }

app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.utils
+package com.topjohnwu.magisk.core.su
 
 import android.content.Context
 import android.content.Intent
@@ -6,31 +6,31 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Process
 import android.widget.Toast
-import com.topjohnwu.magisk.*
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.intent
+import com.topjohnwu.magisk.core.model.su.SuPolicy
+import com.topjohnwu.magisk.core.model.su.toLog
+import com.topjohnwu.magisk.core.model.su.toPolicy
 import com.topjohnwu.magisk.data.repository.LogRepository
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.startActivity
-import com.topjohnwu.magisk.extensions.startActivityWithRoot
-import com.topjohnwu.magisk.extensions.subscribeK
-import com.topjohnwu.magisk.model.entity.MagiskPolicy
-import com.topjohnwu.magisk.model.entity.toLog
-import com.topjohnwu.magisk.model.entity.toPolicy
+import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.ktx.startActivity
+import com.topjohnwu.magisk.ktx.startActivityWithRoot
 import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
+import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import timber.log.Timber
 
-object SuHandler : ProviderCallHandler {
+object SuCallbackHandler {
 
     const val REQUEST = "request"
     const val LOG = "log"
     const val NOTIFY = "notify"
     const val TEST = "test"
 
-    override fun call(context: Context, method: String, arg: String?, extras: Bundle?): Bundle? {
-        invoke(context.wrap(), method, extras)
-        return Bundle.EMPTY
-    }
-
     operator fun invoke(context: Context, action: String?, data: Bundle?) {
         data ?: return
 
@@ -45,20 +45,8 @@ object SuHandler : ProviderCallHandler {
         }
 
         when (action) {
-            REQUEST -> {
-                val intent = context.intent<SuRequestActivity>()
-                    .setAction(action)
-                    .putExtras(data)
-                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    .addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
-                if (Build.VERSION.SDK_INT >= 29) {
-                    // Android Q does not allow starting activity from background
-                    intent.startActivityWithRoot()
-                } else {
-                    intent.startActivity(context)
-                }
-            }
-            LOG -> handleLogs(context, data)
+            REQUEST -> handleRequest(context, data)
+            LOG -> handleLogging(context, data)
             NOTIFY -> handleNotify(context, data)
             TEST -> {
                 val mode = data.getInt("mode", 2)
@@ -72,13 +60,26 @@ object SuHandler : ProviderCallHandler {
 
     private fun Any?.toInt(): Int? {
         return when (this) {
-            is Int -> this
-            is Long -> this.toInt()
+            is Number -> this.toInt()
             else -> null
         }
     }
 
-    private fun handleLogs(context: Context, data: Bundle) {
+    private fun handleRequest(context: Context, data: Bundle) {
+        val intent = context.intent<SuRequestActivity>()
+            .setAction(REQUEST)
+            .putExtras(data)
+            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            .addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
+        if (Build.VERSION.SDK_INT >= 29) {
+            // Android Q does not allow starting activity from background
+            intent.startActivityWithRoot()
+        } else {
+            intent.startActivity(context)
+        }
+    }
+
+    private fun handleLogging(context: Context, data: Bundle) {
         val fromUid = data["from.uid"].toInt() ?: return
         if (fromUid == Process.myUid())
             return
@@ -104,7 +105,9 @@ object SuHandler : ProviderCallHandler {
         )
 
         val logRepo = get<LogRepository>()
-        logRepo.insert(log).subscribeK(onError = { Timber.e(it) })
+        GlobalScope.launch {
+            logRepo.insert(log)
+        }
     }
 
     private fun handleNotify(context: Context, data: Bundle) {
@@ -122,9 +125,9 @@ object SuHandler : ProviderCallHandler {
         }
     }
 
-    private fun notify(context: Context, policy: MagiskPolicy) {
+    private fun notify(context: Context, policy: SuPolicy) {
         if (policy.notification && Config.suNotification == Config.Value.NOTIFICATION_TOAST) {
-            val resId = if (policy.policy == MagiskPolicy.ALLOW)
+            val resId = if (policy.policy == SuPolicy.ALLOW)
                 R.string.su_allow_toast
             else
                 R.string.su_deny_toast

app/src/main/java/com/topjohnwu/magisk/core/su/SuRequestHandler.kt

@@ -0,0 +1,139 @@
+package com.topjohnwu.magisk.core.su
+
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.LocalSocket
+import android.net.LocalSocketAddress
+import androidx.collection.ArrayMap
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.magiskdb.PolicyDao
+import com.topjohnwu.magisk.core.model.su.SuPolicy
+import com.topjohnwu.magisk.core.model.su.toPolicy
+import com.topjohnwu.magisk.ktx.now
+import kotlinx.coroutines.*
+import timber.log.Timber
+import java.io.*
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeUnit.SECONDS
+
+class SuRequestHandler(
+    private val pm: PackageManager,
+    private val policyDB: PolicyDao
+) : Closeable {
+
+    private lateinit var output: DataOutputStream
+    lateinit var policy: SuPolicy
+        private set
+
+    // Return true to indicate undetermined policy, require user interaction
+    suspend fun start(intent: Intent): Boolean {
+        if (!init(intent))
+            return false
+
+        // Never allow com.topjohnwu.magisk (could be malware)
+        if (policy.packageName == BuildConfig.APPLICATION_ID)
+            return false
+
+        when (Config.suAutoResponse) {
+            Config.Value.SU_AUTO_DENY -> {
+                respond(SuPolicy.DENY, 0)
+                return false
+            }
+            Config.Value.SU_AUTO_ALLOW -> {
+                respond(SuPolicy.ALLOW, 0)
+                return false
+            }
+        }
+
+        return true
+    }
+
+    private suspend fun <T> Deferred<T>.timedAwait() : T? {
+        return withTimeoutOrNull(SECONDS.toMillis(1)) {
+            await()
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun close() {
+        if (::output.isInitialized)
+            output.close()
+    }
+
+    private class SuRequestError : IOException()
+
+    private suspend fun init(intent: Intent) = withContext(Dispatchers.IO) {
+        try {
+            val uid: Int
+            if (Const.Version.atLeast_21_0()) {
+                val name = intent.getStringExtra("fifo") ?: throw SuRequestError()
+                uid = intent.getIntExtra("uid", -1).also { if (it < 0) throw SuRequestError() }
+                output = DataOutputStream(FileOutputStream(name).buffered())
+            } else {
+                val name = intent.getStringExtra("socket") ?: throw SuRequestError()
+                val socket = LocalSocket()
+                socket.connect(LocalSocketAddress(name, LocalSocketAddress.Namespace.ABSTRACT))
+                output = DataOutputStream(BufferedOutputStream(socket.outputStream))
+                val input = DataInputStream(BufferedInputStream(socket.inputStream))
+                val map = async { input.readRequest() }.timedAwait() ?: throw SuRequestError()
+                uid = map["uid"]?.toIntOrNull() ?: throw SuRequestError()
+            }
+            policy = uid.toPolicy(pm)
+            true
+        } catch (e: Exception) {
+            when (e) {
+                is IOException, is PackageManager.NameNotFoundException -> {
+                    Timber.e(e)
+                    runCatching { close() }
+                    false
+                }
+                else -> throw e  // Unexpected error
+            }
+        }
+    }
+
+    fun respond(action: Int, time: Int) {
+        val until = if (time > 0)
+            TimeUnit.MILLISECONDS.toSeconds(now) + TimeUnit.MINUTES.toSeconds(time.toLong())
+        else
+            time.toLong()
+
+        policy.policy = action
+        policy.until = until
+        policy.uid = policy.uid % 100000 + Const.USER_ID * 100000
+
+        GlobalScope.launch(Dispatchers.IO) {
+            try {
+                output.writeInt(policy.policy)
+                output.flush()
+            } catch (e: IOException) {
+                Timber.e(e)
+            } finally {
+                runCatching { close() }
+                if (until >= 0)
+                    policyDB.update(policy)
+            }
+        }
+    }
+
+    @Throws(IOException::class)
+    private fun DataInputStream.readRequest(): Map<String, String> {
+        fun readString(): String {
+            val len = readInt()
+            val buf = ByteArray(len)
+            readFully(buf)
+            return String(buf, Charsets.UTF_8)
+        }
+        val ret = ArrayMap<String, String>()
+        while (true) {
+            val name = readString()
+            if (name == "eof")
+                break
+            ret[name] = readString()
+        }
+        return ret
+    }
+
+}

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

@@ -1,26 +1,31 @@
-package com.topjohnwu.magisk.tasks
+package com.topjohnwu.magisk.core.tasks
 
 import android.content.Context
 import android.net.Uri
-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 androidx.core.os.postDelayed
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.displayName
+import com.topjohnwu.magisk.core.utils.unzip
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
+import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.superuser.Shell
-import io.reactivex.Single
+import com.topjohnwu.superuser.internal.UiThreadHandler
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.koin.core.KoinComponent
+import org.koin.core.inject
+import timber.log.Timber
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
 
-abstract class FlashZip(
+open class FlashZip(
     private val mUri: Uri,
     private val console: MutableList<String>,
     private val logs: MutableList<String>
-) {
+): KoinComponent {
 
-    private val context: Context by inject()
+    val context: Context by inject()
     private val installFolder = File(context.cacheDir, "flash").apply {
         if (!exists()) mkdirs()
     }
@@ -43,9 +48,7 @@ abstract class FlashZip(
         console.add("- Copying zip to temp directory")
 
         runCatching {
-            context.readUri(mUri).use { input ->
-                tmpFile.outputStream().use { out -> input.copyTo(out) }
-            }
+            mUri.inputStream().writeTo(tmpFile)
         }.getOrElse {
             when (it) {
                 is FileNotFoundException -> console.add("! Invalid Uri")
@@ -66,7 +69,7 @@ abstract class FlashZip(
             return false
         }
 
-        console.add("- Installing ${mUri.fileName}")
+        console.add("- Installing ${mUri.displayName}")
 
         val parentFile = tmpFile.parent ?: return false
 
@@ -79,21 +82,37 @@ abstract class FlashZip(
             .exec().isSuccess
     }
 
-    fun exec() = Single
-        .fromCallable {
-            runCatching {
-                flash()
-            }.getOrElse {
-                it.printStackTrace()
+    open suspend fun exec() = withContext(Dispatchers.IO) {
+        try {
+            if (!flash()) {
+                console.add("! Installation failed")
                 false
-            }.apply {
-                Shell.su("cd /", "rm -rf ${tmpFile.parent} ${Const.TMP_FOLDER_PATH}")
-                    .submit()
+            } else {
+                true
             }
+        } catch (e: IOException) {
+            Timber.e(e)
+            false
+        } finally {
+            Shell.su("cd /", "rm -rf ${tmpFile.parent} ${Const.TMP_FOLDER_PATH}").submit()
         }
-        .subscribeK(onError = { onResult(false) }) { onResult(it) }
-        .let { Unit } // ignores result disposable
+    }
 
+    class Uninstall(
+        uri: Uri,
+        console: MutableList<String>,
+        log: MutableList<String>
+    ) : FlashZip(uri, console, log) {
+
+        override suspend fun exec(): Boolean {
+            val success = super.exec()
+            if (success) {
+                UiThreadHandler.handler.postDelayed(3000) {
+                    Shell.su("pm uninstall " + context.packageName).exec()
+                }
+            }
+            return success
+        }
+    }
 
-    protected abstract fun onResult(success: Boolean)
 }

app/src/main/java/com/topjohnwu/magisk/core/tasks/HideAPK.kt

@@ -0,0 +1,192 @@
+package com.topjohnwu.magisk.core.tasks
+
+import android.app.ProgressDialog
+import android.content.Context
+import android.content.Intent
+import android.os.Build.VERSION.SDK_INT
+import android.widget.Toast
+import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID
+import com.topjohnwu.magisk.DynAPK
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.*
+import com.topjohnwu.magisk.core.utils.AXML
+import com.topjohnwu.magisk.core.utils.Keygen
+import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.ktx.inject
+import com.topjohnwu.magisk.ktx.writeTo
+import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.signing.JarMap
+import com.topjohnwu.signing.SignApk
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import java.security.SecureRandom
+
+object HideAPK {
+
+    private const val ALPHA = "abcdefghijklmnopqrstuvwxyz"
+    private const val ALPHADOTS = "$ALPHA....."
+    private const val APP_NAME = "Magisk Manager"
+    private const val ANDROID_MANIFEST = "AndroidManifest.xml"
+
+    // Some arbitrary limit
+    const val MAX_LABEL_LENGTH = 32
+
+    private val svc: NetworkService by inject()
+    private val Context.APK_URI get() = Provider.APK_URI(packageName)
+    private val Context.PREFS_URI get() = Provider.PREFS_URI(packageName)
+
+    private fun genPackageName(): String {
+        val random = SecureRandom()
+        val len = 5 + random.nextInt(15)
+        val builder = StringBuilder(len)
+        var next: Char
+        var prev = 0.toChar()
+        for (i in 0 until len) {
+            next = if (prev == '.' || prev == 0.toChar() || i == len - 1) {
+                ALPHA[random.nextInt(ALPHA.length)]
+            } else {
+                ALPHADOTS[random.nextInt(ALPHADOTS.length)]
+            }
+            builder.append(next)
+            prev = next
+        }
+        if (!builder.contains('.')) {
+            // Pick a random index and set it as dot
+            val idx = random.nextInt(len - 1)
+            builder[idx] = '.'
+        }
+        return builder.toString()
+    }
+
+    fun patch(
+        context: Context,
+        apk: String, out: String,
+        pkg: String, label: CharSequence
+    ): Boolean {
+        try {
+            val jar = JarMap.open(apk)
+            val je = jar.getJarEntry(ANDROID_MANIFEST)
+            val xml = AXML(jar.getRawData(je))
+
+            if (!xml.findAndPatch(APPLICATION_ID to pkg, APP_NAME to label.toString()))
+                return false
+
+            // Write apk changes
+            jar.getOutputStream(je).write(xml.bytes)
+            val keys = Keygen(context)
+            SignApk.sign(keys.cert, keys.key, jar, FileOutputStream(out))
+        } catch (e: Exception) {
+            Timber.e(e)
+            return false
+        }
+
+        return true
+    }
+
+    private suspend fun patchAndHide(context: Context, label: String): Boolean {
+        val dlStub = !isRunningAsStub && SDK_INT >= 28 && Const.Version.atLeast_20_2()
+        val src = if (dlStub) {
+            val stub = File(context.cacheDir, "stub.apk")
+            try {
+                svc.fetchFile(Info.remote.stub.link).byteStream().use {
+                    it.writeTo(stub)
+                }
+            } catch (e: IOException) {
+                Timber.e(e)
+                return false
+            }
+            stub.path
+        } else {
+            context.packageCodePath
+        }
+
+        // Generate a new random package name and signature
+        val repack = File(context.cacheDir, "patched.apk")
+        val pkg = genPackageName()
+        Config.keyStoreRaw = ""
+
+        if (!patch(context, src, repack.path, pkg, label))
+            return false
+
+        // Install the application
+        if (!Shell.su("adb_pm_install $repack").exec().isSuccess)
+            return false
+
+        context.apply {
+            val intent = packageManager.getLaunchIntentForPackage(pkg) ?: return false
+            Config.suManager = pkg
+            grantUriPermission(pkg, APK_URI, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            grantUriPermission(pkg, PREFS_URI, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            intent.putExtra(Const.Key.PREV_PKG, packageName)
+            startActivity(intent)
+        }
+
+        return true
+    }
+
+    @Suppress("DEPRECATION")
+    fun hide(context: Context, label: String) {
+        val dialog = ProgressDialog.show(context, context.getString(R.string.hide_manager_title), "", true)
+        GlobalScope.launch {
+            val result = withContext(Dispatchers.IO) {
+                patchAndHide(context, label)
+            }
+            if (!result) {
+                Utils.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG)
+                dialog.dismiss()
+            }
+        }
+    }
+
+    private suspend fun downloadAndRestore(context: Context): Boolean {
+        val apk = if (isRunningAsStub) {
+            DynAPK.current(context)
+        } else {
+            File(context.cacheDir, "manager.apk").also { apk ->
+                try {
+                    svc.fetchFile(Info.remote.app.link).byteStream().use {
+                        it.writeTo(apk)
+                    }
+                } catch (e: IOException) {
+                    Timber.e(e)
+                    return false
+                }
+            }
+        }
+
+        if (!Shell.su("adb_pm_install $apk").exec().isSuccess)
+            return false
+
+        context.apply {
+            val intent = packageManager.getLaunchIntentForPackage(APPLICATION_ID) ?: return false
+            Config.suManager = ""
+            grantUriPermission(APPLICATION_ID, APK_URI, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            grantUriPermission(APPLICATION_ID, PREFS_URI, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            intent.putExtra(Const.Key.PREV_PKG, packageName)
+            startActivity(intent)
+        }
+
+        return true
+    }
+
+    @Suppress("DEPRECATION")
+    fun restore(context: Context) {
+        val dialog = ProgressDialog.show(context, context.getString(R.string.restore_img_msg), "", true)
+        GlobalScope.launch {
+            val result = withContext(Dispatchers.IO) {
+                downloadAndRestore(context)
+            }
+            if (!result) {
+                Utils.toast(R.string.restore_manager_fail_toast, Toast.LENGTH_LONG)
+                dialog.dismiss()
+            }
+        }
+    }
+}

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

@@ -0,0 +1,483 @@
+package com.topjohnwu.magisk.core.tasks
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.widget.Toast
+import androidx.annotation.WorkerThread
+import androidx.core.os.postDelayed
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
+import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.di.Protected
+import com.topjohnwu.magisk.events.dialog.EnvFixDialog
+import com.topjohnwu.magisk.ktx.reboot
+import com.topjohnwu.magisk.ktx.withStreams
+import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.signing.SignBoot
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.ShellUtils
+import com.topjohnwu.superuser.internal.NOPList
+import com.topjohnwu.superuser.internal.UiThreadHandler
+import com.topjohnwu.superuser.io.SuFile
+import com.topjohnwu.superuser.io.SuFileInputStream
+import com.topjohnwu.superuser.io.SuFileOutputStream
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import net.jpountz.lz4.LZ4FrameInputStream
+import org.kamranzafar.jtar.TarEntry
+import org.kamranzafar.jtar.TarHeader
+import org.kamranzafar.jtar.TarInputStream
+import org.kamranzafar.jtar.TarOutputStream
+import org.koin.core.KoinComponent
+import org.koin.core.get
+import org.koin.core.inject
+import timber.log.Timber
+import java.io.*
+import java.nio.ByteBuffer
+import java.security.SecureRandom
+import java.util.*
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+
+abstract class MagiskInstallImpl : KoinComponent {
+
+    protected lateinit var installDir: File
+    private lateinit var srcBoot: String
+    private lateinit var zipUri: Uri
+
+    protected val console: MutableList<String>
+    private val logs: MutableList<String>
+    private var tarOut: TarOutputStream? = null
+
+    private val service: NetworkService by inject()
+    protected val context: Context by inject()
+
+    protected constructor() {
+        console = NOPList.getInstance()
+        logs = NOPList.getInstance()
+    }
+
+    protected constructor(zip: Uri, out: MutableList<String>, err: MutableList<String>) {
+        console = out
+        logs = err
+        zipUri = zip
+        installDir = File(get<Context>(Protected).filesDir.parent, "install")
+        "rm -rf $installDir".sh()
+        installDir.mkdirs()
+    }
+
+    private fun findImage(): Boolean {
+        srcBoot = "find_boot_image; echo \"\$BOOTIMAGE\"".fsh()
+        if (srcBoot.isEmpty()) {
+            console.add("! Unable to detect target image")
+            return false
+        }
+        console.add("- Target image: $srcBoot")
+        return true
+    }
+
+    private fun findSecondaryImage(): Boolean {
+        val slot = "echo \$SLOT".fsh()
+        val target = if (slot == "_a") "_b" else "_a"
+        console.add("- Target slot: $target")
+        srcBoot = arrayOf(
+            "SLOT=$target",
+            "find_boot_image",
+            "SLOT=$slot",
+            "echo \"\$BOOTIMAGE\"").fsh()
+        if (srcBoot.isEmpty()) {
+            console.add("! Unable to detect target image")
+            return false
+        }
+        console.add("- Target image: $srcBoot")
+        return true
+    }
+
+    @Suppress("DEPRECATION")
+    private fun extractZip(): Boolean {
+        val arch = if (Build.VERSION.SDK_INT >= 21) {
+            val abis = listOf(*Build.SUPPORTED_ABIS)
+            if (abis.contains("x86")) "x86" else "arm"
+        } else {
+            if (Build.CPU_ABI == "x86") "x86" else "arm"
+        }
+
+        console.add("- Device platform: " + Build.CPU_ABI)
+        console.add("- Magisk Manager: ${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
+        console.add("- Install target: ${Info.remote.magisk.version} (${Info.remote.magisk.versionCode})")
+
+        try {
+            ZipInputStream(zipUri.inputStream().buffered()).use { zi ->
+                lateinit var ze: ZipEntry
+                while (zi.nextEntry?.let { ze = it } != null) {
+                    if (ze.isDirectory)
+                        continue
+                    var name: String? = null
+                    val names = arrayOf("$arch/", "common/", "META-INF/com/google/android/update-binary")
+                    for (n in names) {
+                        ze.name.run {
+                            if (startsWith(n)) {
+                                name = substring(lastIndexOf('/') + 1)
+                            }
+                        }
+                        name ?: continue
+                        break
+                    }
+                    if (name == null && ze.name.startsWith("chromeos/"))
+                        name = ze.name
+                    name?.also {
+                        val dest = if (installDir is SuFile)
+                            SuFile(installDir, it)
+                        else
+                            File(installDir, it)
+                        dest.parentFile!!.mkdirs()
+                        SuFileOutputStream(dest).use { s -> zi.copyTo(s) }
+                    } ?: continue
+                }
+            }
+        } catch (e: IOException) {
+            console.add("! Cannot unzip zip")
+            Timber.e(e)
+            return false
+        }
+
+        val init64 = SuFile.open(installDir, "magiskinit64")
+        if (Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_64_BIT_ABIS.isNotEmpty()) {
+            init64.renameTo(SuFile.open(installDir, "magiskinit"))
+        } else {
+            init64.delete()
+        }
+        "cd $installDir; chmod 755 *".sh()
+        return true
+    }
+
+    private fun newEntry(name: String, size: Long): TarEntry {
+        console.add("-- Writing: $name")
+        return TarEntry(TarHeader.createHeader(name, size, 0, false, 420 /* 0644 */))
+    }
+
+    @Throws(IOException::class)
+    private fun handleTar(input: InputStream, output: OutputStream): OutputStream {
+        console.add("- Processing tar file")
+        val tarOut = TarOutputStream(output)
+        TarInputStream(input).use { tarIn ->
+            lateinit var entry: TarEntry
+
+            fun decompressedStream() =
+                if (entry.name.contains(".lz4")) LZ4FrameInputStream(tarIn) else tarIn
+
+            while (tarIn.nextEntry?.let { entry = it } != null) {
+                if (entry.name.contains("boot.img") ||
+                    (Config.recovery && entry.name.contains("recovery.img"))) {
+                    val name = entry.name.replace(".lz4", "")
+                    console.add("-- Extracting: $name")
+
+                    val extract = File(installDir, name)
+                    FileOutputStream(extract).use { decompressedStream().copyTo(it) }
+                } else if (entry.name.contains("vbmeta.img")) {
+                    val rawData = ByteArrayOutputStream().let {
+                        decompressedStream().copyTo(it)
+                        it.toByteArray()
+                    }
+                    // Valid vbmeta.img should be at least 256 bytes
+                    if (rawData.size < 256)
+                        continue
+
+                    // Patch flags to AVB_VBMETA_IMAGE_FLAGS_HASHTREE_DISABLED |
+                    // AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED
+                    console.add("-- Patching: vbmeta.img")
+                    ByteBuffer.wrap(rawData).putInt(120, 3)
+                    tarOut.putNextEntry(newEntry("vbmeta.img", rawData.size.toLong()))
+                    tarOut.write(rawData)
+                } else {
+                    console.add("-- Copying: ${entry.name}")
+                    tarOut.putNextEntry(entry)
+                    tarIn.copyTo(tarOut, bufferSize = 1024 * 1024)
+                }
+            }
+            val boot = SuFile.open(installDir, "boot.img")
+            val recovery = SuFile.open(installDir, "recovery.img")
+            if (Config.recovery && recovery.exists() && boot.exists()) {
+                // Install Magisk to recovery
+                srcBoot = recovery.path
+                // Repack boot image to prevent restore
+                arrayOf(
+                    "./magiskboot unpack boot.img",
+                    "./magiskboot repack boot.img",
+                    "./magiskboot cleanup",
+                    "mv new-boot.img boot.img").sh()
+                SuFileInputStream(boot).use {
+                    tarOut.putNextEntry(newEntry("boot.img", boot.length()))
+                    it.copyTo(tarOut)
+                }
+                boot.delete()
+            } else {
+                if (!boot.exists()) {
+                    console.add("! No boot image found")
+                    throw IOException()
+                }
+                srcBoot = boot.path
+            }
+        }
+        return tarOut
+    }
+
+    private fun handleFile(uri: Uri): Boolean {
+        val outStream: OutputStream
+        var outFile: MediaStoreUtils.UriFile? = null
+
+        // Process input file
+        try {
+            uri.inputStream().buffered().use { src ->
+                src.mark(500)
+                val magic = ByteArray(5)
+                if (src.skip(257) != 257L || src.read(magic) != magic.size) {
+                    console.add("! Invalid input file")
+                    return false
+                }
+                src.reset()
+
+                val alpha = "abcdefghijklmnopqrstuvwxyz"
+                val alphaNum = "$alpha${alpha.toUpperCase(Locale.ROOT)}0123456789"
+                val random = SecureRandom()
+                val suffix = StringBuilder()
+                for (i in 1..5) {
+                    suffix.append(alphaNum[random.nextInt(alphaNum.length)])
+                }
+
+                val filename = "magisk_patched_$suffix"
+                outStream = if (magic.contentEquals("ustar".toByteArray())) {
+                    outFile = MediaStoreUtils.getFile("$filename.tar", true)
+                    handleTar(src, outFile!!.uri.outputStream())
+                } else {
+                    // Raw image
+                    srcBoot = File(installDir, "boot.img").path
+                    console.add("- Copying image to cache")
+                    FileOutputStream(srcBoot).use { src.copyTo(it) }
+                    outFile = MediaStoreUtils.getFile("$filename.img", true)
+                    outFile!!.uri.outputStream()
+                }
+            }
+        } catch (e: IOException) {
+            console.add("! Process error")
+            outFile?.delete()
+            Timber.e(e)
+            return false
+        }
+
+        // Patch file
+        if (!patchBoot()) {
+            outFile!!.delete()
+            return false
+        }
+
+        // Output file
+        try {
+            val patched = SuFile.open(installDir, "new-boot.img")
+            if (outStream is TarOutputStream) {
+                val name = if (srcBoot.contains("recovery")) "recovery.img" else "boot.img"
+                outStream.putNextEntry(newEntry(name, patched.length()))
+            }
+            withStreams(SuFileInputStream(patched), outStream) { src, out -> src.copyTo(out) }
+            patched.delete()
+
+            console.add("")
+            console.add("****************************")
+            console.add(" Output file is written to ")
+            console.add(" $outFile ")
+            console.add("****************************")
+        } catch (e: IOException) {
+            console.add("! Failed to output to $outFile")
+            outFile!!.delete()
+            Timber.e(e)
+            return false
+        }
+
+        return true
+    }
+
+    private fun patchBoot(): Boolean {
+        var srcNand = ""
+        if ("[ -c $srcBoot ] && nanddump -f boot.img $srcBoot".sh().isSuccess) {
+            srcNand = srcBoot
+            srcBoot = File(installDir, "boot.img").path
+        }
+
+        var isSigned: Boolean
+        try {
+            SuFileInputStream(srcBoot).use {
+                isSigned = SignBoot.verifySignature(it, null)
+                if (isSigned) {
+                    console.add("- Boot image is signed with AVB 1.0")
+                }
+            }
+        } catch (e: IOException) {
+            console.add("! Unable to check signature")
+            return false
+        }
+
+        if (!("KEEPFORCEENCRYPT=${Config.keepEnc} KEEPVERITY=${Config.keepVerity} " +
+                "RECOVERYMODE=${Config.recovery} sh update-binary " +
+                "sh boot_patch.sh $srcBoot").sh().isSuccess) {
+            return false
+        }
+
+        if (srcNand.isNotEmpty()) {
+            srcBoot = srcNand
+        }
+
+        val job = Shell.sh(
+            "./magiskboot cleanup",
+            "mv bin/busybox busybox",
+            "rm -rf magisk.apk bin boot.img update-binary",
+            "cd /")
+
+        val patched = File(installDir, "new-boot.img")
+        if (isSigned) {
+            console.add("- Signing boot image with verity keys")
+            val signed = File(installDir, "signed.img")
+            try {
+                withStreams(SuFileInputStream(patched), signed.outputStream().buffered()) {
+                    input, out -> SignBoot.doSignature(null, null, input, out, "/boot")
+                }
+            } catch (e: IOException) {
+                console.add("! Unable to sign image")
+                Timber.e(e)
+                return false
+            }
+
+            job.add("mv -f $signed $patched")
+        }
+        job.exec()
+        return true
+    }
+
+    private fun copySepolicyRules(): Boolean {
+        if (Info.remote.magisk.versionCode >= 21100) return true
+        // Copy existing rules for migration
+        "copy_sepolicy_rules".sh()
+        return true
+    }
+
+    private fun flashBoot(): Boolean {
+        if (!"direct_install $installDir $srcBoot".sh().isSuccess)
+            return false
+        "run_migrations".sh()
+        return true
+    }
+
+    private suspend fun postOTA(): Boolean {
+        val bootctl = SuFile("/data/adb/bootctl")
+        try {
+            withStreams(service.fetchBootctl().byteStream(), SuFileOutputStream(bootctl)) {
+                it, out -> it.copyTo(out)
+            }
+        } catch (e: IOException) {
+            console.add("! Unable to download bootctl")
+            Timber.e(e)
+            return false
+        }
+
+        "post_ota ${bootctl.parent}".sh()
+
+        console.add("***************************************")
+        console.add(" Next reboot will boot to second slot!")
+        console.add("***************************************")
+        return true
+    }
+
+    private fun String.sh() = Shell.sh(this).to(console, logs).exec()
+    private fun Array<String>.sh() = Shell.sh(*this).to(console, logs).exec()
+    private fun String.fsh() = ShellUtils.fastCmd(this)
+    private fun Array<String>.fsh() = ShellUtils.fastCmd(*this)
+
+    protected fun doPatchFile(patchFile: Uri) = extractZip() && handleFile(patchFile)
+
+    protected fun direct() = findImage() && extractZip() && patchBoot() &&
+        copySepolicyRules() && flashBoot()
+
+    protected suspend fun secondSlot() = findSecondaryImage() && extractZip() &&
+        patchBoot() && copySepolicyRules() && flashBoot() && postOTA()
+
+    protected fun fixEnv(zip: Uri): Boolean {
+        installDir = SuFile("/data/adb/magisk")
+        Shell.su("rm -rf /data/adb/magisk/*").exec()
+        zipUri = zip
+        return extractZip() && Shell.su("fix_env").exec().isSuccess
+    }
+
+    @WorkerThread
+    protected abstract suspend fun operations(): Boolean
+
+    open suspend fun exec() = withContext(Dispatchers.IO) { operations() }
+}
+
+sealed class MagiskInstaller(
+    file: Uri,
+    console: MutableList<String>,
+    logs: MutableList<String>
+) : MagiskInstallImpl(file, console, logs) {
+
+    override suspend fun exec(): Boolean {
+        val success = super.exec()
+        if (success) {
+            console.add("- All done!")
+        } else {
+            Shell.sh("rm -rf $installDir").submit()
+            console.add("! Installation failed")
+        }
+        return success
+    }
+
+    class Patch(
+        file: Uri,
+        private val uri: Uri,
+        console: MutableList<String>,
+        logs: MutableList<String>
+    ) : MagiskInstaller(file, console, logs) {
+        override suspend fun operations() = doPatchFile(uri)
+    }
+
+    class SecondSlot(
+        file: Uri,
+        console: MutableList<String>,
+        logs: MutableList<String>
+    ) : MagiskInstaller(file, console, logs) {
+        override suspend fun operations() = secondSlot()
+    }
+
+    class Direct(
+        file: Uri,
+        console: MutableList<String>,
+        logs: MutableList<String>
+    ) : MagiskInstaller(file, console, logs) {
+        override suspend fun operations() = direct()
+    }
+
+}
+
+class EnvFixTask(
+    private val zip: Uri
+) : MagiskInstallImpl() {
+    override suspend fun operations() = fixEnv(zip)
+
+    override suspend fun exec(): Boolean {
+        val success = super.exec()
+        LocalBroadcastManager.getInstance(context).sendBroadcast(Intent(EnvFixDialog.DISMISS))
+        Utils.toast(
+            if (success) R.string.reboot_delay_toast else R.string.setup_fail,
+            Toast.LENGTH_LONG
+        )
+        if (success)
+            UiThreadHandler.handler.postDelayed(5000) { reboot() }
+        return success
+    }
+}

app/src/main/java/com/topjohnwu/magisk/core/tasks/RepoUpdater.kt

@@ -0,0 +1,42 @@
+package com.topjohnwu.magisk.core.tasks
+
+import com.topjohnwu.magisk.core.model.module.OnlineModule
+import com.topjohnwu.magisk.data.database.RepoDao
+import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.ktx.synchronized
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.util.*
+
+class RepoUpdater(
+    private val svc: NetworkService,
+    private val repoDB: RepoDao
+) {
+
+    suspend fun run(forced: Boolean) = withContext(Dispatchers.IO) {
+        val cachedMap = HashMap<String, Date>().also { map ->
+            repoDB.getModuleStubs().forEach { map[it.id] = Date(it.last_update) }
+        }.synchronized()
+        svc.fetchRepoInfo()?.let { info ->
+            coroutineScope {
+                info.modules.forEach {
+                    launch {
+                        val lastUpdated = cachedMap.remove(it.id)
+                        if (forced || lastUpdated?.before(Date(it.last_update)) != false) {
+                            try {
+                                val repo = OnlineModule(it).apply { load() }
+                                repoDB.addModule(repo)
+                            } catch (e: OnlineModule.IllegalRepoException) {
+                                Timber.e(e)
+                            }
+                        }
+                    }
+                }
+            }
+            repoDB.removeModules(cachedMap.keys)
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/core/utils/AXML.kt

@@ -0,0 +1,132 @@
+package com.topjohnwu.magisk.core.utils
+
+import java.io.ByteArrayOutputStream
+import java.nio.ByteBuffer
+import java.nio.ByteOrder.LITTLE_ENDIAN
+import java.nio.charset.Charset
+import java.util.*
+
+class AXML(b: ByteArray) {
+
+    var bytes = b
+        private set
+
+    companion object {
+        private const val CHUNK_SIZE_OFF = 4
+        private const val STRING_INDICES_OFF = 7 * 4
+        private val UTF_16LE = Charset.forName("UTF-16LE")
+    }
+
+    /**
+     * String pool header:
+     * 0:  0x1C0001
+     * 1:  chunk size
+     * 2:  number of strings
+     * 3:  number of styles (assert as 0)
+     * 4:  flags
+     * 5:  offset to string data
+     * 6:  offset to style data (assert as 0)
+     *
+     * Followed by an array of uint32_t with size = number of strings
+     * Each entry points to an offset into the string data
+     */
+    fun findAndPatch(vararg patterns: Pair<String, String>): Boolean {
+        val buffer = ByteBuffer.wrap(bytes).order(LITTLE_ENDIAN)
+
+        fun findStringPool(): Int {
+            var offset = 8
+            while (offset < bytes.size) {
+                if (buffer.getInt(offset) == 0x1C0001)
+                    return offset
+                offset += buffer.getInt(offset + CHUNK_SIZE_OFF)
+            }
+            return -1
+        }
+
+        var patch = false
+        val start = findStringPool()
+        if (start < 0)
+            return false
+
+        // Read header
+        buffer.position(start + 4)
+        val intBuf = buffer.asIntBuffer()
+        val size = intBuf.get()
+        val count = intBuf.get()
+        intBuf.get()
+        intBuf.get()
+        val dataOff = start + intBuf.get()
+        intBuf.get()
+
+        val strings = ArrayList<String>(count)
+        // Read and patch all strings
+        loop@ for (i in 0 until count) {
+            val off = dataOff + intBuf.get()
+            val len = buffer.getShort(off)
+            val str = String(bytes, off + 2, len * 2, UTF_16LE)
+            for ((from, to) in patterns) {
+                if (str.contains(from)) {
+                    strings.add(str.replace(from, to))
+                    patch = true
+                    continue@loop
+                }
+            }
+            strings.add(str)
+        }
+
+        if (!patch)
+            return false
+
+        // Write everything before string data, will patch values later
+        val baos = RawByteStream()
+        baos.write(bytes, 0, dataOff)
+
+        // Write string data
+        val strList = IntArray(count)
+        for (i in 0 until count) {
+            strList[i] = baos.size() - dataOff
+            val str = strings[i]
+            baos.write(str.length.toShortBytes())
+            baos.write(str.toByteArray(UTF_16LE))
+            // Null terminate
+            baos.write(0)
+            baos.write(0)
+        }
+        baos.align()
+
+        val sizeDiff = baos.size() - start - size
+        val newBuffer = ByteBuffer.wrap(baos.buf).order(LITTLE_ENDIAN)
+
+        // Patch XML size
+        newBuffer.putInt(CHUNK_SIZE_OFF, buffer.getInt(CHUNK_SIZE_OFF) + sizeDiff)
+        // Patch string pool size
+        newBuffer.putInt(start + CHUNK_SIZE_OFF, size + sizeDiff)
+        // Patch index table
+        newBuffer.position(start + STRING_INDICES_OFF)
+        val newIntBuf = newBuffer.asIntBuffer()
+        strList.forEach { newIntBuf.put(it) }
+
+        // Write the rest of the chunks
+        val nextOff = start + size
+        baos.write(bytes, nextOff, bytes.size - nextOff)
+
+        bytes = baos.toByteArray()
+        return true
+    }
+
+    private fun Int.toShortBytes(): ByteArray {
+        val b = ByteBuffer.allocate(2).order(LITTLE_ENDIAN)
+        b.putShort(this.toShort())
+        return b.array()
+    }
+
+    private class RawByteStream : ByteArrayOutputStream() {
+        val buf: ByteArray get() = buf
+
+        fun align(alignment: Int = 4) {
+            val newCount = (count + alignment - 1) / alignment * alignment
+            for (i in 0 until (newCount - count))
+                write(0)
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/core/utils/BiometricHelper.kt

@@ -1,11 +1,11 @@
-package com.topjohnwu.magisk.utils
+package com.topjohnwu.magisk.core.utils
 
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
-import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Config
 import org.koin.core.KoinComponent
 import org.koin.core.get
 

app/src/main/java/com/topjohnwu/magisk/core/utils/IODispatcherExecutor.kt

@@ -0,0 +1,36 @@
+package com.topjohnwu.magisk.core.utils
+
+import kotlinx.coroutines.*
+import java.util.concurrent.*
+
+class IODispatcherExecutor : AbstractExecutorService() {
+
+    private val job = SupervisorJob().apply { invokeOnCompletion { future.run() } }
+    private val scope = CoroutineScope(job + Dispatchers.IO)
+    private val future = FutureTask(Callable { true })
+
+    override fun execute(command: Runnable) {
+        scope.launch {
+            command.run()
+        }
+    }
+
+    override fun shutdown() = job.cancel()
+
+    override fun shutdownNow(): List<Runnable> {
+        job.cancel()
+        return emptyList()
+    }
+
+    override fun isShutdown() = job.isCancelled
+
+    override fun isTerminated() = job.isCancelled && job.isCompleted
+
+    override fun awaitTermination(timeout: Long, unit: TimeUnit): Boolean {
+        return try {
+            future.get(timeout, unit)
+        } catch (e: TimeoutException) {
+            false
+        }
+    }
+}

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

@@ -1,21 +1,18 @@
-package com.topjohnwu.magisk.utils
+package com.topjohnwu.magisk.core.utils
 
+import android.content.Context
 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.magisk.utils.PatchAPK.ALPHANUM
+import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.signing.CryptoUtils.readCertificate
 import com.topjohnwu.signing.CryptoUtils.readPrivateKey
-import com.topjohnwu.superuser.internal.InternalUtils
+import com.topjohnwu.signing.KeyData
 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.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.math.BigInteger
 import java.security.KeyPairGenerator
@@ -33,42 +30,44 @@ private interface CertKeyProvider {
 }
 
 @Suppress("DEPRECATION")
-class Keygen: CertKeyProvider {
+class Keygen(context: Context) : CertKeyProvider {
 
     companion object {
         private const val ALIAS = "magisk"
         private val PASSWORD get() = "magisk".toCharArray()
         private const val TESTKEY_CERT = "61ed377e85d386a8dfee6b864bd85b0bfaa5af81"
+        private const val DNAME = "C=US,ST=California,L=Mountain View,O=Google Inc.,OU=Android,CN=Android"
         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) }
+    private val start = Calendar.getInstance().apply { add(Calendar.MONTH, -3) }
+    private val end = start.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 {
+    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 }
+        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"))
+            readCertificate(ByteArrayInputStream(KeyData.testCert()))
         }
         override val key by lazy {
-            readPrivateKey(javaClass.getResourceAsStream("/keys/testkey.pk8"))
+            readPrivateKey(ByteArrayInputStream(KeyData.testKey()))
         }
     }
 
     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]
@@ -88,33 +87,18 @@ class Keygen: CertKeyProvider {
         }
     }
 
-    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)
+            GZIPInputStream(Base64.decode(raw,
+                BASE64_FLAG
+            ).inputStream()).use {
+                ks.load(it,
+                    PASSWORD
+                )
             }
         }
 
@@ -124,17 +108,23 @@ class Keygen: CertKeyProvider {
 
         // Generate new private key and certificate
         val kp = KeyPairGenerator.getInstance("RSA").apply { initialize(4096) }.genKeyPair()
-        val dname = X500Name("CN=${randomString()}")
+        val dname = X500Name(DNAME)
         val builder = JcaX509v3CertificateBuilder(dname, BigInteger(160, Random()),
             start.time, end.time, dname, kp.public)
-        val signer = JcaContentSignerBuilder("SHA256WithRSA").build(kp.private)
+        val signer = JcaContentSignerBuilder("SHA1WithRSA").build(kp.private)
         val cert = JcaX509CertificateConverter().getCertificate(builder.build(signer))
 
         // Store them into keystore
-        ks.setKeyEntry(ALIAS, kp.private, PASSWORD, arrayOf(cert))
+        ks.setKeyEntry(
+            ALIAS, kp.private,
+            PASSWORD, arrayOf(cert))
         val bytes = ByteArrayOutputStream()
-        GZIPOutputStream(Base64OutputStream(bytes, BASE64_FLAG)).use {
-            ks.store(it, PASSWORD)
+        GZIPOutputStream(Base64OutputStream(bytes,
+            BASE64_FLAG
+        )).use {
+            ks.store(it,
+                PASSWORD
+            )
         }
         Config.keyStoreRaw = bytes.toString("UTF-8")
 

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

@@ -0,0 +1,90 @@
+@file:Suppress("DEPRECATION")
+
+package com.topjohnwu.magisk.core.utils
+
+import android.annotation.SuppressLint
+import android.content.res.AssetManager
+import android.content.res.Configuration
+import android.content.res.Resources
+import android.util.DisplayMetrics
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.ResMgr
+import com.topjohnwu.magisk.core.addAssetPath
+import com.topjohnwu.magisk.ktx.langTagToLocale
+import com.topjohnwu.magisk.ktx.toLangTag
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.util.*
+import kotlin.Comparator
+import kotlin.collections.ArrayList
+
+var currentLocale: Locale = Locale.getDefault()
+
+@SuppressLint("ConstantLocale")
+val defaultLocale: Locale = Locale.getDefault()
+
+private var cachedLocales: Pair<Array<String>, Array<String>>? = null
+
+suspend fun availableLocales() = cachedLocales ?:
+withContext(Dispatchers.Default) {
+    val compareId = R.string.app_changelog
+
+    // Create a completely new resource to prevent cross talk over app's configs
+    val asset = AssetManager::class.java.newInstance().apply { addAssetPath(ResMgr.apk) }
+    val config = Configuration(ResMgr.resource.configuration)
+    val metrics = DisplayMetrics().apply { setTo(ResMgr.resource.displayMetrics) }
+    val res = Resources(asset, metrics, config)
+
+    val locales = ArrayList<String>().apply {
+        // Add default locale
+        add("en")
+
+        // Add some special locales
+        add("zh-TW")
+        add("pt-BR")
+
+        // Then add all supported locales
+        addAll(res.assets.locales)
+    }.map {
+        it.langTagToLocale()
+    }.distinctBy {
+        config.setLocale(it)
+        res.updateConfiguration(config, metrics)
+        res.getString(compareId)
+    }.sortedWith(Comparator { a, b ->
+        a.getDisplayName(a).compareTo(b.getDisplayName(b), true)
+    })
+
+    config.setLocale(defaultLocale)
+    res.updateConfiguration(config, metrics)
+    val defName = res.getString(R.string.system_default)
+
+    val names = ArrayList<String>(locales.size + 1)
+    val values = ArrayList<String>(locales.size + 1)
+
+    names.add(defName)
+    values.add("")
+
+    locales.forEach { locale ->
+        names.add(locale.getDisplayName(locale))
+        values.add(locale.toLangTag())
+    }
+
+    (names.toTypedArray() to values.toTypedArray()).also { cachedLocales = it }
+}
+
+fun Resources.updateConfig(config: Configuration = configuration) {
+    config.setLocale(currentLocale)
+    updateConfiguration(config, displayMetrics)
+}
+
+fun refreshLocale() {
+    val localeConfig = Config.locale
+    currentLocale = when {
+        localeConfig.isEmpty() -> defaultLocale
+        else -> localeConfig.langTagToLocale()
+    }
+    Locale.setDefault(currentLocale)
+    ResMgr.resource.updateConfig()
+}

app/src/main/java/com/topjohnwu/magisk/core/utils/MediaStoreUtils.kt

@@ -0,0 +1,162 @@
+package com.topjohnwu.magisk.core.utils
+
+import android.content.ContentResolver
+import android.content.ContentUris
+import android.content.ContentValues
+import android.content.Context
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.provider.MediaStore
+import android.provider.OpenableColumns
+import androidx.annotation.RequiresApi
+import androidx.core.net.toFile
+import androidx.core.net.toUri
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.ktx.get
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.IOException
+import java.io.OutputStream
+import java.security.MessageDigest
+import kotlin.experimental.and
+
+@Suppress("DEPRECATION")
+object MediaStoreUtils {
+
+    private val cr: ContentResolver by lazy { get<Context>().contentResolver }
+
+    @get:RequiresApi(api = 29)
+    private val tableUri
+        get() = MediaStore.Downloads.EXTERNAL_CONTENT_URI
+
+    private fun relativePath(name: String) =
+        if (name.isEmpty()) Environment.DIRECTORY_DOWNLOADS
+        else Environment.DIRECTORY_DOWNLOADS + File.separator + name
+
+    fun fullPath(name: String): String =
+        File(Environment.getExternalStorageDirectory(), relativePath(name)).canonicalPath
+
+    private val relativePath get() = relativePath(Config.downloadDir)
+
+    @RequiresApi(api = 30)
+    @Throws(IOException::class)
+    private fun insertFile(displayName: String): MediaStoreFile {
+        val values = ContentValues()
+        values.put(MediaStore.MediaColumns.RELATIVE_PATH, relativePath)
+        values.put(MediaStore.MediaColumns.DISPLAY_NAME, displayName)
+
+        // When a file with the same name exists and was not created by us:
+        // - Before Android 11, insert will return null
+        // - On Android 11+, the system will automatically create a new name
+        // Thus the reason to restrict this method call to API 30+
+        val fileUri = cr.insert(tableUri, values) ?: throw IOException("Can't insert $displayName.")
+
+        val projection = arrayOf(MediaStore.MediaColumns._ID, MediaStore.MediaColumns.DATA)
+        cr.query(fileUri, projection, null, null, null)?.use { cursor ->
+            val idIndex = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns._ID)
+            val dataColumn = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.DATA)
+            if (cursor.moveToFirst()) {
+                val id = cursor.getLong(idIndex)
+                val data = cursor.getString(dataColumn)
+                return MediaStoreFile(id, data)
+            }
+        }
+
+        throw IOException("Can't insert $displayName.")
+    }
+
+    @RequiresApi(api = 29)
+    private fun queryFile(displayName: String): UriFile? {
+        val projection = arrayOf(MediaStore.MediaColumns._ID, MediaStore.MediaColumns.DATA)
+        // Before Android 10, we wrote the DISPLAY_NAME field when insert, so it can be used.
+        val selection = "${MediaStore.MediaColumns.DISPLAY_NAME} == ?"
+        val selectionArgs = arrayOf(displayName)
+        val sortOrder = "${MediaStore.MediaColumns.DATE_ADDED} DESC"
+        cr.query(tableUri, projection, selection, selectionArgs, sortOrder)?.use { cursor ->
+            val idColumn = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns._ID)
+            val dataColumn = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.DATA)
+            while (cursor.moveToNext()) {
+                val id = cursor.getLong(idColumn)
+                val data = cursor.getString(dataColumn)
+                if (data.endsWith(relativePath + File.separator + displayName)) {
+                    return MediaStoreFile(id, data)
+                }
+            }
+        }
+        return null
+    }
+
+    @Throws(IOException::class)
+    fun getFile(displayName: String, skipQuery: Boolean = false): UriFile {
+        if (Build.VERSION.SDK_INT < 30) {
+            // Fallback to file based I/O pre Android 11
+            val parent = File(Environment.getExternalStorageDirectory(), relativePath)
+            parent.mkdirs()
+            return LegacyUriFile(File(parent, displayName))
+        }
+
+        return if (skipQuery) insertFile(displayName)
+        else queryFile(displayName) ?: insertFile(displayName)
+    }
+
+    fun Uri.inputStream() = cr.openInputStream(this) ?: throw FileNotFoundException()
+
+    fun Uri.outputStream() = cr.openOutputStream(this, "rwt") ?: throw FileNotFoundException()
+
+    val Uri.displayName: String get() {
+        if (scheme == "file") {
+            // Simple uri wrapper over file, directly get file name
+            return toFile().name
+        }
+        require(scheme == "content") { "Uri lacks 'content' scheme: $this" }
+        val projection = arrayOf(OpenableColumns.DISPLAY_NAME)
+        cr.query(this, projection, null, null, null)?.use { cursor ->
+            val displayNameColumn = cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)
+            if (cursor.moveToFirst()) {
+                return cursor.getString(displayNameColumn)
+            }
+        }
+        return this.toString()
+    }
+
+    fun Uri.checkSum(alg: String, reference: String) = runCatching {
+        this.inputStream().use {
+            val digest = MessageDigest.getInstance(alg)
+            it.copyTo(object : OutputStream() {
+                override fun write(b: Int) {
+                    digest.update(b.toByte())
+                }
+
+                override fun write(b: ByteArray, off: Int, len: Int) {
+                    digest.update(b, off, len)
+                }
+            })
+            val sb = StringBuilder()
+            digest.digest().forEach { b -> sb.append("%02x".format(b and 0xff.toByte())) }
+            sb.toString() == reference
+        }
+    }.getOrElse { false }
+
+    interface UriFile {
+        val uri: Uri
+        fun delete(): Boolean
+    }
+
+    private class LegacyUriFile(private val file: File) : UriFile {
+        override val uri = file.toUri()
+        override fun delete() = file.delete()
+        override fun toString() = file.toString()
+    }
+
+    @RequiresApi(api = 29)
+    private class MediaStoreFile(private val id: Long, private val data: String) : UriFile {
+        override val uri = ContentUris.withAppendedId(tableUri, id)
+        override fun toString() = data
+        override fun delete(): Boolean {
+            val selection = "${MediaStore.MediaColumns._ID} == ?"
+            val selectionArgs = arrayOf(id.toString())
+            return cr.delete(uri, selection, selectionArgs) == 1
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/core/utils/ProgressInputStream.kt

@@ -1,6 +1,5 @@
-package com.topjohnwu.magisk.utils
+package com.topjohnwu.magisk.core.utils
 
-import com.topjohnwu.superuser.internal.UiThreadHandler
 import java.io.FilterInputStream
 import java.io.InputStream
 
@@ -16,7 +15,7 @@ class ProgressInputStream(
         val cur = System.currentTimeMillis()
         if (cur - lastUpdate > 1000) {
             lastUpdate = cur
-            UiThreadHandler.run { progressEmitter(bytesRead) }
+            progressEmitter(bytesRead)
         }
     }
 
@@ -41,4 +40,4 @@ class ProgressInputStream(
         }
         return sz
     }
-}
+}

app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt

@@ -0,0 +1,59 @@
+package com.topjohnwu.magisk.core.utils
+
+import android.content.Context
+import android.os.Build
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.wrap
+import com.topjohnwu.magisk.ktx.rawResource
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.ShellUtils
+
+class RootInit : Shell.Initializer() {
+
+    override fun onInit(context: Context, shell: Shell): Boolean {
+        return init(context.wrap(), shell)
+    }
+
+    fun init(context: Context, shell: Shell): Boolean {
+        shell.newJob().apply {
+            add("export SDK_INT=${Build.VERSION.SDK_INT}")
+            if (Const.Version.atLeast_20_4()) {
+                add("export MAGISKTMP=\$(magisk --path)/.magisk")
+            } else {
+                add("export MAGISKTMP=/sbin/.magisk")
+            }
+            if (Const.Version.atLeast_21_0()) {
+                add("export ASH_STANDALONE=1")
+                add("[ -x /data/adb/magisk/busybox ] && exec /data/adb/magisk/busybox sh")
+            } else {
+                add("export PATH=\"\$MAGISKTMP/busybox:\$PATH\"")
+            }
+            add(context.rawResource(R.raw.manager))
+            if (shell.isRoot) {
+                add(context.rawResource(R.raw.util_functions))
+            }
+            add("mm_init")
+        }.exec()
+
+        fun fastCmd(cmd: String) = ShellUtils.fastCmd(shell, cmd)
+        fun getVar(name: String) = fastCmd("echo \$$name")
+        fun getBool(name: String) = getVar(name).toBoolean()
+
+        Const.MAGISKTMP = getVar("MAGISKTMP")
+        Info.isSAR = getBool("SYSTEM_ROOT")
+        Info.ramdisk = getBool("RAMDISKEXIST")
+        Info.isAB = getBool("ISAB")
+        Info.crypto = getVar("CRYPTOTYPE")
+        Info.isPixel = fastCmd("getprop ro.product.brand") == "google"
+
+        // Default presets
+        Config.recovery = getBool("RECOVERYMODE")
+        Config.keepVerity = getBool("KEEPVERITY")
+        Config.keepEnc = getBool("KEEPFORCEENCRYPT")
+
+        return true
+    }
+}