Release Magisk v24.1

Co-authored-by: 南宫雪珊 <vvb2060@gmail.com>
Co-authored-by: 残页 <31466456+canyie@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,37 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+
+## READ BEFORE OPENING ISSUES
+
+All bug reports require you to **USE CANARY BUILDS**. Please include the version name and version code in the bug report.
+
+If you experience a bootloop, attach a `dmesg` (kernel logs) when the device refuse to boot. This may very likely require a custom kernel on some devices as `last_kmsg` or `pstore ramoops` are usually not enabled by default. In addition, please also upload the result of `cat /proc/mounts` when your device is working correctly **WITHOUT ROOT**.
+
+If you experience issues during installation, in recovery, upload the recovery logs, or in Magisk, 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
@@ -25,6 +25,21 @@
 [submodule "pcre"]
 	path = native/jni/external/pcre
 	url = https://android.googlesource.com/platform/external/pcre
+[submodule "xhook"]
+	path = native/jni/external/xhook
+	url = https://github.com/iqiyi/xHook.git
+[submodule "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

README.MD

@@ -1,43 +1,62 @@
-# 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 almost perfectly hide modifications within userspace. Note that since 2020.3, the CTS check of [Google's SafetyNet API](https://developer.android.com/training/safetynet/index.html) will **NOT** pass.
+- **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-v23.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v23.0)
+[![](https://img.shields.io/badge/Magisk%20Beta-v24.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v24.0)
+[![](https://img.shields.io/badge/Magisk-Canary-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
 
-**Only reports using debug canary builds will be accepted.** \
-Access canary builds by upgrading to either canary Magisk Manager:
-- [Canary Manager (Release)](https://raw.githubusercontent.com/topjohnwu/magisk_files/canary/app-release.apk)
-- [Canary Manager (Debug)](https://raw.githubusercontent.com/topjohnwu/magisk_files/canary/app-debug.apk)
+**Only bug reports from Canary builds will be accepted.**
 
-For installation issues, upload both boot image and install logs. \
-For Magisk issues, upload boot logcat or dmesg. \
-For Magisk Manager crashes, record and upload the logcat when the crash occurs.
+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.
 
-## Building Environment Requirements
+## Building and Development
 
--  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
+- 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 (C++/C) sources.
+- Optionally, set custom configs with `config.prop`. A sample `config.prop.sample` is provided.
+- To sign APKs and zips with your own private keys, set signing configs in `config.prop`. For more info, check [Google's Documentation](https://developer.android.com/studio/publish/app-signing.html#generate-key).
 
-## Building Notes and Instructions
+## Translation Contributions
 
--  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).
-
-## Translations
-
-Default string resources for Magisk Manager and its stub APK are located here:
+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`

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
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.incremental":"true"]
-            }
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),
-                    'proguard-rules.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.18'
-    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.1'
-    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.7.1'
-    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.10'
-    implementation("com.squareup.okhttp3:okhttp:${vOkHttp}") {
-        force = true
-    }
-    implementation "com.squareup.okhttp3:logging-interceptor:${vOkHttp}"
-
-    def vMoshi = '1.10.0-SNAPSHOT'
-    implementation "com.squareup.moshi:moshi:${vMoshi}"
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}"
-
-    def vRoom = '2.2.4'
-    implementation "androidx.room:room-runtime:${vRoom}"
-    implementation "androidx.room:room-rxjava2:${vRoom}"
-    kapt "androidx.room:room-compiler:${vRoom}"
-
-    def vNav = '2.2.1'
-    implementation "androidx.navigation:navigation-fragment-ktx:${vNav}"
-    implementation "androidx.navigation:navigation-ui-ktx:${vNav}"
-
-    implementation 'androidx.biometric:biometric:1.0.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-beta01'
-    implementation 'androidx.browser:browser:1.2.0'
-    implementation 'androidx.preference:preference:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.fragment:fragment-ktx:1.2.2'
-    implementation 'androidx.work:work-runtime:2.3.3'
-    implementation 'androidx.transition:transition:1.3.1'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.core:core-ktx:1.2.0'
-    implementation 'com.google.android.material:material:1.2.0-alpha03'
-}

app/build.gradle.kts

@@ -0,0 +1,128 @@
+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 {
+    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"
+        }
+    }
+
+    kotlinOptions {
+        jvmTarget = "11"
+        freeCompilerArgs = listOf("-Xjvm-default=enable")
+    }
+}
+
+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:4.7.1")
+    implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
+    implementation("dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0")
+    implementation("dev.rikka.rikkax.insets:insets:1.1.1")
+    implementation("dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1")
+    implementation("io.noties.markwon:core:4.6.2")
+
+    val vBAdapt = "4.0.0"
+    val bindingAdapter = "me.tatarka.bindingcollectionadapter2:bindingcollectionadapter"
+    implementation("${bindingAdapter}:${vBAdapt}")
+    implementation("${bindingAdapter}-recyclerview:${vBAdapt}")
+
+    val vLibsu = "3.2.1"
+    implementation("com.github.topjohnwu.libsu:core:${vLibsu}")
+    implementation("com.github.topjohnwu.libsu:io:${vLibsu}")
+    implementation("com.github.topjohnwu.libsu:service:${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.4.1"
+    implementation("androidx.room:room-runtime:${vRoom}")
+    implementation("androidx.room:room-ktx:${vRoom}")
+    kapt("androidx.room:room-compiler:${vRoom}")
+
+    val vNav = "2.5.0-alpha01"
+    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.3")
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
+    implementation("androidx.appcompat:appcompat:1.4.1")
+    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.7.0")
+    implementation("androidx.core:core-splashscreen:1.0.0-beta01")
+    implementation("com.google.android.material:material:1.5.0")
+}

app/proguard-rules.pro

@@ -16,39 +16,44 @@
 #   public *;
 #}
 
+# Parcelable
+-keepclassmembers class * implements android.os.Parcelable {
+    public static final ** CREATOR;
+}
+
 # Kotlin
 -assumenosideeffects class kotlin.jvm.internal.Intrinsics {
-	public static void checkExpressionValueIsNotNull(...);
-	public static void checkNotNullExpressionValue(...);
-	public static void checkReturnedValueIsNotNull(...);
-	public static void checkFieldIsNotNull(...);
-	public static void checkParameterIsNotNull(...);
+	public static void check*(...);
+	public static void throw*(...);
 }
 
-# Stubs
--keep class a.* { *; }
-
-# Snet
--keepclassmembers class com.topjohnwu.magisk.core.utils.SafetyNetHelper { *; }
--keep,allowobfuscation interface com.topjohnwu.magisk.core.utils.SafetyNetHelper$Callback
--keepclassmembers class * implements com.topjohnwu.magisk.core.utils.SafetyNetHelper$Callback {
-  void onResponse(int);
+# Stub
+-keep class com.topjohnwu.magisk.core.App { <init>(java.lang.Object); }
+-keepclassmembers class androidx.appcompat.app.AppCompatDelegateImpl {
+  boolean mActivityHandlesUiModeChecked;
+  boolean mActivityHandlesUiMode;
 }
 
-# Fragments
--keep,allowobfuscation class * extends androidx.fragment.app.Fragment
-
 # Strip Timber verbose and debug logging
--assumenosideeffects class timber.log.Timber.Tree {
+-assumenosideeffects class timber.log.Timber$Tree {
   public void v(**);
   public void d(**);
 }
 
 # Excessive obfuscation
--repackageclasses
+-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,15 @@
+plugins {
+    id("com.android.library")
+}
+
+setupCommon()
+
+android {
+    defaultConfig {
+        consumerProguardFiles("proguard-rules.pro")
+    }
+}
+
+dependencies {
+    api("io.michaelrocks:paranoid-core:0.3.7")
+}

app/shared/proguard-rules.pro

@@ -19,7 +19,3 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
-
--keepclassmembers class * extends javax.net.ssl.SSLSocketFactory {
-    ** delegate;
-}

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/DynAPK.java

@@ -1,5 +1,7 @@
 package com.topjohnwu.magisk;
 
+import static android.os.Build.VERSION.SDK_INT;
+
 import android.content.Context;
 import android.content.res.AssetManager;
 
@@ -7,14 +9,10 @@ import java.io.File;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import static android.os.Build.VERSION.SDK_INT;
+import io.michaelrocks.paranoid.Obfuscate;
 
+@Obfuscate
 public class DynAPK {
-
-    // Indices of the object array
-    private static final int STUB_VERSION_ENTRY = 0;
-    private static final int CLASS_COMPONENT_MAP = 1;
-
     private static File dynDir;
     private static Method addAssetPath;
 
@@ -38,21 +36,6 @@ public class DynAPK {
         return new File(getDynDir(c), "update.apk");
     }
 
-    public static Data load(Object o) {
-        Object[] arr = (Object[]) o;
-        Data data = new Data();
-        data.version = (int) arr[STUB_VERSION_ENTRY];
-        data.classToComponent = (Map<String, String>) arr[CLASS_COMPONENT_MAP];
-        return data;
-    }
-
-    public static Object pack(Data data) {
-        Object[] arr = new Object[2];
-        arr[STUB_VERSION_ENTRY] = data.version;
-        arr[CLASS_COMPONENT_MAP] = data.classToComponent;
-        return arr;
-    }
-
     public static void addAssetPath(AssetManager asset, String path) {
         try {
             if (addAssetPath == null)
@@ -62,7 +45,28 @@ public class DynAPK {
     }
 
     public static class Data {
-        public int version;
-        public Map<String, String> classToComponent;
+        // 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/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/utils/APKInstall.java

@@ -0,0 +1,121 @@
+package com.topjohnwu.magisk.utils;
+
+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.Session;
+import android.content.pm.PackageInstaller.SessionParams;
+import android.net.Uri;
+import android.os.Build;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import io.michaelrocks.paranoid.Obfuscate;
+
+@Obfuscate
+public final class APKInstall {
+    // @WorkerThread
+    public static void installapk(Context context, File apk) {
+        //noinspection InlinedApi
+        var flag = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE;
+        var action = APKInstall.class.getName();
+        var intent = new Intent(action).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);
+        }
+        try (Session session = installer.openSession(installer.createSession(params))) {
+            OutputStream out = session.openWrite(apk.getName(), 0, apk.length());
+            try (var in = new FileInputStream(apk); out) {
+                transfer(in, out);
+            }
+            session.commit(pending.getIntentSender());
+        } catch (IOException e) {
+            Log.e(APKInstall.class.getSimpleName(), "", e);
+        }
+    }
+
+    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 InstallReceiver register(Context context, String packageName, Runnable onSuccess) {
+        var receiver = new InstallReceiver(context, packageName, onSuccess);
+        var filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
+        filter.addDataScheme("package");
+        context.registerReceiver(receiver, filter);
+        context.registerReceiver(receiver, new IntentFilter(APKInstall.class.getName()));
+        return receiver;
+    }
+
+    public static class InstallReceiver extends BroadcastReceiver {
+        private final Context context;
+        private final String packageName;
+        private final Runnable onSuccess;
+        private final CountDownLatch latch = new CountDownLatch(1);
+        private Intent intent = null;
+
+        private InstallReceiver(Context context, String packageName, Runnable onSuccess) {
+            this.context = context;
+            this.packageName = packageName;
+            this.onSuccess = onSuccess;
+        }
+
+        @Override
+        public void onReceive(Context c, Intent i) {
+            if (Intent.ACTION_PACKAGE_ADDED.equals(i.getAction())) {
+                Uri data = i.getData();
+                if (data == null || onSuccess == null) return;
+                String pkg = data.getSchemeSpecificPart();
+                if (pkg.equals(packageName)) {
+                    onSuccess.run();
+                    context.unregisterReceiver(this);
+                }
+                return;
+            }
+            int status = i.getIntExtra(EXTRA_STATUS, STATUS_FAILURE_INVALID);
+            switch (status) {
+                case STATUS_PENDING_USER_ACTION:
+                    intent = i.getParcelableExtra(Intent.EXTRA_INTENT);
+                    break;
+                case STATUS_SUCCESS:
+                    if (onSuccess != null) onSuccess.run();
+                default:
+                    context.unregisterReceiver(this);
+            }
+            latch.countDown();
+        }
+
+        // @WorkerThread @Nullable
+        public Intent waitIntent() {
+            try {
+                //noinspection ResultOfMethodCallIgnored
+                latch.await(5, TimeUnit.SECONDS);
+            } catch (Exception ignored) {
+            }
+            return intent;
+        }
+    }
+}

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

@@ -9,7 +9,11 @@ import dalvik.system.DexClassLoader;
 
 public class DynamicClassLoader extends DexClassLoader {
 
-    private ClassLoader base = Object.class.getClassLoader();
+    private static final ClassLoader base = Object.class.getClassLoader();
+
+    public DynamicClassLoader(File apk) {
+        super(apk.getPath(), apk.getParent(), null, base);
+    }
 
     public DynamicClassLoader(File apk, ClassLoader parent) {
         super(apk.getPath(), apk.getParent(), null, parent);
@@ -18,7 +22,7 @@ public class DynamicClassLoader extends DexClassLoader {
     @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;
 

app/src/main/AndroidManifest.xml

@@ -3,18 +3,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
 
     <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" />
@@ -26,33 +26,25 @@
             </intent-filter>
         </activity>
 
-        <!-- Main -->
-        <activity android:name="a.b" />
-
-        <!-- Flashing  -->
-        <activity android:name="a.f" />
-
-        <!-- Superuser -->
         <activity
-            android:name="a.m"
+            android:name=".ui.surequest.SuRequestActivity"
             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.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <!-- Receiver -->
         <receiver
-            android:name="a.h"
-            android:directBootAware="true">
+            android:name=".core.Receiver"
+            android:directBootAware="true"
+            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" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
@@ -62,28 +54,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/java/a/a.java

@@ -1,10 +0,0 @@
-package a;
-
-import com.topjohnwu.signing.BootSigner;
-
-public class a {
-
-    public static void main(String[] args) throws Exception {
-        BootSigner.main(args);
-    }
-}

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

@@ -1,26 +0,0 @@
-package a
-
-import com.topjohnwu.magisk.core.App
-import com.topjohnwu.magisk.core.GeneralReceiver
-import com.topjohnwu.magisk.core.SplashActivity
-import com.topjohnwu.magisk.core.download.DownloadService
-import com.topjohnwu.magisk.legacy.flash.FlashActivity
-import com.topjohnwu.magisk.legacy.surequest.SuRequestActivity
-import com.topjohnwu.magisk.ui.MainActivity
-
-class b : MainActivity()
-
-class c : SplashActivity()
-
-class e : App {
-    constructor() : super()
-    constructor(o: Any) : super(o)
-}
-
-class f : FlashActivity()
-
-class h : GeneralReceiver()
-
-class j : DownloadService()
-
-class m : SuRequestActivity()

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

@@ -1,35 +1,30 @@
-package com.topjohnwu.magisk.ui.base
+package com.topjohnwu.magisk.arch
 
 import android.os.Bundle
+import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.graphics.Insets
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.OnRebindCallback
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
+import androidx.navigation.NavDirections
 import com.topjohnwu.magisk.BR
-import com.topjohnwu.magisk.extensions.startAnimations
-import com.topjohnwu.magisk.model.events.EventHandler
-import com.topjohnwu.magisk.model.events.ViewEvent
+import com.topjohnwu.magisk.ktx.startAnimations
 
-abstract class BaseUIFragment<ViewModel : BaseViewModel, Binding : ViewDataBinding> :
-    Fragment(), CompatView<ViewModel>, EventHandler {
+abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHolder {
 
-    protected val activity get() = requireActivity() as BaseUIActivity<*, *>
+    val activity get() = getActivity() as? NavigationActivity<*>
     protected lateinit var binding: Binding
     protected abstract val layoutRes: Int
 
-    override val viewRoot: View get() = binding.root
-    override val navigation by lazy { activity.navigation }
-    private val delegate by lazy { CompatDelegate(this) }
-
-    override fun consumeSystemWindowInsets(insets: Insets) = insets
+    private val navigation get() = activity?.navigation
+    open val snackbarAnchorView: View? get() = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel.viewEvents.observe(this, viewEventObserver)
+        startObserveEvents()
     }
 
     override fun onCreateView(
@@ -37,17 +32,27 @@ abstract class BaseUIFragment<ViewModel : BaseViewModel, Binding : ViewDataBindi
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        binding = DataBindingUtil.inflate<Binding>(inflater, layoutRes, container, false).apply {
-            setVariable(BR.viewModel, viewModel)
-            lifecycleOwner = this@BaseUIFragment
+        binding = DataBindingUtil.inflate<Binding>(inflater, layoutRes, container, false).also {
+            it.setVariable(BR.viewModel, viewModel)
+            it.lifecycleOwner = viewLifecycleOwner
         }
-
         return binding.root
     }
 
-    override fun onEventDispatched(event: ViewEvent) {
-        super.onEventDispatched(event)
-        delegate.onEventExecute(event, this)
+    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
@@ -55,27 +60,25 @@ abstract class BaseUIFragment<ViewModel : BaseViewModel, Binding : ViewDataBindi
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
         binding.addOnRebindCallback(object : OnRebindCallback<Binding>() {
             override fun onPreBind(binding: Binding): Boolean {
-                this@BaseUIFragment.onPreBind(binding)
+                this@BaseFragment.onPreBind(binding)
                 return true
             }
         })
-
-        delegate.onCreate()
     }
 
     override fun onResume() {
         super.onResume()
-
-        delegate.onResume()
+        viewModel.requestRefresh()
     }
 
     protected open fun onPreBind(binding: Binding) {
         (binding.root as? ViewGroup)?.startAnimations()
     }
 
-    protected fun ViewEvent.dispatchOnSelf() = delegate.onEventExecute(this, this@BaseUIFragment)
+    fun NavDirections.navigate() {
+        navigation?.navigate(this)
+    }
 
 }

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

@@ -0,0 +1,129 @@
+package com.topjohnwu.magisk.arch
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import androidx.activity.result.contract.ActivityResultContract
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.databinding.ViewDataBinding
+import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.*
+import com.topjohnwu.magisk.core.tasks.HideAPK
+import com.topjohnwu.magisk.di.ServiceLocator
+import com.topjohnwu.magisk.ui.theme.Theme
+import com.topjohnwu.magisk.view.MagiskDialog
+import com.topjohnwu.magisk.view.Notifications
+import com.topjohnwu.magisk.view.Shortcuts
+import com.topjohnwu.superuser.Shell
+import java.util.concurrent.CountDownLatch
+
+abstract class BaseMainActivity<Binding : ViewDataBinding> : NavigationActivity<Binding>() {
+
+    companion object {
+        private var doPreload = true
+    }
+
+    private val latch = CountDownLatch(1)
+    private val uninstallPkg = registerForActivityResult(UninstallPackage) { latch.countDown() }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setTheme(Theme.selected.themeRes)
+
+        if (isRunningAsStub && doPreload) {
+            // Manually apply splash theme for stub
+            theme.applyStyle(R.style.StubSplashTheme, true)
+        }
+
+        super.onCreate(savedInstanceState)
+
+        if (!isRunningAsStub) {
+            val splashScreen = installSplashScreen()
+            splashScreen.setKeepOnScreenCondition { doPreload }
+        }
+
+        if (doPreload) {
+            Shell.getShell(null) {
+                if (isRunningAsStub && !it.isRoot) {
+                    showInvalidStateMessage()
+                    return@getShell
+                }
+                preLoad()
+                runOnUiThread {
+                    doPreload = false
+                    if (isRunningAsStub) {
+                        // Re-launch main activity without splash theme
+                        relaunch()
+                    } else {
+                        showMainUI(savedInstanceState)
+                    }
+                }
+            }
+        } else {
+            showMainUI(savedInstanceState)
+        }
+    }
+
+    abstract fun showMainUI(savedInstanceState: Bundle?)
+
+    private fun showInvalidStateMessage() {
+        runOnUiThread {
+            MagiskDialog(this).apply {
+                setTitle(R.string.unsupport_nonroot_stub_title)
+                setMessage(R.string.unsupport_nonroot_stub_msg)
+                setButton(MagiskDialog.ButtonType.POSITIVE) {
+                    text = R.string.install
+                    onClick { HideAPK.restore(this@BaseMainActivity) }
+                }
+                setCancelable(false)
+                show()
+            }
+        }
+    }
+
+    private fun preLoad() {
+        val prevPkg = intent.getStringExtra(Const.Key.PREV_PKG)
+
+        Config.load(prevPkg)
+        handleRepackage(prevPkg)
+        Notifications.setup(this)
+        JobService.schedule(this)
+        Shortcuts.setupDynamic(this)
+
+        // Pre-fetch network services
+        ServiceLocator.networkService
+    }
+
+    private fun handleRepackage(pkg: String?) {
+        if (packageName != APPLICATION_ID) {
+            runCatching {
+                // Hidden, remove com.topjohnwu.magisk if exist as it could be malware
+                packageManager.getApplicationInfo(APPLICATION_ID, 0)
+                Shell.su("(pm uninstall $APPLICATION_ID)& >/dev/null 2>&1").exec()
+            }
+        } else {
+            if (Config.suManager.isNotEmpty())
+                Config.suManager = ""
+            pkg ?: return
+            if (!Shell.su("(pm uninstall $pkg)& >/dev/null 2>&1").exec().isSuccess) {
+                uninstallPkg.launch(pkg)
+                // Wait for the uninstallation to finish
+                latch.await()
+            }
+        }
+    }
+
+    object UninstallPackage : ActivityResultContract<String, Boolean>() {
+
+        @Suppress("DEPRECATION")
+        override fun createIntent(context: Context, input: String): Intent {
+            val uri = Uri.Builder().scheme("package").opaquePart(input).build()
+            val intent = Intent(Intent.ACTION_UNINSTALL_PACKAGE, uri)
+            intent.putExtra(Intent.EXTRA_RETURN_RESULT, true)
+            return intent
+        }
+
+        override fun parseResult(resultCode: Int, intent: Intent?) = resultCode == RESULT_OK
+    }
+}

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

@@ -0,0 +1,105 @@
+package com.topjohnwu.magisk.arch
+
+import android.Manifest
+import androidx.annotation.CallSuper
+import androidx.databinding.Bindable
+import androidx.databinding.Observable
+import androidx.databinding.PropertyChangeRegistry
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import androidx.navigation.NavDirections
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.databinding.ObservableHost
+import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.magisk.events.BackPressEvent
+import com.topjohnwu.magisk.events.NavigationEvent
+import com.topjohnwu.magisk.events.PermissionEvent
+import com.topjohnwu.magisk.events.SnackbarEvent
+import kotlinx.coroutines.Job
+
+abstract class BaseViewModel(
+    initialState: State = State.LOADING
+) : ViewModel(), ObservableHost {
+
+    override var callbacks: PropertyChangeRegistry? = null
+
+    enum class State {
+        LOADED, LOADING, LOADING_FAILED
+    }
+
+    @get:Bindable
+    val loading get() = state == State.LOADING
+    @get:Bindable
+    val loaded get() = state == State.LOADED
+    @get:Bindable
+    val loadFailed get() = state == State.LOADING_FAILED
+
+    val isConnected get() = Info.isConnected
+    val viewEvents: LiveData<ViewEvent> get() = _viewEvents
+
+    var state= initialState
+        set(value) = set(value, field, { field = it }, BR.loading, BR.loaded, BR.loadFailed)
+
+    private val _viewEvents = MutableLiveData<ViewEvent>()
+    private var runningJob: Job? = null
+    private val refreshCallback = object : Observable.OnPropertyChangedCallback() {
+        override fun onPropertyChanged(sender: Observable?, propertyId: Int) {
+            requestRefresh()
+        }
+    }
+
+    init {
+        isConnected.addOnPropertyChangedCallback(refreshCallback)
+    }
+
+    /** This should probably never be called manually, it's called manually via delegate. */
+    @Synchronized
+    fun requestRefresh() {
+        if (runningJob?.isActive == true) {
+            return
+        }
+        runningJob = refresh()
+    }
+
+    protected open fun refresh(): Job? = null
+
+    @CallSuper
+    override fun onCleared() {
+        isConnected.removeOnPropertyChangedCallback(refreshCallback)
+        super.onCleared()
+    }
+
+    fun withPermission(permission: String, callback: (Boolean) -> Unit) {
+        PermissionEvent(permission, callback).publish()
+    }
+
+    inline fun withExternalRW(crossinline callback: () -> Unit) {
+        withPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) {
+            if (!it) {
+                SnackbarEvent(R.string.external_rw_permission_denied).publish()
+            } else {
+                callback()
+            }
+        }
+    }
+
+    fun back() = BackPressEvent().publish()
+
+    fun <Event : ViewEvent> Event.publish() {
+        _viewEvents.postValue(this)
+    }
+
+    fun <Event : ViewEventWithScope> Event.publish() {
+        scope = viewModelScope
+        _viewEvents.postValue(this)
+    }
+
+    fun NavDirections.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,87 @@
+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.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.base.BaseActivity
+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 {
+        val theme = Config.darkTheme
+        AppCompatDelegate.setDefaultNightMode(theme)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        layoutInflater.factory2 = LayoutInflaterFactory(delegate)
+            .addOnViewCreatedListener(WindowInsetsHelper.LISTENER)
+
+        super.onCreate(savedInstanceState)
+
+        startObserveEvents()
+
+        // We need to set the window background explicitly since for whatever reason it's not
+        // propagated upstream
+        obtainStyledAttributes(intArrayOf(android.R.attr.windowBackground))
+            .use { it.getDrawable(0) }
+            .also { window.setBackgroundDrawable(it) }
+
+        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
+    }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.requestRefresh()
+    }
+
+    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,19 @@
+package com.topjohnwu.magisk.arch
+
+import androidx.lifecycle.LifecycleOwner
+
+interface ViewModelHolder : LifecycleOwner {
+
+    val viewModel: BaseViewModel
+
+    fun startObserveEvents() {
+        viewModel.viewEvents.observe(this) {
+            onEventDispatched(it)
+        }
+    }
+
+    /**
+     * Called for all [ViewEvent]s published by associated viewModel.
+     */
+    fun onEventDispatched(event: ViewEvent) {}
+}

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

@@ -1,41 +1,33 @@
 package com.topjohnwu.magisk.core
 
+import android.annotation.SuppressLint
+import android.app.Activity
 import android.app.Application
 import android.content.Context
 import android.content.res.Configuration
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.multidex.MultiDex
-import androidx.work.WorkManager
-import com.topjohnwu.magisk.BuildConfig
+import android.os.Bundle
 import com.topjohnwu.magisk.DynAPK
-import com.topjohnwu.magisk.FileProvider
-import com.topjohnwu.magisk.core.su.SuCallbackHandler
-import com.topjohnwu.magisk.core.utils.RootInit
-import com.topjohnwu.magisk.core.utils.updateConfig
-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.core.utils.*
+import com.topjohnwu.magisk.di.ServiceLocator
 import com.topjohnwu.superuser.Shell
-import org.koin.android.ext.koin.androidContext
-import org.koin.core.context.startKoin
+import com.topjohnwu.superuser.internal.UiThreadHandler
+import com.topjohnwu.superuser.ipc.RootService
+import kotlinx.coroutines.Dispatchers
 import timber.log.Timber
 import kotlin.system.exitProcess
 
 open class App() : Application() {
 
     constructor(o: Any) : this() {
-        Info.stub = DynAPK.load(o)
+        val data = DynAPK.Data(o)
+        // Add the root service name mapping
+        data.classToComponent[RootRegistry::class.java.name] = data.rootService.name
+        // Send back the actual root service class
+        data.rootService = RootRegistry::class.java
+        Info.stub = data
     }
 
     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 = SuCallbackHandler
-
         // Always log full stack trace with Timber
         Timber.plant(Timber.DebugTree())
         Thread.setDefaultUncaughtExceptionHandler { _, e ->
@@ -44,42 +36,74 @@ open class App() : Application() {
         }
     }
 
-    override fun attachBaseContext(base: Context) {
-        // Basic setup
-        if (BuildConfig.DEBUG)
-            MultiDex.install(base)
+    override fun attachBaseContext(context: Context) {
+        Shell.setDefaultBuilder(Shell.Builder.create()
+            .setFlags(Shell.FLAG_MOUNT_MASTER)
+            .setInitializers(ShellInit::class.java)
+            .setTimeout(2))
+        Shell.EXECUTOR = DispatcherExecutor(Dispatchers.IO)
 
-        // Some context magic
+        // Get the actual ContextImpl
         val app: Application
-        val impl: Context
-        if (base is Application) {
-            app = base
-            impl = base.baseContext
+        val base: Context
+        if (context is Application) {
+            app = context
+            base = context.baseContext
         } else {
             app = this
-            impl = base
+            base = context
         }
-        val wrapped = impl.wrap()
-        super.attachBaseContext(wrapped)
+        super.attachBaseContext(base)
+        ServiceLocator.context = base
 
-        // Normal startup
-        startKoin {
-            androidContext(wrapped)
-            modules(koinModules)
+        refreshLocale()
+        AppApkPath = if (isRunningAsStub) {
+            DynAPK.current(base).path
+        } else {
+            base.packageResourcePath
         }
-        ResMgr.init(impl)
-        app.registerActivityLifecycleCallbacks(get<ActivityTracker>())
-        WorkManager.initialize(impl.wrapJob(), androidx.work.Configuration.Builder().build())
+
+        base.resources.patch()
+        app.registerActivityLifecycleCallbacks(ActivityTracker)
     }
 
-    // This is required as some platforms expect ContextImpl
-    override fun getBaseContext(): Context {
-        return super.getBaseContext().unwrap()
+    override fun onCreate() {
+        super.onCreate()
+        RootRegistry.bindTask = RootService.createBindTask(
+            intent<RootRegistry>(),
+            UiThreadHandler.executor,
+            RootRegistry.Connection
+        )
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
-        resources.updateConfig(newConfig)
+        if (resources.configuration.diff(newConfig) != 0) {
+            resources.setConfig(newConfig)
+        }
         if (!isRunningAsStub)
             super.onConfigurationChanged(newConfig)
     }
 }
+
+@SuppressLint("StaticFieldLeak")
+object ActivityTracker : Application.ActivityLifecycleCallbacks {
+
+    @Volatile
+    var foreground: Activity? = null
+
+    val hasForeground get() = foreground != null
+
+    override fun onActivityResumed(activity: Activity) {
+        foreground = activity
+    }
+
+    override fun onActivityPaused(activity: Activity) {
+        foreground = null
+    }
+
+    override fun onActivityCreated(activity: Activity, bundle: Bundle?) {}
+    override fun onActivityStarted(activity: Activity) {}
+    override fun onActivityStopped(activity: Activity) {}
+    override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) {}
+    override fun onActivityDestroyed(activity: Activity) {}
+}

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

@@ -1,33 +1,35 @@
 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.BuildConfig
-import com.topjohnwu.magisk.core.magiskdb.SettingsDao
-import com.topjohnwu.magisk.core.magiskdb.StringDao
-import com.topjohnwu.magisk.core.utils.BiometricHelper
-import com.topjohnwu.magisk.core.utils.Utils
+import com.topjohnwu.magisk.core.utils.refreshLocale
+import com.topjohnwu.magisk.data.preference.PreferenceModel
+import com.topjohnwu.magisk.data.repository.DBBoolSettingsNoWrite
 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.di.ServiceLocator
 import com.topjohnwu.magisk.ui.theme.Theme
-import com.topjohnwu.superuser.Shell
-import com.topjohnwu.superuser.io.SuFile
-import com.topjohnwu.superuser.io.SuFileInputStream
 import org.xmlpull.v1.XmlPullParser
 import java.io.File
+import java.io.InputStream
 
 object Config : PreferenceModel, 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
+
+    @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
@@ -35,6 +37,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"
 
@@ -43,24 +47,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_EXTENDED = "dark_theme_extended"
+        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 REDESIGN = "redesign"
+        const val DOWNLOAD_DIR = "download_dir"
         const val SAFETY = "safety_notice"
         const val THEME_ORDINAL = "theme_ordinal"
         const val BOOT_ID = "boot_id"
-        const val LIST_SPAN_COUNT = "column_count"
-
-        // system state
-        const val MAGISKHIDE = "magiskhide"
-        const val COREONLY = "disable"
+        const val ASKED_HOME = "asked_home"
+        const val DOH = "doh"
     }
 
     object Value {
@@ -70,7 +70,6 @@ object Config : PreferenceModel, DBConfig {
         const val BETA_CHANNEL = 1
         const val CUSTOM_CHANNEL = 2
         const val CANARY_CHANNEL = 3
-        const val CANARY_DEBUG_CHANNEL = 4
 
         // root access mode
         const val ROOT_ACCESS_DISABLED = 0
@@ -106,83 +105,80 @@ object Config : PreferenceModel, DBConfig {
     }
 
     private val defaultChannel =
-        if (isCanaryVersion) {
-            if (BuildConfig.DEBUG)
-                Value.CANARY_DEBUG_CHANNEL
-            else
-                Value.CANARY_CHANNEL
-        } else Value.DEFAULT_CHANNEL
+        if (BuildConfig.DEBUG)
+            Value.CANARY_CHANNEL
+        else
+            Value.DEFAULT_CHANNEL
+
+    @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 safetyNotice by preference(Key.SAFETY, true)
-    var darkThemeExtended by preference(
-        Key.DARK_THEME_EXTENDED,
-        AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-    )
+    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)
-    @JvmStatic
-    var coreOnly by preference(Key.COREONLY, false)
+    var doh by preference(Key.DOH, false)
     var showSystemApp by preference(Key.SHOW_SYSTEM_APP, false)
-    @JvmStatic
-    var listSpanCount by preference(Key.LIST_SPAN_COUNT, 1)
 
     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 DBBoolSettingsNoWrite(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.PREFS_URI(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)
+                    putString(Key.UPDATE_CHANNEL, defaultChannel.toString())
+                else if (it.toInt() > Value.CANARY_CHANNEL)
+                    putString(Key.UPDATE_CHANNEL, Value.CANARY_CHANNEL.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")
@@ -226,19 +222,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

@@ -1,74 +1,63 @@
 package com.topjohnwu.magisk.core
 
+import android.os.Build
 import android.os.Process
-import java.io.File
+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
-    const val MAGISK_PATH = "/sbin/.magisk/modules"
-    var MAGISK_DISABLE_FILE = File("xxx")
-    const val TMP_FOLDER_PATH = "/dev/tmp"
+    lateinit var MAGISKTMP: String
+    val MAGISK_PATH get() = "$MAGISKTMP/modules"
+    const val TMPDIR = "/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
+    val APP_IS_CANARY get() = Version.isCanary(BuildConfig.VERSION_CODE)
 
     object Version {
-        const val MIN_VERSION = "v19.0"
-        const val MIN_VERCODE = 19000
-        const val CONNECT_MODE = 20100
-        const val PROVIDER_CONNECT = 20102
+        const val MIN_VERSION = "v21.0"
+        const val MIN_VERCODE = 21000
+
+        fun atLeast_21_2() = Info.env.versionCode >= 21200 || isCanary()
+        fun atLeast_24_0() = Info.env.versionCode >= 24000 || isCanary()
+        fun isCanary() = isCanary(Info.env.versionCode)
+
+        fun isCanary(ver: Int) = ver > 0 && ver % 100 != 0
     }
 
     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 JOB_SERVICE_ID = 7
         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"
 
+        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/users/Magisk-Modules-Repo/"
+        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 {
-        // 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 OPEN_SETTINGS = "settings"
-        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"
+        const val PREV_PKG = "prev_pkg"
     }
 
     object Value {
@@ -79,4 +68,10 @@ object Const {
         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/GeneralReceiver.kt

@@ -1,54 +0,0 @@
-package com.topjohnwu.magisk.core
-
-import android.content.ContextWrapper
-import android.content.Intent
-import com.topjohnwu.magisk.core.base.BaseReceiver
-import com.topjohnwu.magisk.core.download.DownloadService
-import com.topjohnwu.magisk.core.magiskdb.PolicyDao
-import com.topjohnwu.magisk.core.model.ManagerJson
-import com.topjohnwu.magisk.core.su.SuCallbackHandler
-import com.topjohnwu.magisk.core.view.Shortcuts
-import com.topjohnwu.magisk.extensions.reboot
-import com.topjohnwu.magisk.model.entity.internal.Configuration
-import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
-import com.topjohnwu.superuser.Shell
-import org.koin.core.inject
-
-open class GeneralReceiver : BaseReceiver() {
-
-    private val policyDB: PolicyDao by inject()
-
-    private fun getPkg(intent: Intent): String {
-        return intent.data?.encodedSchemeSpecificPart.orEmpty()
-    }
-
-    override fun onReceive(context: ContextWrapper, intent: Intent?) {
-        intent ?: return
-
-        when (intent.action ?: return) {
-            Intent.ACTION_REBOOT -> {
-                SuCallbackHandler(context, intent.getStringExtra("action"), intent.extras)
-            }
-            Intent.ACTION_PACKAGE_REPLACED -> {
-                // This will only work pre-O
-                if (Config.suReAuth)
-                    policyDB.delete(getPkg(intent)).blockingGet()
-            }
-            Intent.ACTION_PACKAGE_FULLY_REMOVED -> {
-                val pkg = getPkg(intent)
-                policyDB.delete(pkg).blockingGet()
-                Shell.su("magiskhide --rm $pkg").submit()
-            }
-            Intent.ACTION_LOCALE_CHANGED -> Shortcuts.setup(context)
-            Const.Key.BROADCAST_MANAGER_UPDATE -> {
-                intent.getParcelableExtra<ManagerJson>(Const.Key.INTENT_SET_APP)?.let {
-                    Info.remote = Info.remote.copy(app = it)
-                }
-                DownloadService(context) {
-                    subject = DownloadSubject.Manager(Configuration.APK.Upgrade)
-                }
-            }
-            Const.Key.BROADCAST_REBOOT -> reboot()
-        }
-    }
-}

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

@@ -2,10 +2,7 @@
 
 package com.topjohnwu.magisk.core
 
-import android.annotation.SuppressLint
-import android.app.job.JobInfo
-import android.app.job.JobScheduler
-import android.app.job.JobWorkItem
+import android.app.Activity
 import android.content.ComponentName
 import android.content.Context
 import android.content.ContextWrapper
@@ -13,158 +10,62 @@ import android.content.Intent
 import android.content.res.AssetManager
 import android.content.res.Configuration
 import android.content.res.Resources
-import androidx.annotation.RequiresApi
+import android.util.DisplayMetrics
 import com.topjohnwu.magisk.DynAPK
-import com.topjohnwu.magisk.ProcessPhoenix
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.download.DownloadService
-import com.topjohnwu.magisk.core.utils.refreshLocale
-import com.topjohnwu.magisk.core.utils.updateConfig
-import com.topjohnwu.magisk.extensions.forceGetDeclaredField
-import com.topjohnwu.magisk.legacy.flash.FlashActivity
-import com.topjohnwu.magisk.legacy.surequest.SuRequestActivity
-import com.topjohnwu.magisk.ui.MainActivity
+import com.topjohnwu.magisk.core.utils.syncLocale
+import com.topjohnwu.magisk.di.AppContext
 
-fun AssetManager.addAssetPath(path: String) {
-    DynAPK.addAssetPath(this, path)
+lateinit var AppApkPath: String
+
+fun AssetManager.addAssetPath(path: String) = DynAPK.addAssetPath(this, path)
+
+fun Context.wrap(): Context = if (this is PatchedContext) this else PatchedContext(this)
+
+private class PatchedContext(base: Context) : ContextWrapper(base) {
+    init { base.resources.patch() }
+    override fun getClassLoader() = javaClass.classLoader!!
+    override fun createConfigurationContext(config: Configuration) =
+        super.createConfigurationContext(config).wrap()
 }
 
-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 Resources.patch(): Resources {
+    syncLocale()
+    if (isRunningAsStub)
+        assets.addAssetPath(AppApkPath)
+    return this
 }
 
-fun Class<*>.cmp(pkg: String): ComponentName {
-    val name = ClassMap[this].name
-    return ComponentName(pkg, Info.stub?.classToComponent?.get(name) ?: name)
+fun createNewResources(): Resources {
+    val asset = AssetManager::class.java.newInstance()
+    asset.addAssetPath(AppApkPath)
+    val config = Configuration(AppContext.resources.configuration)
+    val metrics = DisplayMetrics()
+    metrics.setTo(AppContext.resources.displayMetrics)
+    return Resources(asset, metrics, config)
 }
 
+fun Class<*>.cmp(pkg: String) =
+    ComponentName(pkg, Info.stub?.classToComponent?.get(name) ?: name)
+
+inline fun <reified T> Activity.redirect() = Intent(intent)
+    .setComponent(T::class.java.cmp(packageName))
+    .setFlags(0)
+
 inline fun <reified T> Context.intent() = Intent().setComponent(T::class.java.cmp(packageName))
 
-private open class GlobalResContext(base: Context) : ContextWrapper(base) {
-    open val mRes: Resources get() = ResMgr.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(ResMgr.apk)
-        return this
-    }
-}
-
-object ResMgr {
-
-    lateinit var resource: Resources
-    lateinit var apk: String
-
-    fun init(context: Context) {
-        resource = context.resources
-        refreshLocale()
-        if (isRunningAsStub) {
-            apk = DynAPK.current(context).path
-            resource.assets.addAssetPath(apk)
-        } else {
-            apk = context.packageResourcePath
-        }
-    }
-}
-
-@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,
-        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 }
-}
-
-/*
-* Keep a reference to these resources to prevent it from
-* being removed when running "remove unused resources" */
+// Keep a reference to these resources to prevent it from
+// being removed when running "remove unused resources"
 val shouldKeepResources = listOf(
-    /* TODO: The following strings should be used somewhere */
-    R.string.no_apps_found,
     R.string.no_info_provided,
     R.string.release_notes,
-    R.string.settings_download_path_error,
     R.string.invalid_update_channel,
-    R.string.update_available
+    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

@@ -1,87 +1,70 @@
 package com.topjohnwu.magisk.core
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.topjohnwu.magisk.BuildConfig
+import android.os.Build
+import androidx.databinding.ObservableBoolean
 import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.core.model.UpdateInfo
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.subscribeK
-import com.topjohnwu.magisk.utils.CachedValue
-import com.topjohnwu.magisk.utils.KObservableField
+import com.topjohnwu.magisk.core.utils.net.NetworkObserver
+import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.di.AppContext
+import com.topjohnwu.magisk.ktx.getProperty
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils.fastCmd
-import java.io.FileInputStream
-import java.io.IOException
+import com.topjohnwu.superuser.internal.UiThreadHandler
 
 val isRunningAsStub get() = Info.stub != null
-val isCanaryVersion = !BuildConfig.VERSION_NAME.contains(".")
 
 object Info {
 
-    val envRef = CachedValue { loadState() }
+    var stub: DynAPK.Data? = null
 
-    @JvmStatic
-    val env by envRef              // Local
-    var remote = UpdateInfo()      // Remote
-    @JvmStatic
-    var stub: DynAPK.Data? = null  // Stub
-
-    // Toggle-able options
-    @JvmStatic var keepVerity = false
-    @JvmStatic var keepEnc = false
-    @JvmStatic var recovery = false
-
-    // Immutable device state
-    @JvmStatic var isSAR = false
-    @JvmStatic var isAB = false
-    @JvmStatic var ramdisk = false
-
-    val isConnected by lazy {
-        KObservableField(false).also { field ->
-            ReactiveNetwork.observeNetworkConnectivity(get())
-                .subscribeK {
-                    field.value = it.available()
-                }
-        }
+    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
     }
 
-    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
-                }
+    // 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
+
+    @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 by lazy {
+        ObservableBoolean(false).also { field ->
+            NetworkObserver.observe(AppContext) {
+                UiThreadHandler.run { field.set(it) }
             }
-        } catch (e: IOException) {
-            false
         }
     }
 
     private fun loadState() = Env(
         fastCmd("magisk -v").split(":".toRegex())[0],
-        runCatching { fastCmd("magisk -V").toInt() }.getOrDefault(-1),
-        Shell.su("magiskhide --status").exec().isSuccess
+        runCatching { fastCmd("magisk -V").toInt() }.getOrDefault(-1)
     )
 
     class Env(
-        val magiskVersionString: String = "",
-        code: Int = -1,
-        hide: Boolean = false
+        val versionString: String = "",
+        code: Int = -1
     ) {
-        val magiskHide get() = Config.magiskHide
-        val magiskVersionCode = when (code) {
-            in Int.MIN_VALUE..Const.Version.MIN_VERCODE -> -1
+        val versionCode = when {
+            code < 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
-        }
+        val isActive = versionCode >= 0
     }
 }

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

@@ -0,0 +1,57 @@
+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.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 {
+            svc.fetchUpdate()?.run {
+                Info.remote = this
+                if (Info.env.isActive && BuildConfig.VERSION_CODE < magisk.versionCode)
+                    Notifications.managerUpdate(this@JobService)
+            }
+            jobFinished(params, false)
+        }
+        return false
+    }
+
+    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,48 @@
+package com.topjohnwu.magisk.core
+
+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 android.os.Bundle
+import android.os.ParcelFileDescriptor
+import android.os.ParcelFileDescriptor.MODE_READ_ONLY
+import com.topjohnwu.magisk.core.su.SuCallbackHandler
+import java.io.File
+
+class Provider : ContentProvider() {
+
+    override fun attachInfo(context: Context, info: ProviderInfo) {
+        super.attachInfo(context.wrap(), info)
+    }
+
+    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) {
+            "/apk_file" -> ParcelFileDescriptor.open(File(context!!.packageCodePath), MODE_READ_ONLY)
+            "/prefs_file" -> ParcelFileDescriptor.open(Config.prefsFile, MODE_READ_ONLY)
+            else -> super.openFile(uri, mode)
+        }
+    }
+
+    companion object {
+        fun APK_URI(pkg: String) =
+            Uri.Builder().scheme("content").authority("$pkg.provider").path("apk_file").build()
+
+        fun PREFS_URI(pkg: String) =
+            Uri.Builder().scheme("content").authority("$pkg.provider").path("prefs_file").build()
+    }
+
+    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/Receiver.kt

@@ -0,0 +1,50 @@
+package com.topjohnwu.magisk.core
+
+import android.annotation.SuppressLint
+import android.content.ContextWrapper
+import android.content.Intent
+import com.topjohnwu.magisk.core.base.BaseReceiver
+import com.topjohnwu.magisk.di.ServiceLocator
+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: ContextWrapper, intent: Intent?) {
+        intent ?: return
+
+        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.su("magisk --denylist rm $it").submit() }
+            }
+            Intent.ACTION_LOCALE_CHANGED -> Shortcuts.setupDynamic(context)
+        }
+    }
+}

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

@@ -1,64 +0,0 @@
-package com.topjohnwu.magisk.core
-
-import android.app.Activity
-import android.content.Context
-import android.os.Bundle
-import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.core.tasks.patchDTB
-import com.topjohnwu.magisk.core.utils.Utils
-import com.topjohnwu.magisk.core.view.Notifications
-import com.topjohnwu.magisk.core.view.Shortcuts
-import com.topjohnwu.magisk.data.network.GithubRawServices
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.model.navigation.Navigation
-import com.topjohnwu.superuser.Shell
-
-open class SplashActivity : Activity() {
-
-    override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base.wrap())
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        Shell.getShell { Shell.EXECUTOR.execute(this::initAndStart) }
-    }
-
-    private fun handleRepackage() {
-        val pkg = Config.suManager
-        if (Config.suManager.isNotEmpty() && packageName == BuildConfig.APPLICATION_ID) {
-            Config.suManager = ""
-            Shell.su("(pm uninstall $pkg)& >/dev/null 2>&1").exec()
-        }
-        if (pkg == packageName) {
-            runCatching {
-                // We are the manager, remove com.topjohnwu.magisk as it could be malware
-                packageManager.getApplicationInfo(BuildConfig.APPLICATION_ID, 0)
-                Shell.su("(pm uninstall ${BuildConfig.APPLICATION_ID})& >/dev/null 2>&1").exec()
-            }
-        }
-    }
-
-    private fun initAndStart() {
-        Config.initialize()
-        handleRepackage()
-        Notifications.setup(this)
-        Utils.scheduleUpdateCheck(this)
-        Shortcuts.setup(this)
-
-        // Patch DTB partitions if needed
-        patchDTB(this)
-
-        // Pre-fetch network stuffs
-        get<GithubRawServices>()
-
-        DONE = true
-        Navigation.start(intent, this)
-        finish()
-    }
-
-    companion object {
-
-        var DONE = false
-    }
-}

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

@@ -1,31 +0,0 @@
-package com.topjohnwu.magisk.core
-
-import android.content.Context
-import androidx.work.Worker
-import androidx.work.WorkerParameters
-import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.core.view.Notifications
-import com.topjohnwu.magisk.data.repository.MagiskRepository
-import com.topjohnwu.magisk.extensions.inject
-import com.topjohnwu.superuser.Shell
-
-class UpdateCheckService(context: Context, workerParams: WorkerParameters)
-    : Worker(context, workerParams) {
-
-    private val magiskRepo: MagiskRepository by inject()
-
-    override fun doWork(): Result {
-        // Make sure shell initializer was ran
-        Shell.getShell()
-        return runCatching {
-            magiskRepo.fetchUpdate().blockingGet()
-            if (BuildConfig.VERSION_CODE < Info.remote.app.versionCode)
-                Notifications.managerUpdate(applicationContext)
-            else if (Info.env.magiskVersionCode < Info.remote.magisk.versionCode)
-                Notifications.magiskUpdate(applicationContext)
-            Result.success()
-        }.getOrElse {
-            Result.failure()
-        }
-    }
-}

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

@@ -1,25 +1,33 @@
 package com.topjohnwu.magisk.core.base
 
-import android.Manifest
+import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
 import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.content.res.Configuration
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import androidx.activity.result.contract.ActivityResultContracts.GetContent
+import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
 import androidx.appcompat.app.AppCompatActivity
-import androidx.collection.SparseArrayCompat
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
+import com.topjohnwu.magisk.core.isRunningAsStub
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.core.wrap
-import com.topjohnwu.magisk.extensions.set
-import com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder
-import kotlin.random.Random
-
-typealias RequestCallback = BaseActivity.(Int, Intent?) -> Unit
+import com.topjohnwu.magisk.ktx.reflectField
 
 abstract class BaseActivity : AppCompatActivity() {
 
-    private val resultCallbacks by lazy { SparseArrayCompat<RequestCallback>() }
+    private var permissionCallback: ((Boolean) -> Unit)? = null
+    private val requestPermission = registerForActivityResult(RequestPermission()) {
+        permissionCallback?.invoke(it)
+        permissionCallback = null
+    }
+
+    private var contentCallback: ((Uri) -> Unit)? = null
+    private val getContent = registerForActivityResult(GetContent()) {
+        if (it != null) contentCallback?.invoke(it)
+        contentCallback = null
+    }
 
     override fun applyOverrideConfiguration(config: Configuration?) {
         // Force applying our preferred local
@@ -28,65 +36,42 @@ abstract class BaseActivity : AppCompatActivity() {
     }
 
     override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base.wrap(false))
+        super.attachBaseContext(base.wrap())
     }
 
-    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)
+    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)
         }
+        super.onCreate(savedInstanceState)
     }
 
-    fun withExternalRW(builder: PermissionRequestBuilder.() -> Unit) {
-        withPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, builder = builder)
+    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
+        requestPermission.launch(permission)
     }
 
-    override fun onRequestPermissionsResult(
-        requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        var success = true
-        for (res in grantResults) {
-            if (res != PackageManager.PERMISSION_GRANTED) {
-                success = false
-                break
-            }
-        }
-        resultCallbacks[requestCode]?.also {
-            resultCallbacks.remove(requestCode)
-            it(this@BaseActivity, if (success) 1 else -1, null)
-        }
-
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        resultCallbacks[requestCode]?.also {
-            resultCallbacks.remove(requestCode)
-            it(this@BaseActivity, resultCode, data)
-        }
-    }
-
-    fun startActivityForResult(intent: Intent, requestCode: Int, listener: RequestCallback) {
-        resultCallbacks[requestCode] = listener
-        startActivityForResult(intent, requestCode)
+    fun getContent(type: String, callback: (Uri) -> Unit) {
+        contentCallback = callback
+        getContent.launch(type)
     }
 
     override fun recreate() {
-        startActivity(intent)
+        startActivity(Intent().setComponent(intent.component))
         finish()
     }
 
+    fun relaunch() {
+        startActivity(Intent(intent).setFlags(0))
+        finish()
+    }
 }

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.wrap
+
+abstract class BaseJobService : JobService() {
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base.wrap())
+    }
+}

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

@@ -5,9 +5,8 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
 import com.topjohnwu.magisk.core.wrap
-import org.koin.core.KoinComponent
 
-abstract class BaseReceiver : BroadcastReceiver(), KoinComponent {
+abstract class BaseReceiver : BroadcastReceiver() {
 
     final override fun onReceive(context: Context, intent: Intent?) {
         onReceive(context.wrap() as ContextWrapper, intent)

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

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

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

@@ -1,59 +0,0 @@
-package com.topjohnwu.magisk.core.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 BaseWorkerWrapper {
-
-    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/core/download/DownloadService.kt

@@ -3,162 +3,202 @@ package com.topjohnwu.magisk.core.download
 import android.annotation.SuppressLint
 import android.app.Notification
 import android.app.PendingIntent
+import android.app.PendingIntent.*
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import android.webkit.MimeTypeMap
+import android.os.IBinder
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.MutableLiveData
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.ActivityTracker
+import com.topjohnwu.magisk.core.base.BaseService
 import com.topjohnwu.magisk.core.intent
-import com.topjohnwu.magisk.core.tasks.EnvFixTask
-import com.topjohnwu.magisk.extensions.chooser
-import com.topjohnwu.magisk.extensions.exists
-import com.topjohnwu.magisk.extensions.provide
-import com.topjohnwu.magisk.extensions.subscribeK
-import com.topjohnwu.magisk.legacy.flash.FlashActivity
-import com.topjohnwu.magisk.model.entity.internal.Configuration.*
-import com.topjohnwu.magisk.model.entity.internal.Configuration.Flash.Secondary
-import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
-import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.*
-import com.topjohnwu.magisk.utils.APKInstall
-import io.reactivex.Completable
-import org.koin.core.get
-import java.io.File
-import kotlin.random.Random.Default.nextInt
+import com.topjohnwu.magisk.core.utils.ProgressInputStream
+import com.topjohnwu.magisk.di.ServiceLocator
+import com.topjohnwu.magisk.ktx.synchronized
+import com.topjohnwu.magisk.view.Notifications
+import com.topjohnwu.magisk.view.Notifications.mgr
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import okhttp3.ResponseBody
+import timber.log.Timber
+import java.io.InputStream
 
-/* More of a facade for [RemoteFileService], but whatever... */
-@SuppressLint("Registered")
-open class DownloadService : RemoteFileService() {
+class DownloadService : BaseService() {
 
-    private val context get() = this
-    private val File.type
-        get() = MimeTypeMap.getSingleton()
-            .getMimeTypeFromExtension(extension)
-            ?: "resource/folder"
+    private val hasNotifications get() = notifications.isNotEmpty()
+    private val notifications = HashMap<Int, Notification.Builder>().synchronized()
+    private val job = Job()
 
-    override fun onFinished(subject: DownloadSubject, id: Int) = when (subject) {
-        is Magisk -> onFinishedInternal(subject, id)
-        is Module -> onFinishedInternal(subject, id)
-        is Manager -> onFinishedInternal(subject, id)
+    val service get() = ServiceLocator.networkService
+
+    // -- Service overrides
+
+    override fun onBind(intent: Intent?): IBinder? = null
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        intent.getParcelableExtra<Subject>(SUBJECT_KEY)?.let { doDownload(it) }
+        return START_NOT_STICKY
     }
 
-    private fun onFinishedInternal(
-        subject: Magisk,
-        id: Int
-    ) = when (val conf = subject.configuration) {
-        Uninstall -> FlashActivity.uninstall(this, subject.file, id)
-        EnvFix -> { remove(id); EnvFixTask(subject.file).exec() }
-        is Patch -> FlashActivity.patch(this, subject.file, conf.fileUri, id)
-        is Flash -> FlashActivity.flash(this, subject.file, conf is Secondary, id)
-        else -> Unit
+    override fun onTaskRemoved(rootIntent: Intent?) {
+        super.onTaskRemoved(rootIntent)
+        notifications.forEach { mgr.cancel(it.key) }
+        notifications.clear()
     }
 
-    private fun onFinishedInternal(
-        subject: Module,
-        id: Int
-    ) = when (subject.configuration) {
-        is Flash -> FlashActivity.install(this, subject.file, id)
-        else -> Unit
+    override fun onDestroy() {
+        super.onDestroy()
+        job.cancel()
     }
 
-    private fun onFinishedInternal(
-        subject: Manager,
-        id: Int
-    ) {
-        Completable.fromAction {
-            handleAPK(subject)
-        }.subscribeK {
-            remove(id)
-            when (subject.configuration)  {
-                is APK.Upgrade -> APKInstall.install(this, subject.file)
-                is APK.Restore -> Unit
+    // -- Download logic
+
+    private fun doDownload(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.Manager -> handleAPK(subject, stream)
+                    is Subject.Module -> stream.toModule(subject.file, assets.open("module_installer.sh"))
+                }
+                val activity = ActivityTracker.foreground
+                if (activity != null && subject.autoStart) {
+                    remove(subject.notifyId)
+                    subject.pendingIntent(activity).send()
+                } else {
+                    notifyFinish(subject)
+                }
+                if (!hasNotifications)
+                    stopSelf()
+            } catch (e: Exception) {
+                Timber.e(e)
+                notifyFail(subject)
             }
         }
     }
 
-    // ---
+    private fun ResponseBody.toProgressStream(subject: Subject): InputStream {
+        val max = contentLength()
+        val total = max.toFloat() / 1048576
+        val id = subject.notifyId
 
-    override fun Notification.Builder.addActions(subject: DownloadSubject)
-    = when (subject) {
-        is Magisk -> addActionsInternal(subject)
-        is Module -> addActionsInternal(subject)
-        is Manager -> addActionsInternal(subject)
-    }
+        update(id) { it.setContentTitle(subject.title) }
 
-    private fun Notification.Builder.addActionsInternal(subject: Magisk)
-    = when (val conf = subject.configuration) {
-        Download -> this.apply {
-            fileIntent(subject.file.parentFile!!)
-                .takeIf { it.exists(get()) }
-                ?.let { addAction(0, R.string.download_open_parent, it.chooser()) }
-            fileIntent(subject.file)
-                .takeIf { it.exists(get()) }
-                ?.let { addAction(0, R.string.download_open_self, it.chooser()) }
+        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))
+                }
+            }
         }
-        Uninstall -> setContentIntent(FlashActivity.uninstallIntent(context, subject.file))
-        is Flash -> setContentIntent(FlashActivity.flashIntent(context, subject.file, conf is Secondary))
-        is Patch -> setContentIntent(FlashActivity.patchIntent(context, subject.file, conf.fileUri))
-        else -> this
     }
 
-    private fun Notification.Builder.addActionsInternal(subject: Module)
-    = when (subject.configuration) {
-        Download -> this.apply {
-            fileIntent(subject.file.parentFile!!)
-                .takeIf { it.exists(get()) }
-                ?.let { addAction(0, R.string.download_open_parent, it.chooser()) }
-            fileIntent(subject.file)
-                .takeIf { it.exists(get()) }
-                ?.let { addAction(0, R.string.download_open_self, it.chooser()) }
+    // --- Notification management
+
+    private 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)
+    }
+
+    private fun notifyFinish(subject: Subject) = finalNotify(subject.notifyId) {
+        broadcast(1f, subject)
+        it.setContentIntent(subject.pendingIntent(this))
+            .setContentTitle(subject.title)
+            .setContentText(getString(R.string.download_complete))
+            .setSmallIcon(android.R.drawable.stat_sys_download_done)
+            .setProgress(0, 0, false)
+            .setOngoing(false)
+            .setAutoCancel(true)
+    }
+
+    private fun finalNotify(id: Int, editor: (Notification.Builder) -> Unit): Int {
+        val notification = remove(id)?.also(editor) ?: return -1
+        val newId = Notifications.nextId()
+        mgr.notify(newId, notification.build())
+        return newId
+    }
+
+    private fun create() = Notifications.progress(this, "")
+
+    fun update(id: Int, editor: (Notification.Builder) -> Unit = {}) {
+        val wasEmpty = !hasNotifications
+        val notification = notifications.getOrPut(id, ::create).also(editor)
+        if (wasEmpty)
+            updateForeground()
+        else
+            mgr.notify(id, notification.build())
+    }
+
+    private fun remove(id: Int): Notification.Builder? {
+        val n = notifications.remove(id)?.also { updateForeground() }
+        mgr.cancel(id)
+        return n
+    }
+
+    private fun updateForeground() {
+        if (hasNotifications) {
+            val (id, notification) = notifications.entries.first()
+            startForeground(id, notification.build())
+        } else {
+            stopForeground(false)
         }
-        is Flash -> setContentIntent(FlashActivity.installIntent(context, subject.file))
-        else -> this
-    }
-
-    private fun Notification.Builder.addActionsInternal(subject: Manager)
-    = when (subject.configuration) {
-        APK.Upgrade -> setContentIntent(APKInstall.installIntent(context, subject.file))
-        else -> this
-    }
-
-    @Suppress("ReplaceSingleLineLet")
-    private fun Notification.Builder.setContentIntent(intent: Intent) =
-        setContentIntent(
-            PendingIntent.getActivity(context, nextInt(), intent, PendingIntent.FLAG_ONE_SHOT)
-        )
-
-    @Suppress("ReplaceSingleLineLet")
-    private fun Notification.Builder.addAction(icon: Int, title: Int, intent: Intent) =
-        addAction(icon, getString(title),
-            PendingIntent.getActivity(context, nextInt(), intent, PendingIntent.FLAG_ONE_SHOT)
-        )
-
-    // ---
-
-    private fun fileIntent(file: File): Intent {
-        return Intent(Intent.ACTION_VIEW)
-            .setDataAndType(file.provide(this), file.type)
-            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-    }
-
-    class Builder {
-        lateinit var subject: DownloadSubject
     }
 
     companion object {
+        private const val SUBJECT_KEY = "download_subject"
+        private const val REQUEST_CODE = 1
 
-        inline operator fun invoke(context: Context, argBuilder: Builder.() -> Unit) {
-            val app = context.applicationContext
-            val builder = Builder().apply(argBuilder)
-            val intent = app.intent<DownloadService>().putExtra(ARG_URL, builder.subject)
+        private val progressBroadcast = MutableLiveData<Pair<Float, Subject>?>()
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                app.startForegroundService(intent)
-            } else {
-                app.startService(intent)
+        fun observeProgress(owner: LifecycleOwner, callback: (Float, Subject) -> Unit) {
+            progressBroadcast.value = null
+            progressBroadcast.observe(owner) {
+                val (progress, subject) = it ?: return@observe
+                callback(progress, subject)
             }
         }
 
+        private fun broadcast(progress: Float, subject: Subject) {
+            progressBroadcast.postValue(progress to subject)
+        }
+
+        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/ManagerHandler.kt

@@ -0,0 +1,77 @@
+package com.topjohnwu.magisk.core.download
+
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.Intent
+import androidx.core.content.getSystemService
+import androidx.core.net.toFile
+import com.topjohnwu.magisk.DynAPK
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.ActivityTracker
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.tasks.HideAPK
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
+import com.topjohnwu.magisk.ktx.copyAndClose
+import com.topjohnwu.magisk.ktx.writeTo
+import java.io.File
+import java.io.InputStream
+import java.io.OutputStream
+
+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()
+    }
+}
+
+suspend fun DownloadService.handleAPK(subject: Subject.Manager, stream: InputStream) {
+    fun write(output: OutputStream) {
+        val external = subject.externalFile.outputStream()
+        stream.copyAndClose(TeeOutputStream(external, output))
+    }
+
+    if (isRunningAsStub) {
+        val apk = subject.file.toFile()
+        val id = subject.notifyId
+        write(DynAPK.update(this).outputStream())
+        if (Info.stub!!.version < subject.stub.versionCode) {
+            // Also upgrade stub
+            update(id) {
+                it.setProgress(0, 0, true)
+                    .setContentTitle(getString(R.string.hide_app_title))
+                    .setContentText("")
+            }
+            service.fetchFile(subject.stub.link).byteStream().writeTo(apk)
+            val patched = File(apk.parent, "patched.apk")
+            HideAPK.patch(this, apk, patched, packageName, applicationInfo.nonLocalizedLabel)
+            apk.delete()
+            patched.renameTo(apk)
+        } else {
+            val intent = packageManager.getLaunchIntentForPackage(packageName)
+            intent!!.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            //noinspection InlinedApi
+            val flag = PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            val pending = PendingIntent.getActivity(this, id, intent, flag)
+            if (ActivityTracker.hasForeground) {
+                val alarm = getSystemService<AlarmManager>()
+                alarm!!.set(AlarmManager.RTC, System.currentTimeMillis() + 1000, pending)
+            }
+            stopSelf()
+            Runtime.getRuntime().exit(0)
+        }
+    } else {
+        write(subject.file.outputStream())
+    }
+}

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

@@ -1,72 +0,0 @@
-package com.topjohnwu.magisk.core.download
-
-import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.DynAPK
-import com.topjohnwu.magisk.ProcessPhoenix
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.intent
-import com.topjohnwu.magisk.core.isRunningAsStub
-import com.topjohnwu.magisk.core.utils.PatchAPK
-import com.topjohnwu.magisk.extensions.writeTo
-import com.topjohnwu.magisk.model.entity.internal.Configuration.APK.Restore
-import com.topjohnwu.magisk.model.entity.internal.Configuration.APK.Upgrade
-import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
-import com.topjohnwu.superuser.Shell
-import java.io.File
-
-private fun RemoteFileService.patch(apk: File, id: Int) {
-    if (packageName == BuildConfig.APPLICATION_ID)
-        return
-
-    update(id) {
-        it.setProgress(0, 0, true)
-            .setProgress(0, 0, true)
-            .setContentTitle(getString(R.string.hide_manager_title))
-            .setContentText("")
-    }
-    val patched = File(apk.parent, "patched.apk")
-    PatchAPK.patch(apk.path, patched.path, packageName, applicationInfo.nonLocalizedLabel)
-    apk.delete()
-    patched.renameTo(apk)
-}
-
-private fun RemoteFileService.upgrade(apk: File, id: Int) {
-    if (isRunningAsStub) {
-        // Move to upgrade location
-        apk.copyTo(DynAPK.update(this), overwrite = true)
-        apk.delete()
-        if (Info.stub!!.version < Info.remote.stub.versionCode) {
-            // We also want to upgrade stub
-            service.fetchFile(Info.remote.stub.link).blockingGet().byteStream().use {
-                it.writeTo(apk)
-            }
-            patch(apk, id)
-        } else {
-            // Simply relaunch the app
-            ProcessPhoenix.triggerRebirth(this, intent<ProcessPhoenix>())
-        }
-    } else {
-        patch(apk, id)
-    }
-}
-
-private fun RemoteFileService.restore(apk: File, id: Int) {
-    update(id) {
-        it.setProgress(0, 0, true)
-            .setProgress(0, 0, true)
-            .setContentTitle(getString(R.string.restore_img_msg))
-            .setContentText("")
-    }
-    Config.export()
-    // Make it world readable
-    apk.setReadable(true, false)
-    Shell.su("pm install $apk && pm uninstall $packageName").exec()
-}
-
-fun RemoteFileService.handleAPK(subject: DownloadSubject.Manager) =
-    when (subject.configuration) {
-        is Upgrade -> upgrade(subject.file, subject.hashCode())
-        is Restore -> restore(subject.file, subject.hashCode())
-    }

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

@@ -1,13 +1,15 @@
 package com.topjohnwu.magisk.core.download
 
-import com.topjohnwu.magisk.extensions.withStreams
-import java.io.File
+import android.net.Uri
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
+import com.topjohnwu.magisk.ktx.forEach
+import com.topjohnwu.magisk.ktx.withStreams
 import java.io.InputStream
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import java.util.zip.ZipOutputStream
 
-fun InputStream.toModule(file: File, installer: InputStream) {
+fun InputStream.toModule(file: Uri, installer: InputStream) {
 
     val input = ZipInputStream(buffered())
     val output = ZipOutputStream(file.outputStream().buffered())
@@ -23,22 +25,14 @@ fun InputStream.toModule(file: File, installer: InputStream) {
         zout.putNextEntry(ZipEntry("META-INF/com/google/android/updater-script"))
         zout.write("#MAGISK\n".toByteArray(charset("UTF-8")))
 
-        var off = -1
-        var entry: ZipEntry? = zin.nextEntry
-        while (entry != null) {
-            if (off < 0) {
-                off = entry.name.indexOf('/') + 1
-            }
-
-            val path = entry.name.substring(off)
+        zin.forEach { entry ->
+            val path = entry.name
             if (path.isNotEmpty() && !path.startsWith("META-INF")) {
                 zout.putNextEntry(ZipEntry(path))
                 if (!entry.isDirectory) {
                     zin.copyTo(zout)
                 }
             }
-
-            entry = zin.nextEntry
         }
     }
 }

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

@@ -1,86 +0,0 @@
-package com.topjohnwu.magisk.core.download
-
-import android.app.Notification
-import android.content.Intent
-import android.os.IBinder
-import com.topjohnwu.magisk.core.base.BaseService
-import com.topjohnwu.magisk.core.view.Notifications
-import org.koin.core.KoinComponent
-import java.util.*
-import kotlin.collections.HashMap
-import kotlin.random.Random.Default.nextInt
-
-abstract class NotificationService : BaseService(), KoinComponent {
-
-    private val hasNotifications get() = notifications.isNotEmpty()
-
-    private val notifications = Collections.synchronizedMap(HashMap<Int, Notification.Builder>())
-
-    override fun onTaskRemoved(rootIntent: Intent?) {
-        super.onTaskRemoved(rootIntent)
-        notifications.forEach { cancel(it.key) }
-        notifications.clear()
-    }
-
-    abstract fun createNotification(): Notification.Builder
-
-    // --
-
-    fun update(
-        id: Int,
-        body: (Notification.Builder) -> Unit = {}
-    ) {
-        val wasEmpty = notifications.isEmpty()
-        val notification = notifications.getOrPut(id, ::createNotification).also(body)
-        if (wasEmpty)
-            updateForeground()
-        else
-            notify(id, notification.build())
-    }
-
-    protected fun lastNotify(
-        id: Int,
-        editBody: (Notification.Builder) -> Notification.Builder? = { null }
-    ) : Int {
-        val currentNotification = remove(id)?.run(editBody)
-
-        var newId = -1
-        currentNotification?.let {
-            newId = nextInt(Int.MAX_VALUE)
-            notify(newId, it.build())
-        }
-
-        if (!hasNotifications) {
-            stopSelf()
-        }
-        return newId
-    }
-
-    protected fun remove(id: Int) = notifications.remove(id).also {
-        cancel(id)
-        updateForeground()
-    }
-
-    // ---
-
-    private fun notify(id: Int, notification: Notification) {
-        Notifications.mgr.notify(id, notification)
-    }
-
-    private fun cancel(id: Int) {
-        Notifications.mgr.cancel(id)
-    }
-
-    private fun updateForeground() {
-        if (hasNotifications) {
-            val first = notifications.entries.first()
-            startForeground(first.key, first.value.build())
-        } else {
-            stopForeground(true)
-        }
-    }
-
-    // --
-
-    override fun onBind(p0: Intent?): IBinder? = null
-}

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

@@ -1,135 +0,0 @@
-package com.topjohnwu.magisk.core.download
-
-import android.app.Activity
-import android.app.Notification
-import android.content.Intent
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.utils.ProgressInputStream
-import com.topjohnwu.magisk.core.view.Notifications
-import com.topjohnwu.magisk.data.network.GithubRawServices
-import com.topjohnwu.magisk.di.NullActivity
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.subscribeK
-import com.topjohnwu.magisk.extensions.writeTo
-import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
-import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Magisk
-import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Module
-import com.topjohnwu.superuser.ShellUtils
-import io.reactivex.Completable
-import okhttp3.ResponseBody
-import org.koin.android.ext.android.inject
-import org.koin.core.KoinComponent
-import timber.log.Timber
-import java.io.InputStream
-
-abstract class RemoteFileService : NotificationService() {
-
-    val service: GithubRawServices by inject()
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        intent?.getParcelableExtra<DownloadSubject>(ARG_URL)?.let { start(it) }
-        return START_REDELIVER_INTENT
-    }
-
-    override fun createNotification() = Notifications.progress(this, "")
-
-    // ---
-
-    private fun start(subject: DownloadSubject) = checkExisting(subject)
-        .onErrorResumeNext { download(subject) }
-        .subscribeK(onError = {
-            Timber.e(it)
-            failNotify(subject)
-        }) {
-            val newId = finishNotify(subject)
-            if (get<Activity>() !is NullActivity) {
-                onFinished(subject, newId)
-            }
-        }
-
-    private fun checkExisting(subject: DownloadSubject) = Completable.fromAction {
-        check(subject is Magisk) { "Download cache is disabled" }
-        check(subject.file.exists() &&
-                ShellUtils.checkSum("MD5", subject.file, subject.magisk.md5)) {
-            "The given file does not match checksum"
-        }
-    }
-
-    private fun download(subject: DownloadSubject) = service.fetchFile(subject.url)
-        .map { it.toProgressStream(subject) }
-        .flatMapCompletable { stream ->
-            when (subject) {
-                is Module -> service.fetchInstaller()
-                    .doOnSuccess { stream.toModule(subject.file, it.byteStream()) }
-                    .ignoreElement()
-                else -> Completable.fromAction { stream.writeTo(subject.file) }
-            }
-        }
-
-    private fun ResponseBody.toProgressStream(subject: DownloadSubject): InputStream {
-        val maxRaw = contentLength()
-        val max = maxRaw / 1_000_000f
-        val id = subject.hashCode()
-
-        update(id) { it.setContentTitle(subject.title) }
-
-        return ProgressInputStream(byteStream()) {
-            val progress = it / 1_000_000f
-            update(id) { notification ->
-                if (maxRaw > 0) {
-                    send(progress / max, subject)
-                    notification
-                        .setProgress(maxRaw.toInt(), it.toInt(), false)
-                        .setContentText("%.2f / %.2f MB".format(progress, max))
-                } else {
-                    send(-1f, subject)
-                    notification.setContentText("%.2f MB / ??".format(progress))
-                }
-            }
-        }
-    }
-
-    private fun failNotify(subject: DownloadSubject) = lastNotify(subject.hashCode()) {
-        send(0f, subject)
-        it.setContentText(getString(R.string.download_file_error))
-            .setSmallIcon(android.R.drawable.stat_notify_error)
-            .setOngoing(false)
-    }
-
-    private fun finishNotify(subject: DownloadSubject) = lastNotify(subject.hashCode()) {
-        send(1f, subject)
-        it.addActions(subject)
-            .setContentText(getString(R.string.download_complete))
-            .setSmallIcon(android.R.drawable.stat_sys_download_done)
-            .setProgress(0, 0, false)
-            .setOngoing(false)
-            .setAutoCancel(true)
-    }
-
-    // ---
-
-
-    @Throws(Throwable::class)
-    protected abstract fun onFinished(subject: DownloadSubject, id: Int)
-
-    protected abstract fun Notification.Builder.addActions(subject: DownloadSubject)
-            : Notification.Builder
-
-    companion object : KoinComponent {
-        const val ARG_URL = "arg_url"
-
-        private val internalProgressBroadcast = MutableLiveData<Pair<Float, DownloadSubject>>()
-        val progressBroadcast: LiveData<Pair<Float, DownloadSubject>> get() = internalProgressBroadcast
-
-        fun send(progress: Float, subject: DownloadSubject) {
-            internalProgressBroadcast.postValue(progress to subject)
-        }
-
-        fun reset() {
-            internalProgressBroadcast.value = null
-        }
-    }
-
-}

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

@@ -0,0 +1,89 @@
+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.toFile
+import androidx.core.net.toUri
+import com.topjohnwu.magisk.core.Info
+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.di.AppContext
+import com.topjohnwu.magisk.ktx.cachedFile
+import com.topjohnwu.magisk.ui.flash.FlashFragment
+import com.topjohnwu.magisk.utils.APKInstall
+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 autoStart: Boolean get() = true
+
+    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 autoStart: 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 Manager(
+        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")
+        }
+
+        val externalFile get() = MediaStoreUtils.getFile("$title.apk").uri
+
+        override fun pendingIntent(context: Context): PendingIntent {
+            val receiver = APKInstall.register(context, null, null)
+            APKInstall.installapk(context, file.toFile())
+            val intent = receiver.waitIntent() ?: Intent()
+            return 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/magiskdb/BaseDao.kt

@@ -1,8 +1,6 @@
 package com.topjohnwu.magisk.core.magiskdb
 
 import androidx.annotation.StringDef
-import com.topjohnwu.superuser.Shell
-import io.reactivex.Single
 
 abstract class BaseDao {
 
@@ -20,25 +18,11 @@ abstract class BaseDao {
     @TableStrict
     abstract val table: String
 
-    inline fun <reified Builder : Query.Builder> query(builder: Builder.() -> Unit = {}) =
+    inline fun <reified Builder : Query.Builder> buildQuery(builder: Builder.() -> Unit = {}) =
         Builder::class.java.newInstance()
             .apply { table = this@BaseDao.table }
             .apply(builder)
             .toString()
             .let { Query(it) }
-            .query()
 
 }
-
-fun Query.query() = query.su()
-
-private fun String.suRaw() = Single.fromCallable { Shell.su(this).exec().out }
-private fun String.su() = suRaw().map { it.toMap() }
-
-private fun List<String>.toMap() = map { it.split(Regex("\\|")) }
-    .map { it.toMapInternal() }
-
-private fun List<String>.toMapInternal() = map { it.split("=", limit = 2) }
-    .filter { it.size == 2 }
-    .map { Pair(it[0], it[1]) }
-    .toMap()

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

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

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

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

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

@@ -4,17 +4,19 @@ class SettingsDao : BaseDao() {
 
     override val table = Table.SETTINGS
 
-    fun delete(key: String) = query<Delete> {
+    suspend fun delete(key: String) = buildQuery<Delete> {
         condition { equals("key", key) }
-    }.ignoreElement()
+    }.commit()
 
-    fun put(key: String, value: Int) = query<Replace> {
+    suspend fun put(key: String, value: Int) = buildQuery<Replace> {
         values("key" to key, "value" to value)
-    }.ignoreElement()
+    }.commit()
 
-    fun fetch(key: String, default: Int = -1) = query<Select> {
+    suspend fun fetch(key: String, default: Int = -1) = buildQuery<Select> {
         fields("value")
         condition { equals("key", key) }
-    }.map { it.firstOrNull()?.values?.firstOrNull()?.toIntOrNull() ?: default }
+    }.query {
+        it["value"]?.toIntOrNull()
+    }.firstOrNull() ?: default
 
 }

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

@@ -4,17 +4,19 @@ class StringDao : BaseDao() {
 
     override val table = Table.STRINGS
 
-    fun delete(key: String) = query<Delete> {
+    suspend fun delete(key: String) = buildQuery<Delete> {
         condition { equals("key", key) }
-    }.ignoreElement()
+    }.commit()
 
-    fun put(key: String, value: String) = query<Replace> {
+    suspend fun put(key: String, value: String) = buildQuery<Replace> {
         values("key" to key, "value" to value)
-    }.ignoreElement()
+    }.commit()
 
-    fun fetch(key: String, default: String = "") = query<Select> {
+    suspend fun fetch(key: String, default: String = "") = buildQuery<Select> {
         fields("value")
         condition { equals("key", key) }
-    }.map { it.firstOrNull()?.values?.firstOrNull() ?: default }
+    }.query {
+        it["value"]
+    }.firstOrNull() ?: default
 
 }

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

@@ -1,70 +0,0 @@
-package com.topjohnwu.magisk.core.model
-
-import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
-import com.topjohnwu.magisk.core.model.MagiskPolicy.Companion.INTERACTIVE
-import com.topjohnwu.magisk.extensions.getLabel
-
-
-data class MagiskPolicy(
-    var uid: Int,
-    val packageName: String,
-    val appName: String,
-    var policy: Int = INTERACTIVE,
-    var until: Long = -1L,
-    val logging: Boolean = true,
-    val notification: Boolean = true,
-    val applicationInfo: ApplicationInfo
-) {
-
-    companion object {
-        const val INTERACTIVE = 0
-        const val DENY = 1
-        const val ALLOW = 2
-    }
-
-}
-
-fun MagiskPolicy.toMap() = mapOf(
-    "uid" to uid,
-    "package_name" to packageName,
-    "policy" to policy,
-    "until" to until,
-    "logging" to logging,
-    "notification" to notification
-)
-
-@Throws(PackageManager.NameNotFoundException::class)
-fun Map<String, String>.toPolicy(pm: PackageManager): MagiskPolicy {
-    val uid = get("uid")?.toIntOrNull() ?: -1
-    val packageName = get("package_name").orEmpty()
-    val info = pm.getApplicationInfo(packageName, PackageManager.GET_UNINSTALLED_PACKAGES)
-
-    if (info.uid != uid)
-        throw PackageManager.NameNotFoundException()
-
-    return MagiskPolicy(
-        uid = uid,
-        packageName = packageName,
-        policy = get("policy")?.toIntOrNull() ?: INTERACTIVE,
-        until = get("until")?.toLongOrNull() ?: -1L,
-        logging = get("logging")?.toIntOrNull() != 0,
-        notification = get("notification")?.toIntOrNull() != 0,
-        applicationInfo = info,
-        appName = info.getLabel(pm)
-    )
-}
-
-@Throws(PackageManager.NameNotFoundException::class)
-fun Int.toPolicy(pm: PackageManager, policy: Int = INTERACTIVE): MagiskPolicy {
-    val pkg = pm.getPackagesForUid(this)?.firstOrNull()
-        ?: throw PackageManager.NameNotFoundException()
-    val info = pm.getApplicationInfo(pkg, PackageManager.GET_UNINSTALLED_PACKAGES)
-    return MagiskPolicy(
-        uid = info.uid,
-        packageName = pkg,
-        policy = policy,
-        applicationInfo = info,
-        appName = info.getLabel(pm)
-    )
-}

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

@@ -2,41 +2,44 @@ package com.topjohnwu.magisk.core.model
 
 import android.os.Parcelable
 import com.squareup.moshi.JsonClass
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @JsonClass(generateAdapter = true)
 data class UpdateInfo(
-    val app: ManagerJson = ManagerJson(),
-    val uninstaller: UninstallerJson = UninstallerJson(),
     val magisk: MagiskJson = MagiskJson(),
     val stub: StubJson = StubJson()
 )
 
-@JsonClass(generateAdapter = true)
-data class UninstallerJson(
-    val link: String = ""
-)
-
-@JsonClass(generateAdapter = true)
-data class MagiskJson(
-    val version: String = "",
-    val versionCode: Int = -1,
-    val link: String = "",
-    val note: String = "",
-    val md5: String = ""
-)
-
 @Parcelize
 @JsonClass(generateAdapter = true)
-data class ManagerJson(
+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/BaseModule.kt

@@ -1,41 +0,0 @@
-package com.topjohnwu.magisk.core.model.module
-
-abstract class BaseModule : Comparable<BaseModule> {
-    abstract var id: String
-        protected set
-    abstract var name: String
-        protected set
-    abstract var author: String
-        protected set
-    abstract var version: String
-        protected set
-    abstract var versionCode: Int
-        protected set
-    abstract var description: String
-        protected set
-
-    @Throws(NumberFormatException::class)
-    protected 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
-            }
-        }
-    }
-
-    override operator fun compareTo(other: BaseModule) = name.compareTo(other.name, true)
-}

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

@@ -0,0 +1,150 @@
+package com.topjohnwu.magisk.core.model.module
+
+import com.squareup.moshi.JsonDataException
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.di.ServiceLocator
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.io.SuFile
+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 = SuFile(path, "remove")
+    private val disableFile = SuFile(path, "disable")
+    private val updateFile = SuFile(path, "update")
+    private val ruleFile = SuFile(path, "sepolicy.rule")
+    private val riruFolder = SuFile(path, "riru")
+    private val zygiskFolder = SuFile(path, "zygisk")
+    private val unloaded = SuFile(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) {
+            val dir = "$PERSIST/$id"
+            if (enable) {
+                disableFile.delete()
+                if (Const.Version.atLeast_21_2())
+                    Shell.su("copy_sepolicy_rules").submit()
+                else
+                    Shell.su("mkdir -p $dir", "cp -af $ruleFile $dir").submit()
+            } else {
+                !disableFile.createNewFile()
+                if (Const.Version.atLeast_21_2())
+                    Shell.su("copy_sepolicy_rules").submit()
+                else
+                    Shell.su("rm -rf $dir").submit()
+            }
+        }
+
+    var remove: Boolean
+        get() = removeFile.exists()
+        set(remove) {
+            if (remove) {
+                if (updateFile.exists()) return
+                removeFile.createNewFile()
+                if (Const.Version.atLeast_21_2())
+                    Shell.su("copy_sepolicy_rules").submit()
+                else
+                    Shell.su("rm -rf $PERSIST/$id").submit()
+            } else {
+                removeFile.delete()
+                if (Const.Version.atLeast_21_2())
+                    Shell.su("copy_sepolicy_rules").submit()
+                else
+                    Shell.su("cp -af $ruleFile $PERSIST/$id").submit()
+            }
+        }
+
+    @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.su("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"
+
+        suspend fun installed() = withContext(Dispatchers.IO) {
+            SuFile(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

@@ -1,79 +1,14 @@
 package com.topjohnwu.magisk.core.model.module
 
-import androidx.annotation.WorkerThread
-import com.topjohnwu.magisk.core.Const
-import com.topjohnwu.superuser.Shell
-import com.topjohnwu.superuser.io.SuFile
+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
 
-class Module(path: String) : BaseModule() {
-    override var id: String = ""
-    override var name: String = ""
-    override var author: String = ""
-    override var version: String = ""
-    override var versionCode: Int = -1
-    override var description: String = ""
-
-    private val removeFile = SuFile(path, "remove")
-    private val disableFile = SuFile(path, "disable")
-    private val updateFile = SuFile(path, "update")
-    private val ruleFile = SuFile(path, "sepolicy.rule")
-
-    val updated: Boolean = updateFile.exists()
-
-    var enable: Boolean = !disableFile.exists()
-        set(enable) {
-            val dir = "$PERSIST/$id"
-            field = if (enable) {
-                Shell.su("mkdir -p $dir", "cp -af $ruleFile $dir").submit()
-                disableFile.delete()
-            } else {
-                Shell.su("rm -rf $dir").submit()
-                !disableFile.createNewFile()
-            }
-        }
-
-    var remove: Boolean = removeFile.exists()
-        set(remove) {
-            field = if (remove) {
-                Shell.su("rm -rf $PERSIST/$id").submit()
-                removeFile.createNewFile()
-            } else {
-                Shell.su("cp -af $ruleFile $PERSIST/$id").submit()
-                !removeFile.delete()
-            }
-        }
-
-    init {
-        runCatching {
-            parseProps(Shell.su("dos2unix < $path/module.prop").exec().out)
-        }
-
-        if (id.isEmpty()) {
-            val sep = path.lastIndexOf('/')
-            id = path.substring(sep + 1)
-        }
-
-        if (name.isEmpty()) {
-            name = id
-        }
-    }
-
-    companion object {
-
-        private const val PERSIST = "/sbin/.magisk/mirror/persist/magisk"
-
-        @WorkerThread
-        fun loadModules(): List<Module> {
-            val moduleList = mutableListOf<Module>()
-            val path = SuFile(Const.MAGISK_PATH)
-            val modules =
-                    path.listFiles { _, name -> name != "lost+found" && name != ".core" }.orEmpty()
-            for (file in modules) {
-                if (file.isFile) continue
-                val module = Module(Const.MAGISK_PATH + "/" + file.name)
-                moduleList.add(module)
-            }
-            return moduleList.sortedBy { it.name.toLowerCase() }
-        }
-    }
+    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/module/Repo.kt

@@ -1,71 +0,0 @@
-package com.topjohnwu.magisk.core.model.module
-
-import android.os.Parcelable
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import com.topjohnwu.magisk.core.Const
-import com.topjohnwu.magisk.data.repository.StringRepository
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.legalFilename
-import kotlinx.android.parcel.Parcelize
-import java.text.DateFormat
-import java.util.*
-
-@Entity(tableName = "repos")
-@Parcelize
-data class Repo(
-    @PrimaryKey override var id: String,
-    override var name: String,
-    override var author: String,
-    override var version: String,
-    override var versionCode: Int,
-    override var description: String,
-    var last_update: Long
-) : BaseModule(), Parcelable {
-
-    private val stringRepo: StringRepository get() = get()
-
-    val lastUpdate get() = Date(last_update)
-
-    val lastUpdateString: String get() = dateFormat.format(lastUpdate)
-
-    val downloadFilename: String get() = "$name-$version($versionCode).zip".legalFilename()
-
-    val readme get() = stringRepo.getReadme(this)
-
-    val zipUrl: String get() = Const.Url.ZIP_URL.format(id)
-
-    constructor(id: String) : this(id, "", "", "", -1, "", 0)
-
-    @Throws(IllegalRepoException::class)
-    fun update() {
-        val props = runCatching {
-            stringRepo.getMetadata(this).blockingGet()
-                    .orEmpty().split("\\n".toRegex()).dropLastWhile { it.isEmpty() }
-        }.getOrElse {
-            throw IllegalRepoException("Repo [$id] module.prop download error: " + it.message)
-        }
-
-        props.runCatching {
-            parseProps(this)
-        }.onFailure {
-            throw IllegalRepoException("Repo [$id] parse error: " + it.message)
-        }
-
-        if (versionCode < 0) {
-            throw IllegalRepoException("Repo [$id] does not contain versionCode")
-        }
-    }
-
-    @Throws(IllegalRepoException::class)
-    fun update(lastUpdate: Date) {
-        last_update = lastUpdate.time
-        update()
-    }
-
-    class IllegalRepoException(message: String) : Exception(message)
-
-    companion object {
-        val dateFormat = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM)!!
-    }
-}

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

@@ -0,0 +1,19 @@
+package com.topjohnwu.magisk.core.model.su
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.topjohnwu.magisk.ktx.now
+
+@Entity(tableName = "logs")
+data 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 = now
+) {
+    @PrimaryKey(autoGenerate = true) var id: Int = 0
+}

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

@@ -0,0 +1,85 @@
+@file:SuppressLint("InlinedApi")
+
+package com.topjohnwu.magisk.core.model.su
+
+import android.annotation.SuppressLint
+import android.content.pm.PackageManager
+import android.graphics.drawable.Drawable
+import com.topjohnwu.magisk.core.model.su.SuPolicy.Companion.INTERACTIVE
+import com.topjohnwu.magisk.ktx.getLabel
+
+data class SuPolicy(
+    val uid: Int,
+    val packageName: String,
+    val appName: String,
+    val icon: Drawable,
+    var policy: Int = INTERACTIVE,
+    var until: Long = -1L,
+    val logging: Boolean = true,
+    val notification: Boolean = true
+) {
+
+    companion object {
+        const val INTERACTIVE = 0
+        const val DENY = 1
+        const val ALLOW = 2
+    }
+
+    fun toLog(toUid: Int, fromPid: Int, command: String) = SuLog(
+        uid, toUid, fromPid, packageName, appName,
+        command, policy == ALLOW)
+
+    fun toMap() = mapOf(
+        "uid" to uid,
+        "package_name" to packageName,
+        "policy" to policy,
+        "until" to until,
+        "logging" to logging,
+        "notification" to notification
+    )
+}
+
+@Throws(PackageManager.NameNotFoundException::class)
+fun Map<String, String>.toPolicy(pm: PackageManager): SuPolicy {
+    val uid = get("uid")?.toIntOrNull() ?: -1
+    val packageName = get("package_name").orEmpty()
+    val info = pm.getApplicationInfo(packageName, PackageManager.MATCH_UNINSTALLED_PACKAGES)
+
+    if (info.uid != uid)
+        throw PackageManager.NameNotFoundException()
+
+    return SuPolicy(
+        uid = uid,
+        packageName = packageName,
+        appName = info.getLabel(pm),
+        icon = info.loadIcon(pm),
+        policy = get("policy")?.toIntOrNull() ?: INTERACTIVE,
+        until = get("until")?.toLongOrNull() ?: -1L,
+        logging = get("logging")?.toIntOrNull() != 0,
+        notification = get("notification")?.toIntOrNull() != 0
+    )
+}
+
+@Throws(PackageManager.NameNotFoundException::class)
+fun Int.toPolicy(pm: PackageManager, policy: Int = INTERACTIVE): SuPolicy {
+    val pkg = pm.getPackagesForUid(this)?.firstOrNull()
+        ?: throw PackageManager.NameNotFoundException()
+    val info = pm.getApplicationInfo(pkg, PackageManager.MATCH_UNINSTALLED_PACKAGES)
+    return SuPolicy(
+        uid = info.uid,
+        packageName = pkg,
+        appName = info.getLabel(pm),
+        icon = info.loadIcon(pm),
+        policy = policy
+    )
+}
+
+fun Int.toUidPolicy(pm: PackageManager, policy: Int): SuPolicy {
+    return SuPolicy(
+        uid = this,
+        packageName = "[UID] $this",
+        appName = "[UID] $this",
+        icon = pm.defaultActivityIcon,
+        policy = policy
+    )
+}

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

@@ -1,43 +1,27 @@
 package com.topjohnwu.magisk.core.su
 
 import android.content.Context
-import android.content.Intent
-import android.os.Build
 import android.os.Bundle
-import android.os.Process
 import android.widget.Toast
 import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.ProviderCallHandler
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.intent
-import com.topjohnwu.magisk.core.model.MagiskPolicy
-import com.topjohnwu.magisk.core.model.toPolicy
-import com.topjohnwu.magisk.core.utils.Utils
-import com.topjohnwu.magisk.core.wrap
-import com.topjohnwu.magisk.data.repository.LogRepository
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.startActivity
-import com.topjohnwu.magisk.extensions.startActivityWithRoot
-import com.topjohnwu.magisk.extensions.subscribeK
-import com.topjohnwu.magisk.legacy.surequest.SuRequestActivity
-import com.topjohnwu.magisk.model.entity.toLog
-import com.topjohnwu.superuser.Shell
+import com.topjohnwu.magisk.core.model.su.SuPolicy
+import com.topjohnwu.magisk.core.model.su.toPolicy
+import com.topjohnwu.magisk.core.model.su.toUidPolicy
+import com.topjohnwu.magisk.di.ServiceLocator
+import com.topjohnwu.magisk.utils.Utils
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import timber.log.Timber
 
-object SuCallbackHandler : ProviderCallHandler {
+object SuCallbackHandler {
 
     const val REQUEST = "request"
     const val LOG = "log"
     const val NOTIFY = "notify"
-    const val TEST = "test"
 
-    override fun call(context: Context, method: String, arg: String?, extras: Bundle?): Bundle? {
-        invoke(context.wrap(), method, extras)
-        return Bundle.EMPTY
-    }
-
-    operator fun invoke(context: Context, action: String?, data: Bundle?) {
+    fun run(context: Context, action: String?, data: Bundle?) {
         data ?: return
 
         // Debug messages
@@ -51,86 +35,72 @@ object SuCallbackHandler : ProviderCallHandler {
         }
 
         when (action) {
-            REQUEST -> {
-                val intent = context.intent<SuRequestActivity>()
-                    .setAction(action)
-                    .putExtras(data)
-                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    .addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
-                if (Build.VERSION.SDK_INT >= 29) {
-                    // Android Q does not allow starting activity from background
-                    intent.startActivityWithRoot()
-                } else {
-                    intent.startActivity(context)
-                }
-            }
-            LOG -> handleLogs(context, data)
+            LOG -> handleLogging(context, data)
             NOTIFY -> handleNotify(context, data)
-            TEST -> {
-                val mode = data.getInt("mode", 2)
-                Shell.su(
-                    "magisk --connect-mode $mode",
-                    "magisk --use-broadcast"
-                ).submit()
-            }
         }
     }
 
-    private fun Any?.toInt(): Int? {
-        return when (this) {
-            is Int -> this
-            is Long -> this.toInt()
-            else -> null
+    // 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 handleLogs(context: Context, data: Bundle) {
-        val fromUid = data["from.uid"].toInt() ?: return
-        if (fromUid == Process.myUid())
-            return
+    private fun handleLogging(context: Context, data: Bundle) {
+        val fromUid = data.getIntComp("from.uid", -1)
+        val notify = data.getBoolean("notify", true)
+        val allow = data.getIntComp("policy", SuPolicy.ALLOW)
 
         val pm = context.packageManager
 
-        val notify = data.getBoolean("notify", true)
-        val allow = data["policy"].toInt() ?: return
-
-        val policy = runCatching { fromUid.toPolicy(pm, allow) }.getOrElse { return }
+        val policy = runCatching {
+            fromUid.toPolicy(pm, allow)
+        }.getOrElse {
+            GlobalScope.launch { ServiceLocator.policyDB.delete(fromUid) }
+            fromUid.toUidPolicy(pm, allow)
+        }
 
         if (notify)
             notify(context, policy)
 
-        val toUid = data["to.uid"].toInt() ?: return
-        val pid = data["pid"].toInt() ?: return
+        val toUid = data.getIntComp("to.uid", -1)
+        val pid = data.getIntComp("pid", -1)
 
-        val command = data.getString("command") ?: return
+        val command = data.getString("command", "")
         val log = policy.toLog(
             toUid = toUid,
             fromPid = pid,
             command = command
         )
 
-        val logRepo = get<LogRepository>()
-        logRepo.insert(log).subscribeK(onError = { Timber.e(it) })
-    }
-
-    private fun handleNotify(context: Context, data: Bundle) {
-        val fromUid = data["from.uid"].toInt() ?: return
-        if (fromUid == Process.myUid())
-            return
-
-        val pm = context.packageManager
-        val allow = data["policy"].toInt() ?: return
-
-        runCatching {
-            val policy = fromUid.toPolicy(pm, allow)
-            if (policy.policy >= 0)
-                notify(context, policy)
+        GlobalScope.launch {
+            ServiceLocator.logRepo.insert(log)
         }
     }
 
-    private fun notify(context: Context, policy: MagiskPolicy) {
-        if (policy.notification && Config.suNotification == Config.Value.NOTIFICATION_TOAST) {
-            val resId = if (policy.policy == MagiskPolicy.ALLOW)
+    private fun handleNotify(context: Context, data: Bundle) {
+        val fromUid = data.getIntComp("from.uid", -1)
+        val allow = data.getIntComp("policy", SuPolicy.ALLOW)
+
+        val pm = context.packageManager
+
+
+        val policy = runCatching {
+            fromUid.toPolicy(pm, allow)
+        }.getOrElse {
+            GlobalScope.launch { ServiceLocator.policyDB.delete(fromUid) }
+            fromUid.toUidPolicy(pm, allow)
+        }
+        notify(context, policy)
+    }
+
+    private fun notify(context: Context, policy: SuPolicy) {
+        if (Config.suNotification == Config.Value.NOTIFICATION_TOAST) {
+            val resId = if (policy.policy == SuPolicy.ALLOW)
                 R.string.su_allow_toast
             else
                 R.string.su_deny_toast

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

@@ -1,57 +0,0 @@
-package com.topjohnwu.magisk.core.su
-
-import android.net.LocalSocket
-import android.net.LocalSocketAddress
-import androidx.collection.ArrayMap
-import timber.log.Timber
-import java.io.*
-
-abstract class SuConnector @Throws(IOException::class)
-protected constructor(name: String) {
-
-    private val socket: LocalSocket = LocalSocket()
-    protected var out: DataOutputStream
-    protected var input: DataInputStream
-
-    init {
-        socket.connect(LocalSocketAddress(name, LocalSocketAddress.Namespace.ABSTRACT))
-        out = DataOutputStream(BufferedOutputStream(socket.outputStream))
-        input = DataInputStream(BufferedInputStream(socket.inputStream))
-    }
-
-    private fun readString(): String {
-        val len = input.readInt()
-        val buf = ByteArray(len)
-        input.readFully(buf)
-        return String(buf, Charsets.UTF_8)
-    }
-
-    @Throws(IOException::class)
-    fun readRequest(): Map<String, String> {
-        val ret = ArrayMap<String, String>()
-        while (true) {
-            val name = readString()
-            if (name == "eof")
-                break
-            ret[name] = readString()
-        }
-        return ret
-    }
-
-    fun response() {
-        runCatching {
-            onResponse()
-            out.flush()
-        }.onFailure { Timber.e(it) }
-
-        runCatching {
-            input.close()
-            out.close()
-            socket.close()
-        }
-    }
-
-    @Throws(IOException::class)
-    protected abstract fun onResponse()
-
-}

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

@@ -2,87 +2,83 @@ package com.topjohnwu.magisk.core.su
 
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.os.CountDownTimer
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.magiskdb.PolicyDao
-import com.topjohnwu.magisk.core.model.MagiskPolicy
-import com.topjohnwu.magisk.core.model.toPolicy
-import com.topjohnwu.magisk.extensions.now
+import com.topjohnwu.magisk.core.model.su.SuPolicy
+import com.topjohnwu.magisk.core.model.su.toPolicy
+import com.topjohnwu.magisk.ktx.now
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
+import java.io.Closeable
+import java.io.DataOutputStream
+import java.io.FileOutputStream
+import java.io.IOException
 import java.util.concurrent.TimeUnit
 
-abstract class SuRequestHandler(
-    private val packageManager: PackageManager,
+class SuRequestHandler(
+    private val pm: PackageManager,
     private val policyDB: PolicyDao
-) {
-    protected var timer: CountDownTimer = object : CountDownTimer(
-        TimeUnit.MINUTES.toMillis(1), TimeUnit.MINUTES.toMillis(1)) {
-        override fun onFinish() {
-            respond(MagiskPolicy.DENY, 0)
-        }
-        override fun onTick(remains: Long) {}
-    }
-        set(value) {
-            field.cancel()
-            field = value
-            field.start()
-        }
+) : Closeable {
 
-    protected lateinit var policy: MagiskPolicy
+    private lateinit var output: DataOutputStream
+    lateinit var policy: SuPolicy
+        private set
 
-    private val cleanupTasks = mutableListOf<() -> Unit>()
-    private lateinit var connector: SuConnector
-
-    abstract fun onStart()
-    abstract fun onRespond()
-
-    fun start(intent: Intent): Boolean {
-        val socketName = intent.getStringExtra("socket") ?: return false
-
-        try {
-            connector = object : SuConnector(socketName) {
-                override fun onResponse() {
-                    out.writeInt(policy.policy)
-                }
-            }
-            val map = connector.readRequest()
-            val uid = map["uid"]?.toIntOrNull() ?: return false
-            policy = uid.toPolicy(packageManager)
-        } catch (e: Exception) {
-            Timber.e(e)
+    // Return true to indicate undetermined policy, require user interaction
+    suspend fun start(intent: Intent): Boolean {
+        if (!init(intent))
             return false
-        }
 
         // Never allow com.topjohnwu.magisk (could be malware)
-        if (policy.packageName == BuildConfig.APPLICATION_ID)
+        if (policy.packageName == BuildConfig.APPLICATION_ID) {
+            Shell.su("(pm uninstall ${BuildConfig.APPLICATION_ID})& >/dev/null 2>&1").exec()
             return false
+        }
 
-        when (Config.suAutoReponse) {
+        when (Config.suAutoResponse) {
             Config.Value.SU_AUTO_DENY -> {
-                respond(MagiskPolicy.DENY, 0)
-                return true
+                respond(SuPolicy.DENY, 0)
+                return false
             }
             Config.Value.SU_AUTO_ALLOW -> {
-                respond(MagiskPolicy.ALLOW, 0)
-                return true
+                respond(SuPolicy.ALLOW, 0)
+                return false
             }
         }
 
-        timer.start()
-        cleanupTasks.add {
-            timer.cancel()
-        }
-
-        onStart()
         return true
     }
 
-    private fun respond() {
-        connector.response()
-        cleanupTasks.forEach { it() }
-        onRespond()
+    @Throws(IOException::class)
+    override fun close() {
+        if (::output.isInitialized)
+            output.close()
+    }
+
+    private class SuRequestError : IOException()
+
+    private suspend fun init(intent: Intent) = withContext(Dispatchers.IO) {
+        try {
+            val name = intent.getStringExtra("fifo") ?: throw SuRequestError()
+            val uid = intent.getIntExtra("uid", -1).also { if (it < 0) throw SuRequestError() }
+            output = DataOutputStream(FileOutputStream(name).buffered())
+            policy = uid.toPolicy(pm)
+            true
+        } catch (e: Exception) {
+            when (e) {
+                is IOException, is PackageManager.NameNotFoundException -> {
+                    Timber.e(e)
+                    runCatching { close() }
+                    false
+                }
+                else -> throw e  // Unexpected error
+            }
+        }
     }
 
     fun respond(action: Int, time: Int) {
@@ -93,11 +89,18 @@ abstract class SuRequestHandler(
 
         policy.policy = action
         policy.until = until
-        policy.uid = policy.uid % 100000 + Const.USER_ID * 100000
 
-        if (until >= 0)
-            policyDB.update(policy).blockingAwait()
-
-        respond()
+        GlobalScope.launch(Dispatchers.IO) {
+            try {
+                output.writeInt(policy.policy)
+                output.flush()
+            } catch (e: IOException) {
+                Timber.e(e)
+            } finally {
+                runCatching { close() }
+                if (until >= 0)
+                    policyDB.update(policy)
+            }
+        }
     }
 }

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

@@ -1,37 +0,0 @@
-package com.topjohnwu.magisk.core.tasks
-
-import android.content.Context
-import android.content.ContextWrapper
-import android.content.Intent
-import android.content.IntentFilter
-import com.topjohnwu.magisk.core.Const
-import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.base.BaseReceiver
-import com.topjohnwu.magisk.core.view.Notifications
-import com.topjohnwu.superuser.Shell
-import timber.log.Timber
-
-private const val DTB_PATCH_RESULT = "dtb_result"
-private const val DTB_PATCH_ACTION = "com.topjohnwu.magisk.DTBO_PATCH"
-
-private class DTBPatchReceiver : BaseReceiver() {
-    override fun onReceive(context: ContextWrapper, intent: Intent?) {
-        intent?.also {
-            val result = it.getIntExtra(DTB_PATCH_RESULT, 1)
-            Timber.d("result=[$result]")
-            if (result == 0)
-                Notifications.dtboPatched(context)
-        }
-        context.unregisterReceiver(this)
-    }
-}
-
-fun patchDTB(context: Context) {
-    if (Info.isNewReboot) {
-        val c = context.applicationContext
-        c.registerReceiver(DTBPatchReceiver(), IntentFilter(DTB_PATCH_ACTION))
-        val broadcastCmd = "am broadcast --user ${Const.USER_ID} -p ${c.packageName} " +
-                "-a $DTB_PATCH_ACTION --ei $DTB_PATCH_RESULT \$result"
-        Shell.su("mm_patch_dtb '$broadcastCmd'").submit()
-    }
-}

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

@@ -1,10 +0,0 @@
-package com.topjohnwu.magisk.core.tasks
-
-import androidx.annotation.MainThread
-
-interface FlashResultListener {
-
-    @MainThread
-    fun onResult(success: Boolean)
-
-}

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

@@ -1,97 +1,85 @@
 package com.topjohnwu.magisk.core.tasks
 
-import android.content.Context
 import android.net.Uri
+import androidx.core.net.toFile
 import com.topjohnwu.magisk.core.Const
+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.extensions.fileName
-import com.topjohnwu.magisk.extensions.inject
-import com.topjohnwu.magisk.extensions.readUri
-import com.topjohnwu.magisk.extensions.subscribeK
+import com.topjohnwu.magisk.di.AppContext
+import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.superuser.Shell
-import io.reactivex.Single
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
 
-abstract class FlashZip(
+open class FlashZip(
     private val mUri: Uri,
     private val console: MutableList<String>,
     private val logs: MutableList<String>
-) : FlashResultListener {
+) {
 
-    private val context: Context by inject()
-    private val installFolder = File(context.cacheDir, "flash").apply {
-        if (!exists()) mkdirs()
-    }
-    private val tmpFile: File = File(installFolder, "install.zip")
-
-    @Throws(IOException::class)
-    private fun unzipAndCheck(): Boolean {
-        val parentFile = tmpFile.parentFile ?: return false
-        tmpFile.unzip(parentFile, "META-INF/com/google/android", true)
-
-        val updaterScript = File(parentFile, "updater-script")
-        return Shell
-            .su("grep -q '#MAGISK' $updaterScript")
-            .exec()
-            .isSuccess
-    }
+    private val installDir = File(AppContext.cacheDir, "flash")
+    private lateinit var zipFile: File
 
     @Throws(IOException::class)
     private fun flash(): Boolean {
-        console.add("- Copying zip to temp directory")
+        installDir.deleteRecursively()
+        installDir.mkdirs()
 
-        runCatching {
-            context.readUri(mUri).use { input ->
-                tmpFile.outputStream().use { out -> input.copyTo(out) }
+        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
+                }
             }
-        }.getOrElse {
-            when (it) {
-                is FileNotFoundException -> console.add("! Invalid Uri")
-                is IOException -> console.add("! Cannot copy to cache")
-            }
-            throw it
         }
 
-        val isMagiskModule = runCatching {
-            unzipAndCheck()
+        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 (!isMagiskModule) {
-            console.add("! This zip is not a Magisk Module!")
+        if (!isValid) {
+            console.add("! This zip is not a Magisk module!")
             return false
         }
 
-        console.add("- Installing ${mUri.fileName}")
+        console.add("- Installing ${mUri.displayName}")
 
-        val parentFile = tmpFile.parent ?: return false
-
-        return Shell
-            .su(
-                "cd $parentFile",
-                "BOOTMODE=true sh update-binary dummy 1 $tmpFile"
-            )
-            .to(console, logs)
-            .exec().isSuccess
+        return Shell.su("sh $installDir/update-binary dummy 1 \'$zipFile\'")
+            .to(console, logs).exec().isSuccess
     }
 
-    fun exec() = Single
-        .fromCallable {
-            runCatching {
-                flash()
-            }.getOrElse {
-                it.printStackTrace()
+    open suspend fun exec() = withContext(Dispatchers.IO) {
+        try {
+            if (!flash()) {
+                console.add("! Installation failed")
                 false
-            }.apply {
-                Shell.su("cd /", "rm -rf ${tmpFile.parent} ${Const.TMP_FOLDER_PATH}")
-                    .submit()
+            } else {
+                true
             }
+        } catch (e: IOException) {
+            Timber.e(e)
+            false
+        } finally {
+            Shell.su("cd /", "rm -rf $installDir ${Const.TMPDIR}").submit()
         }
-        .subscribeK(onError = { onResult(false) }) { onResult(it) }
-        .let { Unit } // ignores result disposable
-
+    }
 }

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

@@ -1,51 +0,0 @@
-package com.topjohnwu.magisk.core.tasks
-
-import android.content.Context
-import android.net.Uri
-import androidx.core.os.postDelayed
-import com.topjohnwu.magisk.extensions.inject
-import com.topjohnwu.superuser.Shell
-import com.topjohnwu.superuser.internal.UiThreadHandler
-
-sealed class Flashing(
-    uri: Uri,
-    private val console: MutableList<String>,
-    log: MutableList<String>,
-    private val resultListener: FlashResultListener
-) : FlashZip(uri, console, log) {
-
-    override fun onResult(success: Boolean) {
-        if (!success) {
-            console.add("! Installation failed")
-        }
-
-        resultListener.onResult(success)
-    }
-
-    class Install(
-        uri: Uri,
-        console: MutableList<String>,
-        log: MutableList<String>,
-        resultListener: FlashResultListener
-    ) : Flashing(uri, console, log, resultListener)
-
-    class Uninstall(
-        uri: Uri,
-        console: MutableList<String>,
-        log: MutableList<String>,
-        resultListener: FlashResultListener
-    ) : Flashing(uri, console, log, resultListener) {
-
-        private val context: Context by inject()
-
-        override fun onResult(success: Boolean) {
-            if (success) {
-                UiThreadHandler.handler.postDelayed(3000) {
-                    Shell.su("pm uninstall " + context.packageName).exec()
-                }
-            }
-            super.onResult(success)
-        }
-    }
-
-}

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

@@ -0,0 +1,171 @@
+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.DynAPK
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.Provider
+import com.topjohnwu.magisk.core.utils.AXML
+import com.topjohnwu.magisk.core.utils.Keygen
+import com.topjohnwu.magisk.di.ServiceLocator
+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.withContext
+import timber.log.Timber
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import java.security.SecureRandom
+
+object HideAPK {
+
+    private const val ALPHA = "abcdefghijklmnopqrstuvwxyz"
+    private const val ALPHADOTS = "$ALPHA....."
+    private const val APP_NAME = "Magisk"
+    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: File,
+        pkg: String, label: CharSequence
+    ): Boolean {
+        try {
+            val jar = JarMap.open(apk, true)
+            val je = jar.getJarEntry(ANDROID_MANIFEST)
+            val xml = AXML(jar.getRawData(je))
+
+            if (!xml.findAndPatch(APPLICATION_ID to pkg, APP_NAME to label.toString()))
+                return false
+
+            // Write apk changes
+            jar.getOutputStream(je).write(xml.bytes)
+            val keys = Keygen(context)
+            SignApk.sign(keys.cert, keys.key, jar, FileOutputStream(out))
+        } catch (e: Exception) {
+            Timber.e(e)
+            return false
+        }
+
+        return true
+    }
+
+    private 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.APK_URI(self), flag)
+        activity.grantUriPermission(pkg, Provider.PREFS_URI(self), flag)
+        intent.putExtra(Const.Key.PREV_PKG, self)
+        activity.startActivity(intent)
+        activity.finish()
+    }
+
+    private suspend fun patchAndHide(activity: Activity, label: String): 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.su(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, repack, pkg, label))
+            return false
+
+        // Install and auto launch app
+        val receiver = APKInstall.register(activity, pkg) {
+            launchApp(activity, pkg)
+        }
+        val cmd = "adb_pm_install $repack ${activity.applicationInfo.uid}"
+        if (!Shell.su(cmd).exec().isSuccess) {
+            APKInstall.installapk(activity, repack)
+            receiver.waitIntent()?.let { activity.startActivity(it) }
+        }
+        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 result = withContext(Dispatchers.IO) {
+            patchAndHide(activity, label)
+        }
+        if (!result) {
+            dialog.dismiss()
+            Utils.toast(R.string.failure, Toast.LENGTH_LONG)
+        }
+    }
+
+    @Suppress("DEPRECATION")
+    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 apk = DynAPK.current(activity)
+        val receiver = APKInstall.register(activity, APPLICATION_ID) {
+            launchApp(activity, APPLICATION_ID)
+            dialog.dismiss()
+        }
+        val cmd = "adb_pm_install $apk ${activity.applicationInfo.uid}"
+        Shell.su(cmd).submit(Shell.EXECUTOR) { ret ->
+            if (ret.isSuccess) return@submit
+            APKInstall.installapk(activity, apk)
+            receiver.waitIntent()?.let { activity.startActivity(it) }
+        }
+    }
+}

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

@@ -1,370 +0,0 @@
-package com.topjohnwu.magisk.core.tasks
-
-import android.content.Context
-import android.net.Uri
-import android.os.Build
-import android.text.TextUtils
-import androidx.annotation.WorkerThread
-import androidx.core.net.toUri
-import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.data.network.GithubRawServices
-import com.topjohnwu.magisk.di.Protected
-import com.topjohnwu.magisk.extensions.*
-import com.topjohnwu.signing.SignBoot
-import com.topjohnwu.superuser.Shell
-import com.topjohnwu.superuser.ShellUtils
-import com.topjohnwu.superuser.internal.NOPList
-import com.topjohnwu.superuser.io.SuFile
-import com.topjohnwu.superuser.io.SuFileInputStream
-import com.topjohnwu.superuser.io.SuFileOutputStream
-import io.reactivex.Single
-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.File
-import java.io.FileOutputStream
-import java.io.IOException
-import java.io.InputStream
-import java.nio.ByteBuffer
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-
-abstract class MagiskInstallImpl : FlashResultListener {
-
-    protected lateinit var installDir: File
-    private lateinit var srcBoot: String
-    private lateinit var destFile: File
-    private lateinit var zipUri: Uri
-
-    private val console: MutableList<String>
-    private val logs: MutableList<String>
-    private var tarOut: TarOutputStream? = null
-
-    private val service: GithubRawServices by inject()
-    protected val context: Context by inject()
-
-    protected constructor() {
-        console = NOPList.getInstance()
-        logs = NOPList.getInstance()
-    }
-
-    constructor(zip: Uri, out: MutableList<String>, err: MutableList<String>) {
-        console = out
-        logs = err
-        zipUri = zip
-        installDir = File(get<Context>(Protected).filesDir.parent, "install")
-        "rm -rf $installDir".sh()
-        installDir.mkdirs()
-    }
-
-    private fun findImage(): Boolean {
-        srcBoot = "find_boot_image; echo \"\$BOOTIMAGE\"".fsh()
-        if (srcBoot.isEmpty()) {
-            console.add("! Unable to detect target image")
-            return false
-        }
-        console.add("- Target image: $srcBoot")
-        return true
-    }
-
-    private fun findSecondaryImage(): Boolean {
-        val slot = "echo \$SLOT".fsh()
-        val target = if (slot == "_a") "_b" else "_a"
-        console.add("- Target slot: $target")
-        srcBoot = arrayOf(
-                "SLOT=$target",
-                "find_boot_image",
-                "SLOT=$slot",
-                "echo \"\$BOOTIMAGE\"").fsh()
-        if (srcBoot.isEmpty()) {
-            console.add("! Unable to detect target image")
-            return false
-        }
-        console.add("- Target image: $srcBoot")
-        return true
-    }
-
-    private fun extractZip(): Boolean {
-        val arch: String
-        arch = if (Build.VERSION.SDK_INT >= 21) {
-            val abis = listOf(*Build.SUPPORTED_ABIS)
-            if (abis.contains("x86")) "x86" else "arm"
-        } else {
-            if (TextUtils.equals(Build.CPU_ABI, "x86")) "x86" else "arm"
-        }
-
-        console.add("- Device platform: " + Build.CPU_ABI)
-
-        try {
-            ZipInputStream(context.readUri(zipUri).buffered()).use { zi ->
-                lateinit var ze: ZipEntry
-                while (zi.nextEntry?.let { ze = it } != null) {
-                    if (ze.isDirectory)
-                        continue
-                    var name: String? = null
-                    val names = arrayOf("$arch/", "common/", "META-INF/com/google/android/update-binary")
-                    for (n in names) {
-                        ze.name.run {
-                            if (startsWith(n)) {
-                                name = substring(lastIndexOf('/') + 1)
-                            }
-                        }
-                        name ?: continue
-                        break
-                    }
-                    if (name == null && ze.name.startsWith("chromeos/"))
-                        name = ze.name
-                    if (name == null)
-                        continue
-                    val dest = if (installDir is SuFile)
-                        SuFile(installDir, name)
-                    else
-                        File(installDir, name)
-                    dest.parentFile!!.mkdirs()
-                    SuFileOutputStream(dest).use { zi.copyTo(it) }
-                }
-            }
-        } catch (e: IOException) {
-            console.add("! Cannot unzip zip")
-            Timber.e(e)
-            return false
-        }
-
-        val init64 = SuFile.open(installDir, "magiskinit64")
-        if (Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_64_BIT_ABIS.isNotEmpty()) {
-            init64.renameTo(SuFile.open(installDir, "magiskinit"))
-        } else {
-            init64.delete()
-        }
-        "cd $installDir; chmod 755 *".sh()
-        return true
-    }
-
-    private fun newEntry(name: String, size: Long): TarEntry {
-        console.add("-- Writing: $name")
-        return TarEntry(TarHeader.createHeader(name, size, 0, false, 420 /* 0644 */))
-    }
-
-    @Throws(IOException::class)
-    private fun handleTar(input: InputStream) {
-        console.add("- Processing tar file")
-        var vbmeta = false
-        val tarOut = TarOutputStream(destFile)
-        this.tarOut = tarOut
-        TarInputStream(input).use { tarIn ->
-            lateinit var entry: TarEntry
-            while (tarIn.nextEntry?.let { entry = it } != null) {
-                if (entry.name.contains("boot.img") || entry.name.contains("recovery.img")) {
-                    val name = entry.name
-                    console.add("-- Extracting: $name")
-                    val extract = File(installDir, name)
-                    FileOutputStream(extract).use { tarIn.copyTo(it) }
-                    if (name.contains(".lz4")) {
-                        console.add("-- Decompressing: $name")
-                        "./magiskboot decompress $extract".sh()
-                    }
-                } else if (entry.name.contains("vbmeta.img")) {
-                    vbmeta = true
-                    val buf = ByteBuffer.allocate(256)
-                    buf.put("AVB0".toByteArray())   // magic
-                    buf.putInt(1)                   // required_libavb_version_major
-                    buf.putInt(120, 2)              // flags
-                    buf.position(128)               // release_string
-                    buf.put("avbtool 1.1.0".toByteArray())
-                    tarOut.putNextEntry(newEntry("vbmeta.img", 256))
-                    tarOut.write(buf.array())
-                } else {
-                    console.add("-- Writing: " + entry.name)
-                    tarOut.putNextEntry(entry)
-                    tarIn.copyTo(tarOut)
-                }
-            }
-            val boot = SuFile.open(installDir, "boot.img")
-            val recovery = SuFile.open(installDir, "recovery.img")
-            if (vbmeta && recovery.exists() && boot.exists()) {
-                // Install Magisk to recovery
-                srcBoot = recovery.path
-                // Repack boot image to prevent restore
-                arrayOf(
-                        "./magiskboot unpack boot.img",
-                        "./magiskboot repack boot.img",
-                        "./magiskboot cleanup",
-                        "mv new-boot.img boot.img").sh()
-                SuFileInputStream(boot).use {
-                    tarOut.putNextEntry(newEntry("boot.img", boot.length()))
-                    it.copyTo(tarOut)
-                }
-                boot.delete()
-            } else {
-                if (!boot.exists()) {
-                    console.add("! No boot image found")
-                    throw IOException()
-                }
-                srcBoot = boot.path
-            }
-        }
-    }
-
-    private fun handleFile(uri: Uri): Boolean {
-        try {
-            context.readUri(uri).buffered().use {
-                it.mark(500)
-                val magic = ByteArray(5)
-                if (it.skip(257) != 257L || it.read(magic) != magic.size) {
-                    console.add("! Invalid file")
-                    return false
-                }
-                it.reset()
-                if (magic.contentEquals("ustar".toByteArray())) {
-                    destFile = File(Config.downloadDirectory, "magisk_patched.tar")
-                    handleTar(it)
-                } else {
-                    // Raw image
-                    srcBoot = File(installDir, "boot.img").path
-                    destFile = File(Config.downloadDirectory, "magisk_patched.img")
-                    console.add("- Copying image to cache")
-                    FileOutputStream(srcBoot).use { out -> it.copyTo(out) }
-                }
-            }
-        } catch (e: IOException) {
-            console.add("! Process error")
-            Timber.e(e)
-            return false
-        }
-
-        return true
-    }
-
-    private fun patchBoot(): Boolean {
-        var isSigned = false
-        try {
-            SuFileInputStream(srcBoot).use {
-                isSigned = SignBoot.verifySignature(it, null)
-                if (isSigned) {
-                    console.add("- Boot image is signed with AVB 1.0")
-                }
-            }
-        } catch (e: IOException) {
-            console.add("! Unable to check signature")
-            return false
-        }
-
-        if (!("KEEPFORCEENCRYPT=${Info.keepEnc} KEEPVERITY=${Info.keepVerity} " +
-                "RECOVERYMODE=${Info.recovery} sh update-binary " +
-                "sh boot_patch.sh $srcBoot").sh().isSuccess) {
-            return false
-        }
-
-        val job = Shell.sh(
-                "./magiskboot cleanup",
-                "mv bin/busybox busybox",
-                "rm -rf magisk.apk bin boot.img update-binary",
-                "cd /")
-
-        val patched = File(installDir, "new-boot.img")
-        if (isSigned) {
-            console.add("- Signing boot image with verity keys")
-            val signed = File(installDir, "signed.img")
-            try {
-                withStreams(SuFileInputStream(patched), signed.outputStream().buffered()) {
-                    input, out -> SignBoot.doSignature("/boot", input, out, null, null)
-                }
-            } catch (e: IOException) {
-                console.add("! Unable to sign image")
-                Timber.e(e)
-                return false
-            }
-
-            job.add("mv -f $signed $patched")
-        }
-        job.exec()
-        return true
-    }
-
-    private fun flashBoot(): Boolean {
-        if (!"direct_install $installDir $srcBoot".sh().isSuccess)
-            return false
-        arrayOf(
-            "(KEEPVERITY=${Info.keepVerity} patch_dtb_partitions)",
-            "run_migrations"
-        ).sh()
-        return true
-    }
-
-    private fun storeBoot(): Boolean {
-        val patched = SuFile.open(installDir, "new-boot.img")
-        try {
-            val os = tarOut?.let {
-                it.putNextEntry(newEntry(
-                    if (srcBoot.contains("recovery")) "recovery.img" else "boot.img",
-                    patched.length()))
-                tarOut = null
-                it
-            } ?: destFile.outputStream()
-            patched.suInputStream().use { it.copyTo(os); os.close() }
-        } catch (e: IOException) {
-            console.add("! Failed to output to $destFile")
-            Timber.e(e)
-            return false
-        }
-
-        patched.delete()
-        console.add("")
-        console.add("****************************")
-        console.add(" Output file is placed in ")
-        console.add(" $destFile ")
-        console.add("****************************")
-        return true
-    }
-
-    private fun postOTA(): Boolean {
-        val bootctl = SuFile("/data/adb/bootctl")
-        try {
-            withStreams(service.fetchBootctl().blockingGet().byteStream(), bootctl.suOutputStream()) {
-                input, out -> input.copyTo(out)
-            }
-        } catch (e: IOException) {
-            console.add("! Unable to download bootctl")
-            Timber.e(e)
-            return false
-        }
-
-        "post_ota ${bootctl.parent}".sh()
-
-        console.add("***************************************")
-        console.add(" Next reboot will boot to second slot!")
-        console.add("***************************************")
-        return true
-    }
-
-    private fun String.sh() = Shell.sh(this).to(console, logs).exec()
-    private fun Array<String>.sh() = Shell.sh(*this).to(console, logs).exec()
-    private fun String.fsh() = ShellUtils.fastCmd(this)
-    private fun Array<String>.fsh() = ShellUtils.fastCmd(*this)
-
-    protected fun doPatchFile(patchFile: Uri) =
-        extractZip() && handleFile(patchFile) && patchBoot() && storeBoot()
-
-    protected fun direct() = findImage() && extractZip() && patchBoot() && flashBoot()
-
-    protected fun secondSlot() =
-        findSecondaryImage() && extractZip() && patchBoot() && flashBoot() && postOTA()
-
-    protected fun fixEnv(zip: File): Boolean {
-        installDir = SuFile("/data/adb/magisk")
-        Shell.su("rm -rf /data/adb/magisk/*").exec()
-        zipUri = zip.toUri()
-        return extractZip() && Shell.su("fix_env").exec().isSuccess
-    }
-
-    @WorkerThread
-    protected abstract fun operations(): Boolean
-
-    fun exec() {
-        Single.fromCallable { operations() }.subscribeK { onResult(it) }
-    }
-
-}

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

@@ -1,77 +1,522 @@
 package com.topjohnwu.magisk.core.tasks
 
-import android.content.Intent
 import android.net.Uri
+import android.system.Os
 import android.widget.Toast
+import androidx.annotation.WorkerThread
 import androidx.core.os.postDelayed
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.utils.Utils
-import com.topjohnwu.magisk.extensions.reboot
-import com.topjohnwu.magisk.model.events.dialog.EnvFixDialog
+import com.topjohnwu.magisk.core.*
+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.di.ServiceLocator
+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 java.io.File
+import com.topjohnwu.superuser.io.SuFile
+import com.topjohnwu.superuser.io.SuFileInputStream
+import com.topjohnwu.superuser.io.SuFileOutputStream
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import net.jpountz.lz4.LZ4FrameInputStream
+import org.kamranzafar.jtar.TarEntry
+import org.kamranzafar.jtar.TarHeader
+import org.kamranzafar.jtar.TarInputStream
+import org.kamranzafar.jtar.TarOutputStream
+import timber.log.Timber
+import java.io.*
+import java.nio.ByteBuffer
+import java.security.SecureRandom
+import java.util.*
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
 
-sealed class MagiskInstaller(
-    file: Uri,
-    private val console: MutableList<String>,
-    logs: MutableList<String>,
-    private val resultListener: FlashResultListener
-) : MagiskInstallImpl(file, console, logs) {
+abstract class MagiskInstallImpl protected constructor(
+    protected val console: MutableList<String> = NOPList.getInstance(),
+    private val logs: MutableList<String> = NOPList.getInstance()
+) {
 
-    override fun onResult(success: Boolean) {
+    protected var installDir = File("xxx")
+    private lateinit var srcBoot: File
+
+    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 fun findImage(): Boolean {
+        val bootPath = "find_boot_image; echo \"\$BOOTIMAGE\"".fsh()
+        if (bootPath.isEmpty()) {
+            console.add("! Unable to detect target image")
+            return false
+        }
+        srcBoot = SuFile(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 = SuFile(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 = File(context.filesDir.parent, "install")
+        installDir.deleteRecursively()
+        installDir.mkdirs()
+
+        try {
+            // Extract binaries
+            if (isRunningAsStub) {
+                val zf = ZipFile(DynAPK.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
+            SuFile(Const.TMPDIR).also {
+                arrayOf(
+                    "rm -rf $it",
+                    "mkdir -p $it",
+                    "cp_readlink $installDir $it",
+                    "rm -rf $installDir"
+                ).sh()
+                installDir = it
+            }
+        }
+
+        return true
+    }
+
+    // Optimization for SuFile I/O streams to skip an internal trial and error
+    private fun installDirFile(name: String): File {
+        return if (useRootDir)
+            SuFile(installDir, name)
+        else
+            File(installDir, name)
+    }
+
+    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 = installDirFile(name)
+                    decompressedStream().cleanPump(SuFileOutputStream.open(extract))
+                } 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 = installDirFile("boot.img")
+        val recovery = installDirFile("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()
+            SuFileInputStream.open(boot).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 = installDirFile("boot.img")
+                    console.add("- Copying image to cache")
+                    src.cleanPump(SuFileOutputStream.open(srcBoot))
+                    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 = installDirFile("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()))
+            }
+            SuFileInputStream.open(newBoot).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.let { it !is SuFile || !it.isCharacter }) {
+            try {
+                SuFileInputStream.open(srcBoot).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 = installDirFile("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 = SuFileInputStream.open(newBoot).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 doPatchFile(patchFile: Uri) = extractFiles() && handleFile(patchFile)
+
+    protected fun direct() = findImage() && extractFiles() && patchBoot() && flashBoot()
+
+    protected suspend 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 {
+        synchronized(Companion) {
+            if (haveActiveSession)
+                return false
+            haveActiveSession = true
+        }
+        val result = withContext(Dispatchers.IO) { operations() }
+        synchronized(Companion) {
+            haveActiveSession = false
+        }
+        return result
+    }
+
+    companion object {
+        private var haveActiveSession = 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.sh("rm -rf $installDir").submit()
             console.add("! Installation failed")
         }
-        resultListener.onResult(success)
+        return success
     }
 
     class Patch(
-        file: Uri,
         private val uri: Uri,
         console: MutableList<String>,
-        logs: MutableList<String>,
-        resultListener: FlashResultListener
-    ) : MagiskInstaller(file, console, logs, resultListener) {
-        override fun operations() = doPatchFile(uri)
+        logs: MutableList<String>
+    ) : MagiskInstaller(console, logs) {
+        override suspend fun operations() = doPatchFile(uri)
     }
 
     class SecondSlot(
-        file: Uri,
         console: MutableList<String>,
-        logs: MutableList<String>,
-        resultListener: FlashResultListener
-    ) : MagiskInstaller(file, console, logs, resultListener) {
-        override fun operations() = secondSlot()
+        logs: MutableList<String>
+    ) : MagiskInstaller(console, logs) {
+        override suspend fun operations() = secondSlot()
     }
 
     class Direct(
-        file: Uri,
         console: MutableList<String>,
-        logs: MutableList<String>,
-        resultListener: FlashResultListener
-    ) : MagiskInstaller(file, console, logs, resultListener) {
-        override fun operations() = direct()
+        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 EnvFixTask(
-    private val zip: File
-) : MagiskInstallImpl() {
-    override fun operations() = fixEnv(zip)
+    class Uninstall(
+        console: MutableList<String>,
+        logs: MutableList<String>
+    ) : MagiskInstallImpl(console, logs) {
+        override suspend fun operations() = uninstall()
 
-    override fun onResult(success: Boolean) {
-        LocalBroadcastManager.getInstance(context).sendBroadcast(Intent(EnvFixDialog.DISMISS))
-        Utils.toast(
-            if (success) R.string.reboot_delay_toast else R.string.setup_fail,
-            Toast.LENGTH_LONG
-        )
-        if (success)
-            UiThreadHandler.handler.postDelayed(5000) { reboot() }
+        override suspend fun exec(): Boolean {
+            val success = super.exec()
+            if (success) {
+                UiThreadHandler.handler.postDelayed(3000) {
+                    Shell.su("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/tasks/RepoUpdater.kt

@@ -1,101 +0,0 @@
-package com.topjohnwu.magisk.core.tasks
-
-import com.squareup.moshi.JsonClass
-import com.topjohnwu.magisk.core.Const
-import com.topjohnwu.magisk.core.model.module.Repo
-import com.topjohnwu.magisk.data.database.RepoDao
-import com.topjohnwu.magisk.data.network.GithubApiServices
-import io.reactivex.Completable
-import io.reactivex.Flowable
-import io.reactivex.rxkotlin.toFlowable
-import io.reactivex.schedulers.Schedulers
-import timber.log.Timber
-import java.net.HttpURLConnection
-import java.text.SimpleDateFormat
-import java.util.*
-import kotlin.collections.HashSet
-
-class RepoUpdater(
-    private val api: GithubApiServices,
-    private val repoDB: RepoDao
-) {
-    private fun loadRepos(repos: List<GithubRepoInfo>, cached: MutableSet<String>) =
-        repos.toFlowable().parallel().runOn(Schedulers.io()).map {
-            // Skip submission
-            if (it.id == "submission")
-                return@map
-            val repo = repoDB.getRepo(it.id)?.apply { cached.remove(it.id) } ?: Repo(it.id)
-            repo.runCatching {
-                update(it.pushDate)
-                repoDB.addRepo(this)
-            }.getOrElse(Timber::e)
-        }.sequential()
-
-    private fun loadPage(
-        cached: MutableSet<String>,
-        page: Int = 1,
-        etag: String = ""
-    ): Flowable<Unit> = api.fetchRepos(page, etag).flatMap {
-        it.error()?.also { throw it }
-        it.response()?.run {
-            if (code() == HttpURLConnection.HTTP_NOT_MODIFIED)
-                return@run Flowable.error<Unit>(CachedException())
-
-            if (page == 1)
-                repoDB.etagKey = headers()[Const.Key.ETAG_KEY].orEmpty().trimEtag()
-
-            val flow = loadRepos(body()!!, cached)
-            if (headers()[Const.Key.LINK_KEY].orEmpty().contains("next")) {
-                flow.mergeWith(loadPage(cached, page + 1))
-            } else {
-                flow
-            }
-        }
-    }
-
-    private fun forcedReload(cached: MutableSet<String>) =
-        cached.toFlowable().parallel().runOn(Schedulers.io()).map {
-            runCatching {
-                Repo(it).update()
-            }.getOrElse(Timber::e)
-        }.sequential()
-
-    private fun String.trimEtag() = substring(indexOf('\"'), lastIndexOf('\"') + 1)
-
-    @Suppress("RedundantLambdaArrow")
-    operator fun invoke(forced: Boolean) : Completable {
-        return Flowable
-            .fromCallable { Collections.synchronizedSet(HashSet(repoDB.repoIDList)) }
-            .flatMap { cached ->
-                loadPage(cached, etag = repoDB.etagKey).doOnComplete {
-                    repoDB.removeRepos(cached)
-                }.onErrorResumeNext { it: Throwable ->
-                    if (it is CachedException) {
-                        if (forced)
-                            return@onErrorResumeNext forcedReload(cached)
-                    } else {
-                        Timber.e(it)
-                    }
-                    Flowable.empty()
-                }
-            }.ignoreElements()
-    }
-
-    class CachedException : Exception()
-}
-
-private val dateFormat: SimpleDateFormat =
-    SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US).apply {
-        timeZone = TimeZone.getTimeZone("UTC")
-    }
-
-@JsonClass(generateAdapter = true)
-data class GithubRepoInfo(
-    val name: String,
-    val pushed_at: String
-) {
-    val id get() = name
-
-    @Transient
-    val pushDate = dateFormat.parse(pushed_at)!!
-}

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

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

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

@@ -6,12 +6,11 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Config
-import org.koin.core.KoinComponent
-import org.koin.core.get
+import com.topjohnwu.magisk.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

@@ -5,13 +5,14 @@ import android.content.pm.PackageManager
 import android.util.Base64
 import android.util.Base64OutputStream
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.utils.PatchAPK.ALPHANUM
-import com.topjohnwu.signing.CryptoUtils.readCertificate
-import com.topjohnwu.signing.CryptoUtils.readPrivateKey
+import com.topjohnwu.magisk.signing.CryptoUtils.readCertificate
+import com.topjohnwu.magisk.signing.CryptoUtils.readPrivateKey
+import com.topjohnwu.magisk.signing.KeyData
 import org.bouncycastle.asn1.x500.X500Name
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter
 import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder
 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder
+import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.math.BigInteger
 import java.security.KeyPairGenerator
@@ -35,11 +36,12 @@ class Keygen(context: Context) : CertKeyProvider {
         private const val ALIAS = "magisk"
         private val PASSWORD get() = "magisk".toCharArray()
         private const val TESTKEY_CERT = "61ed377e85d386a8dfee6b864bd85b0bfaa5af81"
+        private const val DNAME = "C=US,ST=California,L=Mountain View,O=Google Inc.,OU=Android,CN=Android"
         private const val BASE64_FLAG = Base64.NO_PADDING or Base64.NO_WRAP
     }
 
-    private val start = Calendar.getInstance()
-    private val end = Calendar.getInstance().apply { add(Calendar.YEAR, 30) }
+    private val start = Calendar.getInstance().apply { add(Calendar.MONTH, -3) }
+    private val end = (start.clone() as Calendar).apply { add(Calendar.YEAR, 30) }
 
     override val cert get() = provider.cert
     override val key get() = provider.key
@@ -58,10 +60,10 @@ class Keygen(context: Context) : CertKeyProvider {
 
     class TestProvider : CertKeyProvider {
         override val cert by lazy {
-            readCertificate(javaClass.getResourceAsStream("/keys/testkey.x509.pem"))
+            readCertificate(ByteArrayInputStream(KeyData.testCert()))
         }
         override val key by lazy {
-            readPrivateKey(javaClass.getResourceAsStream("/keys/testkey.pk8"))
+            readPrivateKey(ByteArrayInputStream(KeyData.testKey()))
         }
     }
 
@@ -85,17 +87,6 @@ class Keygen(context: Context) : CertKeyProvider {
         }
     }
 
-    private fun randomString(): String {
-        val rand = kotlin.random.Random.Default
-        val len = rand.nextInt(5, 10)
-        val sb = StringBuilder(len)
-        for (i in 0..len) {
-            val idx = rand.nextInt(ALPHANUM.length)
-            sb.append(ALPHANUM[idx])
-        }
-        return sb.toString()
-    }
-
     private fun init(): KeyStore {
         val raw = Config.keyStoreRaw
         val ks = KeyStore.getInstance("PKCS12")
@@ -117,7 +108,7 @@ class Keygen(context: Context) : CertKeyProvider {
 
         // Generate new private key and certificate
         val kp = KeyPairGenerator.getInstance("RSA").apply { initialize(4096) }.genKeyPair()
-        val dname = X500Name("CN=${randomString()}")
+        val dname = X500Name(DNAME)
         val builder = JcaX509v3CertificateBuilder(dname, BigInteger(160, Random()),
             start.time, end.time, dname, kp.public)
         val signer = JcaContentSignerBuilder("SHA1WithRSA").build(kp.private)

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

@@ -3,19 +3,15 @@
 package com.topjohnwu.magisk.core.utils
 
 import android.annotation.SuppressLint
-import android.content.res.AssetManager
 import android.content.res.Configuration
 import android.content.res.Resources
-import android.util.DisplayMetrics
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.ResMgr
-import com.topjohnwu.magisk.core.addAssetPath
-import com.topjohnwu.magisk.extensions.langTagToLocale
-import com.topjohnwu.magisk.extensions.toLangTag
-import io.reactivex.Single
+import com.topjohnwu.magisk.core.createNewResources
+import com.topjohnwu.magisk.di.AppContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import java.util.*
-import kotlin.Comparator
 import kotlin.collections.ArrayList
 
 var currentLocale: Locale = Locale.getDefault()
@@ -23,14 +19,14 @@ var currentLocale: Locale = Locale.getDefault()
 @SuppressLint("ConstantLocale")
 val defaultLocale: Locale = Locale.getDefault()
 
-val availableLocales = Single.fromCallable {
+private var cachedLocales: Pair<Array<String>, Array<String>>? = null
+
+suspend fun availableLocales() = cachedLocales ?:
+withContext(Dispatchers.Default) {
     val compareId = R.string.app_changelog
 
-    // Create a completely new resource to prevent cross talk over app's configs
-    val asset = AssetManager::class.java.newInstance().apply { addAssetPath(ResMgr.apk) }
-    val config = Configuration(ResMgr.resource.configuration)
-    val metrics = DisplayMetrics().apply { setTo(ResMgr.resource.displayMetrics) }
-    val res = Resources(asset, metrics, config)
+    // Create a completely new resource to prevent cross talk over active configs
+    val res = createNewResources()
 
     val locales = ArrayList<String>().apply {
         // Add default locale
@@ -41,23 +37,19 @@ val availableLocales = Single.fromCallable {
         add("pt-BR")
 
         // Then add all supported locales
-        addAll(res.assets.locales)
+        addAll(Resources.getSystem().assets.locales)
     }.map {
-        it.langTagToLocale()
+        Locale.forLanguageTag(it)
     }.distinctBy {
-        config.setLocale(it)
-        res.updateConfiguration(config, metrics)
+        res.setLocale(it)
         res.getString(compareId)
-    }.sortedWith(Comparator { a, b ->
+    }.sortedWith { a, b ->
         a.getDisplayName(a).compareTo(b.getDisplayName(b), true)
-    })
+    }
 
-    config.setLocale(defaultLocale)
-    res.updateConfiguration(config, metrics)
+    res.setLocale(defaultLocale)
     val defName = res.getString(R.string.system_default)
 
-    Pair(locales, defName)
-}.map { (locales, defName) ->
     val names = ArrayList<String>(locales.size + 1)
     val values = ArrayList<String>(locales.size + 1)
 
@@ -66,23 +58,30 @@ val availableLocales = Single.fromCallable {
 
     locales.forEach { locale ->
         names.add(locale.getDisplayName(locale))
-        values.add(locale.toLangTag())
+        values.add(locale.toLanguageTag())
     }
 
-    Pair(names.toTypedArray(), values.toTypedArray())
-}.cache()!!
+    (names.toTypedArray() to values.toTypedArray()).also { cachedLocales = it }
+}
 
-fun Resources.updateConfig(config: Configuration = configuration) {
+fun Resources.setConfig(config: Configuration) {
     config.setLocale(currentLocale)
     updateConfiguration(config, displayMetrics)
 }
 
+fun Resources.syncLocale() = setConfig(configuration)
+
+fun Resources.setLocale(locale: Locale) {
+    configuration.setLocale(locale)
+    updateConfiguration(configuration, displayMetrics)
+}
+
 fun refreshLocale() {
     val localeConfig = Config.locale
     currentLocale = when {
         localeConfig.isEmpty() -> defaultLocale
-        else -> localeConfig.langTagToLocale()
+        else -> Locale.forLanguageTag(localeConfig)
     }
     Locale.setDefault(currentLocale)
-    ResMgr.resource.updateConfig()
+    AppContext.resources.syncLocale()
 }

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

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

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

@@ -1,155 +0,0 @@
-package com.topjohnwu.magisk.core.utils
-
-import android.content.Context
-import android.os.Build.VERSION.SDK_INT
-import android.widget.Toast
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.Const
-import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.isRunningAsStub
-import com.topjohnwu.magisk.core.view.Notifications
-import com.topjohnwu.magisk.data.network.GithubRawServices
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.subscribeK
-import com.topjohnwu.magisk.extensions.writeTo
-import com.topjohnwu.signing.JarMap
-import com.topjohnwu.signing.SignAPK
-import com.topjohnwu.superuser.Shell
-import io.reactivex.Single
-import timber.log.Timber
-import java.io.File
-import java.io.FileOutputStream
-import java.nio.ByteBuffer
-import java.nio.ByteOrder
-import java.security.SecureRandom
-
-object PatchAPK {
-
-    private const val ALPHA = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    private const val DIGITS = "0123456789"
-    const val ALPHANUM = ALPHA + DIGITS
-    private const val ALPHANUMDOTS = "$ALPHANUM............"
-
-    private const val APP_ID = "com.topjohnwu.magisk"
-    private const val APP_NAME = "Magisk Manager"
-
-    private fun genPackageName(prefix: String, length: Int): CharSequence {
-        val builder = StringBuilder(length)
-        builder.append(prefix)
-        val len = length - prefix.length
-        val random = SecureRandom()
-        var next: Char
-        var prev = prefix[prefix.length - 1]
-        for (i in 0 until len) {
-            next = if (prev == '.' || i == len - 1) {
-                ALPHA[random.nextInt(ALPHA.length)]
-            } else {
-                ALPHANUMDOTS[random.nextInt(ALPHANUMDOTS.length)]
-            }
-            builder.append(next)
-            prev = next
-        }
-        return builder
-    }
-
-    private fun findAndPatch(xml: ByteArray, from: CharSequence, to: CharSequence): Boolean {
-        if (to.length > from.length)
-            return false
-        val buf = ByteBuffer.wrap(xml).order(ByteOrder.LITTLE_ENDIAN).asCharBuffer()
-        val offList = mutableListOf<Int>()
-        var i = 0
-        loop@ while (i < buf.length - from.length) {
-            for (j in from.indices) {
-                if (buf.get(i + j) != from[j]) {
-                    ++i
-                    continue@loop
-                }
-            }
-            offList.add(i)
-            i += from.length
-        }
-        if (offList.isEmpty())
-            return false
-
-        val toBuf = to.toString().toCharArray().copyOf(from.length)
-        for (off in offList) {
-            buf.position(off)
-            buf.put(toBuf)
-        }
-        return true
-    }
-
-    fun patch(apk: String, out: String, pkg: CharSequence, label: CharSequence): Boolean {
-        try {
-            val jar = JarMap.open(apk)
-            val je = jar.getJarEntry(Const.ANDROID_MANIFEST)
-            val xml = jar.getRawData(je)
-
-            if (!findAndPatch(xml, APP_ID, pkg) ||
-                !findAndPatch(xml, APP_NAME, label))
-                return false
-
-            // Write apk changes
-            jar.getOutputStream(je).write(xml)
-            val keys = Keygen(get())
-            SignAPK.sign(keys.cert, keys.key, jar, FileOutputStream(out).buffered())
-        } catch (e: Exception) {
-            Timber.e(e)
-            return false
-        }
-
-        return true
-    }
-
-    private fun patchAndHide(context: Context, label: String): Boolean {
-        val dlStub = !isRunningAsStub && SDK_INT >= 28 &&
-                Info.env.magiskVersionCode >= Const.Version.PROVIDER_CONNECT
-        val src = if (dlStub) {
-            val stub = File(context.cacheDir, "stub.apk")
-            val svc = get<GithubRawServices>()
-            try {
-                svc.fetchFile(Info.remote.stub.link).blockingGet().byteStream().use {
-                    it.writeTo(stub)
-                }
-            } catch (e: Exception) {
-                Timber.e(e)
-                return false
-            }
-            stub.path
-        } else {
-            context.packageCodePath
-        }
-
-        // Generate a new random package name and signature
-        val repack = File(context.cacheDir, "patched.apk")
-        val pkg = genPackageName("com.", APP_ID.length)
-        Config.keyStoreRaw = ""
-
-        if (!patch(src, repack.path, pkg, label))
-            return false
-
-        // Install the application
-        repack.setReadable(true, false)
-        if (!Shell.su("force_pm_install $repack").exec().isSuccess)
-            return false
-
-        Config.suManager = pkg.toString()
-        Config.export()
-        Shell.su("pm uninstall $APP_ID").submit()
-
-        return true
-    }
-
-    fun hideManager(context: Context, label: String) {
-        val progress = Notifications.progress(context, context.getString(R.string.hide_manager_title))
-        Notifications.mgr.notify(Const.ID.HIDE_MANAGER_NOTIFICATION_ID, progress.build())
-        Single.fromCallable {
-            patchAndHide(context, label)
-        }.subscribeK {
-            if (!it)
-                Utils.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG)
-            Notifications.mgr.cancel(Const.ID.HIDE_MANAGER_NOTIFICATION_ID)
-        }
-    }
-}

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

@@ -1,12 +1,11 @@
 package com.topjohnwu.magisk.core.utils
 
-import com.topjohnwu.superuser.internal.UiThreadHandler
 import java.io.FilterInputStream
 import java.io.InputStream
 
 class ProgressInputStream(
     base: InputStream,
-    val progressEmitter: (Long) -> Unit = {}
+    val progressEmitter: (Long) -> Unit
 ) : FilterInputStream(base) {
 
     private var bytesRead = 0L
@@ -16,7 +15,7 @@ class ProgressInputStream(
         val cur = System.currentTimeMillis()
         if (cur - lastUpdate > 1000) {
             lastUpdate = cur
-            UiThreadHandler.run { progressEmitter(bytesRead) }
+            progressEmitter(bytesRead)
         }
     }
 
@@ -41,4 +40,9 @@ class ProgressInputStream(
         }
         return sz
     }
+
+    override fun close() {
+        super.close()
+        progressEmitter(bytesRead)
+    }
 }

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

@@ -1,46 +0,0 @@
-package com.topjohnwu.magisk.core.utils
-
-import android.content.Context
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.Const
-import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.wrap
-import com.topjohnwu.magisk.extensions.rawResource
-import com.topjohnwu.superuser.Shell
-import com.topjohnwu.superuser.ShellUtils
-import com.topjohnwu.superuser.io.SuFile
-
-class RootInit : Shell.Initializer() {
-
-    override fun onInit(context: Context, shell: Shell): Boolean {
-        return init(context.wrap(), shell)
-    }
-
-    fun init(context: Context, shell: Shell): Boolean {
-        val job = shell.newJob()
-        job.add(context.rawResource(R.raw.manager))
-        if (shell.isRoot) {
-            job.add(context.rawResource(R.raw.util_functions))
-                .add("SHA1=`grep_prop SHA1 /sbin/.magisk/config`")
-            Const.MAGISK_DISABLE_FILE = SuFile("/cache/.disable_magisk")
-        }
-
-        job.add(
-            "export BOOTMODE=true",
-            "mount_partitions",
-            "get_flags",
-            "run_migrations"
-        ).exec()
-
-        fun getvar(name: String) = ShellUtils.fastCmd(shell, "echo \$$name").toBoolean()
-
-        Info.keepVerity = getvar("KEEPVERITY")
-        Info.keepEnc = getvar("KEEPFORCEENCRYPT")
-        Info.isSAR = getvar("SYSTEM_ROOT")
-        Info.ramdisk = shell.newJob().add("check_boot_ramdisk").exec().isSuccess
-        Info.recovery = getvar("RECOVERYMODE")
-        Info.isAB = getvar("ISAB")
-
-        return true
-    }
-}

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

@@ -0,0 +1,55 @@
+package com.topjohnwu.magisk.core.utils
+
+import android.content.ComponentName
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.Binder
+import android.os.IBinder
+import com.topjohnwu.superuser.ipc.RootService
+import timber.log.Timber
+import java.util.concurrent.CountDownLatch
+import kotlin.system.exitProcess
+
+class RootRegistry(stub: Any?) : RootService() {
+
+    constructor() : this(null)
+
+    private val className: String? = stub?.javaClass?.name
+
+    init {
+        // Always log full stack trace with Timber
+        Timber.plant(Timber.DebugTree())
+        Thread.setDefaultUncaughtExceptionHandler { _, e ->
+            Timber.e(e)
+            exitProcess(1)
+        }
+    }
+
+    override fun onBind(intent: Intent): IBinder {
+        // TODO: PLACEHOLDER
+        return Binder()
+    }
+
+    override fun getComponentName(): ComponentName {
+        return ComponentName(packageName, className ?: javaClass.name)
+    }
+
+    // TODO: PLACEHOLDER
+    object Connection : CountDownLatch(1), ServiceConnection {
+        override fun onServiceConnected(name: ComponentName, service: IBinder) {
+            Timber.d("onServiceConnected")
+            countDown()
+        }
+        override fun onNullBinding(name: ComponentName) {
+            Timber.d("onServiceConnected")
+            countDown()
+        }
+        override fun onServiceDisconnected(name: ComponentName) {
+            bind(Intent().setComponent(name), this)
+        }
+    }
+
+    companion object {
+        var bindTask: Runnable? = null
+    }
+}

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

@@ -1,21 +0,0 @@
-package com.topjohnwu.magisk.core.utils
-
-interface SafetyNetHelper {
-
-    val version: Int
-
-    fun attest()
-
-    interface Callback {
-        fun onResponse(responseCode: Int)
-    }
-
-    companion object {
-
-        const val RESPONSE_ERR = 0x01
-        const val CONNECTION_FAIL = 0x02
-
-        const val BASIC_PASS = 0x10
-        const val CTS_PASS = 0x20
-    }
-}

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

@@ -0,0 +1,90 @@
+package com.topjohnwu.magisk.core.utils
+
+import android.content.Context
+import com.topjohnwu.magisk.DynAPK
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.ktx.cachedFile
+import com.topjohnwu.magisk.ktx.deviceProtectedContext
+import com.topjohnwu.magisk.ktx.rawResource
+import com.topjohnwu.magisk.ktx.writeTo
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.ShellUtils
+import java.io.File
+import java.util.jar.JarFile
+
+class ShellInit : Shell.Initializer() {
+    override fun onInit(context: Context, shell: Shell): Boolean {
+        if (shell.isRoot) {
+            RootRegistry.bindTask?.run()
+            RootRegistry.bindTask = null
+        }
+        shell.newJob().apply {
+            add("export ASH_STANDALONE=1")
+
+            val localBB: File
+            if (isRunningAsStub) {
+                if (!shell.isRoot)
+                    return true
+                val jar = JarFile(DynAPK.current(context))
+                val bb = jar.getJarEntry("lib/${Const.CPU_ABI}/libbusybox.so")
+                localBB = context.deviceProtectedContext.cachedFile("busybox")
+                localBB.delete()
+                jar.getInputStream(bb).writeTo(localBB)
+                localBB.setExecutable(true)
+            } else {
+                localBB = File(context.applicationInfo.nativeLibraryDir, "libbusybox.so")
+            }
+
+            if (shell.isRoot) {
+                add("export MAGISKTMP=\$(magisk --path)/.magisk")
+                // Test if we can properly execute stuff in /data
+                Info.noDataExec = !shell.newJob().add("$localBB true").exec().isSuccess
+            }
+
+            if (Info.noDataExec) {
+                // Copy it out of /data to workaround Samsung bullshit
+                add(
+                    "if [ -x \$MAGISKTMP/busybox/busybox ]; then",
+                    "  cp -af $localBB \$MAGISKTMP/busybox/busybox",
+                    "  exec \$MAGISKTMP/busybox/busybox sh",
+                    "else",
+                    "  cp -af $localBB /dev/.busybox",
+                    "  exec /dev/.busybox sh",
+                    "fi"
+                )
+            } else {
+                // Directly execute the file
+                add("exec $localBB sh")
+            }
+
+            add(context.rawResource(R.raw.manager))
+            if (shell.isRoot) {
+                add(context.assets.open("util_functions.sh"))
+            }
+            add("app_init")
+        }.exec()
+
+        fun fastCmd(cmd: String) = ShellUtils.fastCmd(shell, cmd)
+        fun getVar(name: String) = fastCmd("echo \$$name")
+        fun getBool(name: String) = getVar(name).toBoolean()
+
+        Const.MAGISKTMP = getVar("MAGISKTMP")
+        Info.isSAR = getBool("SYSTEM_ROOT")
+        Info.ramdisk = getBool("RAMDISKEXIST")
+        Info.vbmeta = getBool("VBMETAEXIST")
+        Info.isAB = getBool("ISAB")
+        Info.crypto = getVar("CRYPTOTYPE")
+
+        // Default presets
+        Config.recovery = getBool("RECOVERYMODE")
+        Config.keepVerity = getBool("KEEPVERITY")
+        Config.keepEnc = getBool("KEEPFORCEENCRYPT")
+        Config.patchVbmeta = getBool("PATCHVBMETAFLAG")
+
+        return true
+    }
+}

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

@@ -1,78 +0,0 @@
-package com.topjohnwu.magisk.core.utils
-
-import android.content.Context
-import android.content.Intent
-import android.content.res.Resources
-import android.net.Uri
-import android.os.Environment
-import android.widget.Toast
-import androidx.work.*
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.Const
-import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.UpdateCheckService
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.superuser.internal.UiThreadHandler
-import java.io.File
-import java.util.concurrent.TimeUnit
-
-object Utils {
-
-    fun toast(msg: CharSequence, duration: Int) {
-        UiThreadHandler.run { Toast.makeText(get(), msg, duration).show() }
-    }
-
-    fun toast(resId: Int, duration: Int) {
-        UiThreadHandler.run { Toast.makeText(get(), resId, duration).show() }
-    }
-
-    fun dpInPx(dp: Int): Int {
-        val scale = get<Resources>().displayMetrics.density
-        return (dp * scale + 0.5).toInt()
-    }
-
-    fun showSuperUser(): Boolean {
-        return Info.env.isActive && (Const.USER_ID == 0
-                || Config.suMultiuserMode != Config.Value.MULTIUSER_MODE_OWNER_MANAGED)
-    }
-
-    fun scheduleUpdateCheck(context: Context) {
-        if (Config.checkUpdate) {
-            val constraints = Constraints.Builder()
-                .setRequiredNetworkType(NetworkType.CONNECTED)
-                .setRequiresDeviceIdle(true)
-                .build()
-            val request = PeriodicWorkRequest
-                .Builder(UpdateCheckService::class.java, 12, TimeUnit.HOURS)
-                .setConstraints(constraints)
-                .build()
-            WorkManager.getInstance(context).enqueueUniquePeriodicWork(
-                Const.ID.CHECK_MAGISK_UPDATE_WORKER_ID,
-                ExistingPeriodicWorkPolicy.REPLACE, request
-            )
-        } else {
-            WorkManager.getInstance(context)
-                .cancelUniqueWork(Const.ID.CHECK_MAGISK_UPDATE_WORKER_ID)
-        }
-    }
-
-    fun openLink(context: Context, link: Uri) {
-        val intent = Intent(Intent.ACTION_VIEW, link)
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        if (intent.resolveActivity(context.packageManager) != null) {
-            context.startActivity(intent)
-        } else {
-            toast(
-                R.string.open_link_failed_toast,
-                Toast.LENGTH_SHORT
-            )
-        }
-    }
-
-    fun ensureDownloadPath(path: String) =
-        File(Environment.getExternalStorageDirectory(), path).run {
-            if ((exists() && isDirectory) || mkdirs()) this else null
-        }
-
-}

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

@@ -36,10 +36,9 @@ fun InputStream.unzip(folder: File, path: String, junkPath: Boolean) {
                 dest = SuFile(folder, name)
                 dest.parentFile!!.mkdirs()
             }
-            SuFileOutputStream(dest).use { out -> zin.copyTo(out) }
+            SuFileOutputStream.open(dest).use { out -> zin.copyTo(out) }
         }
-    } catch (e: IOException) {
-        e.printStackTrace()
-        throw e
+    } catch (e: IllegalArgumentException) {
+        throw IOException(e)
     }
 }

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

@@ -0,0 +1,49 @@
+package com.topjohnwu.magisk.core.utils.net
+
+import android.annotation.TargetApi
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import androidx.collection.ArraySet
+
+@TargetApi(21)
+open class LollipopNetworkObserver(
+    context: Context,
+    callback: ConnectionCallback
+): NetworkObserver(context, callback) {
+
+    private val networkCallback = NetCallback()
+
+    init {
+        val request = NetworkRequest.Builder()
+            .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+            .build()
+        manager.registerNetworkCallback(request, networkCallback)
+    }
+
+    @Suppress("DEPRECATION")
+    override fun getCurrentState() {
+        callback(manager.activeNetworkInfo?.isConnected ?: false)
+    }
+
+    override fun stopObserving() {
+        manager.unregisterNetworkCallback(networkCallback)
+    }
+
+    private inner class NetCallback : ConnectivityManager.NetworkCallback() {
+
+        private val activeList = ArraySet<Network>()
+
+        override fun onAvailable(network: Network) {
+            activeList.add(network)
+            callback(true)
+        }
+
+        override fun onLost(network: Network) {
+            activeList.remove(network)
+            callback(!activeList.isEmpty())
+        }
+    }
+}

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

@@ -0,0 +1,53 @@
+@file:Suppress("DEPRECATION")
+
+package com.topjohnwu.magisk.core.utils.net
+
+import android.annotation.TargetApi
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.NetworkCapabilities
+import android.os.PowerManager
+import androidx.core.content.getSystemService
+
+@TargetApi(23)
+class MarshmallowNetworkObserver(
+    context: Context,
+    callback: ConnectionCallback
+): LollipopNetworkObserver(context, callback) {
+
+    private val receiver = IdleBroadcastReceiver()
+
+    init {
+        val filter = IntentFilter(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED)
+        app.registerReceiver(receiver, filter)
+    }
+
+    override fun stopObserving() {
+        super.stopObserving()
+        app.unregisterReceiver(receiver)
+    }
+
+    override fun getCurrentState() {
+        callback(manager.getNetworkCapabilities(manager.activeNetwork)
+            ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) ?: false)
+    }
+
+    private inner class IdleBroadcastReceiver: BroadcastReceiver() {
+
+        private fun Context.isIdleMode(): Boolean {
+            val pwm = getSystemService<PowerManager>() ?: return true
+            val isIgnoringOptimizations = pwm.isIgnoringBatteryOptimizations(packageName)
+            return pwm.isDeviceIdleMode && !isIgnoringOptimizations
+        }
+
+        override fun onReceive(context: Context, intent: Intent) {
+            if (context.isIdleMode()) {
+                callback(false)
+            } else {
+                getCurrentState()
+            }
+        }
+    }
+}

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

@@ -0,0 +1,29 @@
+package com.topjohnwu.magisk.core.utils.net
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.os.Build
+import androidx.core.content.getSystemService
+
+typealias ConnectionCallback = (Boolean) -> Unit
+
+abstract class NetworkObserver(
+    context: Context,
+    protected val callback: ConnectionCallback
+) {
+
+    protected val app: Context = context.applicationContext
+    protected val manager = context.getSystemService<ConnectivityManager>()!!
+
+    protected abstract fun stopObserving()
+    protected abstract fun getCurrentState()
+
+    companion object {
+        fun observe(context: Context, callback: ConnectionCallback): NetworkObserver {
+            val observer: NetworkObserver = if (Build.VERSION.SDK_INT >= 23)
+                MarshmallowNetworkObserver(context, callback)
+            else LollipopNetworkObserver(context, callback)
+            return observer.apply { getCurrentState() }
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/core/view/Notifications.kt

@@ -1,126 +0,0 @@
-package com.topjohnwu.magisk.core.view
-
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.os.Build.VERSION.SDK_INT
-import androidx.core.app.TaskStackBuilder
-import androidx.core.content.getSystemService
-import androidx.core.graphics.drawable.toIcon
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.*
-import com.topjohnwu.magisk.core.Const.ID.PROGRESS_NOTIFICATION_CHANNEL
-import com.topjohnwu.magisk.core.Const.ID.UPDATE_NOTIFICATION_CHANNEL
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.getBitmap
-
-object Notifications {
-
-    val mgr by lazy { get<Context>().getSystemService<NotificationManager>()!! }
-
-    fun setup(context: Context) {
-        if (SDK_INT >= 26) {
-            var channel = NotificationChannel(UPDATE_NOTIFICATION_CHANNEL,
-                    context.getString(R.string.update_channel), NotificationManager.IMPORTANCE_DEFAULT)
-            mgr.createNotificationChannel(channel)
-            channel = NotificationChannel(PROGRESS_NOTIFICATION_CHANNEL,
-                    context.getString(R.string.progress_channel), NotificationManager.IMPORTANCE_LOW)
-            mgr.createNotificationChannel(channel)
-        }
-    }
-
-    private fun updateBuilder(context: Context): Notification.Builder {
-        return Notification.Builder(context).apply {
-            val bitmap = context.getBitmap(R.drawable.ic_magisk_outline)
-            setLargeIcon(bitmap)
-            if (SDK_INT >= 26) {
-                setSmallIcon(bitmap.toIcon())
-                setChannelId(UPDATE_NOTIFICATION_CHANNEL)
-            } else {
-                setSmallIcon(R.drawable.ic_magisk_outline)
-                setVibrate(longArrayOf(0, 100, 100, 100))
-            }
-        }
-    }
-
-    fun magiskUpdate(context: Context) {
-        val intent = context.intent<SplashActivity>()
-                .putExtra(Const.Key.OPEN_SECTION, "magisk")
-        val stackBuilder = TaskStackBuilder.create(context)
-        stackBuilder.addParentStack(SplashActivity::class.java.cmp(context.packageName))
-        stackBuilder.addNextIntent(intent)
-        val pendingIntent = stackBuilder.getPendingIntent(
-            Const.ID.MAGISK_UPDATE_NOTIFICATION_ID,
-                PendingIntent.FLAG_UPDATE_CURRENT)
-
-        val builder = updateBuilder(
-            context
-        )
-            .setContentTitle(context.getString(R.string.magisk_update_title))
-            .setContentText(context.getString(R.string.manager_download_install))
-            .setAutoCancel(true)
-            .setContentIntent(pendingIntent)
-
-        mgr.notify(Const.ID.MAGISK_UPDATE_NOTIFICATION_ID, builder.build())
-    }
-
-    fun managerUpdate(context: Context) {
-        val intent = context.intent<GeneralReceiver>()
-                .setAction(Const.Key.BROADCAST_MANAGER_UPDATE)
-                .putExtra(Const.Key.INTENT_SET_APP, Info.remote.app)
-
-        val pendingIntent = PendingIntent.getBroadcast(context,
-                Const.ID.APK_UPDATE_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT)
-
-        val builder = updateBuilder(
-            context
-        )
-            .setContentTitle(context.getString(R.string.manager_update_title))
-            .setContentText(context.getString(R.string.manager_download_install))
-            .setAutoCancel(true)
-            .setContentIntent(pendingIntent)
-
-        mgr.notify(Const.ID.APK_UPDATE_NOTIFICATION_ID, builder.build())
-    }
-
-    fun dtboPatched(context: Context) {
-        val intent = context.intent<GeneralReceiver>()
-                .setAction(Const.Key.BROADCAST_REBOOT)
-        val pendingIntent = PendingIntent.getBroadcast(context,
-                Const.ID.DTBO_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT)
-
-        val builder = updateBuilder(
-            context
-        )
-            .setContentTitle(context.getString(R.string.dtbo_patched_title))
-            .setContentText(context.getString(R.string.dtbo_patched_reboot))
-
-        if (SDK_INT >= 23) {
-            val action = Notification.Action.Builder(
-                context.getBitmap(R.drawable.ic_refresh).toIcon(),
-                context.getString(R.string.reboot), pendingIntent).build()
-            builder.addAction(action)
-        } else {
-            builder.addAction(
-                R.drawable.ic_refresh,
-                context.getString(R.string.reboot), pendingIntent)
-        }
-
-        mgr.notify(Const.ID.DTBO_NOTIFICATION_ID, builder.build())
-    }
-
-    fun progress(context: Context, title: CharSequence): Notification.Builder {
-        val builder = if (SDK_INT >= 26) {
-            Notification.Builder(context, PROGRESS_NOTIFICATION_CHANNEL)
-        } else {
-            Notification.Builder(context).setPriority(Notification.PRIORITY_LOW)
-        }
-        builder.setSmallIcon(android.R.drawable.stat_sys_download)
-            .setContentTitle(title)
-            .setProgress(0, 0, true)
-            .setOngoing(true)
-        return builder
-    }
-}

app/src/main/java/com/topjohnwu/magisk/core/view/Shortcuts.kt

@@ -1,87 +0,0 @@
-package com.topjohnwu.magisk.core.view
-
-import android.content.Context
-import android.content.Intent
-import android.content.pm.ShortcutInfo
-import android.content.pm.ShortcutManager
-import android.graphics.drawable.Icon
-import android.os.Build
-import androidx.annotation.RequiresApi
-import androidx.core.content.getSystemService
-import androidx.core.graphics.drawable.toAdaptiveIcon
-import androidx.core.graphics.drawable.toIcon
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.*
-import com.topjohnwu.magisk.core.utils.Utils
-import com.topjohnwu.magisk.extensions.getBitmap
-
-object Shortcuts {
-
-    fun setup(context: Context) {
-        if (Build.VERSION.SDK_INT >= 25) {
-            val manager = context.getSystemService<ShortcutManager>()
-            manager?.dynamicShortcuts =
-                getShortCuts(context)
-        }
-    }
-
-    @RequiresApi(api = 25)
-    private fun getShortCuts(context: Context): List<ShortcutInfo> {
-        val shortCuts = mutableListOf<ShortcutInfo>()
-        val intent = context.intent<SplashActivity>()
-
-        fun getIcon(id: Int): Icon {
-            return if (Build.VERSION.SDK_INT >= 26)
-                context.getBitmap(id).toAdaptiveIcon()
-            else
-                context.getBitmap(id).toIcon()
-        }
-
-        if (Utils.showSuperUser()) {
-            shortCuts.add(
-                ShortcutInfo.Builder(context, "superuser")
-                    .setShortLabel(context.getString(R.string.superuser))
-                    .setIntent(
-                        Intent(intent)
-                            .putExtra(Const.Key.OPEN_SECTION, "superuser")
-                            .setAction(Intent.ACTION_VIEW)
-                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
-                    )
-                    .setIcon(getIcon(R.drawable.sc_superuser))
-                    .setRank(0)
-                    .build()
-            )
-        }
-        if (Info.env.magiskHide) {
-            shortCuts.add(
-                ShortcutInfo.Builder(context, "magiskhide")
-                    .setShortLabel(context.getString(R.string.magiskhide))
-                    .setIntent(
-                        Intent(intent)
-                            .putExtra(Const.Key.OPEN_SECTION, "magiskhide")
-                            .setAction(Intent.ACTION_VIEW)
-                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
-                    )
-                    .setIcon(getIcon(R.drawable.sc_magiskhide))
-                    .setRank(1)
-                    .build()
-            )
-        }
-        if (!Config.coreOnly && Info.env.isActive) {
-            shortCuts.add(
-                ShortcutInfo.Builder(context, "modules")
-                    .setShortLabel(context.getString(R.string.modules))
-                    .setIntent(
-                        Intent(intent)
-                            .putExtra(Const.Key.OPEN_SECTION, "modules")
-                            .setAction(Intent.ACTION_VIEW)
-                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
-                    )
-                    .setIcon(getIcon(R.drawable.sc_extension))
-                    .setRank(2)
-                    .build()
-            )
-        }
-        return shortCuts
-    }
-}

app/src/main/java/com/topjohnwu/magisk/data/database/Repo.kt

@@ -1,67 +0,0 @@
-@file:JvmMultifileClass
-
-package com.topjohnwu.magisk.data.database
-
-import androidx.room.Dao
-import androidx.room.Query
-import com.topjohnwu.magisk.core.model.module.Repo
-
-interface RepoBase {
-
-    fun getRepos(offset: Int, limit: Int = LIMIT): List<Repo>
-    fun searchRepos(query: String, offset: Int, limit: Int = LIMIT): List<Repo>
-
-    @Query("SELECT * FROM repos WHERE id = :id AND versionCode > :versionCode LIMIT 1")
-    fun getUpdatableRepoById(id: String, versionCode: Int): Repo?
-
-    @Query("SELECT * FROM repos WHERE id = :id LIMIT 1")
-    fun getRepoById(id: String): Repo?
-
-    companion object {
-        const val LIMIT = 10
-    }
-
-}
-
-@Dao
-interface RepoByUpdatedDao : RepoBase {
-
-    @Query("SELECT * FROM repos ORDER BY last_update DESC LIMIT :limit OFFSET :offset")
-    override fun getRepos(offset: Int, limit: Int): List<Repo>
-
-    @Query(
-        """SELECT * 
-        FROM repos
-        WHERE 
-            (author LIKE '%' || :query || '%') ||
-            (name LIKE '%' || :query || '%') ||
-            (description LIKE '%' || :query || '%')
-        ORDER BY last_update DESC
-        LIMIT :limit 
-        OFFSET :offset"""
-    )
-    override fun searchRepos(query: String, offset: Int, limit: Int): List<Repo>
-
-}
-
-@Dao
-interface RepoByNameDao : RepoBase {
-
-    @Query("SELECT * FROM repos ORDER BY name COLLATE NOCASE LIMIT :limit OFFSET :offset")
-    override fun getRepos(offset: Int, limit: Int): List<Repo>
-
-    @Query(
-        """SELECT * 
-        FROM repos
-        WHERE 
-            (author LIKE '%' || :query || '%') ||
-            (name LIKE '%' || :query || '%') ||
-            (description LIKE '%' || :query || '%')
-        ORDER BY name COLLATE NOCASE
-        LIMIT :limit 
-        OFFSET :offset"""
-    )
-    override fun searchRepos(query: String, offset: Int, limit: Int): List<Repo>
-
-
-}