Release Magisk v25.2

`daemon_entry` calls `getprop` which initializes sysprop impl and checks whether we need to load persistent property file. On FDE devices, magiskd starts before /data is actually decrypted, and the check always fails. Thus `persist_getprop("persist.sys.safemode")` will always fail.

.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,36 @@
+---
+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 DEBUG 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 MAGISK**.
+
+If you experience issues during installation, in recovery, upload the recovery logs, or in Magisk, 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 app, dump the full `logcat` **when the crash happens**.
+
+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.
+
+-->
+
+Device:
+Android version:
+Magisk version name:
+Magisk version code:

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,6 @@
+blank_issues_enabled: false
+contact_links:
+  - name: XDA Community Support
+    url: https://forum.xda-developers.com/f/magisk.5903/
+    about: Please ask and answer questions here.
+

.github/ccache.sh

@@ -0,0 +1,19 @@
+OS=$(uname)
+CCACHE_VER=4.4
+
+case $OS in
+  Darwin )
+    brew install ccache
+    ln -s $(which ccache) ./ccache
+    ;;
+  Linux )
+    sudo apt-get install -y ccache
+    ln -s $(which ccache) ./ccache
+    ;;
+  * )
+    curl -OL https://github.com/ccache/ccache/releases/download/v${CCACHE_VER}/ccache-${CCACHE_VER}-windows-64.zip
+    unzip -j ccache-*-windows-64.zip '*/ccache.exe'
+    ;;
+esac
+mkdir ./.ccache
+./ccache -o compiler_check='%compiler% -dumpmachine; %compiler% -dumpversion'

.github/workflows/build.yml

@@ -0,0 +1,91 @@
+name: Magisk Build
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - 'app/**'
+      - 'native/**'
+      - 'stub/**'
+      - 'buildSrc/**'
+      - 'build.py'
+      - 'gradle.properties'
+      - '.github/workflows/build.yml'
+  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 ]
+    env:
+      NDK_CCACHE: ${{ github.workspace }}/ccache
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
+
+    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 ccache
+        run: bash .github/ccache.sh
+
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            !~/.gradle/caches/build-cache-*
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+          restore-keys: ${{ runner.os }}-gradle-
+
+      - name: Cache build cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ${{ github.workspace }}/.ccache
+            ~/.gradle/caches/build-cache-*
+          key: ${{ runner.os }}-build-cache-${{ github.sha }}
+          restore-keys: ${{ runner.os }}-build-cache-
+
+      - name: Set up NDK
+        run: python build.py -v ndk
+
+      - name: Build release
+        run: |
+          ./ccache -zp
+          python build.py -vr all
+
+      - name: Build debug
+        run: |
+          python build.py -v all
+          ./ccache -s
+
+      - name: Stop gradle daemon
+        run: ./gradlew --stop
+
+      # 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

.gitignore

@@ -4,6 +4,7 @@ out
 *.apk
 /config.prop
 /update.sh
+/dict.txt
 
 # Built binaries
 native/out

.gitmodules

@@ -6,7 +6,7 @@
 	url = https://github.com/topjohnwu/ndk-busybox.git
 [submodule "dtc"]
 	path = native/jni/external/dtc
-	url = https://github.com/dgibson/dtc
+	url = https://github.com/dgibson/dtc.git
 [submodule "lz4"]
 	path = native/jni/external/lz4
 	url = https://github.com/lz4/lz4.git
@@ -22,6 +22,24 @@
 [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 "libcxx"]
+	path = native/jni/external/libcxx
+	url = https://github.com/topjohnwu/libcxx.git
+[submodule "zlib"]
+	path = native/jni/external/zlib
+	url = https://android.googlesource.com/platform/external/zlib
+[submodule "parallel-hashmap"]
+	path = native/jni/external/parallel-hashmap
+	url = https://github.com/greg7mdp/parallel-hashmap.git
 [submodule "termux-elf-cleaner"]
 	path = tools/termux-elf-cleaner
 	url = https://github.com/termux/termux-elf-cleaner.git
+[submodule "zopfli"]
+	path = native/jni/external/zopfli
+	url = https://github.com/google/zopfli.git
+[submodule "cxx-rs"]
+	path = native/jni/external/cxx-rs
+	url = https://github.com/topjohnwu/cxx.git

README.MD

@@ -1,63 +1,75 @@
-# 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)
+[![Downloads](https://img.shields.io/badge/dynamic/json?color=green&label=Downloads&query=totalString&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk-files%2Fcount%2Fcount.json&cacheSeconds=1800)](https://raw.githubusercontent.com/topjohnwu/magisk-files/count/count.json)
+
+#### This is not an officially supported Google product
 
 ## 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 software for customizing Android, supporting devices higher than Android 5.0.<br>
+Some highlight features:
 
-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).
+- **MagiskSU**: Provide root access for applications
+- **Magisk Modules**: Modify read-only partitions by installing modules
+- **MagiskBoot**: The most complete tool for unpacking and repacking Android boot images
+- **Zygisk**: Run code in every Android applications' processes
+
+## Downloads
+
+[Github](https://github.com/topjohnwu/Magisk/) is the only source where you can get official Magisk information and downloads.
+
+[![](https://img.shields.io/badge/Magisk-v25.1-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v25.1)
+[![](https://img.shields.io/badge/Magisk%20Beta-v25.1-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v25.1)
+[![](https://img.shields.io/badge/Magisk-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk-files/canary/app-release.apk)
+[![](https://img.shields.io/badge/Magisk-Debug-red)](https://raw.githubusercontent.com/topjohnwu/magisk-files/canary/app-debug.apk)
+
+## Useful Links
+
+- [Installation Instruction](https://topjohnwu.github.io/Magisk/install.html)
+- [Magisk Documentation](https://topjohnwu.github.io/Magisk/)
+- [Magisk Troubleshoot Wiki](https://www.didgeridoohan.com/magisk/HomePage) (by [@Didgeridoohan](https://github.com/Didgeridoohan))
 
 ## 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.
+**Only bug reports from Debug builds will be accepted.**
 
-## Building Environment Requirements
+For installation issues, upload both boot image and install logs.<br>
+For Magisk issues, upload boot logcat or dmesg.<br>
+For Magisk app crashes, record and upload the logcat when the crash occurs.
 
--  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
+## Building and Development
 
-## Building Notes and Instructions
+- 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/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 with Android Studio. The IDE can be used for both app (Kotlin/Java) and native sources.
+- Optionally, set custom configs with `config.prop`. A sample `config.prop.sample` is provided.
 
--  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).
+## Signing and Distribution
 
-## Translations
+- The certificate of the key used to sign the final Magisk APK product is also directly embedded into some executables. In release builds, Magisk's root daemon will enforce this certificate check and reject and forcefully uninstall any non-matching Magisk apps to protect users from malicious and unverified Magisk APKs.
+- To do any development on Magisk itself, switch to an **official debug build and reinstall Magisk** to bypass the signature check.
+- To distribute your own Magisk builds signed with your own keys, set your signing configs in `config.prop`.
+- Check [Google's Documentation](https://developer.android.com/studio/publish/app-signing.html#generate-key) for more details on generating your own key.
 
-Default string resources for Magisk Manager and its stub APK are located here:
+## Translation Contributions
+
+Default string resources for the Magisk app and its stub APK are located here:
 
 - `app/src/main/res/values/strings.xml`
 - `stub/src/main/res/values/strings.xml`
 
 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/.gitignore

@@ -6,6 +6,7 @@
 app/release
 *.hprof
 .externalNativeBuild/
-public.certificate.x509.pem
-private.key.pk8
 *.apk
+src/main/assets
+src/main/jniLibs
+src/main/resources

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,120 @@
+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)
+    }
+    arguments {
+        arg("room.incremental", "true")
+    }
+}
+
+android {
+    namespace = "com.topjohnwu.magisk"
+
+    defaultConfig {
+        applicationId = "com.topjohnwu.magisk"
+        vectorDrawables.useSupportLibrary = true
+        versionName = Config.version
+        versionCode = Config.versionCode
+        ndk.abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles("proguard-rules.pro")
+        }
+    }
+
+    buildFeatures {
+        dataBinding = true
+    }
+
+    packagingOptions {
+        resources {
+            excludes += "/META-INF/*"
+            excludes += "/org/bouncycastle/**"
+            excludes += "/kotlin/**"
+            excludes += "/kotlinx/**"
+            excludes += "/okhttp3/**"
+            excludes += "/*.txt"
+            excludes += "/*.bin"
+            excludes += "/*.json"
+        }
+        jniLibs {
+            keepDebugSymbols += "**/*.so"
+        }
+    }
+}
+
+setupApp()
+
+configurations.all {
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk7")
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
+}
+
+dependencies {
+    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:5.0.1")
+    implementation("org.bouncycastle:bcpkix-jdk18on:1.71")
+    implementation("dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0")
+    implementation("dev.rikka.rikkax.insets:insets:1.2.0")
+    implementation("dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1")
+    implementation("io.noties.markwon:core:4.6.2")
+
+    val vLibsu = "5.0.2"
+    implementation("com.github.topjohnwu.libsu:core:${vLibsu}")
+    implementation("com.github.topjohnwu.libsu:service:${vLibsu}")
+    implementation("com.github.topjohnwu.libsu:nio:${vLibsu}")
+
+    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 = "4.9.3"
+    implementation("com.squareup.okhttp3:okhttp:${vOkHttp}")
+    implementation("com.squareup.okhttp3:logging-interceptor:${vOkHttp}")
+    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:${vOkHttp}")
+
+    val vMoshi = "1.13.0"
+    implementation("com.squareup.moshi:moshi:${vMoshi}")
+    kapt("com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}")
+
+    val vRoom = "2.5.0-alpha02"
+    implementation("androidx.room:room-runtime:${vRoom}")
+    implementation("androidx.room:room-ktx:${vRoom}")
+    kapt("androidx.room:room-compiler:${vRoom}")
+
+    val vNav = "2.5.0-rc01"
+    implementation("androidx.navigation:navigation-fragment-ktx:${vNav}")
+    implementation("androidx.navigation:navigation-ui-ktx:${vNav}")
+
+    implementation("androidx.biometric:biometric:1.1.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
+    implementation("androidx.appcompat:appcompat:1.4.2")
+    implementation("androidx.preference:preference:1.2.0")
+    implementation("androidx.recyclerview:recyclerview:1.2.1")
+    implementation("androidx.fragment:fragment-ktx:1.4.1")
+    implementation("androidx.transition:transition:1.4.1")
+    implementation("androidx.core:core-ktx:1.8.0")
+    implementation("androidx.core:core-splashscreen:1.0.0-rc01")
+    implementation("com.google.android.material:material:1.6.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

@@ -1,51 +1,49 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/topjohnwu/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# 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);
+# Parcelable
+-keepclassmembers class * implements android.os.Parcelable {
+    public static final ** CREATOR;
 }
 
-# Keep all fragment constructors
--keepclassmembers class * extends androidx.fragment.app.Fragment {
-  public <init>(...);
+# Kotlin
+-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
+	public static void check*(...);
+	public static void throw*(...);
+}
+-assumenosideeffects class java.util.Objects {
+    public static ** requireNonNull(...);
 }
 
-# DelegateWorker
--keep,allowobfuscation class * extends com.topjohnwu.magisk.base.DelegateWorker
+# Stub
+-keep class com.topjohnwu.magisk.core.App { <init>(java.lang.Object); }
+-keepclassmembers class androidx.appcompat.app.AppCompatDelegateImpl {
+  boolean mActivityHandlesUiModeChecked;
+  boolean mActivityHandlesUiMode;
+}
 
-# BootSigner
--keep class a.a { *; }
+# main
+-keep,allowoptimization public class com.topjohnwu.magisk.signing.SignBoot {
+    public static void main(java.lang.String[]);
+}
 
-# Workaround R8 bug
--keep,allowobfuscation class com.topjohnwu.magisk.model.receiver.GeneralReceiver
--keepclassmembers class a.e { *; }
-
-# Strip logging
--assumenosideeffects class timber.log.Timber.Tree { *; }
+# Strip Timber verbose and debug logging
+-assumenosideeffects class timber.log.Timber$Tree {
+  public void v(**);
+  public void d(**);
+}
 
 # Excessive obfuscation
 -repackageclasses 'a'
 -allowaccessmodification
 
-# QOL
--dontnote **
--dontwarn com.caverock.androidsvg.**
--dontwarn ru.noties.markwon.**
+-obfuscationdictionary ../dict.txt
+-classobfuscationdictionary ../dict.txt
+-packageobfuscationdictionary ../dict.txt
+
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.commonmark.ext.gfm.strikethrough.Strikethrough
+-dontwarn org.conscrypt.Conscrypt*
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE

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,13 @@
+plugins {
+    id("com.android.library")
+}
+
+setupCommon()
+
+android {
+    namespace = "com.topjohnwu.shared"
+}
+
+dependencies {
+    api("io.michaelrocks:paranoid-core:0.3.7")
+}

app/shared/src/debug/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:usesCleartextTraffic="true"
+        tools:ignore="UnusedAttribute" />
+
+</manifest>

app/shared/src/main/AndroidManifest.xml

@@ -0,0 +1,27 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.topjohnwu.shared"
+    android:installLocation="internalOnly">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
+    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="29"
+        tools:ignore="ScopedStorage" />
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+
+    <application
+        android:allowBackup="false"
+        android:label="Magisk"
+        android:requestLegacyExternalStorage="true"
+        android:supportsRtl="true"
+        android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+
+</manifest>

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

@@ -0,0 +1,24 @@
+package com.topjohnwu.magisk;
+
+import android.content.Context;
+
+import io.michaelrocks.paranoid.Obfuscate;
+
+@Obfuscate
+public class ProviderInstaller {
+
+    public static boolean install(Context context) {
+        try {
+            // Try installing new SSL provider from Google Play Service
+            Context gms = context.createPackageContext("com.google.android.gms",
+                    Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY);
+            gms.getClassLoader()
+                    .loadClass("com.google.android.gms.common.security.ProviderInstallerImpl")
+                    .getMethod("insertProvider", Context.class)
+                    .invoke(null, gms);
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,109 @@
+package com.topjohnwu.magisk;
+
+import static android.os.Build.VERSION.SDK_INT;
+import static android.os.ParcelFileDescriptor.MODE_READ_ONLY;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.res.AssetManager;
+import android.content.res.Resources;
+import android.content.res.loader.ResourcesLoader;
+import android.content.res.loader.ResourcesProvider;
+import android.os.ParcelFileDescriptor;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Map;
+
+import io.michaelrocks.paranoid.Obfuscate;
+
+@Obfuscate
+public class StubApk {
+    private static File dynDir;
+    private static Method addAssetPath;
+
+    private static File getDynDir(ApplicationInfo info) {
+        if (dynDir == null) {
+            final String dataDir;
+            if (SDK_INT >= 24) {
+                // Use device protected path to allow directBootAware
+                dataDir = info.deviceProtectedDataDir;
+            } else {
+                dataDir = info.dataDir;
+            }
+            dynDir = new File(dataDir, "dyn");
+            dynDir.mkdirs();
+        }
+        return dynDir;
+    }
+
+    public static File current(Context c) {
+        return new File(getDynDir(c.getApplicationInfo()), "current.apk");
+    }
+
+    public static File current(ApplicationInfo info) {
+        return new File(getDynDir(info), "current.apk");
+    }
+
+    public static File update(Context c) {
+        return new File(getDynDir(c.getApplicationInfo()), "update.apk");
+    }
+
+    public static File update(ApplicationInfo info) {
+        return new File(getDynDir(info), "update.apk");
+    }
+
+    public static void addAssetPath(Resources res, String path) {
+        if (SDK_INT >= 30) {
+            try (var fd = ParcelFileDescriptor.open(new File(path), MODE_READ_ONLY)) {
+                var loader = new ResourcesLoader();
+                loader.addProvider(ResourcesProvider.loadFromApk(fd));
+                res.addLoaders(loader);
+            } catch (IOException ignored) {}
+        } else {
+            AssetManager asset = res.getAssets();
+            try {
+                if (addAssetPath == null)
+                    addAssetPath = AssetManager.class.getMethod("addAssetPath", String.class);
+                addAssetPath.invoke(asset, path);
+            } catch (Exception ignored) {}
+        }
+    }
+
+    public static void restartProcess(Activity activity) {
+        Intent intent = activity.getPackageManager()
+                .getLaunchIntentForPackage(activity.getPackageName());
+        activity.finishAffinity();
+        activity.startActivity(intent);
+        Runtime.getRuntime().exit(0);
+    }
+
+    public static class Data {
+        // Indices of the object array
+        private static final int STUB_VERSION = 0;
+        private static final int CLASS_COMPONENT_MAP = 1;
+        private static final int ROOT_SERVICE = 2;
+        private static final int ARR_SIZE = 3;
+
+        private final Object[] arr;
+
+        public Data() { arr = new Object[ARR_SIZE]; }
+        public Data(Object o) { arr = (Object[]) o; }
+        public Object getObject() { return arr; }
+
+        public int getVersion() { return (int) arr[STUB_VERSION]; }
+        public void setVersion(int version) { arr[STUB_VERSION] = version; }
+        public Map<String, String> getClassToComponent() {
+            // noinspection unchecked
+            return (Map<String, String>) arr[CLASS_COMPONENT_MAP];
+        }
+        public void setClassToComponent(Map<String, String> map) {
+            arr[CLASS_COMPONENT_MAP] = map;
+        }
+        public Class<?> getRootService() { return (Class<?>) arr[ROOT_SERVICE]; }
+        public void setRootService(Class<?> service) { arr[ROOT_SERVICE] = service; }
+    }
+}

app/shared/src/main/java/com/topjohnwu/magisk/utils/APKInstall.java

@@ -0,0 +1,174 @@
+package com.topjohnwu.magisk.utils;
+
+import static android.content.pm.PackageInstaller.EXTRA_SESSION_ID;
+import static android.content.pm.PackageInstaller.EXTRA_STATUS;
+import static android.content.pm.PackageInstaller.STATUS_FAILURE_INVALID;
+import static android.content.pm.PackageInstaller.STATUS_PENDING_USER_ACTION;
+import static android.content.pm.PackageInstaller.STATUS_SUCCESS;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageInstaller.SessionParams;
+import android.net.Uri;
+import android.os.Build;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import io.michaelrocks.paranoid.Obfuscate;
+
+@Obfuscate
+public final class APKInstall {
+
+    public static void transfer(InputStream in, OutputStream out) throws IOException {
+        int size = 8192;
+        var buffer = new byte[size];
+        int read;
+        while ((read = in.read(buffer, 0, size)) >= 0) {
+            out.write(buffer, 0, read);
+        }
+    }
+
+    public static Session startSession(Context context) {
+        return startSession(context, null, null, null);
+    }
+
+    public static Session startSession(Context context, String pkg,
+                                       Runnable onFailure, Runnable onSuccess) {
+        var receiver = new InstallReceiver(pkg, onSuccess, onFailure);
+        context = context.getApplicationContext();
+        if (pkg != null) {
+            // If pkg is not null, look for package added event
+            var filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
+            filter.addDataScheme("package");
+            context.registerReceiver(receiver, filter);
+        }
+        context.registerReceiver(receiver, new IntentFilter(receiver.sessionId));
+        return receiver;
+    }
+
+    public interface Session {
+        // @WorkerThread
+        OutputStream openStream(Context context) throws IOException;
+        // @WorkerThread
+        void install(Context context, File apk) throws IOException;
+        // @WorkerThread @Nullable
+        Intent waitIntent();
+    }
+
+    private static class InstallReceiver extends BroadcastReceiver implements Session {
+        private final String packageName;
+        private final Runnable onSuccess;
+        private final Runnable onFailure;
+        private final CountDownLatch latch = new CountDownLatch(1);
+        private Intent userAction = null;
+
+        final String sessionId = UUID.randomUUID().toString();
+
+        private InstallReceiver(String packageName, Runnable onSuccess, Runnable onFailure) {
+            this.packageName = packageName;
+            this.onSuccess = onSuccess;
+            this.onFailure = onFailure;
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction())) {
+                Uri data = intent.getData();
+                if (data == null)
+                    return;
+                String pkg = data.getSchemeSpecificPart();
+                if (pkg.equals(packageName)) {
+                    onSuccess(context);
+                }
+            } else if (sessionId.equals(intent.getAction())) {
+                int status = intent.getIntExtra(EXTRA_STATUS, STATUS_FAILURE_INVALID);
+                switch (status) {
+                    case STATUS_PENDING_USER_ACTION:
+                        userAction = intent.getParcelableExtra(Intent.EXTRA_INTENT);
+                        break;
+                    case STATUS_SUCCESS:
+                        if (packageName == null) {
+                            onSuccess(context);
+                        }
+                        break;
+                    default:
+                        int id = intent.getIntExtra(EXTRA_SESSION_ID, 0);
+                        if (id > 0) {
+                            var installer = context.getPackageManager().getPackageInstaller();
+                            var info = installer.getSessionInfo(id);
+                            if (info != null) {
+                                installer.abandonSession(info.getSessionId());
+                            }
+                        }
+                        if (onFailure != null) {
+                            onFailure.run();
+                        }
+                        context.getApplicationContext().unregisterReceiver(this);
+                }
+                latch.countDown();
+            }
+        }
+
+        private void onSuccess(Context context) {
+            if (onSuccess != null)
+                onSuccess.run();
+            context.getApplicationContext().unregisterReceiver(this);
+        }
+
+        @Override
+        public Intent waitIntent() {
+            try {
+                // noinspection ResultOfMethodCallIgnored
+                latch.await(5, TimeUnit.SECONDS);
+            } catch (Exception ignored) {}
+            return userAction;
+        }
+
+        @Override
+        public OutputStream openStream(Context context) throws IOException {
+            // noinspection InlinedApi
+            var flag = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE;
+            var intent = new Intent(sessionId).setPackage(context.getPackageName());
+            var pending = PendingIntent.getBroadcast(context, 0, intent, flag);
+
+            var installer = context.getPackageManager().getPackageInstaller();
+            var params = new SessionParams(SessionParams.MODE_FULL_INSTALL);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                params.setRequireUserAction(SessionParams.USER_ACTION_NOT_REQUIRED);
+            }
+            var session = installer.openSession(installer.createSession(params));
+            var out = session.openWrite(sessionId, 0, -1);
+            return new FilterOutputStream(out) {
+                @Override
+                public void write(byte[] b, int off, int len) throws IOException {
+                    out.write(b, off, len);
+                }
+                @Override
+                public void close() throws IOException {
+                    super.close();
+                    session.commit(pending.getIntentSender());
+                    session.close();
+                }
+            };
+        }
+
+        @Override
+        public void install(Context context, File apk) throws IOException {
+            try (var src = new FileInputStream(apk);
+                 var out = openStream(context)) {
+                transfer(src, out);
+            }
+        }
+    }
+}

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

@@ -5,26 +5,29 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.Enumeration;
 
-import dalvik.system.DexClassLoader;
+import dalvik.system.BaseDexClassLoader;
 
-public class DynamicClassLoader extends DexClassLoader {
+public class DynamicClassLoader extends BaseDexClassLoader {
 
-    private ClassLoader base = Object.class.getClassLoader();
+    public DynamicClassLoader(File apk) {
+        this(apk, getSystemClassLoader());
+    }
 
     public DynamicClassLoader(File apk, ClassLoader parent) {
-        super(apk.getPath(), apk.getParent(), null, parent);
+        // Set optimizedDirectory to null to bypass DexFile's security checks
+        super(apk.getPath(), null, null, parent);
     }
 
     @Override
     protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
         // First check if already loaded
-        Class cls = findLoadedClass(name);
+        Class<?> cls = findLoadedClass(name);
         if (cls != null)
             return cls;
 
         try {
             // Then check boot classpath
-            return base.loadClass(name);
+            return getSystemClassLoader().loadClass(name);
         } catch (ClassNotFoundException ignored) {
             try {
                 // Next try current dex
@@ -42,7 +45,7 @@ public class DynamicClassLoader extends DexClassLoader {
 
     @Override
     public URL getResource(String name) {
-        URL resource = base.getResource(name);
+        URL resource = getSystemClassLoader().getResource(name);
         if (resource != null)
             return resource;
         resource = findResource(name);
@@ -54,7 +57,7 @@ public class DynamicClassLoader extends DexClassLoader {
 
     @Override
     public Enumeration<URL> getResources(String name) throws IOException {
-        return new CompoundEnumeration<>(base.getResources(name),
+        return new CompoundEnumeration<>(getSystemClassLoader().getResources(name),
                 findResources(name), getParent().getResources(name));
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,55 +1,47 @@
 <?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" />
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
-        android:name="a.e"
-        android:allowBackup="true"
+        android:name=".core.App"
+        android:extractNativeLibs="true"
+        android:icon="@drawable/ic_launcher"
+        android:multiArch="true"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
 
-        <!-- Splash -->
         <activity
-            android:name="a.c"
+            android:name=".ui.MainActivity"
+            android:exported="true"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity>
-
-        <!-- Main -->
-        <activity android:name="a.b" />
-
-        <!-- 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"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <!-- Receiver -->
-        <receiver
-            android:name="a.h"
-            android:directBootAware="true">
+        <activity
+            android:name=".ui.surequest.SuRequestActivity"
+            android:directBootAware="true"
+            android:exported="false"
+            android:taskAffinity=""
+            tools:ignore="AppLinkUrlError">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <receiver
+            android:name=".core.Receiver"
+            android:exported="false">
             <intent-filter>
-                <action android:name="android.intent.action.REBOOT" />
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
+                <action android:name="android.intent.action.UID_REMOVED" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
@@ -59,28 +51,32 @@
             </intent-filter>
         </receiver>
 
-        <!-- DownloadService -->
-        <service android:name="a.j" />
+        <service
+            android:name=".core.download.DownloadService"
+            android:exported="false" />
 
-        <!-- Hardcode GMS version -->
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="12451000" />
+        <service
+            android:name=".core.JobService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
-        <!-- Initialize WorkManager on-demand -->
         <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
-            tools:node="remove" />
+            android:name=".core.Provider"
+            android:authorities="${applicationId}.provider"
+            android:directBootAware="true"
+            android:exported="false"
+            android:grantUriPermissions="true" />
 
         <!-- We don't invalidate Room -->
         <service
             android:name="androidx.room.MultiInstanceInvalidationService"
-            tools:node="remove"/>
+            tools:node="remove" />
 
-        <!-- We don't use Device Credentials -->
-        <activity
-            android:name="androidx.biometric.DeviceCredentialHandlerActivity"
+        <!-- We don't need emoji compat -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
             tools:node="remove" />
 
     </application>

app/src/main/aidl/com/topjohnwu/magisk/core/utils/IRootUtils.aidl

@@ -0,0 +1,9 @@
+// IRootUtils.aidl
+package com.topjohnwu.magisk.core.utils;
+
+// Declare any non-default types here with import statements
+
+interface IRootUtils {
+    android.app.ActivityManager.RunningAppProcessInfo getAppProcess(int pid);
+    IBinder getFileSystem();
+}

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/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/App.kt

@@ -1,90 +0,0 @@
-package com.topjohnwu.magisk
-
-import android.app.Application
-import android.content.Context
-import android.content.res.Configuration
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.multidex.MultiDex
-import androidx.room.Room
-import androidx.work.WorkManager
-import androidx.work.impl.WorkDatabase
-import androidx.work.impl.WorkDatabase_Impl
-import com.topjohnwu.magisk.data.database.RepoDatabase
-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.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.superuser.Shell
-import org.koin.android.ext.koin.androidContext
-import org.koin.core.context.startKoin
-import timber.log.Timber
-
-open class App() : Application() {
-
-    constructor(o: Any) : this() {
-        Info.stub = DynAPK.load(o)
-    }
-
-    init {
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
-        Shell.Config.setFlags(Shell.FLAG_MOUNT_MASTER or Shell.FLAG_USE_MAGISK_BUSYBOX)
-        Shell.Config.verboseLogging(BuildConfig.DEBUG)
-        Shell.Config.addInitializers(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
-            }
-        }
-    }
-
-    override fun attachBaseContext(base: Context) {
-        // Basic setup
-        if (BuildConfig.DEBUG)
-            MultiDex.install(base)
-        Timber.plant(Timber.DebugTree())
-
-        // Some context magic
-        val app: Application
-        val impl: Context
-        if (base is Application) {
-            app = base
-            impl = base.baseContext
-        } else {
-            app = this
-            impl = base
-        }
-        val wrapped = impl.wrap()
-        super.attachBaseContext(wrapped)
-
-        // Normal startup
-        startKoin {
-            androidContext(wrapped)
-            modules(koinModules)
-        }
-        ResourceMgr.init(impl)
-        app.registerActivityLifecycleCallbacks(get<ActivityTracker>())
-        WorkManager.initialize(impl.wrapJob(), androidx.work.Configuration.Builder().build())
-    }
-
-    // This is required as some platforms expect ContextImpl
-    override fun getBaseContext(): Context {
-        return super.getBaseContext().unwrap()
-    }
-
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        resources.updateConfig(newConfig)
-        if (!isRunningAsStub)
-            super.onConfigurationChanged(newConfig)
-    }
-}

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/Hacks.kt

@@ -1,155 +0,0 @@
-@file:Suppress("DEPRECATION")
-
-package com.topjohnwu.magisk
-
-import android.annotation.SuppressLint
-import android.app.job.JobInfo
-import android.app.job.JobScheduler
-import android.app.job.JobWorkItem
-import android.content.ComponentName
-import android.content.Context
-import android.content.ContextWrapper
-import android.content.Intent
-import android.content.res.AssetManager
-import android.content.res.Configuration
-import android.content.res.Resources
-import androidx.annotation.RequiresApi
-import 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.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.wrapJob(): Context = object : GlobalResContext(this) {
-
-    override fun getApplicationContext(): Context {
-        return this
-    }
-
-    @SuppressLint("NewApi")
-    override fun getSystemService(name: String): Any? {
-        return if (!isRunningAsStub) super.getSystemService(name) else
-            when (name) {
-                Context.JOB_SCHEDULER_SERVICE ->
-                    JobSchedulerWrapper(super.getSystemService(name) as JobScheduler)
-                else -> super.getSystemService(name)
-            }
-    }
-}
-
-fun Class<*>.cmp(pkg: String): ComponentName {
-    val name = ClassMap[this].name
-    return ComponentName(pkg, Info.stub?.classToComponent?.get(name) ?: name)
-}
-
-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
-
-    override fun getResources(): Resources {
-        return mRes
-    }
-
-    override fun getClassLoader(): ClassLoader {
-        return javaClass.classLoader!!
-    }
-
-    override fun createConfigurationContext(config: Configuration): Context {
-        return ResContext(super.createConfigurationContext(config))
-    }
-}
-
-private class ResContext(base: Context) : GlobalResContext(base) {
-    override val mRes by lazy { base.resources.patch() }
-
-    private fun Resources.patch(): Resources {
-        updateConfig()
-        if (isRunningAsStub)
-            assets.addAssetPath(ResourceMgr.resApk)
-        return this
-    }
-}
-
-object ResourceMgr {
-
-    lateinit var resource: Resources
-    lateinit var resApk: String
-
-    fun init(context: Context) {
-        resource = context.resources
-        refreshLocale()
-        if (isRunningAsStub) {
-            resApk = DynAPK.current(context).path
-            resource.assets.addAssetPath(resApk)
-        }
-    }
-}
-
-@RequiresApi(28)
-private class JobSchedulerWrapper(private val base: JobScheduler) : JobScheduler() {
-
-    override fun schedule(job: JobInfo): Int {
-        return base.schedule(job.patch())
-    }
-
-    override fun enqueue(job: JobInfo, work: JobWorkItem): Int {
-        return base.enqueue(job.patch(), work)
-    }
-
-    override fun cancel(jobId: Int) {
-        base.cancel(jobId)
-    }
-
-    override fun cancelAll() {
-        base.cancelAll()
-    }
-
-    override fun getAllPendingJobs(): List<JobInfo> {
-        return base.allPendingJobs
-    }
-
-    override fun getPendingJob(jobId: Int): JobInfo? {
-        return base.getPendingJob(jobId)
-    }
-
-    private fun JobInfo.patch(): JobInfo {
-        // We need to swap out the service of JobInfo
-        val name = service.className
-        val component = ComponentName(
-            service.packageName,
-            Info.stub!!.classToComponent[name] ?: name)
-
-        javaClass.forceGetDeclaredField("service")?.set(this, component)
-        return this
-    }
-}
-
-object ClassMap {
-
-    private val map = mapOf(
-        App::class.java to a.e::class.java,
-        MainActivity::class.java to a.b::class.java,
-        SplashActivity::class.java to a.c::class.java,
-        FlashActivity::class.java to a.f::class.java,
-        UpdateCheckService::class.java to a.g::class.java,
-        GeneralReceiver::class.java to a.h::class.java,
-        DownloadService::class.java to a.j::class.java,
-        SuRequestActivity::class.java to a.m::class.java,
-        ProcessPhoenix::class.java to a.r::class.java
-    )
-
-    operator fun get(c: Class<*>) = map.getOrElse(c) { c }
-}

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/AsyncLoadViewModel.kt

@@ -0,0 +1,22 @@
+package com.topjohnwu.magisk.arch
+
+import androidx.annotation.MainThread
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+
+abstract class AsyncLoadViewModel : BaseViewModel() {
+
+    private var loadingJob: Job? = null
+
+    @MainThread
+    fun startLoading() {
+        if (loadingJob?.isActive == true) {
+            // Prevent multiple jobs from running at the same time
+            return
+        }
+        loadingJob = viewModelScope.launch { doLoadWork() }
+    }
+
+    protected abstract suspend fun doLoadWork()
+}

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

@@ -0,0 +1,93 @@
+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.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 BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHolder {
+
+    val activity get() = getActivity() as? NavigationActivity<*>
+    protected lateinit var binding: Binding
+    protected abstract val layoutRes: Int
+
+    private val navigation get() = activity?.navigation
+    open val snackbarView: View? get() = null
+    open val snackbarAnchorView: View? get() = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        startObserveLiveData()
+    }
+
+    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 = viewLifecycleOwner
+        }
+        savedInstanceState?.let { viewModel.onRestoreState(it) }
+        return binding.root
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        viewModel.onSaveState(outState)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        activity?.supportActionBar?.subtitle = null
+    }
+
+    override fun onEventDispatched(event: ViewEvent) = when(event) {
+        is ContextExecutor -> event(requireContext())
+        is ActivityExecutor -> activity?.let { event(it) } ?: Unit
+        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@BaseFragment.onPreBind(binding)
+                return true
+            }
+        })
+    }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.let {
+            if (it is AsyncLoadViewModel)
+                it.startLoading()
+        }
+    }
+
+    protected open fun onPreBind(binding: Binding) {
+        (binding.root as? ViewGroup)?.startAnimations()
+    }
+
+    fun NavDirections.navigate() {
+        navigation?.currentDestination?.getAction(actionId)?.let { navigation!!.navigate(this) }
+    }
+
+}

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

@@ -0,0 +1,71 @@
+package com.topjohnwu.magisk.arch
+
+import android.Manifest.permission.REQUEST_INSTALL_PACKAGES
+import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+import android.annotation.SuppressLint
+import android.os.Bundle
+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.R
+import com.topjohnwu.magisk.databinding.ObservableHost
+import com.topjohnwu.magisk.events.BackPressEvent
+import com.topjohnwu.magisk.events.NavigationEvent
+import com.topjohnwu.magisk.events.PermissionEvent
+import com.topjohnwu.magisk.events.SnackbarEvent
+
+abstract class BaseViewModel : ViewModel(), ObservableHost {
+
+    override var callbacks: PropertyChangeRegistry? = null
+
+    private val _viewEvents = MutableLiveData<ViewEvent>()
+    val viewEvents: LiveData<ViewEvent> get() = _viewEvents
+
+    open fun onSaveState(state: Bundle) {}
+    open fun onRestoreState(state: Bundle) {}
+    open fun onNetworkChanged(network: Boolean) {}
+
+    fun withPermission(permission: String, callback: (Boolean) -> Unit) {
+        PermissionEvent(permission, callback).publish()
+    }
+
+    inline fun withExternalRW(crossinline callback: () -> Unit) {
+        withPermission(WRITE_EXTERNAL_STORAGE) {
+            if (!it) {
+                SnackbarEvent(R.string.external_rw_permission_denied).publish()
+            } else {
+                callback()
+            }
+        }
+    }
+
+    @SuppressLint("InlinedApi")
+    inline fun withInstallPermission(crossinline callback: () -> Unit) {
+        withPermission(REQUEST_INSTALL_PACKAGES) {
+            if (!it) {
+                SnackbarEvent(R.string.install_unknown_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.navigate(pop: Boolean = false) {
+        _viewEvents.postValue(NavigationEvent(this, pop))
+    }
+
+}

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

@@ -0,0 +1,35 @@
+package com.topjohnwu.magisk.arch
+
+import android.view.KeyEvent
+import androidx.databinding.ViewDataBinding
+import androidx.navigation.NavController
+import androidx.navigation.NavDirections
+import androidx.navigation.fragment.NavHostFragment
+
+abstract class NavigationActivity<Binding : ViewDataBinding> : UIActivity<Binding>() {
+
+    abstract val navHostId: Int
+
+    private val navHostFragment by lazy {
+        supportFragmentManager.findFragmentById(navHostId) as NavHostFragment
+    }
+
+    protected val currentFragment get() =
+        navHostFragment.childFragmentManager.fragments.getOrNull(0) as? BaseFragment<*>
+
+    val navigation: NavController get() = navHostFragment.navController
+
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        return currentFragment?.onKeyEvent(event) == true || super.dispatchKeyEvent(event)
+    }
+
+    override fun onBackPressed() {
+        if (currentFragment?.onBackPressed()?.not() == true) {
+            super.onBackPressed()
+        }
+    }
+
+    fun NavDirections.navigate() {
+        navigation.navigate(this)
+    }
+}

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

@@ -0,0 +1,103 @@
+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.View
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.content.res.use
+import androidx.core.view.WindowCompat
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import com.google.android.material.snackbar.Snackbar
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.base.BaseActivity
+import com.topjohnwu.magisk.widget.Pre23CardViewBackgroundColorFixLayoutInflaterListener
+import rikka.insets.WindowInsetsHelper
+import rikka.layoutinflater.view.LayoutInflaterFactory
+
+abstract class UIActivity<Binding : ViewDataBinding> : BaseActivity(), ViewModelHolder {
+
+    protected lateinit var binding: Binding
+    protected abstract val layoutRes: Int
+
+    open val snackbarView get() = binding.root
+    open val snackbarAnchorView: View? get() = null
+
+    init {
+        AppCompatDelegate.setDefaultNightMode(Config.darkTheme)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        layoutInflater.factory2 = LayoutInflaterFactory(delegate)
+            .addOnViewCreatedListener(WindowInsetsHelper.LISTENER)
+            .apply {
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                    this.addOnViewCreatedListener(Pre23CardViewBackgroundColorFixLayoutInflaterListener.getInstance())
+                }
+            }
+
+        super.onCreate(savedInstanceState)
+
+        startObserveLiveData()
+
+        // 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) }
+
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        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?) {
+        binding.root.rootView.accessibilityDelegate = delegate
+    }
+
+    fun showSnackbar(
+        message: CharSequence,
+        length: Int = Snackbar.LENGTH_SHORT,
+        builder: Snackbar.() -> Unit = {}
+    ) = Snackbar.make(snackbarView, message, length)
+        .setAnchorView(snackbarAnchorView).apply(builder).show()
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.let {
+            if (it is AsyncLoadViewModel)
+                it.startLoading()
+        }
+    }
+
+    override fun onEventDispatched(event: ViewEvent) = when (event) {
+        is ContextExecutor -> event(this)
+        is ActivityExecutor -> event(this)
+        else -> Unit
+    }
+}

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: UIActivity<*>)
+}
+
+interface FragmentExecutor {
+    operator fun invoke(fragment: BaseFragment<*>)
+}

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

@@ -0,0 +1,48 @@
+package com.topjohnwu.magisk.arch
+
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStoreOwner
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.ui.home.HomeViewModel
+import com.topjohnwu.magisk.ui.install.InstallViewModel
+import com.topjohnwu.magisk.ui.log.LogViewModel
+import com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
+import com.topjohnwu.magisk.ui.surequest.SuRequestViewModel
+
+interface ViewModelHolder : LifecycleOwner, ViewModelStoreOwner {
+
+    val viewModel: BaseViewModel
+
+    fun startObserveLiveData() {
+        viewModel.viewEvents.observe(this, this::onEventDispatched)
+        Info.isConnected.observe(this, viewModel::onNetworkChanged)
+    }
+
+    /**
+     * Called for all [ViewEvent]s published by associated viewModel.
+     */
+    fun onEventDispatched(event: ViewEvent) {}
+}
+
+object VMFactory : ViewModelProvider.Factory {
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return when (modelClass) {
+            HomeViewModel::class.java -> HomeViewModel(ServiceLocator.networkService)
+            LogViewModel::class.java -> LogViewModel(ServiceLocator.logRepo)
+            SuperuserViewModel::class.java -> SuperuserViewModel(ServiceLocator.policyDB)
+            InstallViewModel::class.java -> InstallViewModel(ServiceLocator.networkService)
+            SuRequestViewModel::class.java ->
+                SuRequestViewModel(ServiceLocator.policyDB, ServiceLocator.timeoutPrefs)
+            else -> modelClass.newInstance()
+        } as T
+    }
+}
+
+inline fun <reified VM : ViewModel> ViewModelHolder.viewModel() =
+    lazy(LazyThreadSafetyMode.NONE) {
+        ViewModelProvider(this, VMFactory)[VM::class.java]
+    }

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/BaseReceiver.kt

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

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

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

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

@@ -1,59 +0,0 @@
-package com.topjohnwu.magisk.base
-
-import android.content.Context
-import android.net.Network
-import android.net.Uri
-import androidx.annotation.MainThread
-import androidx.annotation.RequiresApi
-import androidx.work.Data
-import androidx.work.ListenableWorker
-import com.google.common.util.concurrent.ListenableFuture
-import java.util.*
-
-abstract class DelegateWorker {
-
-    private lateinit var worker: ListenableWorker
-
-    val applicationContext: Context
-        get() = worker.applicationContext
-
-    val id: UUID
-        get() = worker.id
-
-    val inputData: Data
-        get() = worker.inputData
-
-    val tags: Set<String>
-        get() = worker.tags
-
-    val triggeredContentUris: List<Uri>
-        @RequiresApi(24)
-        get() = worker.triggeredContentUris
-
-    val triggeredContentAuthorities: List<String>
-        @RequiresApi(24)
-        get() = worker.triggeredContentAuthorities
-
-    val network: Network?
-        @RequiresApi(28)
-        get() = worker.network
-
-    val runAttemptCount: Int
-        get() = worker.runAttemptCount
-
-    val isStopped: Boolean
-        get() = worker.isStopped
-
-    abstract fun doWork(): ListenableWorker.Result
-
-    fun onStopped() {}
-
-    fun attachWorker(w: ListenableWorker) {
-        worker = w
-    }
-
-    @MainThread
-    fun startWork(): ListenableFuture<ListenableWorker.Result> {
-        return worker.startWork()
-    }
-}

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

@@ -0,0 +1,106 @@
+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 com.topjohnwu.magisk.StubApk
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.utils.*
+import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.internal.UiThreadHandler
+import com.topjohnwu.superuser.ipc.RootService
+import kotlinx.coroutines.Dispatchers
+import timber.log.Timber
+import java.lang.ref.WeakReference
+import kotlin.system.exitProcess
+
+open class App() : Application() {
+
+    constructor(o: Any) : this() {
+        val data = StubApk.Data(o)
+        // Add the root service name mapping
+        data.classToComponent[RootUtils::class.java.name] = data.rootService.name
+        // Send back the actual root service class
+        data.rootService = RootUtils::class.java
+        Info.stub = data
+    }
+
+    init {
+        // Always log full stack trace with Timber
+        Timber.plant(Timber.DebugTree())
+        Thread.setDefaultUncaughtExceptionHandler { _, e ->
+            Timber.e(e)
+            exitProcess(1)
+        }
+    }
+
+    override fun attachBaseContext(context: Context) {
+        // Get the actual ContextImpl
+        val app: Application
+        val base: Context
+        if (context is Application) {
+            app = context
+            base = context.baseContext
+            AppApkPath = StubApk.current(base).path
+        } else {
+            app = this
+            base = context
+            AppApkPath = base.packageResourcePath
+        }
+        super.attachBaseContext(base)
+        ServiceLocator.context = base
+        app.registerActivityLifecycleCallbacks(ActivityTracker)
+
+        Shell.setDefaultBuilder(Shell.Builder.create()
+            .setFlags(Shell.FLAG_MOUNT_MASTER)
+            .setInitializers(ShellInit::class.java)
+            .setContext(base)
+            .setTimeout(2))
+        Shell.EXECUTOR = DispatcherExecutor(Dispatchers.IO)
+        RootUtils.bindTask = RootService.bindOrTask(
+            intent<RootUtils>(),
+            UiThreadHandler.executor,
+            RootUtils.Connection
+        )
+        // Pre-heat the shell ASAP
+        Shell.getShell(null) {}
+
+        refreshLocale()
+        resources.patch()
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        if (resources.configuration.diff(newConfig) != 0) {
+            resources.setConfig(newConfig)
+        }
+        if (!isRunningAsStub)
+            super.onConfigurationChanged(newConfig)
+    }
+}
+
+object ActivityTracker : Application.ActivityLifecycleCallbacks {
+
+    val foreground: Activity? get() = ref.get()
+
+    @Volatile
+    private var ref = WeakReference<Activity>(null)
+
+    override fun onActivityResumed(activity: Activity) {
+        if (activity is SuRequestActivity) return
+        ref = WeakReference(activity)
+    }
+
+    override fun onActivityPaused(activity: Activity) {
+        if (activity is SuRequestActivity) return
+        ref.clear()
+    }
+
+    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,30 +1,37 @@
-package com.topjohnwu.magisk
+package com.topjohnwu.magisk.core
 
-import android.content.Context
+import android.annotation.SuppressLint
 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.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.BuildConfig
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.repository.BoolDBPropertyNoWrite
+import com.topjohnwu.magisk.core.repository.DBConfig
+import com.topjohnwu.magisk.core.repository.PreferenceConfig
+import com.topjohnwu.magisk.core.utils.refreshLocale
+import com.topjohnwu.magisk.ui.theme.Theme
+import kotlinx.coroutines.GlobalScope
 import org.xmlpull.v1.XmlPullParser
 import java.io.File
+import java.io.InputStream
 
-object Config : PreferenceModel, DBConfig {
+object Config : PreferenceConfig, DBConfig {
 
-    override val stringDao: StringDao by inject()
-    override val settingsDao: SettingsDao by inject()
-    override val context: Context by inject(Protected)
+    override val stringDB get() = ServiceLocator.stringDB
+    override val settingsDB get() = ServiceLocator.settingsDB
+    override val context get() = ServiceLocator.deContext
+    override val coroutineScope get() = GlobalScope
+
+    @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
@@ -32,6 +39,8 @@ object Config : PreferenceModel, DBConfig {
         const val SU_MULTIUSER_MODE = "multiuser_mode"
         const val SU_MNT_NS = "mnt_ns"
         const val SU_BIOMETRIC = "su_biometric"
+        const val ZYGISK = "zygisk"
+        const val DENYLIST = "denylist"
         const val SU_MANAGER = "requester"
         const val KEYSTORE = "keystore"
 
@@ -40,19 +49,20 @@ 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"
-
-        // system state
-        const val MAGISKHIDE = "magiskhide"
-        const val COREONLY = "disable"
+        const val ASKED_HOME = "asked_home"
+        const val DOH = "doh"
     }
 
     object Value {
@@ -62,7 +72,7 @@ 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
+        const val DEBUG_CHANNEL = 4
 
         // root access mode
         const val ROOT_ACCESS_DISABLED = 0
@@ -98,74 +108,83 @@ 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.DEBUG_CHANNEL
+        else if (Const.APP_IS_CANARY)
+            Value.CANARY_CHANNEL
+        else
+            Value.DEFAULT_CHANNEL
+
+    @JvmField var keepVerity = false
+    @JvmField var keepEnc = false
+    @JvmField var patchVbmeta = false
+    @JvmField 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 magiskHide by preference(Key.MAGISKHIDE, true)
-    var coreOnly by preference(Key.COREONLY, false)
+    var doh by preference(Key.DOH, 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)
     var suMultiuserMode by dbSettings(Key.SU_MULTIUSER_MODE, Value.MULTIUSER_MODE_OWNER_ONLY)
     var suBiometric by dbSettings(Key.SU_BIOMETRIC, false)
+    var zygisk by dbSettings(Key.ZYGISK, false)
+    var denyList by BoolDBPropertyNoWrite(Key.DENYLIST, false)
     var suManager by dbStrings(Key.SU_MANAGER, "", true)
     var keyStoreRaw by dbStrings(Key.KEYSTORE, "", true)
 
-    // Always return a path in external storage where we can write
-    val downloadDirectory get() =
-        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.preferencesUri(pkg))?.use {
+                prefs.edit { parsePrefs(it) }
+            }
         }
-    }.edit {
-        parsePrefs(this)
 
-        // Legacy stuff
-        remove(SU_FINGERPRINT)
-
-        // 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()
+        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 ||
+                    it.toInt() > Value.DEBUG_CHANNEL ||
+                    it.toInt() < Value.DEFAULT_CHANNEL) {
+                    putString(Key.UPDATE_CHANNEL, defaultChannel.toString())
+                }
+            }
+        }
     }
 
-    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 +228,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,75 @@
+package com.topjohnwu.magisk.core
+
+import android.os.Build
+import android.os.Process
+import com.topjohnwu.magisk.BuildConfig
+
+@Suppress("DEPRECATION")
+object Const {
+
+    val CPU_ABI: String get() = Build.SUPPORTED_ABIS[0]
+
+    // Null if 32-bit only or 64-bit only
+    val CPU_ABI_32 =
+        if (Build.SUPPORTED_64_BIT_ABIS.isEmpty()) null
+        else Build.SUPPORTED_32_BIT_ABIS.firstOrNull()
+
+    // Paths
+    lateinit var MAGISKTMP: String
+    val MAGISK_PATH get() = "$MAGISKTMP/modules"
+    const val TMPDIR = "/dev/tmp"
+    const val MAGISK_LOG = "/cache/magisk.log"
+
+    // Misc
+    val USER_ID = Process.myUid() / 100000
+    val APP_IS_CANARY get() = Version.isCanary(BuildConfig.VERSION_CODE)
+
+    object Version {
+        const val MIN_VERSION = "v22.0"
+        const val MIN_VERCODE = 22000
+
+        fun atLeast_24_0() = Info.env.versionCode >= 24000 || isCanary()
+        fun atLeast_25_0() = Info.env.versionCode >= 25000 || isCanary()
+        fun isCanary() = isCanary(Info.env.versionCode)
+
+        fun isCanary(ver: Int) = ver > 0 && ver % 100 != 0
+    }
+
+    object ID {
+        const val JOB_SERVICE_ID = 7
+    }
+
+    object Url {
+        const val PATREON_URL = "https://www.patreon.com/topjohnwu"
+        const val SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk"
+
+        val CHANGELOG_URL = if (APP_IS_CANARY) Info.remote.magisk.note
+        else "https://topjohnwu.github.io/Magisk/releases/${BuildConfig.VERSION_CODE}.md"
+
+        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/"
+    }
+
+    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 MODULES = "modules"
+        const val SUPERUSER = "superuser"
+    }
+}

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

@@ -0,0 +1,74 @@
+@file:Suppress("DEPRECATION")
+
+package com.topjohnwu.magisk.core
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
+import android.content.res.AssetManager
+import android.content.res.Configuration
+import android.content.res.Resources
+import android.util.DisplayMetrics
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.StubApk
+import com.topjohnwu.magisk.core.di.AppContext
+import com.topjohnwu.magisk.core.utils.syncLocale
+import com.topjohnwu.magisk.ktx.unwrap
+
+lateinit var AppApkPath: String
+
+fun Resources.addAssetPath(path: String) = StubApk.addAssetPath(this, path)
+
+fun Resources.patch(): Resources {
+    if (isRunningAsStub)
+        addAssetPath(AppApkPath)
+    syncLocale()
+    return this
+}
+
+fun Context.patch(): Context {
+    unwrap().resources.patch()
+    return this
+}
+
+// Wrapping is only necessary for ContextThemeWrapper to support configuration overrides
+fun Context.wrap(): Context {
+    patch()
+    return object : ContextWrapper(this) {
+        override fun createConfigurationContext(config: Configuration): Context {
+            return super.createConfigurationContext(config).wrap()
+        }
+    }
+}
+
+fun createNewResources(): Resources {
+    val asset = AssetManager::class.java.newInstance()
+    val config = Configuration(AppContext.resources.configuration)
+    val metrics = DisplayMetrics()
+    metrics.setTo(AppContext.resources.displayMetrics)
+    val res = Resources(asset, metrics, config)
+    res.addAssetPath(AppApkPath)
+    return res
+}
+
+fun Class<*>.cmp(pkg: String) =
+    ComponentName(pkg, Info.stub?.classToComponent?.get(name) ?: name)
+
+inline fun <reified T> Context.intent() = Intent().setComponent(T::class.java.cmp(packageName))
+
+// 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.drawable.ic_device,
+    R.drawable.ic_more,
+    R.drawable.ic_magisk_delete,
+    R.drawable.ic_refresh_data_md2,
+    R.drawable.ic_order_date,
+    R.drawable.ic_order_name,
+    R.array.allow_timeout,
+)

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

@@ -0,0 +1,75 @@
+package com.topjohnwu.magisk.core
+
+import android.os.Build
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.topjohnwu.magisk.StubApk
+import com.topjohnwu.magisk.core.di.AppContext
+import com.topjohnwu.magisk.core.model.UpdateInfo
+import com.topjohnwu.magisk.core.repository.NetworkService
+import com.topjohnwu.magisk.core.utils.net.NetworkObserver
+import com.topjohnwu.magisk.ktx.getProperty
+import com.topjohnwu.superuser.ShellUtils.fastCmd
+
+val isRunningAsStub get() = Info.stub != null
+
+object Info {
+
+    var stub: StubApk.Data? = null
+
+    val EMPTY_REMOTE = UpdateInfo()
+    var remote = EMPTY_REMOTE
+    suspend fun getRemote(svc: NetworkService): UpdateInfo? {
+        return if (remote === EMPTY_REMOTE) {
+            svc.fetchUpdate()?.apply { remote = this }
+        } else remote
+    }
+
+    // Device state
+    @JvmStatic val env by lazy { loadState() }
+    @JvmField var isSAR = false
+    var isAB = false
+    @JvmField val isZygiskEnabled = System.getenv("ZYGISK_ENABLED") == "1"
+    @JvmStatic val isFDE get() = crypto == "block"
+    @JvmField var ramdisk = false
+    @JvmField var vbmeta = false
+    var crypto = ""
+    var noDataExec = false
+    var isRooted = false
+
+    @JvmField var hasGMS = true
+    val isSamsung = Build.MANUFACTURER.equals("samsung", ignoreCase = true)
+    @JvmField val isEmulator =
+        getProperty("ro.kernel.qemu", "0") == "1" ||
+            getProperty("ro.boot.qemu", "0") == "1"
+
+    val isConnected: LiveData<Boolean> by lazy {
+        MutableLiveData(false).also { field ->
+            NetworkObserver.observe(AppContext) {
+                remote = EMPTY_REMOTE
+                field.postValue(it)
+            }
+        }
+    }
+
+    private fun loadState(): Env {
+        val v = fastCmd("magisk -v").split(":".toRegex())
+        return Env(
+            v[0], v.size >= 3 && v[2] == "D",
+            runCatching { fastCmd("magisk -V").toInt() }.getOrDefault(-1)
+        )
+    }
+
+    class Env(
+        val versionString: String = "",
+        val isDebug: Boolean = false,
+        code: Int = -1
+    ) {
+        val versionCode = when {
+            code < Const.Version.MIN_VERCODE -> -1
+            else -> if (isRooted) code else -1
+        }
+        val isUnsupported = code > 0 && code < Const.Version.MIN_VERCODE
+        val isActive = versionCode >= 0
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.topjohnwu.magisk.core
+
+import android.app.job.JobInfo
+import android.app.job.JobParameters
+import android.app.job.JobScheduler
+import android.content.Context
+import androidx.core.content.getSystemService
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.core.base.BaseJobService
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.view.Notifications
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import java.util.concurrent.TimeUnit
+
+class JobService : BaseJobService() {
+
+    private val job = Job()
+    private val svc get() = ServiceLocator.networkService
+
+    override fun onStartJob(params: JobParameters): Boolean {
+        val coroutineScope = CoroutineScope(Dispatchers.IO + job)
+        coroutineScope.launch {
+            doWork()
+            jobFinished(params, false)
+        }
+        return false
+    }
+
+    private suspend fun doWork() {
+        svc.fetchUpdate()?.let {
+            Info.remote = it
+            if (Info.env.isActive && BuildConfig.VERSION_CODE < it.magisk.versionCode)
+                Notifications.updateAvailable(this)
+        }
+    }
+
+    override fun onStopJob(params: JobParameters): Boolean {
+        job.cancel()
+        return false
+    }
+
+    companion object {
+        fun schedule(context: Context) {
+            val scheduler = context.getSystemService<JobScheduler>() ?: return
+            if (Config.checkUpdate) {
+                val cmp = JobService::class.java.cmp(context.packageName)
+                val info = JobInfo.Builder(Const.ID.JOB_SERVICE_ID, cmp)
+                    .setPeriodic(TimeUnit.HOURS.toMillis(12))
+                    .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                    .setRequiresDeviceIdle(true)
+                    .build()
+                scheduler.schedule(info)
+            } else {
+                scheduler.cancel(Const.ID.JOB_SERVICE_ID)
+            }
+        }
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.topjohnwu.magisk.core
+
+import android.net.Uri
+import android.os.Bundle
+import android.os.ParcelFileDescriptor
+import android.os.ParcelFileDescriptor.MODE_READ_ONLY
+import com.topjohnwu.magisk.core.base.BaseProvider
+import com.topjohnwu.magisk.core.su.SuCallbackHandler
+
+class Provider : BaseProvider() {
+
+    override fun call(method: String, arg: String?, extras: Bundle?): Bundle? {
+        SuCallbackHandler.run(context!!, method, extras)
+        return Bundle.EMPTY
+    }
+
+    override fun openFile(uri: Uri, mode: String): ParcelFileDescriptor? {
+        return when (uri.encodedPath ?: return null) {
+            "/prefs_file" -> ParcelFileDescriptor.open(Config.prefsFile, MODE_READ_ONLY)
+            else -> super.openFile(uri, mode)
+        }
+    }
+
+    companion object {
+        fun preferencesUri(pkg: String): Uri =
+            Uri.Builder().scheme("content").authority("$pkg.provider").path("prefs_file").build()
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.topjohnwu.magisk.core
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import com.topjohnwu.magisk.core.base.BaseReceiver
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.view.Notifications
+import com.topjohnwu.magisk.view.Shortcuts
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+
+open class Receiver : BaseReceiver() {
+
+    private val policyDB get() = ServiceLocator.policyDB
+
+    @SuppressLint("InlinedApi")
+    private fun getPkg(intent: Intent): String? {
+        val pkg = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME)
+        return pkg ?: intent.data?.schemeSpecificPart
+    }
+
+    private fun getUid(intent: Intent): Int? {
+        val uid = intent.getIntExtra(Intent.EXTRA_UID, -1)
+        return if (uid == -1) null else uid
+    }
+
+    override fun onReceive(context: Context, intent: Intent?) {
+        intent ?: return
+        super.onReceive(context, intent)
+
+        fun rmPolicy(uid: Int) = GlobalScope.launch {
+            policyDB.delete(uid)
+        }
+
+        when (intent.action ?: return) {
+            Intent.ACTION_PACKAGE_REPLACED -> {
+                // This will only work pre-O
+                if (Config.suReAuth)
+                    getUid(intent)?.let { rmPolicy(it) }
+            }
+            Intent.ACTION_UID_REMOVED -> {
+                getUid(intent)?.let { rmPolicy(it) }
+            }
+            Intent.ACTION_PACKAGE_FULLY_REMOVED -> {
+                getPkg(intent)?.let { Shell.cmd("magisk --denylist rm $it").submit() }
+            }
+            Intent.ACTION_LOCALE_CHANGED -> Shortcuts.setupDynamic(context)
+            Intent.ACTION_MY_PACKAGE_REPLACED -> {
+                @Suppress("DEPRECATION")
+                val installer = context.packageManager.getInstallerPackageName(context.packageName)
+                if (installer == context.packageName) {
+                    Notifications.updateDone(context)
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,121 @@
+package com.topjohnwu.magisk.core.base
+
+import android.Manifest.permission.REQUEST_INSTALL_PACKAGES
+import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.os.Parcelable
+import android.widget.Toast
+import androidx.activity.result.ActivityResultCallback
+import androidx.activity.result.contract.ActivityResultContracts.GetContent
+import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
+import androidx.appcompat.app.AppCompatActivity
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.utils.RequestInstall
+import com.topjohnwu.magisk.core.wrap
+import com.topjohnwu.magisk.ktx.reflectField
+import com.topjohnwu.magisk.utils.Utils
+
+interface ContentResultCallback: ActivityResultCallback<Uri>, Parcelable {
+    fun onActivityLaunch() {}
+    // Make the result type explicitly non-null
+    override fun onActivityResult(result: Uri)
+}
+
+abstract class BaseActivity : AppCompatActivity() {
+
+    private var permissionCallback: ((Boolean) -> Unit)? = null
+    private val requestPermission = registerForActivityResult(RequestPermission()) {
+        permissionCallback?.invoke(it)
+        permissionCallback = null
+    }
+    private val requestInstall = registerForActivityResult(RequestInstall()) {
+        permissionCallback?.invoke(it)
+        permissionCallback = null
+    }
+
+    private var contentCallback: ContentResultCallback? = null
+    private val getContent = registerForActivityResult(GetContent()) {
+        if (it != null) contentCallback?.onActivityResult(it)
+        contentCallback = null
+    }
+
+    private val mReferrerField by lazy(LazyThreadSafetyMode.NONE) {
+        Activity::class.java.reflectField("mReferrer")
+    }
+
+    val realCallingPackage: String? get() {
+        callingPackage?.let { return it }
+        if (Build.VERSION.SDK_INT >= 22) {
+            mReferrerField.get(this)?.let { return it as String }
+        }
+        return null
+    }
+
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base.wrap())
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        if (isRunningAsStub) {
+            // Overwrite private members to avoid nasty "false" stack traces being logged
+            val delegate = delegate
+            val clz = delegate.javaClass
+            clz.reflectField("mActivityHandlesUiModeChecked").set(delegate, true)
+            clz.reflectField("mActivityHandlesUiMode").set(delegate, false)
+        }
+        contentCallback = savedInstanceState?.getParcelable(CONTENT_CALLBACK_KEY)
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        contentCallback?.let {
+            outState.putParcelable(CONTENT_CALLBACK_KEY, it)
+        }
+    }
+
+    fun withPermission(permission: String, callback: (Boolean) -> Unit) {
+        if (permission == WRITE_EXTERNAL_STORAGE && Build.VERSION.SDK_INT >= 30) {
+            // We do not need external rw on 30+
+            callback(true)
+            return
+        }
+        permissionCallback = callback
+        if (permission == REQUEST_INSTALL_PACKAGES) {
+            requestInstall.launch(Unit)
+        } else {
+            requestPermission.launch(permission)
+        }
+    }
+
+    fun getContent(type: String, callback: ContentResultCallback) {
+        contentCallback = callback
+        try {
+            getContent.launch(type)
+            callback.onActivityLaunch()
+        } catch (e: ActivityNotFoundException) {
+            Utils.toast(R.string.app_not_found, Toast.LENGTH_SHORT)
+        }
+    }
+
+    override fun recreate() {
+        startActivity(Intent().setComponent(intent.component))
+        finish()
+    }
+
+    fun relaunch() {
+        startActivity(Intent(intent).setFlags(0))
+        finish()
+    }
+
+    companion object {
+        private const val CONTENT_CALLBACK_KEY = "content_callback"
+    }
+}

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

@@ -0,0 +1,11 @@
+package com.topjohnwu.magisk.core.base
+
+import android.app.job.JobService
+import android.content.Context
+import com.topjohnwu.magisk.core.patch
+
+abstract class BaseJobService : JobService() {
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base.patch())
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.topjohnwu.magisk.core.base
+
+import android.content.ContentProvider
+import android.content.ContentValues
+import android.content.Context
+import android.content.pm.ProviderInfo
+import android.database.Cursor
+import android.net.Uri
+import com.topjohnwu.magisk.core.patch
+
+open class BaseProvider : ContentProvider() {
+    override fun attachInfo(context: Context, info: ProviderInfo) {
+        super.attachInfo(context.patch(), info)
+    }
+    override fun onCreate() = true
+    override fun getType(uri: Uri): String? = null
+    override fun insert(uri: Uri, values: ContentValues?): Uri? = null
+    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?) = 0
+    override fun update(uri: Uri, values: ContentValues?, selection: String?, selectionArgs: Array<out String>?) = 0
+    override fun query(uri: Uri, projection: Array<out String>?, selection: String?, selectionArgs: Array<out String>?, sortOrder: String?): Cursor? = null
+}

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

@@ -0,0 +1,14 @@
+package com.topjohnwu.magisk.core.base
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import androidx.annotation.CallSuper
+import com.topjohnwu.magisk.core.patch
+
+abstract class BaseReceiver : BroadcastReceiver() {
+    @CallSuper
+    override fun onReceive(context: Context, intent: Intent?) {
+        context.patch()
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.topjohnwu.magisk.core.base
+
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import com.topjohnwu.magisk.core.patch
+
+open class BaseService : Service() {
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base.patch())
+    }
+    override fun onBind(intent: Intent?): IBinder? = null
+}

app/src/main/java/com/topjohnwu/magisk/core/data/NetworkServices.kt

@@ -0,0 +1,44 @@
+package com.topjohnwu.magisk.core.data
+
+import com.topjohnwu.magisk.core.model.BranchInfo
+import com.topjohnwu.magisk.core.model.ModuleJson
+import com.topjohnwu.magisk.core.model.UpdateInfo
+import okhttp3.ResponseBody
+import retrofit2.http.*
+
+private const val BRANCH = "branch"
+private const val REPO = "repo"
+private const val FILE = "file"
+
+interface GithubPageServices {
+
+    @GET("{$FILE}")
+    suspend fun fetchUpdateJSON(@Path(FILE) file: String): UpdateInfo
+}
+
+interface RawServices {
+
+    @GET
+    suspend fun fetchCustomUpdate(@Url url: String): UpdateInfo
+
+    @GET
+    @Streaming
+    suspend fun fetchFile(@Url url: String): ResponseBody
+
+    @GET
+    suspend fun fetchString(@Url url: String): String
+
+    @GET
+    suspend fun fetchModuleJson(@Url url: String): ModuleJson
+
+}
+
+interface GithubApiServices {
+
+    @GET("repos/{$REPO}/branches/{$BRANCH}")
+    @Headers("Accept: application/vnd.github.v3+json")
+    suspend fun fetchBranch(
+        @Path(REPO, encoded = true) repo: String,
+        @Path(BRANCH) branch: String
+    ): BranchInfo
+}

app/src/main/java/com/topjohnwu/magisk/core/data/SuLogDao.kt

@@ -0,0 +1,37 @@
+package com.topjohnwu.magisk.core.data
+
+import androidx.room.*
+import com.topjohnwu.magisk.core.model.su.SuLog
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.util.*
+
+@Database(version = 1, entities = [SuLog::class], exportSchema = false)
+abstract class SuLogDatabase : RoomDatabase() {
+
+    abstract fun suLogDao(): SuLogDao
+}
+
+@Dao
+abstract class SuLogDao(private val db: SuLogDatabase) {
+
+    private val twoWeeksAgo =
+        Calendar.getInstance().apply { add(Calendar.WEEK_OF_YEAR, -2) }.timeInMillis
+
+    suspend fun deleteAll() = withContext(Dispatchers.IO) { db.clearAllTables() }
+
+    suspend fun fetchAll(): MutableList<SuLog> {
+        deleteOutdated()
+        return fetch()
+    }
+
+    @Query("SELECT * FROM logs ORDER BY time DESC")
+    protected abstract suspend fun fetch(): MutableList<SuLog>
+
+    @Query("DELETE FROM logs WHERE time < :timeout")
+    protected abstract suspend fun deleteOutdated(timeout: Long = twoWeeksAgo)
+
+    @Insert
+    abstract suspend fun insert(log: SuLog)
+
+}

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

@@ -0,0 +1,47 @@
+package com.topjohnwu.magisk.core.data.magiskdb
+
+import com.topjohnwu.magisk.ktx.await
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+open class MagiskDB {
+
+    suspend fun <R> exec(
+        query: String,
+        mapper: suspend (Map<String, String>) -> R
+    ): List<R> {
+        return withContext(Dispatchers.IO) {
+            val out = Shell.cmd("magisk --sqlite '$query'").await().out
+            out.map { line ->
+                line.split("\\|".toRegex())
+                    .map { it.split("=", limit = 2) }
+                    .filter { it.size == 2 }
+                    .associate { it[0] to it[1] }
+                    .let { mapper(it) }
+            }
+        }
+    }
+
+    suspend inline fun exec(query: String) {
+        exec(query) {}
+    }
+
+    fun Map<String, Any>.toQuery(): String {
+        val keys = this.keys.joinToString(",")
+        val values = this.values.joinToString(",") {
+            when (it) {
+                is Boolean -> if (it) "1" else "0"
+                is Number -> it.toString()
+                else -> "\"$it\""
+            }
+        }
+        return "($keys) VALUES($values)"
+    }
+
+    object Table {
+        const val POLICY = "policies"
+        const val SETTINGS = "settings"
+        const val STRINGS = "strings"
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.topjohnwu.magisk.core.data.magiskdb
+
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.di.AppContext
+import com.topjohnwu.magisk.core.model.su.SuPolicy
+import java.util.concurrent.TimeUnit
+
+class PolicyDao : MagiskDB() {
+
+    suspend fun deleteOutdated() {
+        val nowSeconds = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())
+        val query = "DELETE FROM ${Table.POLICY} WHERE " +
+            "(until > 0 AND until < $nowSeconds) OR until < 0"
+        exec(query)
+    }
+
+    suspend fun delete(uid: Int) {
+        val query = "DELETE FROM ${Table.POLICY} WHERE uid == $uid"
+        exec(query)
+    }
+
+    suspend fun fetch(uid: Int): SuPolicy? {
+        val query = "SELECT * FROM ${Table.POLICY} WHERE uid == $uid LIMIT = 1"
+        return exec(query, ::toPolicy).firstOrNull()
+    }
+
+    suspend fun update(policy: SuPolicy) {
+        val map = policy.toMap()
+        if (!Const.Version.atLeast_25_0()) {
+            // Put in package_name for old database
+            map["package_name"] = AppContext.packageManager.getNameForUid(policy.uid)!!
+        }
+        val query = "REPLACE INTO ${Table.POLICY} ${map.toQuery()}"
+        exec(query)
+    }
+
+    suspend fun fetchAll(): List<SuPolicy> {
+        val query = "SELECT * FROM ${Table.POLICY} WHERE uid/100000 == ${Const.USER_ID}"
+        return exec(query, ::toPolicy).filterNotNull()
+    }
+
+    private fun toPolicy(map: Map<String, String>): SuPolicy? {
+        val uid = map["uid"]?.toInt() ?: return null
+        val policy = SuPolicy(uid)
+
+        map["policy"]?.toInt()?.let { policy.policy = it }
+        map["until"]?.toLong()?.let { policy.until = it }
+        map["logging"]?.toInt()?.let { policy.logging = it != 0 }
+        map["notification"]?.toInt()?.let { policy.notification = it != 0 }
+        return policy
+    }
+
+}

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

@@ -0,0 +1,20 @@
+package com.topjohnwu.magisk.core.data.magiskdb
+
+class SettingsDao : MagiskDB() {
+
+    suspend fun delete(key: String) {
+        val query = "DELETE FROM ${Table.SETTINGS} WHERE key == \"$key\""
+        exec(query)
+    }
+
+    suspend fun put(key: String, value: Int) {
+        val kv = mapOf("key" to key, "value" to value)
+        val query = "REPLACE INTO ${Table.SETTINGS} ${kv.toQuery()}"
+        exec(query)
+    }
+
+    suspend fun fetch(key: String, default: Int = -1): Int {
+        val query = "SELECT value FROM ${Table.SETTINGS} WHERE key == \"$key\" LIMIT 1"
+        return exec(query) { it["value"]?.toInt() }.firstOrNull() ?: default
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.topjohnwu.magisk.core.data.magiskdb
+
+class StringDao : MagiskDB() {
+
+    suspend fun delete(key: String) {
+        val query = "DELETE FROM ${Table.STRINGS} WHERE key == \"$key\""
+        exec(query)
+    }
+
+    suspend fun put(key: String, value: String) {
+        val kv = mapOf("key" to key, "value" to value)
+        val query = "REPLACE INTO ${Table.STRINGS} ${kv.toQuery()}"
+        exec(query)
+    }
+
+    suspend fun fetch(key: String, default: String = ""): String {
+        val query = "SELECT value FROM ${Table.STRINGS} WHERE key == \"$key\" LIMIT 1"
+        return exec(query) { it["value"] }.firstOrNull() ?: default
+    }
+}

app/src/main/java/com/topjohnwu/magisk/core/di/Networking.kt

@@ -0,0 +1,99 @@
+package com.topjohnwu.magisk.core.di
+
+import android.content.Context
+import com.squareup.moshi.Moshi
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.ProviderInstaller
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.utils.currentLocale
+import okhttp3.Cache
+import okhttp3.ConnectionSpec
+import okhttp3.Dns
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+import okhttp3.dnsoverhttps.DnsOverHttps
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.converter.scalars.ScalarsConverterFactory
+import java.io.File
+import java.net.InetAddress
+import java.net.UnknownHostException
+
+private class DnsResolver(client: OkHttpClient) : Dns {
+
+    private val doh by lazy {
+        DnsOverHttps.Builder().client(client)
+            .url("https://cloudflare-dns.com/dns-query".toHttpUrl())
+            .bootstrapDnsHosts(listOf(
+                InetAddress.getByName("162.159.36.1"),
+                InetAddress.getByName("162.159.46.1"),
+                InetAddress.getByName("1.1.1.1"),
+                InetAddress.getByName("1.0.0.1"),
+                InetAddress.getByName("2606:4700:4700::1111"),
+                InetAddress.getByName("2606:4700:4700::1001"),
+                InetAddress.getByName("2606:4700:4700::0064"),
+                InetAddress.getByName("2606:4700:4700::6400")
+            ))
+            .resolvePrivateAddresses(true)  /* To make PublicSuffixDatabase never used */
+            .build()
+    }
+
+    override fun lookup(hostname: String): List<InetAddress> {
+        if (Config.doh) {
+            try {
+                return doh.lookup(hostname)
+            } catch (e: UnknownHostException) {}
+        }
+        return Dns.SYSTEM.lookup(hostname)
+    }
+}
+
+
+fun createOkHttpClient(context: Context): OkHttpClient {
+    val appCache = Cache(File(context.cacheDir, "okhttp"), 10 * 1024 * 1024)
+    val builder = OkHttpClient.Builder().cache(appCache)
+
+    if (BuildConfig.DEBUG) {
+        builder.addInterceptor(HttpLoggingInterceptor().apply {
+            level = HttpLoggingInterceptor.Level.BASIC
+        })
+    } else {
+        builder.connectionSpecs(listOf(ConnectionSpec.MODERN_TLS))
+    }
+
+    builder.dns(DnsResolver(builder.build()))
+
+    builder.addInterceptor { chain ->
+        val request = chain.request().newBuilder()
+        request.header("User-Agent", "Magisk/${BuildConfig.VERSION_CODE}")
+        request.header("Accept-Language", currentLocale.toLanguageTag())
+        chain.proceed(request.build())
+    }
+
+    if (!ProviderInstaller.install(context)) {
+        Info.hasGMS = false
+    }
+
+    return builder.build()
+}
+
+fun createMoshiConverterFactory(): MoshiConverterFactory {
+    val moshi = Moshi.Builder().build()
+    return MoshiConverterFactory.create(moshi)
+}
+
+fun createRetrofit(okHttpClient: OkHttpClient): Retrofit.Builder {
+    return Retrofit.Builder()
+        .addConverterFactory(ScalarsConverterFactory.create())
+        .addConverterFactory(createMoshiConverterFactory())
+        .client(okHttpClient)
+}
+
+inline fun <reified T> createApiService(retrofitBuilder: Retrofit.Builder, baseUrl: String): T {
+    return retrofitBuilder
+        .baseUrl(baseUrl)
+        .build()
+        .create(T::class.java)
+}

app/src/main/java/com/topjohnwu/magisk/core/di/ServiceLocator.kt

@@ -0,0 +1,60 @@
+package com.topjohnwu.magisk.core.di
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.text.method.LinkMovementMethod
+import androidx.room.Room
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.data.SuLogDatabase
+import com.topjohnwu.magisk.core.data.magiskdb.PolicyDao
+import com.topjohnwu.magisk.core.data.magiskdb.SettingsDao
+import com.topjohnwu.magisk.core.data.magiskdb.StringDao
+import com.topjohnwu.magisk.core.repository.LogRepository
+import com.topjohnwu.magisk.core.repository.NetworkService
+import com.topjohnwu.magisk.ktx.deviceProtectedContext
+import io.noties.markwon.Markwon
+import io.noties.markwon.utils.NoCopySpannableFactory
+
+val AppContext: Context inline get() = ServiceLocator.context
+
+@SuppressLint("StaticFieldLeak")
+object ServiceLocator {
+
+    lateinit var context: Context
+    val deContext by lazy { context.deviceProtectedContext }
+    val timeoutPrefs by lazy { deContext.getSharedPreferences("su_timeout", 0) }
+
+    // Database
+    val policyDB = PolicyDao()
+    val settingsDB = SettingsDao()
+    val stringDB = StringDao()
+    val sulogDB by lazy { createSuLogDatabase(deContext).suLogDao() }
+    val logRepo by lazy { LogRepository(sulogDB) }
+
+    // Networking
+    val okhttp by lazy { createOkHttpClient(context) }
+    val retrofit by lazy { createRetrofit(okhttp) }
+    val markwon by lazy { createMarkwon(context) }
+    val networkService by lazy {
+        NetworkService(
+            createApiService(retrofit, Const.Url.GITHUB_PAGE_URL),
+            createApiService(retrofit, Const.Url.GITHUB_RAW_URL),
+            createApiService(retrofit, Const.Url.GITHUB_API_URL)
+        )
+    }
+}
+
+private fun createSuLogDatabase(context: Context) =
+    Room.databaseBuilder(context, SuLogDatabase::class.java, "sulogs.db")
+        .fallbackToDestructiveMigration()
+        .build()
+
+private fun createMarkwon(context: Context) =
+    Markwon.builder(context).textSetter { textView, spanned, bufferType, onComplete ->
+        textView.apply {
+            movementMethod = LinkMovementMethod.getInstance()
+            setSpannableFactory(NoCopySpannableFactory.getInstance())
+            setText(spanned, bufferType)
+            onComplete.run()
+        }
+    }.build()

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

@@ -0,0 +1,218 @@
+package com.topjohnwu.magisk.core.download
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.app.PendingIntent.*
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import androidx.core.net.toFile
+import androidx.lifecycle.LifecycleOwner
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.StubApk
+import com.topjohnwu.magisk.core.ActivityTracker
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.intent
+import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.tasks.HideAPK
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
+import com.topjohnwu.magisk.ktx.copyAndClose
+import com.topjohnwu.magisk.ktx.forEach
+import com.topjohnwu.magisk.ktx.withStreams
+import com.topjohnwu.magisk.ktx.writeTo
+import com.topjohnwu.magisk.utils.APKInstall
+import com.topjohnwu.magisk.view.Notifications
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
+
+class DownloadService : NotificationService() {
+
+    private val job = Job()
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        intent.getParcelableExtra<Subject>(SUBJECT_KEY)?.let { download(it) }
+        return START_NOT_STICKY
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        job.cancel()
+    }
+
+    private fun download(subject: Subject) {
+        update(subject.notifyId)
+        val coroutineScope = CoroutineScope(job + Dispatchers.IO)
+        coroutineScope.launch {
+            try {
+                val stream = service.fetchFile(subject.url).toProgressStream(subject)
+                when (subject) {
+                    is Subject.App -> handleApp(stream, subject)
+                    is Subject.Module -> handleModule(stream, subject.file)
+                }
+                val activity = ActivityTracker.foreground
+                if (activity != null && subject.autoLaunch) {
+                    remove(subject.notifyId)
+                    subject.pendingIntent(activity)?.send()
+                } else {
+                    notifyFinish(subject)
+                }
+                subject.postDownload?.invoke()
+                if (!hasNotifications)
+                    stopSelf()
+            } catch (e: Exception) {
+                Timber.e(e)
+                notifyFail(subject)
+            }
+        }
+    }
+
+    private suspend fun handleApp(stream: InputStream, subject: Subject.App) {
+        fun writeTee(output: OutputStream) {
+            val uri =  MediaStoreUtils.getFile("${subject.title}.apk").uri
+            val external = uri.outputStream()
+            stream.copyAndClose(TeeOutputStream(external, output))
+        }
+
+        if (isRunningAsStub) {
+            val updateApk = StubApk.update(this)
+            try {
+                // Download full APK to stub update path
+                writeTee(updateApk.outputStream())
+
+                if (Info.stub!!.version < subject.stub.versionCode) {
+                    // Also upgrade stub
+                    update(subject.notifyId) {
+                        it.setProgress(0, 0, true)
+                            .setContentTitle(getString(R.string.hide_app_title))
+                            .setContentText("")
+                    }
+
+                    // Download
+                    val apk = subject.file.toFile()
+                    service.fetchFile(subject.stub.link).byteStream().writeTo(apk)
+
+                    // Patch and install
+                    val session = APKInstall.startSession(this)
+                    session.openStream(this).use {
+                        val label = applicationInfo.nonLocalizedLabel
+                        if (!HideAPK.patch(this, apk, it, packageName, label)) {
+                            throw IOException("HideAPK patch error")
+                        }
+                    }
+                    apk.delete()
+                    subject.intent = session.waitIntent()
+                } else {
+                    ActivityTracker.foreground?.let {
+                        // Relaunch the process if we are foreground
+                        StubApk.restartProcess(it)
+                    } ?: run {
+                        // Or else kill the current process after posting notification
+                        subject.intent = Notifications.selfLaunchIntent(this)
+                        subject.postDownload = { Runtime.getRuntime().exit(0) }
+                    }
+                    return
+                }
+            } catch (e: Exception) {
+                // If any error occurred, do not let stub load the new APK
+                updateApk.delete()
+                throw e
+            }
+        } else {
+            val session = APKInstall.startSession(this)
+            writeTee(session.openStream(this))
+            subject.intent = session.waitIntent()
+        }
+    }
+
+    private fun handleModule(src: InputStream, file: Uri) {
+        val input = ZipInputStream(src.buffered())
+        val output = ZipOutputStream(file.outputStream().buffered())
+
+        withStreams(input, output) { zin, zout ->
+            zout.putNextEntry(ZipEntry("META-INF/"))
+            zout.putNextEntry(ZipEntry("META-INF/com/"))
+            zout.putNextEntry(ZipEntry("META-INF/com/google/"))
+            zout.putNextEntry(ZipEntry("META-INF/com/google/android/"))
+            zout.putNextEntry(ZipEntry("META-INF/com/google/android/update-binary"))
+            assets.open("module_installer.sh").copyTo(zout)
+
+            zout.putNextEntry(ZipEntry("META-INF/com/google/android/updater-script"))
+            zout.write("#MAGISK\n".toByteArray())
+
+            zin.forEach { entry ->
+                val path = entry.name
+                if (path.isNotEmpty() && !path.startsWith("META-INF")) {
+                    zout.putNextEntry(ZipEntry(path))
+                    if (!entry.isDirectory) {
+                        zin.copyTo(zout)
+                    }
+                }
+            }
+        }
+    }
+
+    private class TeeOutputStream(
+        private val o1: OutputStream,
+        private val o2: OutputStream
+    ) : OutputStream() {
+        override fun write(b: Int) {
+            o1.write(b)
+            o2.write(b)
+        }
+        override fun write(b: ByteArray?, off: Int, len: Int) {
+            o1.write(b, off, len)
+            o2.write(b, off, len)
+        }
+        override fun close() {
+            o1.close()
+            o2.close()
+        }
+    }
+
+    companion object {
+        private const val SUBJECT_KEY = "subject"
+        private const val REQUEST_CODE = 1
+
+        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 intent(context: Context, subject: Subject) =
+            context.intent<DownloadService>().putExtra(SUBJECT_KEY, subject)
+
+        @SuppressLint("InlinedApi")
+        fun getPendingIntent(context: Context, subject: Subject): PendingIntent {
+            val flag = FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT or FLAG_ONE_SHOT
+            val intent = intent(context, subject)
+            return if (Build.VERSION.SDK_INT >= 26) {
+                getForegroundService(context, REQUEST_CODE, intent, flag)
+            } else {
+                getService(context, REQUEST_CODE, intent, flag)
+            }
+        }
+
+        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/NotificationService.kt

@@ -0,0 +1,110 @@
+package com.topjohnwu.magisk.core.download
+
+import android.app.Notification
+import android.content.Intent
+import androidx.lifecycle.MutableLiveData
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.base.BaseService
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.utils.ProgressInputStream
+import com.topjohnwu.magisk.ktx.synchronized
+import com.topjohnwu.magisk.view.Notifications
+import okhttp3.ResponseBody
+import java.io.InputStream
+
+open class NotificationService : BaseService() {
+
+    private val notifications = HashMap<Int, Notification.Builder>().synchronized()
+    protected val hasNotifications get() = notifications.isNotEmpty()
+
+    protected val service get() = ServiceLocator.networkService
+
+    override fun onTaskRemoved(rootIntent: Intent?) {
+        super.onTaskRemoved(rootIntent)
+        notifications.forEach { Notifications.mgr.cancel(it.key) }
+        notifications.clear()
+    }
+
+    protected 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))
+                }
+            }
+        }
+    }
+
+    private fun finalNotify(id: Int, editor: (Notification.Builder) -> Unit): Int {
+        val notification = remove(id)?.also(editor) ?: return -1
+        val newId = Notifications.nextId()
+        Notifications.mgr.notify(newId, notification.build())
+        return newId
+    }
+
+    protected fun notifyFail(subject: Subject) = finalNotify(subject.notifyId) {
+        broadcast(-2f, subject)
+        it.setContentText(getString(R.string.download_file_error))
+            .setSmallIcon(android.R.drawable.stat_notify_error)
+            .setOngoing(false)
+    }
+
+    protected fun notifyFinish(subject: Subject) = finalNotify(subject.notifyId) {
+        broadcast(1f, subject)
+        it.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)
+        subject.pendingIntent(this)?.let { intent -> it.setContentIntent(intent) }
+    }
+
+    private fun create() = Notifications.progress(this, "")
+
+    private fun updateForeground() {
+        if (hasNotifications) {
+            val (id, notification) = notifications.entries.first()
+            startForeground(id, notification.build())
+        } else {
+            stopForeground(false)
+        }
+    }
+
+    protected fun update(id: Int, editor: (Notification.Builder) -> Unit = {}) {
+        val wasEmpty = !hasNotifications
+        val notification = notifications.getOrPut(id, ::create).also(editor)
+        if (wasEmpty)
+            updateForeground()
+        else
+            Notifications.mgr.notify(id, notification.build())
+    }
+
+    protected fun remove(id: Int): Notification.Builder? {
+        val n = notifications.remove(id)?.also { updateForeground() }
+        Notifications.mgr.cancel(id)
+        return n
+    }
+
+    companion object {
+        @JvmStatic
+        protected val progressBroadcast = MutableLiveData<Pair<Float, Subject>?>()
+
+        private fun broadcast(progress: Float, subject: Subject) {
+            progressBroadcast.postValue(progress to subject)
+        }
+    }
+}

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

@@ -0,0 +1,86 @@
+package com.topjohnwu.magisk.core.download
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Parcelable
+import androidx.core.net.toUri
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.di.AppContext
+import com.topjohnwu.magisk.core.model.MagiskJson
+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.ui.flash.FlashFragment
+import com.topjohnwu.magisk.view.Notifications
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
+
+private fun cachedFile(name: String) = AppContext.cachedFile(name).apply { delete() }.toUri()
+
+enum class Action {
+    Flash,
+    Download
+}
+
+sealed class Subject : Parcelable {
+
+    abstract val url: String
+    abstract val file: Uri
+    abstract val title: String
+    abstract val notifyId: Int
+    open val autoLaunch: Boolean get() = true
+    open val postDownload: (() -> Unit)? get() = null
+
+    abstract fun pendingIntent(context: Context): PendingIntent?
+
+    @Parcelize
+    class Module(
+        val module: OnlineModule,
+        val action: Action,
+        override val notifyId: Int = Notifications.nextId()
+    ) : Subject() {
+        override val url: String get() = module.zipUrl
+        override val title: String get() = module.downloadFilename
+        override val autoLaunch: Boolean get() = action == Action.Flash
+
+        @IgnoredOnParcel
+        override val file by lazy {
+            MediaStoreUtils.getFile(title).uri
+        }
+
+        override fun pendingIntent(context: Context) =
+            FlashFragment.installIntent(context, file)
+    }
+
+    @Parcelize
+    class App(
+        private val json: MagiskJson = Info.remote.magisk,
+        val stub: StubJson = Info.remote.stub,
+        override val notifyId: Int = Notifications.nextId()
+    ) : Subject() {
+        override val title: String get() = "Magisk-${json.version}(${json.versionCode})"
+        override val url: String get() = json.link
+
+        @IgnoredOnParcel
+        override val file by lazy {
+            cachedFile("manager.apk")
+        }
+
+        @IgnoredOnParcel
+        override var postDownload: (() -> Unit)? = null
+
+        @IgnoredOnParcel
+        var intent: Intent? = null
+        override fun pendingIntent(context: Context) = intent?.toPending(context)
+    }
+
+    @SuppressLint("InlinedApi")
+    protected fun Intent.toPending(context: Context): PendingIntent {
+        return PendingIntent.getActivity(context, notifyId, this,
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_ONE_SHOT)
+    }
+}

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

@@ -0,0 +1,45 @@
+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 magisk: MagiskJson = MagiskJson(),
+    val stub: StubJson = StubJson()
+)
+
+@Parcelize
+@JsonClass(generateAdapter = true)
+data class MagiskJson(
+    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 version: String,
+    val versionCode: Int,
+    val zipUrl: String,
+    val changelog: String,
+)
+
+@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,138 @@
+package com.topjohnwu.magisk.core.model.module
+
+import com.squareup.moshi.JsonDataException
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.utils.RootUtils
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.IOException
+import java.util.*
+
+data class LocalModule(
+    private val path: String,
+) : Module() {
+    private val svc get() = ServiceLocator.networkService
+
+    override var id: String = ""
+    override var name: String = ""
+    override var version: String = ""
+    override var versionCode: Int = -1
+    var author: String = ""
+    var description: String = ""
+    var updateInfo: OnlineModule? = null
+    var outdated = false
+
+    private var updateUrl: String = ""
+    private val removeFile = RootUtils.fs.getFile(path, "remove")
+    private val disableFile = RootUtils.fs.getFile(path, "disable")
+    private val updateFile = RootUtils.fs.getFile(path, "update")
+    private val riruFolder = RootUtils.fs.getFile(path, "riru")
+    private val zygiskFolder = RootUtils.fs.getFile(path, "zygisk")
+    private val unloaded = RootUtils.fs.getFile(zygiskFolder, "unloaded")
+
+    val updated: Boolean get() = updateFile.exists()
+    val isRiru: Boolean get() = (id == "riru-core") || riruFolder.exists()
+    val isZygisk: Boolean get() = zygiskFolder.exists()
+    val zygiskUnloaded: Boolean get() = unloaded.exists()
+
+    var enable: Boolean
+        get() = !disableFile.exists()
+        set(enable) {
+            if (enable) {
+                disableFile.delete()
+                Shell.cmd("copy_sepolicy_rules").submit()
+            } else {
+                !disableFile.createNewFile()
+                Shell.cmd("copy_sepolicy_rules").submit()
+            }
+        }
+
+    var remove: Boolean
+        get() = removeFile.exists()
+        set(remove) {
+            if (remove) {
+                if (updateFile.exists()) return
+                removeFile.createNewFile()
+                Shell.cmd("copy_sepolicy_rules").submit()
+            } else {
+                removeFile.delete()
+                Shell.cmd("copy_sepolicy_rules").submit()
+            }
+        }
+
+    @Throws(NumberFormatException::class)
+    private fun parseProps(props: List<String>) {
+        for (line in props) {
+            val prop = line.split("=".toRegex(), 2).map { it.trim() }
+            if (prop.size != 2)
+                continue
+
+            val key = prop[0]
+            val value = prop[1]
+            if (key.isEmpty() || key[0] == '#')
+                continue
+
+            when (key) {
+                "id" -> id = value
+                "name" -> name = value
+                "version" -> version = value
+                "versionCode" -> versionCode = value.toInt()
+                "author" -> author = value
+                "description" -> description = value
+                "updateJson" -> updateUrl = value
+            }
+        }
+    }
+
+    init {
+        runCatching {
+            parseProps(Shell.cmd("dos2unix < $path/module.prop").exec().out)
+        }
+
+        if (id.isEmpty()) {
+            val sep = path.lastIndexOf('/')
+            id = path.substring(sep + 1)
+        }
+
+        if (name.isEmpty()) {
+            name = id
+        }
+    }
+
+    suspend fun fetch(): Boolean {
+        if (updateUrl.isEmpty())
+            return false
+
+        try {
+            val json = svc.fetchModuleJson(updateUrl)
+            updateInfo = OnlineModule(this, json)
+            outdated = json.versionCode > versionCode
+            return true
+        } catch (e: IOException) {
+            Timber.w(e)
+        } catch (e: JsonDataException) {
+            Timber.w(e)
+        }
+
+        return false
+    }
+
+    companion object {
+
+        private val PERSIST get() = "${Const.MAGISKTMP}/mirror/persist/magisk"
+
+        fun loaded() = RootUtils.fs.getFile(Const.MAGISK_PATH).exists()
+
+        suspend fun installed() = withContext(Dispatchers.IO) {
+            RootUtils.fs.getFile(Const.MAGISK_PATH)
+                .listFiles()
+                .orEmpty()
+                .filter { !it.isFile }
+                .map { LocalModule("${Const.MAGISK_PATH}/${it.name}") }
+                .sortedBy { it.name.lowercase(Locale.ROOT) }
+        }
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.topjohnwu.magisk.core.model.module
+
+abstract class Module : Comparable<Module> {
+    abstract var id: String
+        protected set
+    abstract var name: String
+        protected set
+    abstract var version: String
+        protected set
+    abstract var versionCode: Int
+        protected set
+
+    override operator fun compareTo(other: Module) = id.compareTo(other.id)
+}

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

@@ -0,0 +1,27 @@
+package com.topjohnwu.magisk.core.model.module
+
+import android.os.Parcelable
+import com.topjohnwu.magisk.core.model.ModuleJson
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class OnlineModule(
+    override var id: String,
+    override var name: String,
+    override var version: String,
+    override var versionCode: Int,
+    val zipUrl: String,
+    val changelog: String,
+) : Module(), Parcelable {
+    constructor(local: LocalModule, json: ModuleJson) :
+        this(local.id, local.name, json.version, json.versionCode, json.zipUrl, json.changelog)
+
+    val downloadFilename get() = "$name-$version($versionCode).zip".legalFilename()
+
+    private fun String.legalFilename() = replace(" ", "_")
+        .replace("'", "").replace("\"", "")
+        .replace("$", "").replace("`", "")
+        .replace("*", "").replace("/", "_")
+        .replace("#", "").replace("@", "")
+        .replace("\\", "_")
+}

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

@@ -0,0 +1,58 @@
+package com.topjohnwu.magisk.core.model.su
+
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.topjohnwu.magisk.ktx.getLabel
+
+@Entity(tableName = "logs")
+class SuLog(
+    val fromUid: Int,
+    val toUid: Int,
+    val fromPid: Int,
+    val packageName: String,
+    val appName: String,
+    val command: String,
+    val action: Boolean,
+    val time: Long = System.currentTimeMillis()
+) {
+    @PrimaryKey(autoGenerate = true) var id: Int = 0
+}
+
+fun PackageManager.createSuLog(
+    info: PackageInfo,
+    toUid: Int,
+    fromPid: Int,
+    command: String,
+    policy: Int
+): SuLog {
+    val appInfo = info.applicationInfo
+    return SuLog(
+        fromUid = appInfo.uid,
+        toUid = toUid,
+        fromPid = fromPid,
+        packageName = getNameForUid(appInfo.uid)!!,
+        appName = appInfo.getLabel(this),
+        command = command,
+        action = policy == SuPolicy.ALLOW
+    )
+}
+
+fun createSuLog(
+    fromUid: Int,
+    toUid: Int,
+    fromPid: Int,
+    command: String,
+    policy: Int
+): SuLog {
+    return SuLog(
+        fromUid = fromUid,
+        toUid = toUid,
+        fromPid = fromPid,
+        packageName = "[UID] $fromUid",
+        appName = "[UID] $fromUid",
+        command = command,
+        action = policy == SuPolicy.ALLOW
+    )
+}

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

@@ -0,0 +1,22 @@
+package com.topjohnwu.magisk.core.model.su
+
+class SuPolicy(val uid: Int) {
+    companion object {
+        const val INTERACTIVE = 0
+        const val DENY = 1
+        const val ALLOW = 2
+    }
+
+    var policy: Int = INTERACTIVE
+    var until: Long = -1L
+    var logging: Boolean = true
+    var notification: Boolean = true
+
+    fun toMap(): MutableMap<String, Any> = mutableMapOf(
+        "uid" to uid,
+        "policy" to policy,
+        "until" to until,
+        "logging" to logging,
+        "notification" to notification
+    )
+}

app/src/main/java/com/topjohnwu/magisk/core/repository/DBConfig.kt

@@ -1,63 +1,66 @@
-package com.topjohnwu.magisk.data.repository
+package com.topjohnwu.magisk.core.repository
 
-import com.topjohnwu.magisk.data.database.SettingsDao
-import com.topjohnwu.magisk.data.database.StringDao
-import io.reactivex.schedulers.Schedulers
+import com.topjohnwu.magisk.core.data.magiskdb.SettingsDao
+import com.topjohnwu.magisk.core.data.magiskdb.StringDao
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
 interface DBConfig {
-    val settingsDao: SettingsDao
-    val stringDao: StringDao
+    val settingsDB: SettingsDao
+    val stringDB: StringDao
+    val coroutineScope: CoroutineScope
 
     fun dbSettings(
         name: String,
         default: Int
-    ) = DBSettingsValue(name, default)
+    ) = IntDBProperty(name, default)
 
     fun dbSettings(
         name: String,
         default: Boolean
-    ) = DBBoolSettings(name, default)
+    ) = BoolDBProperty(name, default)
 
     fun dbStrings(
         name: String,
         default: String,
         sync: Boolean = false
-    ) = DBStringsValue(name, default, sync)
+    ) = StringDBProperty(name, default, sync)
 
 }
 
-class DBSettingsValue(
+class IntDBProperty(
     private val name: String,
     private val default: Int
 ) : ReadWriteProperty<DBConfig, Int> {
 
-    private var value: Int? = null
+    var value: Int? = null
 
     @Synchronized
     override fun getValue(thisRef: DBConfig, property: KProperty<*>): Int {
         if (value == null)
-            value = thisRef.settingsDao.fetch(name, default).blockingGet()
-        return value!!
+            value = runBlocking { thisRef.settingsDB.fetch(name, default) }
+        return value as Int
     }
 
     override fun setValue(thisRef: DBConfig, property: KProperty<*>, value: Int) {
         synchronized(this) {
             this.value = value
         }
-        thisRef.settingsDao.put(name, value)
-            .subscribeOn(Schedulers.io())
-            .subscribe()
+        thisRef.coroutineScope.launch {
+            thisRef.settingsDB.put(name, value)
+        }
     }
 }
 
-class DBBoolSettings(
+open class BoolDBProperty(
     name: String,
     default: Boolean
 ) : ReadWriteProperty<DBConfig, Boolean> {
 
-    val base = DBSettingsValue(name, if (default) 1 else 0)
+    val base = IntDBProperty(name, if (default) 1 else 0)
 
     override fun getValue(thisRef: DBConfig, property: KProperty<*>): Boolean =
         base.getValue(thisRef, property) != 0
@@ -66,7 +69,18 @@ class DBBoolSettings(
         base.setValue(thisRef, property, if (value) 1 else 0)
 }
 
-class DBStringsValue(
+class BoolDBPropertyNoWrite(
+    name: String,
+    default: Boolean
+) : BoolDBProperty(name, default) {
+    override fun setValue(thisRef: DBConfig, property: KProperty<*>, value: Boolean) {
+        synchronized(base) {
+            base.value = if (value) 1 else 0
+        }
+    }
+}
+
+class StringDBProperty(
     private val name: String,
     private val default: String,
     private val sync: Boolean
@@ -77,7 +91,9 @@ class DBStringsValue(
     @Synchronized
     override fun getValue(thisRef: DBConfig, property: KProperty<*>): String {
         if (value == null)
-            value = thisRef.stringDao.fetch(name, default).blockingGet()
+            value = runBlocking {
+                thisRef.stringDB.fetch(name, default)
+            }
         return value!!
     }
 
@@ -87,19 +103,23 @@ class DBStringsValue(
         }
         if (value.isEmpty()) {
             if (sync) {
-                thisRef.stringDao.delete(name).blockingAwait()
+                runBlocking {
+                    thisRef.stringDB.delete(name)
+                }
             } else {
-                thisRef.stringDao.delete(name)
-                    .subscribeOn(Schedulers.io())
-                    .subscribe()
+                thisRef.coroutineScope.launch {
+                    thisRef.stringDB.delete(name)
+                }
             }
         } else {
             if (sync) {
-                thisRef.stringDao.put(name, value).blockingAwait()
+                runBlocking {
+                    thisRef.stringDB.put(name, value)
+                }
             } else {
-                thisRef.stringDao.put(name, value)
-                    .subscribeOn(Schedulers.io())
-                    .subscribe()
+                thisRef.coroutineScope.launch {
+                    thisRef.stringDB.put(name, value)
+                }
             }
         }
     }

app/src/main/java/com/topjohnwu/magisk/core/repository/LogRepository.kt

@@ -0,0 +1,46 @@
+package com.topjohnwu.magisk.core.repository
+
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.data.SuLogDao
+import com.topjohnwu.magisk.core.model.su.SuLog
+import com.topjohnwu.magisk.ktx.await
+import com.topjohnwu.superuser.Shell
+
+
+class LogRepository(
+    private val logDao: SuLogDao
+) {
+
+    suspend fun fetchSuLogs() = logDao.fetchAll()
+
+    suspend fun fetchMagiskLogs(): String {
+        val list = object : AbstractMutableList<String>() {
+            val buf = StringBuilder()
+            override val size get() = 0
+            override fun get(index: Int): String = ""
+            override fun removeAt(index: Int): String = ""
+            override fun set(index: Int, element: String): String = ""
+            override fun add(index: Int, element: String) {
+                if (element.isNotEmpty()) {
+                    buf.append(element)
+                    buf.append('\n')
+                }
+            }
+        }
+        if (Info.env.isActive) {
+            Shell.cmd("cat ${Const.MAGISK_LOG} || logcat -d -s Magisk").to(list).await()
+        } else {
+            Shell.cmd("logcat -d").to(list).await()
+        }
+        return list.buf.toString()
+    }
+
+    suspend fun clearLogs() = logDao.deleteAll()
+
+    fun clearMagiskLogs(cb: (Shell.Result) -> Unit) =
+        Shell.cmd("echo -n > ${Const.MAGISK_LOG}").submit(cb)
+
+    suspend fun insert(log: SuLog) = logDao.insert(log)
+
+}

app/src/main/java/com/topjohnwu/magisk/core/repository/NetworkService.kt

@@ -0,0 +1,71 @@
+package com.topjohnwu.magisk.core.repository
+
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Config.Value.BETA_CHANNEL
+import com.topjohnwu.magisk.core.Config.Value.CANARY_CHANNEL
+import com.topjohnwu.magisk.core.Config.Value.CUSTOM_CHANNEL
+import com.topjohnwu.magisk.core.Config.Value.DEBUG_CHANNEL
+import com.topjohnwu.magisk.core.Config.Value.DEFAULT_CHANNEL
+import com.topjohnwu.magisk.core.Config.Value.STABLE_CHANNEL
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.data.GithubApiServices
+import com.topjohnwu.magisk.core.data.GithubPageServices
+import com.topjohnwu.magisk.core.data.RawServices
+import retrofit2.HttpException
+import timber.log.Timber
+import java.io.IOException
+
+class NetworkService(
+    private val pages: GithubPageServices,
+    private val raw: RawServices,
+    private val api: GithubApiServices
+) {
+    suspend fun fetchUpdate() = safe {
+        var info = when (Config.updateChannel) {
+            DEFAULT_CHANNEL, STABLE_CHANNEL -> fetchStableUpdate()
+            BETA_CHANNEL -> fetchBetaUpdate()
+            CANARY_CHANNEL -> fetchCanaryUpdate()
+            DEBUG_CHANNEL -> fetchDebugUpdate()
+            CUSTOM_CHANNEL -> fetchCustomUpdate(Config.customChannelUrl)
+            else -> throw IllegalArgumentException()
+        }
+        if (info.magisk.versionCode < Info.env.versionCode &&
+            Config.updateChannel == DEFAULT_CHANNEL) {
+            Config.updateChannel = BETA_CHANNEL
+            info = fetchBetaUpdate()
+        }
+        info
+    }
+
+    // UpdateInfo
+    private suspend fun fetchStableUpdate() = pages.fetchUpdateJSON("stable.json")
+    private suspend fun fetchBetaUpdate() = pages.fetchUpdateJSON("beta.json")
+    private suspend fun fetchCanaryUpdate() = pages.fetchUpdateJSON("canary.json")
+    private suspend fun fetchDebugUpdate() = pages.fetchUpdateJSON("debug.json")
+    private suspend fun fetchCustomUpdate(url: String) = raw.fetchCustomUpdate(url)
+
+    private inline fun <T> safe(factory: () -> T): T? {
+        return try {
+            if (Info.isConnected.value == true)
+                factory()
+            else
+                null
+        } catch (e: Exception) {
+            Timber.e(e)
+            null
+        }
+    }
+
+    private inline fun <T> wrap(factory: () -> T): T {
+        return try {
+            factory()
+        } catch (e: HttpException) {
+            throw IOException(e)
+        }
+    }
+
+    // Fetch files
+    suspend fun fetchFile(url: String) = wrap { raw.fetchFile(url) }
+    suspend fun fetchString(url: String) = wrap { raw.fetchString(url) }
+    suspend fun fetchModuleJson(url: String) = wrap { raw.fetchModuleJson(url) }
+}

app/src/main/java/com/topjohnwu/magisk/core/repository/PreferenceConfig.kt

@@ -0,0 +1,230 @@
+package com.topjohnwu.magisk.core.repository
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+interface PreferenceConfig {
+
+    val context: Context
+
+    val fileName: String
+        get() = "${context.packageName}_preferences"
+
+    val prefs: SharedPreferences
+        get() = context.getSharedPreferences(fileName, Context.MODE_PRIVATE)
+
+    fun preferenceStrInt(
+        name: String,
+        default: Int,
+        commit: Boolean = false
+    ) = object: ReadWriteProperty<PreferenceConfig, Int> {
+        val base = StringProperty(name, default.toString(), commit)
+        override fun getValue(thisRef: PreferenceConfig, property: KProperty<*>): Int =
+                base.getValue(thisRef, property).toInt()
+
+        override fun setValue(thisRef: PreferenceConfig, property: KProperty<*>, value: Int) =
+                base.setValue(thisRef, property, value.toString())
+    }
+
+    fun preference(
+        name: String,
+        default: Boolean,
+        commit: Boolean = false
+    ) = BooleanProperty(name, default, commit)
+
+    fun preference(
+        name: String,
+        default: Float,
+        commit: Boolean = false
+    ) = FloatProperty(name, default, commit)
+
+    fun preference(
+        name: String,
+        default: Int,
+        commit: Boolean = false
+    ) = IntProperty(name, default, commit)
+
+    fun preference(
+        name: String,
+        default: Long,
+        commit: Boolean = false
+    ) = LongProperty(name, default, commit)
+
+    fun preference(
+        name: String,
+        default: String,
+        commit: Boolean = false
+    ) = StringProperty(name, default, commit)
+
+    fun preference(
+        name: String,
+        default: Set<String>,
+        commit: Boolean = false
+    ) = StringSetProperty(name, default, commit)
+
+}
+
+abstract class PreferenceProperty {
+
+    fun SharedPreferences.Editor.put(name: String, value: Boolean) = putBoolean(name, value)
+    fun SharedPreferences.Editor.put(name: String, value: Float) = putFloat(name, value)
+    fun SharedPreferences.Editor.put(name: String, value: Int) = putInt(name, value)
+    fun SharedPreferences.Editor.put(name: String, value: Long) = putLong(name, value)
+    fun SharedPreferences.Editor.put(name: String, value: String) = putString(name, value)
+    fun SharedPreferences.Editor.put(name: String, value: Set<String>) = putStringSet(name, value)
+
+    fun SharedPreferences.get(name: String, value: Boolean) = getBoolean(name, value)
+    fun SharedPreferences.get(name: String, value: Float) = getFloat(name, value)
+    fun SharedPreferences.get(name: String, value: Int) = getInt(name, value)
+    fun SharedPreferences.get(name: String, value: Long) = getLong(name, value)
+    fun SharedPreferences.get(name: String, value: String) = getString(name, value) ?: value
+    fun SharedPreferences.get(name: String, value: Set<String>) = getStringSet(name, value) ?: value
+
+}
+
+class BooleanProperty(
+    private val name: String,
+    private val default: Boolean,
+    private val commit: Boolean
+) : PreferenceProperty(), ReadWriteProperty<PreferenceConfig, Boolean> {
+
+    override operator fun getValue(
+        thisRef: PreferenceConfig,
+        property: KProperty<*>
+    ): Boolean {
+        val prefName = name.ifBlank { property.name }
+        return thisRef.prefs.get(prefName, default)
+    }
+
+    override operator fun setValue(
+        thisRef: PreferenceConfig,
+        property: KProperty<*>,
+        value: Boolean
+    ) {
+        val prefName = name.ifBlank { property.name }
+        thisRef.prefs.edit(commit) { put(prefName, value) }
+    }
+}
+
+class FloatProperty(
+    private val name: String,
+    private val default: Float,
+    private val commit: Boolean
+) : PreferenceProperty(), ReadWriteProperty<PreferenceConfig, Float> {
+
+    override operator fun getValue(
+        thisRef: PreferenceConfig,
+        property: KProperty<*>
+    ): Float {
+        val prefName = name.ifBlank { property.name }
+        return thisRef.prefs.get(prefName, default)
+    }
+
+    override operator fun setValue(
+        thisRef: PreferenceConfig,
+        property: KProperty<*>,
+        value: Float
+    ) {
+        val prefName = name.ifBlank { property.name }
+        thisRef.prefs.edit(commit) { put(prefName, value) }
+    }
+}
+
+class IntProperty(
+    private val name: String,
+    private val default: Int,
+    private val commit: Boolean
+) : PreferenceProperty(), ReadWriteProperty<PreferenceConfig, Int> {
+
+    override operator fun getValue(
+        thisRef: PreferenceConfig,
+        property: KProperty<*>
+    ): Int {
+        val prefName = name.ifBlank { property.name }
+        return thisRef.prefs.get(prefName, default)
+    }
+
+    override operator fun setValue(
+        thisRef: PreferenceConfig,
+        property: KProperty<*>,
+        value: Int
+    ) {
+        val prefName = name.ifBlank { property.name }
+        thisRef.prefs.edit(commit) { put(prefName, value) }
+    }
+}
+
+class LongProperty(
+    private val name: String,
+    private val default: Long,
+    private val commit: Boolean
+) : PreferenceProperty(), ReadWriteProperty<PreferenceConfig, Long> {
+
+    override operator fun getValue(
+        thisRef: PreferenceConfig,
+        property: KProperty<*>
+    ): Long {
+        val prefName = name.ifBlank { property.name }
+        return thisRef.prefs.get(prefName, default)
+    }
+
+    override operator fun setValue(
+        thisRef: PreferenceConfig,
+        property: KProperty<*>,
+        value: Long
+    ) {
+        val prefName = name.ifBlank { property.name }
+        thisRef.prefs.edit(commit) { put(prefName, value) }
+    }
+}
+
+class StringProperty(
+    private val name: String,
+    private val default: String,
+    private val commit: Boolean
+) : PreferenceProperty(), ReadWriteProperty<PreferenceConfig, String> {
+
+    override operator fun getValue(
+        thisRef: PreferenceConfig,
+        property: KProperty<*>
+    ): String {
+        val prefName = name.ifBlank { property.name }
+        return thisRef.prefs.get(prefName, default)
+    }
+
+    override operator fun setValue(
+        thisRef: PreferenceConfig,
+        property: KProperty<*>,
+        value: String
+    ) {
+        val prefName = name.ifBlank { property.name }
+        thisRef.prefs.edit(commit) { put(prefName, value) }
+    }
+}
+
+class StringSetProperty(
+    private val name: String,
+    private val default: Set<String>,
+    private val commit: Boolean
+) : PreferenceProperty(), ReadWriteProperty<PreferenceConfig, Set<String>> {
+
+    override operator fun getValue(
+        thisRef: PreferenceConfig,
+        property: KProperty<*>
+    ): Set<String> {
+        val prefName = name.ifBlank { property.name }
+        return thisRef.prefs.get(prefName, default)
+    }
+
+    override operator fun setValue(
+        thisRef: PreferenceConfig,
+        property: KProperty<*>,
+        value: Set<String>
+    ) {
+        val prefName = name.ifBlank { property.name }
+        thisRef.prefs.edit(commit) { put(prefName, value) }
+    }
+}

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

@@ -0,0 +1,99 @@
+package com.topjohnwu.magisk.core.su
+
+import android.content.Context
+import android.os.Bundle
+import android.widget.Toast
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.model.su.SuPolicy
+import com.topjohnwu.magisk.core.model.su.createSuLog
+import com.topjohnwu.magisk.ktx.getLabel
+import com.topjohnwu.magisk.ktx.getPackageInfo
+import com.topjohnwu.magisk.utils.Utils
+import kotlinx.coroutines.runBlocking
+import timber.log.Timber
+
+object SuCallbackHandler {
+
+    const val REQUEST = "request"
+    const val LOG = "log"
+    const val NOTIFY = "notify"
+
+    fun run(context: Context, action: String?, data: Bundle?) {
+        data ?: return
+
+        // Debug messages
+        if (BuildConfig.DEBUG) {
+            Timber.d(action)
+            data.let { bundle ->
+                bundle.keySet().forEach {
+                    Timber.d("[%s]=[%s]", it, bundle[it])
+                }
+            }
+        }
+
+        when (action) {
+            LOG -> handleLogging(context, data)
+            NOTIFY -> handleNotify(context, data)
+        }
+    }
+
+    // https://android.googlesource.com/platform/frameworks/base/+/547bf5487d52b93c9fe183aa6d56459c170b17a4
+    private fun Bundle.getIntComp(key: String, defaultValue: Int): Int {
+        val value = get(key) ?: return defaultValue
+        return when (value) {
+            is Int -> value
+            is Long -> value.toInt()
+            else -> defaultValue
+        }
+    }
+
+    private fun handleLogging(context: Context, data: Bundle) {
+        val fromUid = data.getIntComp("from.uid", -1)
+        val notify = data.getBoolean("notify", true)
+        val policy = data.getIntComp("policy", SuPolicy.ALLOW)
+        val toUid = data.getIntComp("to.uid", -1)
+        val pid = data.getIntComp("pid", -1)
+        val command = data.getString("command", "")
+
+        val pm = context.packageManager
+
+        val log = runCatching {
+            pm.getPackageInfo(fromUid, pid)?.let {
+                pm.createSuLog(it, toUid, pid, command, policy)
+            }
+        }.getOrNull() ?: createSuLog(fromUid, toUid, pid, command, policy)
+
+        if (notify)
+            notify(context, log.action, log.appName)
+
+        runBlocking { ServiceLocator.logRepo.insert(log) }
+    }
+
+    private fun handleNotify(context: Context, data: Bundle) {
+        val uid = data.getIntComp("from.uid", -1)
+        val pid = data.getIntComp("pid", -1)
+        val policy = data.getIntComp("policy", SuPolicy.ALLOW)
+
+        val pm = context.packageManager
+
+        val appName = runCatching {
+            pm.getPackageInfo(uid, pid)?.applicationInfo?.getLabel(pm)
+        }.getOrNull() ?: "[UID] $uid"
+
+        notify(context, policy == SuPolicy.ALLOW, appName)
+    }
+
+    private fun notify(context: Context, granted: Boolean, appName: String) {
+        if (Config.suNotification == Config.Value.NOTIFICATION_TOAST) {
+            val resId = if (granted)
+                R.string.su_allow_toast
+            else
+                R.string.su_deny_toast
+
+            Utils.toast(context.getString(resId, appName), Toast.LENGTH_SHORT)
+        }
+    }
+}

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

@@ -0,0 +1,111 @@
+package com.topjohnwu.magisk.core.su
+
+import android.content.Intent
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.data.magiskdb.PolicyDao
+import com.topjohnwu.magisk.core.model.su.SuPolicy
+import com.topjohnwu.magisk.ktx.getPackageInfo
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.DataOutputStream
+import java.io.FileOutputStream
+import java.io.IOException
+import java.util.concurrent.TimeUnit
+
+class SuRequestHandler(
+    val pm: PackageManager,
+    private val policyDB: PolicyDao
+) {
+
+    private lateinit var output: DataOutputStream
+    private lateinit var policy: SuPolicy
+    lateinit var pkgInfo: PackageInfo
+        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 (pkgInfo.packageName == BuildConfig.APPLICATION_ID) {
+            Shell.cmd("(pm uninstall ${BuildConfig.APPLICATION_ID} >/dev/null 2>&1)&").exec()
+            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 fun close() {
+        if (::output.isInitialized)
+            runCatching { output.close() }
+    }
+
+    private suspend fun init(intent: Intent) = withContext(Dispatchers.IO) {
+        try {
+            val fifo = intent.getStringExtra("fifo") ?: throw IOException("fifo == null")
+            output = DataOutputStream(FileOutputStream(fifo))
+            val uid = intent.getIntExtra("uid", -1)
+            if (uid <= 0) {
+                throw IOException("uid == $uid")
+            }
+            policy = SuPolicy(uid)
+            val pid = intent.getIntExtra("pid", -1)
+            try {
+                pkgInfo = pm.getPackageInfo(uid, pid) ?: PackageInfo().apply {
+                    val name = pm.getNameForUid(uid) ?: throw PackageManager.NameNotFoundException()
+                    // We only fill in sharedUserId and leave other fields uninitialized
+                    sharedUserId = name.split(":")[0]
+                }
+                return@withContext true
+            } catch (e: PackageManager.NameNotFoundException) {
+                respond(SuPolicy.DENY, -1)
+                return@withContext false
+            }
+        } catch (e: IOException) {
+            Timber.e(e)
+            close()
+            return@withContext false
+        }
+    }
+
+    suspend fun respond(action: Int, time: Int) {
+        val until = if (time > 0)
+            TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()) +
+                TimeUnit.MINUTES.toSeconds(time.toLong())
+        else
+            time.toLong()
+
+        policy.policy = action
+        policy.until = until
+
+        withContext(Dispatchers.IO) {
+            try {
+                output.writeInt(policy.policy)
+                output.flush()
+            } catch (e: IOException) {
+                Timber.e(e)
+            } finally {
+                close()
+                if (until >= 0)
+                    policyDB.update(policy)
+            }
+        }
+    }
+}

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

@@ -0,0 +1,85 @@
+package com.topjohnwu.magisk.core.tasks
+
+import android.net.Uri
+import androidx.core.net.toFile
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.di.AppContext
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.displayName
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
+import com.topjohnwu.magisk.core.utils.unzip
+import com.topjohnwu.magisk.ktx.writeTo
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.IOException
+
+open class FlashZip(
+    private val mUri: Uri,
+    private val console: MutableList<String>,
+    private val logs: MutableList<String>
+) {
+
+    private val installDir = File(AppContext.cacheDir, "flash")
+    private lateinit var zipFile: File
+
+    @Throws(IOException::class)
+    private fun flash(): Boolean {
+        installDir.deleteRecursively()
+        installDir.mkdirs()
+
+        zipFile = if (mUri.scheme == "file") {
+            mUri.toFile()
+        } else {
+            File(installDir, "install.zip").also {
+                console.add("- Copying zip to temp directory")
+                try {
+                    mUri.inputStream().writeTo(it)
+                } catch (e: IOException) {
+                    when (e) {
+                        is FileNotFoundException -> console.add("! Invalid Uri")
+                        else -> console.add("! Cannot copy to cache")
+                    }
+                    throw e
+                }
+            }
+        }
+
+        val isValid = runCatching {
+            zipFile.unzip(installDir, "META-INF/com/google/android", true)
+            val script = File(installDir, "updater-script")
+            script.readText().contains("#MAGISK")
+        }.getOrElse {
+            console.add("! Unzip error")
+            throw it
+        }
+
+        if (!isValid) {
+            console.add("! This zip is not a Magisk module!")
+            return false
+        }
+
+        console.add("- Installing ${mUri.displayName}")
+
+        return Shell.cmd("sh $installDir/update-binary dummy 1 \'$zipFile\'")
+            .to(console, logs).exec().isSuccess
+    }
+
+    open suspend fun exec() = withContext(Dispatchers.IO) {
+        try {
+            if (!flash()) {
+                console.add("! Installation failed")
+                false
+            } else {
+                true
+            }
+        } catch (e: IOException) {
+            Timber.e(e)
+            false
+        } finally {
+            Shell.cmd("cd /", "rm -rf $installDir ${Const.TMPDIR}").submit()
+        }
+    }
+}

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

@@ -0,0 +1,194 @@
+package com.topjohnwu.magisk.core.tasks
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.widget.Toast
+import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.StubApk
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.Provider
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.utils.AXML
+import com.topjohnwu.magisk.core.utils.Keygen
+import com.topjohnwu.magisk.ktx.await
+import com.topjohnwu.magisk.ktx.writeTo
+import com.topjohnwu.magisk.signing.JarMap
+import com.topjohnwu.magisk.signing.SignApk
+import com.topjohnwu.magisk.utils.APKInstall
+import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Runnable
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import java.io.OutputStream
+import java.security.SecureRandom
+
+object HideAPK {
+
+    private const val ALPHA = "abcdefghijklmnopqrstuvwxyz"
+    private const val ALPHADOTS = "$ALPHA....."
+    private const val ANDROID_MANIFEST = "AndroidManifest.xml"
+
+    // Some arbitrary limit
+    const val MAX_LABEL_LENGTH = 32
+
+    private val svc get() = ServiceLocator.networkService
+
+    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 == '.' || i == 0 || 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 - 2)
+            builder[idx + 1] = '.'
+        }
+        return builder.toString()
+    }
+
+    fun patch(
+        context: Context,
+        apk: File, out: OutputStream,
+        pkg: String, label: CharSequence
+    ): Boolean {
+        val info = context.packageManager.getPackageArchiveInfo(apk.path, 0) ?: return false
+        val name = info.applicationInfo.nonLocalizedLabel.toString()
+        try {
+            JarMap.open(apk, true).use { jar ->
+                val je = jar.getJarEntry(ANDROID_MANIFEST)
+                val xml = AXML(jar.getRawData(je))
+
+                if (!xml.findAndPatch(APPLICATION_ID to pkg, name to label.toString()))
+                    return false
+
+                // Write apk changes
+                jar.getOutputStream(je).use { it.write(xml.bytes) }
+                val keys = Keygen()
+                SignApk.sign(keys.cert, keys.key, jar, out)
+                return true
+            }
+        } catch (e: Exception) {
+            Timber.e(e)
+            return false
+        }
+    }
+
+    private fun launchApp(activity: Activity, pkg: String) {
+        val intent = activity.packageManager.getLaunchIntentForPackage(pkg) ?: return
+        Config.suManager = if (pkg == APPLICATION_ID) "" else pkg
+        val self = activity.packageName
+        val flag = Intent.FLAG_GRANT_READ_URI_PERMISSION
+        activity.grantUriPermission(pkg, Provider.preferencesUri(self), flag)
+        intent.putExtra(Const.Key.PREV_PKG, self)
+        activity.startActivity(intent)
+        activity.finish()
+    }
+
+    @Suppress("BlockingMethodInNonBlockingContext")
+    private suspend fun patchAndHide(activity: Activity, label: String, onFailure: Runnable): Boolean {
+        val stub = File(activity.cacheDir, "stub.apk")
+        try {
+            svc.fetchFile(Info.remote.stub.link).byteStream().writeTo(stub)
+        } catch (e: IOException) {
+            Timber.e(e)
+            stub.createNewFile()
+            val cmd = "\$MAGISKBIN/magiskinit -x manager ${stub.path}"
+            if (!Shell.cmd(cmd).exec().isSuccess)
+                return false
+        }
+
+        // Generate a new random package name and signature
+        val repack = File(activity.cacheDir, "patched.apk")
+        val pkg = genPackageName()
+        Config.keyStoreRaw = ""
+
+        if (!patch(activity, stub, FileOutputStream(repack), pkg, label))
+            return false
+
+        // Install and auto launch app
+        val session = APKInstall.startSession(activity, pkg, onFailure) {
+            launchApp(activity, pkg)
+        }
+
+        val cmd = "adb_pm_install $repack ${activity.applicationInfo.uid}"
+        if (Shell.cmd(cmd).exec().isSuccess) return true
+
+        try {
+            session.install(activity, repack)
+        } catch (e: IOException) {
+            Timber.e(e)
+            return false
+        }
+        session.waitIntent()?.let { activity.startActivity(it) } ?: return false
+        return true
+    }
+
+    @Suppress("DEPRECATION")
+    suspend fun hide(activity: Activity, label: String) {
+        val dialog = android.app.ProgressDialog(activity).apply {
+            setTitle(activity.getString(R.string.hide_app_title))
+            isIndeterminate = true
+            setCancelable(false)
+            show()
+        }
+        val onFailure = Runnable {
+            dialog.dismiss()
+            Utils.toast(R.string.failure, Toast.LENGTH_LONG)
+        }
+        val success = withContext(Dispatchers.IO) {
+            patchAndHide(activity, label, onFailure)
+        }
+        if (!success) onFailure.run()
+    }
+
+    @Suppress("DEPRECATION")
+    suspend fun restore(activity: Activity) {
+        val dialog = android.app.ProgressDialog(activity).apply {
+            setTitle(activity.getString(R.string.restore_img_msg))
+            isIndeterminate = true
+            setCancelable(false)
+            show()
+        }
+        val onFailure = Runnable {
+            dialog.dismiss()
+            Utils.toast(R.string.failure, Toast.LENGTH_LONG)
+        }
+        val apk = StubApk.current(activity)
+        val session = APKInstall.startSession(activity, APPLICATION_ID, onFailure) {
+            launchApp(activity, APPLICATION_ID)
+            dialog.dismiss()
+        }
+        val cmd = "adb_pm_install $apk ${activity.applicationInfo.uid}"
+        if (Shell.cmd(cmd).await().isSuccess) return
+        val success = withContext(Dispatchers.IO) {
+            try {
+                session.install(activity, apk)
+            } catch (e: IOException) {
+                Timber.e(e)
+                return@withContext false
+            }
+            session.waitIntent()?.let { activity.startActivity(it) } ?: return@withContext false
+            return@withContext true
+        }
+        if (!success) onFailure.run()
+    }
+}

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

@@ -0,0 +1,513 @@
+package com.topjohnwu.magisk.core.tasks
+
+import android.net.Uri
+import android.system.Os
+import android.widget.Toast
+import androidx.annotation.WorkerThread
+import androidx.core.os.postDelayed
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.StubApk
+import com.topjohnwu.magisk.core.*
+import com.topjohnwu.magisk.core.di.ServiceLocator
+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.core.utils.RootUtils
+import com.topjohnwu.magisk.ktx.reboot
+import com.topjohnwu.magisk.ktx.withStreams
+import com.topjohnwu.magisk.ktx.writeTo
+import com.topjohnwu.magisk.signing.SignBoot
+import com.topjohnwu.magisk.utils.Utils
+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.nio.ExtendedFile
+import com.topjohnwu.superuser.nio.FileSystemManager
+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 timber.log.Timber
+import java.io.*
+import java.nio.ByteBuffer
+import java.security.SecureRandom
+import java.util.*
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+
+abstract class MagiskInstallImpl protected constructor(
+    protected val console: MutableList<String> = NOPList.getInstance(),
+    private val logs: MutableList<String> = NOPList.getInstance()
+) {
+
+    protected lateinit var installDir: ExtendedFile
+    private lateinit var srcBoot: ExtendedFile
+
+    private val shell = Shell.getShell()
+    private val service get() = ServiceLocator.networkService
+    protected val context get() = ServiceLocator.deContext
+    private val useRootDir = shell.isRoot && Info.noDataExec
+
+    private val rootFS get() = RootUtils.fs
+    private val localFS get() = FileSystemManager.getLocal()
+
+    private fun findImage(): Boolean {
+        val bootPath = "RECOVERYMODE=${Config.recovery} find_boot_image; echo \"\$BOOTIMAGE\"".fsh()
+        if (bootPath.isEmpty()) {
+            console.add("! Unable to detect target image")
+            return false
+        }
+        srcBoot = rootFS.getFile(bootPath)
+        console.add("- Target image: $bootPath")
+        return true
+    }
+
+    private fun findSecondary(): Boolean {
+        val slot = "echo \$SLOT".fsh()
+        val target = if (slot == "_a") "_b" else "_a"
+        console.add("- Target slot: $target")
+        val bootPath = arrayOf(
+            "SLOT=$target",
+            "find_boot_image",
+            "SLOT=$slot",
+            "echo \"\$BOOTIMAGE\"").fsh()
+        if (bootPath.isEmpty()) {
+            console.add("! Unable to detect target image")
+            return false
+        }
+        srcBoot = rootFS.getFile(bootPath)
+        console.add("- Target image: $bootPath")
+        return true
+    }
+
+    private fun extractFiles(): Boolean {
+        console.add("- Device platform: ${Const.CPU_ABI}")
+        console.add("- Installing: ${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
+
+        installDir = localFS.getFile(context.filesDir.parent, "install")
+        installDir.deleteRecursively()
+        installDir.mkdirs()
+
+        try {
+            // Extract binaries
+            if (isRunningAsStub) {
+                val zf = ZipFile(StubApk.current(context))
+
+                // Also extract magisk32 on non 64-bit only 64-bit devices
+                val is32lib = Const.CPU_ABI_32?.let {
+                    { entry: ZipEntry -> entry.name == "lib/$it/libmagisk32.so" }
+                } ?: { false }
+
+                zf.entries().asSequence().filter {
+                    !it.isDirectory && (it.name.startsWith("lib/${Const.CPU_ABI}/") || is32lib(it))
+                }.forEach {
+                    val n = it.name.substring(it.name.lastIndexOf('/') + 1)
+                    val name = n.substring(3, n.length - 3)
+                    val dest = File(installDir, name)
+                    zf.getInputStream(it).writeTo(dest)
+                }
+            } else {
+                val info = context.applicationInfo
+                var libs = File(info.nativeLibraryDir).listFiles { _, name ->
+                    name.startsWith("lib") && name.endsWith(".so")
+                } ?: emptyArray()
+
+                // Also symlink magisk32 on non 64-bit only 64-bit devices
+                val lib32 = info.javaClass.getDeclaredField("secondaryNativeLibraryDir").get(info) as String?
+                if (lib32 != null) {
+                    libs += File(lib32, "libmagisk32.so")
+                }
+
+                for (lib in libs) {
+                    val name = lib.name.substring(3, lib.name.length - 3)
+                    Os.symlink(lib.path, "$installDir/$name")
+                }
+            }
+
+            // Extract scripts
+            for (script in listOf("util_functions.sh", "boot_patch.sh", "addon.d.sh")) {
+                val dest = File(installDir, script)
+                context.assets.open(script).writeTo(dest)
+            }
+            // Extract chromeos tools
+            File(installDir, "chromeos").mkdir()
+            for (file in listOf("futility", "kernel_data_key.vbprivk", "kernel.keyblock")) {
+                val name = "chromeos/$file"
+                val dest = File(installDir, name)
+                context.assets.open(name).writeTo(dest)
+            }
+        } catch (e: Exception) {
+            console.add("! Unable to extract files")
+            Timber.e(e)
+            return false
+        }
+
+        if (useRootDir) {
+            // Move everything to tmpfs to workaround Samsung bullshit
+            rootFS.getFile(Const.TMPDIR).also {
+                arrayOf(
+                    "rm -rf $it",
+                    "mkdir -p $it",
+                    "cp_readlink $installDir $it",
+                    "rm -rf $installDir"
+                ).sh()
+                installDir = it
+            }
+        }
+
+        return true
+    }
+
+    private fun InputStream.cleanPump(out: OutputStream) = withStreams(this, out) { src, _ ->
+        src.copyTo(out)
+    }
+
+    private fun newTarEntry(name: String, size: Long): TarEntry {
+        console.add("-- Writing: $name")
+        return TarEntry(TarHeader.createHeader(name, size, 0, false, 420 /* 0644 */))
+    }
+
+    @Throws(IOException::class)
+    private fun processTar(input: InputStream, output: OutputStream): OutputStream {
+        console.add("- Processing tar file")
+        val tarOut = TarOutputStream(output)
+        TarInputStream(input).use { tarIn ->
+            lateinit var entry: TarEntry
+
+            fun decompressedStream(): InputStream {
+                val src = if (entry.name.endsWith(".lz4")) LZ4FrameInputStream(tarIn) else tarIn
+                return object : FilterInputStream(src) {
+                    override fun available() = 0  /* Workaround bug in LZ4FrameInputStream */
+                    override fun close() { /* Never close src stream */ }
+                }
+            }
+
+            while (tarIn.nextEntry?.let { entry = it } != null) {
+                if (entry.name.startsWith("boot.img") ||
+                    (Config.recovery && entry.name.contains("recovery.img"))) {
+                    val name = entry.name.replace(".lz4", "")
+                    console.add("-- Extracting: $name")
+
+                    val extract = installDir.getChildFile(name)
+                    decompressedStream().cleanPump(extract.newOutputStream())
+                } else if (entry.name.contains("vbmeta.img")) {
+                    val rawData = decompressedStream().readBytes()
+                    // 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(newTarEntry("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 = installDir.getChildFile("boot.img")
+        val recovery = installDir.getChildFile("recovery.img")
+        if (Config.recovery && recovery.exists() && boot.exists()) {
+            // Install to recovery
+            srcBoot = recovery
+            // Repack boot image to prevent auto restore
+            arrayOf(
+                "cd $installDir",
+                "chmod -R 755 .",
+                "./magiskboot unpack boot.img",
+                "./magiskboot repack boot.img",
+                "cat new-boot.img > boot.img",
+                "./magiskboot cleanup",
+                "rm -f new-boot.img",
+                "cd /").sh()
+            boot.newInputStream().use {
+                tarOut.putNextEntry(newTarEntry("boot.img", boot.length()))
+                it.copyTo(tarOut)
+            }
+            boot.delete()
+        } else {
+            if (!boot.exists()) {
+                console.add("! No boot image found")
+                throw IOException()
+            }
+            srcBoot = boot
+        }
+        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.uppercase(Locale.ROOT)}0123456789"
+                val random = SecureRandom()
+                val filename = StringBuilder("magisk_patched-${BuildConfig.VERSION_CODE}_").run {
+                    for (i in 1..5) {
+                        append(alphaNum[random.nextInt(alphaNum.length)])
+                    }
+                    toString()
+                }
+
+                outStream = if (magic.contentEquals("ustar".toByteArray())) {
+                    // tar file
+                    outFile = MediaStoreUtils.getFile("$filename.tar", true)
+                    processTar(src, outFile!!.uri.outputStream())
+                } else {
+                    // raw image
+                    srcBoot = installDir.getChildFile("boot.img")
+                    console.add("- Copying image to cache")
+                    src.cleanPump(srcBoot.newOutputStream())
+                    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 newBoot = installDir.getChildFile("new-boot.img")
+            if (outStream is TarOutputStream) {
+                val name = if (srcBoot.path.contains("recovery")) "recovery.img" else "boot.img"
+                outStream.putNextEntry(newTarEntry(name, newBoot.length()))
+            }
+            newBoot.newInputStream().cleanPump(outStream)
+            newBoot.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
+        }
+
+        // Fix up binaries
+        srcBoot.delete()
+        "cp_readlink $installDir".sh()
+
+        return true
+    }
+
+    private fun patchBoot(): Boolean {
+        var isSigned = false
+        if (!srcBoot.isCharacter) {
+            try {
+                srcBoot.newInputStream().use {
+                    if (SignBoot.verifySignature(it, null)) {
+                        isSigned = true
+                        console.add("- Boot image is signed with AVB 1.0")
+                    }
+                }
+            } catch (e: IOException) {
+                console.add("! Unable to check signature")
+                Timber.e(e)
+                return false
+            }
+        }
+
+        val newBoot = installDir.getChildFile("new-boot.img")
+        if (!useRootDir) {
+            // Create output files before hand
+            newBoot.createNewFile()
+            File(installDir, "stock_boot.img").createNewFile()
+        }
+
+        val cmds = arrayOf(
+            "cd $installDir",
+            "KEEPFORCEENCRYPT=${Config.keepEnc} " +
+            "KEEPVERITY=${Config.keepVerity} " +
+            "PATCHVBMETAFLAG=${Config.patchVbmeta} " +
+            "RECOVERYMODE=${Config.recovery} " +
+            "sh boot_patch.sh $srcBoot")
+
+        if (!cmds.sh().isSuccess)
+            return false
+
+        val job = shell.newJob().add("./magiskboot cleanup", "cd /")
+
+        if (isSigned) {
+            console.add("- Signing boot image with verity keys")
+            val signed = File.createTempFile("signed", ".img", context.cacheDir)
+            try {
+                val src = newBoot.newInputStream().buffered()
+                val out = signed.outputStream().buffered()
+                withStreams(src, out) { _, _ ->
+                    SignBoot.doSignature(null, null, src, out, "/boot")
+                }
+            } catch (e: IOException) {
+                console.add("! Unable to sign image")
+                Timber.e(e)
+                return false
+            }
+            job.add("cat $signed > $newBoot", "rm -f $signed")
+        }
+        job.exec()
+        return true
+    }
+
+    private fun flashBoot() = "direct_install $installDir $srcBoot".sh().isSuccess
+
+    private fun postOTA(): Boolean {
+        try {
+            val bootctl = File.createTempFile("bootctl", null, context.cacheDir)
+            context.assets.open("bootctl").writeTo(bootctl)
+            "post_ota $bootctl".sh()
+        } catch (e: IOException) {
+            console.add("! Unable to download bootctl")
+            Timber.e(e)
+            return false
+        }
+
+        console.add("***************************************")
+        console.add(" Next reboot will boot to second slot!")
+        console.add("***************************************")
+        return true
+    }
+
+    private fun String.sh() = shell.newJob().add(this).to(console, logs).exec()
+    private fun Array<String>.sh() = shell.newJob().add(*this).to(console, logs).exec()
+    private fun String.fsh() = ShellUtils.fastCmd(shell, this)
+    private fun Array<String>.fsh() = ShellUtils.fastCmd(shell, *this)
+
+    protected fun patchFile(file: Uri) = extractFiles() && handleFile(file)
+
+    protected fun direct() = findImage() && extractFiles() && patchBoot() && flashBoot()
+
+    protected fun secondSlot() =
+        findSecondary() && extractFiles() && patchBoot() && flashBoot() && postOTA()
+
+    protected fun fixEnv() = extractFiles() && "fix_env $installDir".sh().isSuccess
+
+    protected fun uninstall() = "run_uninstaller $AppApkPath".sh().isSuccess
+
+    @WorkerThread
+    protected abstract suspend fun operations(): Boolean
+
+    open suspend fun exec(): Boolean {
+        if (haveActiveSession.getAndSet(true))
+            return false
+        val result = withContext(Dispatchers.IO) { operations() }
+        haveActiveSession.set(false)
+        return result
+    }
+
+    companion object {
+        private var haveActiveSession = AtomicBoolean(false)
+    }
+}
+
+abstract class MagiskInstaller(
+    console: MutableList<String>,
+    logs: MutableList<String>
+) : MagiskInstallImpl(console, logs) {
+
+    override suspend fun exec(): Boolean {
+        val success = super.exec()
+        if (success) {
+            console.add("- All done!")
+        } else {
+            Shell.cmd("rm -rf $installDir").submit()
+            console.add("! Installation failed")
+        }
+        return success
+    }
+
+    class Patch(
+        private val uri: Uri,
+        console: MutableList<String>,
+        logs: MutableList<String>
+    ) : MagiskInstaller(console, logs) {
+        override suspend fun operations() = patchFile(uri)
+    }
+
+    class SecondSlot(
+        console: MutableList<String>,
+        logs: MutableList<String>
+    ) : MagiskInstaller(console, logs) {
+        override suspend fun operations() = secondSlot()
+    }
+
+    class Direct(
+        console: MutableList<String>,
+        logs: MutableList<String>
+    ) : MagiskInstaller(console, logs) {
+        override suspend fun operations() = direct()
+    }
+
+    class Emulator(
+        console: MutableList<String>,
+        logs: MutableList<String>
+    ) : MagiskInstaller(console, logs) {
+        override suspend fun operations() = fixEnv()
+    }
+
+    class Uninstall(
+        console: MutableList<String>,
+        logs: MutableList<String>
+    ) : MagiskInstallImpl(console, logs) {
+        override suspend fun operations() = uninstall()
+
+        override suspend fun exec(): Boolean {
+            val success = super.exec()
+            if (success) {
+                UiThreadHandler.handler.postDelayed(3000) {
+                    Shell.cmd("pm uninstall ${context.packageName}").exec()
+                }
+            }
+            return success
+        }
+    }
+
+    class FixEnv(private val callback: () -> Unit) : MagiskInstallImpl() {
+        override suspend fun operations() = fixEnv()
+
+        override suspend fun exec(): Boolean {
+            val success = super.exec()
+            callback()
+            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/utils/AXML.kt

@@ -0,0 +1,131 @@
+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
+
+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,17 +1,16 @@
-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 org.koin.core.KoinComponent
-import org.koin.core.get
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.di.AppContext
 
-object BiometricHelper: KoinComponent {
+object BiometricHelper {
 
-    private val mgr by lazy { BiometricManager.from(get()) }
+    private val mgr by lazy { BiometricManager.from(AppContext) }
 
     val isSupported get() = when (mgr.canAuthenticate()) {
         BiometricManager.BIOMETRIC_SUCCESS -> true

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

@@ -0,0 +1,36 @@
+package com.topjohnwu.magisk.core.utils
+
+import kotlinx.coroutines.*
+import java.util.concurrent.AbstractExecutorService
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+class DispatcherExecutor(dispatcher: CoroutineDispatcher) : AbstractExecutorService() {
+
+    private val job = SupervisorJob()
+    private val scope = CoroutineScope(job + dispatcher)
+    private val latch = CountDownLatch(1)
+
+    init {
+        job.invokeOnCompletion { latch.countDown() }
+    }
+
+    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) = latch.await(timeout, unit)
+}

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

@@ -0,0 +1,78 @@
+package com.topjohnwu.magisk.core.utils
+
+import android.util.Base64
+import android.util.Base64OutputStream
+import com.topjohnwu.magisk.core.Config
+import org.bouncycastle.asn1.x500.X500Name
+import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo
+import org.bouncycastle.cert.X509v3CertificateBuilder
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder
+import java.io.ByteArrayOutputStream
+import java.math.BigInteger
+import java.security.KeyPairGenerator
+import java.security.KeyStore
+import java.security.PrivateKey
+import java.security.cert.X509Certificate
+import java.util.*
+import java.util.zip.GZIPInputStream
+import java.util.zip.GZIPOutputStream
+
+private interface CertKeyProvider {
+    val cert: X509Certificate
+    val key: PrivateKey
+}
+
+class Keygen : CertKeyProvider {
+
+    companion object {
+        private const val ALIAS = "magisk"
+        private val PASSWORD get() = "magisk".toCharArray()
+        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().apply { add(Calendar.MONTH, -3) }
+    private val end = (start.clone() as Calendar).apply { add(Calendar.YEAR, 30) }
+
+    private val ks = init()
+    override val cert = ks.getCertificate(ALIAS) as X509Certificate
+    override val key = ks.getKey(ALIAS, PASSWORD) as PrivateKey
+
+    private fun init(): KeyStore {
+        val raw = Config.keyStoreRaw
+        val ks = KeyStore.getInstance("PKCS12")
+        if (raw.isEmpty()) {
+            ks.load(null)
+        } else {
+            GZIPInputStream(Base64.decode(raw, BASE64_FLAG).inputStream()).use {
+                ks.load(it, PASSWORD)
+            }
+        }
+
+        // Keys already exist
+        if (ks.containsAlias(ALIAS))
+            return ks
+
+        // Generate new private key and certificate
+        val kp = KeyPairGenerator.getInstance("RSA").apply { initialize(4096) }.genKeyPair()
+        val dname = X500Name(DNAME)
+        val builder = X509v3CertificateBuilder(
+            dname, BigInteger(160, Random()),
+            start.time, end.time, Locale.ROOT, dname,
+            SubjectPublicKeyInfo.getInstance(kp.public.encoded)
+        )
+        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))
+        val bytes = ByteArrayOutputStream()
+        GZIPOutputStream(Base64OutputStream(bytes, BASE64_FLAG)).use {
+            ks.store(it, PASSWORD)
+        }
+        Config.keyStoreRaw = bytes.toString("UTF-8")
+
+        return ks
+    }
+}