Release Magisk v24.2

Fix, added some translations.
Added note for technicality word in case user don't know the word mean in English like "boot image", "image" is translated to "đĩa ảnh", I can't really understand it if I use Vietnamese lang 😂.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,15 +7,17 @@ assignees: ''
 
 ---
 
+<!--
+
 ## READ BEFORE OPENING ISSUES
 
 All bug reports require you to **USE CANARY BUILDS**. Please include the version name and version code in the bug report.
 
 If you experience a bootloop, attach a `dmesg` (kernel logs) when the device refuse to boot. This may very likely require a custom kernel on some devices as `last_kmsg` or `pstore ramoops` are usually not enabled by default. In addition, please also upload the result of `cat /proc/mounts` when your device is working correctly **WITHOUT ROOT**.
 
-If you experience issues during installation, in recovery, upload the recovery logs, or in Magisk Manager, upload the install logs. Please also upload the `boot.img` or `recovery.img` that you are using for patching.
+If you experience 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 Manager, dump the full `logcat` **when the crash happens**. **DO NOT** upload `magisk.log`.
+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)
 
@@ -26,3 +28,10 @@ If you experience other issues related to Magisk, upload `magisk.log`, and prefe
 **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

@@ -10,6 +10,7 @@ on:
       - 'buildSrc/**'
       - 'build.py'
       - 'gradle.properties'
+      - '.github/workflows/build.yml'
   pull_request:
     branches: [ master ]
   workflow_dispatch:
@@ -21,7 +22,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, windows-latest, macOS-latest ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+    env:
+      NDK_CCACHE: ${{ github.workspace }}/ccache
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
 
     steps:
       - name: Check out
@@ -40,50 +44,43 @@ jobs:
         with:
           python-version: '3.x'
 
-      - name: Set up GitHub env (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          $oldAndroidPath = $env:ANDROID_SDK_ROOT
-          $sdk_root = "C:\Android"
-          New-Item -Path $sdk_root -ItemType SymbolicLink -Value $oldAndroidPath
-          $ndk_ver = Select-String -Path "gradle.properties" -Pattern "^magisk.fullNdkVersion=" | % { $_ -replace ".*=" }
-          echo "ANDROID_SDK_ROOT=$sdk_root" >> $env:GITHUB_ENV
-          echo "ANDROID_HOME=$sdk_root" >> $env:GITHUB_ENV
-          echo "MAGISK_NDK_VERSION=$ndk_ver" >> $env:GITHUB_ENV
-          echo "GRADLE_OPTS=-Dorg.gradle.daemon=false" >> $env:GITHUB_ENV
+      - name: Set up ccache
+        run: bash .github/ccache.sh
 
-      - name: Set up GitHub env (Unix)
-        if: runner.os != 'Windows'
-        run: |
-          ndk_ver=$(sed -n 's/^magisk.fullNdkVersion=//p' gradle.properties)
-          echo ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT >> $GITHUB_ENV
-          echo MAGISK_NDK_VERSION=$ndk_ver >> $GITHUB_ENV
-
-      - name: Cache Gradle
+      - 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 NDK
-        id: ndk-cache
+      - name: Cache build cache
         uses: actions/cache@v2
         with:
-          path: ${{ env.ANDROID_SDK_ROOT }}/ndk/magisk
-          key: ${{ runner.os }}-ndk-${{ env.MAGISK_NDK_VERSION }}
+          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
-        if: steps.ndk-cache.outputs.cache-hit != 'true'
-        run: python build.py ndk
+        run: python build.py -v ndk
 
       - name: Build release
-        run: python build.py -vr all
+        run: |
+          ./ccache -zp
+          python build.py -vr all
 
       - name: Build debug
-        run: python build.py -v all
+        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

.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
@@ -28,6 +28,18 @@
 [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,72 +1,62 @@
 ![](docs/images/logo.png)
 
-![ZIP Downloads](https://img.shields.io/badge/dynamic/json?color=blue&label=ZIP%20Downloads&query=magisk&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk_files%2Fcount%2Fcount.json&cacheSeconds=1800)
-![APK Downloads](https://img.shields.io/badge/dynamic/json?color=green&label=APK%20Downloads&query=manager&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk_files%2Fcount%2Fcount.json&cacheSeconds=1800)
+[![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. It covers fundamental parts of 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:
 
-Here are some feature highlights:
-
-- **MagiskSU**: Provide root access to your device
+- **MagiskSU**: Provide root access for applications
 - **Magisk Modules**: Modify read-only partitions by installing modules
-- **MagiskHide**: Hide Magisk from root detections / system integrity checks
+- **MagiskBoot**: The most complete tool for unpacking and repacking Android boot images
+- **Zygisk**: Run code in every Android applications' processes
 
 ## Downloads
 
-[![](https://img.shields.io/badge/Magisk%20Manager-v8.0.5-green)](https://github.com/topjohnwu/Magisk/releases/download/manager-v8.0.5/MagiskManager-v8.0.5.apk)
-[![](https://img.shields.io/badge/Magisk%20Manager-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk_files/canary/app-debug.apk)
-<br>
-[![](https://img.shields.io/badge/Magisk-v21.2-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v21.2)
-[![](https://img.shields.io/badge/Magisk%20Beta-v21.2-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v21.2)
+[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-v24.1-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v24.1)
+[![](https://img.shields.io/badge/Magisk%20Beta-v24.1-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v24.1)
+[![](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)
-- [Frequently Asked Questions](https://topjohnwu.github.io/Magisk/faq.html)
 - [Magisk Documentation](https://topjohnwu.github.io/Magisk/)
 - [Magisk Troubleshoot Wiki](https://www.didgeridoohan.com/magisk/HomePage) (by [@Didgeridoohan](https://github.com/Didgeridoohan))
 
-## Android Version Support
-
-- Android 4.2+: MagiskSU and Magisk Modules Only
-- Android 4.4+: All core features available
-- Android 6.0+: Guaranteed MagiskHide support
-- Android 7.0+: Full MagiskHide protection
-- Android 9.0+: Magisk Manager stealth mode
-
 ## Bug Reports
 
-Canary Channels are cutting edge builds for those adventurous. To access canary builds, install the Canary Magisk Manager, switch to the Canary Channel in settings and upgrade.
-
 **Only bug reports from Canary builds will be accepted.**
 
 For installation issues, upload both boot image and install logs.<br>
 For Magisk issues, upload boot logcat or dmesg.<br>
-For Magisk Manager crashes, record and upload the logcat when the crash occurs.
+For Magisk app crashes, record and upload the logcat when the crash occurs.
 
 ## Building and Development
 
 - 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)
+  (Windows only: select **'Add Python to PATH'** in installer, and run `pip install colorama` after install)
 - Configure to use the JDK bundled in Android Studio:
-	- macOS: `export JAVA_HOME="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home"`
-	- Linux: `export PATH="/path/to/androidstudio/jre/bin:$PATH"`
-	- Windows: Add `C:\Path\To\Android Studio\jre\bin` to environment variable `PATH`
+  - 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 in Android Studio. Both app (Kotlin/Java) and native (C++/C) source code can be properly developed using the IDE, but *always* use `build.py` for building.
+  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).
 
 ## Translation Contributions
 
-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.kts

@@ -1,5 +1,3 @@
-import java.io.PrintStream
-
 plugins {
     id("com.android.application")
     kotlin("android")
@@ -15,29 +13,25 @@ kapt {
     javacOptions {
         option("-Xmaxerrs", 1000)
     }
+    arguments {
+        arg("room.incremental", "true")
+    }
 }
 
 android {
     defaultConfig {
         applicationId = "com.topjohnwu.magisk"
         vectorDrawables.useSupportLibrary = true
-        multiDexEnabled = true
-        versionName = Config.appVersion
-        versionCode = Config.appVersionCode
-
-        javaCompileOptions.annotationProcessorOptions.arguments(
-            mapOf("room.incremental" to "true")
-        )
+        versionName = Config.version
+        versionCode = Config.versionCode
+        ndk.abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
     }
 
     buildTypes {
-        getByName("release") {
+        release {
             isMinifyEnabled = true
             isShrinkResources = true
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
+            proguardFiles("proguard-rules.pro")
         }
     }
 
@@ -45,139 +39,90 @@ android {
         dataBinding = true
     }
 
-    dependenciesInfo {
-        includeInApk = false
-        includeInBundle = false
-    }
-
     packagingOptions {
-        exclude("/META-INF/**")
-        exclude("/org/bouncycastle/**")
-        exclude("/kotlin/**")
-        exclude("/kotlinx/**")
-        exclude("/okhttp3/**")
-        exclude("/*.txt")
-        exclude("/*.bin")
+        resources {
+            excludes += "/META-INF/*"
+            excludes += "/org/bouncycastle/**"
+            excludes += "/kotlin/**"
+            excludes += "/kotlinx/**"
+            excludes += "/okhttp3/**"
+            excludes += "/*.txt"
+            excludes += "/*.bin"
+            excludes += "/*.json"
+        }
+        jniLibs {
+            keepDebugSymbols += "**/*.so"
+        }
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+        freeCompilerArgs = listOf("-Xjvm-default=enable")
     }
 }
 
-tasks["preBuild"]?.dependsOn(tasks.register("copyUtils", Copy::class) {
-    from(rootProject.file("scripts/util_functions.sh"))
-    into("src/main/res/raw")
-})
+setupApp()
 
-android.applicationVariants.all {
-    val keysDir = rootProject.file("tools/keys")
-    val outSrcDir = File(buildDir, "generated/source/keydata/$name")
-    val outSrc = File(outSrcDir, "com/topjohnwu/signing/KeyData.java")
-
-    fun PrintStream.newField(name: String, file: File) {
-        println("public static byte[] $name() {")
-        print("byte[] buf = {")
-        val bytes = file.readBytes()
-        print(bytes.joinToString(",") { "(byte)(${it.toInt() and 0xff})" })
-        println("};")
-        println("return buf;")
-        println("}")
-    }
-
-    val genSrcTask = tasks.register("generate${name.capitalize()}KeyData") {
-        inputs.dir(keysDir)
-        outputs.file(outSrc)
-        doLast {
-            outSrc.parentFile.mkdirs()
-            PrintStream(outSrc).use {
-                it.println("package com.topjohnwu.signing;")
-                it.println("public final class KeyData {")
-
-                it.newField("testCert", File(keysDir, "testkey.x509.pem"))
-                it.newField("testKey", File(keysDir, "testkey.pk8"))
-                it.newField("verityCert", File(keysDir, "verity.x509.pem"))
-                it.newField("verityKey", File(keysDir, "verity.pk8"))
-
-                it.println("}")
-            }
-        }
-    }
-    registerJavaGeneratingTask(genSrcTask.get(), outSrcDir)
+configurations.all {
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk7")
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-    implementation(kotlin("stdlib"))
     implementation(project(":app:shared"))
 
     implementation("com.github.topjohnwu:jtar:1.0.0")
     implementation("com.github.topjohnwu:indeterminate-checkbox:1.0.7")
     implementation("com.github.topjohnwu:lz4-java:1.7.1")
     implementation("com.jakewharton.timber:timber:4.7.1")
-
-    val vBC = "1.68"
-    implementation("org.bouncycastle:bcprov-jdk15on:${vBC}")
-    implementation("org.bouncycastle:bcpkix-jdk15on:${vBC}")
+    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 vMarkwon = "4.6.0"
-    implementation("io.noties.markwon:core:${vMarkwon}")
-    implementation("io.noties.markwon:html:${vMarkwon}")
-    implementation("io.noties.markwon:image:${vMarkwon}")
-    implementation("com.caverock:androidsvg:1.4")
-
-    val vLibsu = "3.0.2"
+    val vLibsu = "4.0.0"
     implementation("com.github.topjohnwu.libsu:core:${vLibsu}")
     implementation("com.github.topjohnwu.libsu:io:${vLibsu}")
-
-    val vKoin = "2.1.6"
-    implementation("org.koin:koin-core:${vKoin}")
-    implementation("org.koin:koin-android:${vKoin}")
-    implementation("org.koin:koin-androidx-viewmodel:${vKoin}")
+    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 = "3.12.12"
-    implementation("com.squareup.okhttp3:okhttp") {
-        version {
-            strictly(vOkHttp)
-        }
-    }
+    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.11.0"
+    val vMoshi = "1.13.0"
     implementation("com.squareup.moshi:moshi:${vMoshi}")
     kapt("com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}")
 
-    val vRoom = "2.3.0-alpha04"
+    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: String by rootProject.extra
+    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.0.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.0.4")
+    implementation("androidx.biometric:biometric:1.1.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    implementation("androidx.browser:browser:1.3.0")
-    implementation("androidx.preference:preference:1.1.1")
-    implementation("androidx.recyclerview:recyclerview:1.1.0")
-    implementation("androidx.fragment:fragment-ktx:1.2.5")
-    implementation("androidx.work:work-runtime-ktx:2.4.0")
-    implementation("androidx.transition:transition:1.3.1")
-    implementation("androidx.multidex:multidex:2.0.1")
-    implementation("androidx.core:core-ktx:1.3.2")
-    implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.0.0")
-    implementation("com.google.android.material:material:1.2.1")
+    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,36 +16,44 @@
 #   public *;
 #}
 
-# Kotlin
--assumenosideeffects class kotlin.jvm.internal.Intrinsics {
-	public static void checkExpressionValueIsNotNull(...);
-	public static void checkNotNullExpressionValue(...);
-	public static void checkReturnedValueIsNotNull(...);
-	public static void checkFieldIsNotNull(...);
-	public static void checkParameterIsNotNull(...);
+# Parcelable
+-keepclassmembers class * implements android.os.Parcelable {
+    public static final ** CREATOR;
 }
 
-# Stubs
--keep class a.* { *; }
+# Kotlin
+-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
+	public static void check*(...);
+	public static void throw*(...);
+}
 
-# Snet
--keepclassmembers class com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper { *; }
--keep,allowobfuscation interface com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper$Callback
--keepclassmembers class * implements com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper$Callback {
-  void onResponse(org.json.JSONObject);
+# Stub
+-keep class com.topjohnwu.magisk.core.App { <init>(java.lang.Object); }
+-keepclassmembers class androidx.appcompat.app.AppCompatDelegateImpl {
+  boolean mActivityHandlesUiModeChecked;
+  boolean mActivityHandlesUiMode;
 }
 
 # 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/shared/build.gradle.kts

@@ -2,13 +2,14 @@ plugins {
     id("com.android.library")
 }
 
+setupCommon()
+
 android {
     defaultConfig {
-        vectorDrawables.useSupportLibrary = true
         consumerProguardFiles("proguard-rules.pro")
     }
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+    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

@@ -1,17 +1,27 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.topjohnwu.shared">
+    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:label="Magisk Manager"
-        android:installLocation="internalOnly"
-        android:usesCleartextTraffic="true"
+        android:allowBackup="false"
+        android:label="Magisk"
+        android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
-        android:theme="@android:style/Theme.Translucent.NoTitleBar"
-        tools:ignore="UnusedAttribute">
-    </application>
+        android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
 </manifest>

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

@@ -1,68 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import static android.os.Build.VERSION.SDK_INT;
-
-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;
-
-    private static File getDynDir(Context c) {
-        if (dynDir == null) {
-            if (SDK_INT >= 24) {
-                // Use protected context to allow directBootAware
-                c = c.createDeviceProtectedStorageContext();
-            }
-            dynDir = new File(c.getFilesDir().getParent(), "dyn");
-            dynDir.mkdir();
-        }
-        return dynDir;
-    }
-
-    public static File current(Context c) {
-        return new File(getDynDir(c), "current.apk");
-    }
-
-    public static File update(Context c) {
-        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)
-                addAssetPath = AssetManager.class.getMethod("addAssetPath", String.class);
-            addAssetPath.invoke(asset, path);
-        } catch (Exception ignored) {}
-    }
-
-    public static class Data {
-        public int version;
-        public Map<String, String> classToComponent;
-    }
-}

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

@@ -1,341 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.pm.ProviderInfo;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.os.ParcelFileDescriptor;
-import android.provider.OpenableColumns;
-import android.text.TextUtils;
-import android.webkit.MimeTypeMap;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Modified from androidx.core.content.FileProvider
- */
-public class FileProvider extends ContentProvider {
-    private static final String[] COLUMNS = {
-            OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE };
-
-    private static final File DEVICE_ROOT = new File("/");
-
-    private static HashMap<String, PathStrategy> sCache = new HashMap<>();
-
-    private PathStrategy mStrategy;
-
-    @Override
-    public boolean onCreate() {
-        return true;
-    }
-
-    @Override
-    public void attachInfo(Context context, ProviderInfo info) {
-        super.attachInfo(context, info);
-
-        
-        if (info.exported) {
-            throw new SecurityException("Provider must not be exported");
-        }
-        if (!info.grantUriPermissions) {
-            throw new SecurityException("Provider must grant uri permissions");
-        }
-
-        mStrategy = getPathStrategy(context, info.authority);
-    }
-
-    
-    public static Uri getUriForFile(Context context, String authority,
-                                    File file) {
-        final PathStrategy strategy = getPathStrategy(context, authority);
-        return strategy.getUriForFile(file);
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection,
-                        String[] selectionArgs,
-                        String sortOrder) {
-        
-        final File file = mStrategy.getFileForUri(uri);
-
-        if (projection == null) {
-            projection = COLUMNS;
-        }
-
-        String[] cols = new String[projection.length];
-        Object[] values = new Object[projection.length];
-        int i = 0;
-        for (String col : projection) {
-            if (OpenableColumns.DISPLAY_NAME.equals(col)) {
-                cols[i] = OpenableColumns.DISPLAY_NAME;
-                values[i++] = file.getName();
-            } else if (OpenableColumns.SIZE.equals(col)) {
-                cols[i] = OpenableColumns.SIZE;
-                values[i++] = file.length();
-            }
-        }
-
-        cols = copyOf(cols, i);
-        values = copyOf(values, i);
-
-        final MatrixCursor cursor = new MatrixCursor(cols, 1);
-        cursor.addRow(values);
-        return cursor;
-    }
-
-    @Override
-    public String getType(Uri uri) {
-        
-        final File file = mStrategy.getFileForUri(uri);
-
-        final int lastDot = file.getName().lastIndexOf('.');
-        if (lastDot >= 0) {
-            final String extension = file.getName().substring(lastDot + 1);
-            final String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
-            if (mime != null) {
-                return mime;
-            }
-        }
-
-        return "application/octet-stream";
-    }
-
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        throw new UnsupportedOperationException("No external inserts");
-    }
-
-    @Override
-    public int update(Uri uri, ContentValues values, String selection,
-                      String[] selectionArgs) {
-        throw new UnsupportedOperationException("No external updates");
-    }
-
-    @Override
-    public int delete(Uri uri, String selection,
-                      String[] selectionArgs) {
-        
-        final File file = mStrategy.getFileForUri(uri);
-        return file.delete() ? 1 : 0;
-    }
-
-    @Override
-    public ParcelFileDescriptor openFile(Uri uri, String mode)
-            throws FileNotFoundException {
-        
-        final File file = mStrategy.getFileForUri(uri);
-        final int fileMode = modeToMode(mode);
-        return ParcelFileDescriptor.open(file, fileMode);
-    }
-
-    private static PathStrategy getPathStrategy(Context context, String authority) {
-        PathStrategy strat;
-        synchronized (sCache) {
-            strat = sCache.get(authority);
-            if (strat == null) {
-                strat = createPathStrategy(context, authority);
-                sCache.put(authority, strat);
-            }
-        }
-        return strat;
-    }
-
-    private static PathStrategy createPathStrategy(Context context, String authority) {
-        final SimplePathStrategy strat = new SimplePathStrategy(authority);
-
-        strat.addRoot("root_files", buildPath(DEVICE_ROOT, "."));
-        strat.addRoot("internal_files", buildPath(context.getFilesDir(), "."));
-        strat.addRoot("cache_files", buildPath(context.getCacheDir(), "."));
-        strat.addRoot("external_files", buildPath(Environment.getExternalStorageDirectory(), "."));
-        {
-            File[] externalFilesDirs = getExternalFilesDirs(context, null);
-            if (externalFilesDirs.length > 0) {
-                strat.addRoot("external_file_files", buildPath(externalFilesDirs[0], "."));
-            }
-        }
-        {
-            File[] externalCacheDirs = getExternalCacheDirs(context);
-            if (externalCacheDirs.length > 0) {
-                strat.addRoot("external_cache_files", buildPath(externalCacheDirs[0], "."));
-            }
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            File[] externalMediaDirs = context.getExternalMediaDirs();
-            if (externalMediaDirs.length > 0) {
-                strat.addRoot("external_media_files", buildPath(externalMediaDirs[0], "."));
-            }
-        }
-
-        return strat;
-    }
-
-    interface PathStrategy {
-        
-        Uri getUriForFile(File file);
-
-        File getFileForUri(Uri uri);
-    }
-
-    static class SimplePathStrategy implements PathStrategy {
-        private final String mAuthority;
-        private final HashMap<String, File> mRoots = new HashMap<>();
-
-        SimplePathStrategy(String authority) {
-            mAuthority = authority;
-        }
-
-        void addRoot(String name, File root) {
-            if (TextUtils.isEmpty(name)) {
-                throw new IllegalArgumentException("Name must not be empty");
-            }
-
-            try {
-                
-                root = root.getCanonicalFile();
-            } catch (IOException e) {
-                throw new IllegalArgumentException(
-                        "Failed to resolve canonical path for " + root, e);
-            }
-
-            mRoots.put(name, root);
-        }
-
-        @Override
-        public Uri getUriForFile(File file) {
-            String path;
-            try {
-                path = file.getCanonicalPath();
-            } catch (IOException e) {
-                throw new IllegalArgumentException("Failed to resolve canonical path for " + file);
-            }
-
-            
-            Map.Entry<String, File> mostSpecific = null;
-            for (Map.Entry<String, File> root : mRoots.entrySet()) {
-                final String rootPath = root.getValue().getPath();
-                if (path.startsWith(rootPath) && (mostSpecific == null
-                        || rootPath.length() > mostSpecific.getValue().getPath().length())) {
-                    mostSpecific = root;
-                }
-            }
-
-            if (mostSpecific == null) {
-                throw new IllegalArgumentException(
-                        "Failed to find configured root that contains " + path);
-            }
-
-            
-            final String rootPath = mostSpecific.getValue().getPath();
-            if (rootPath.endsWith("/")) {
-                path = path.substring(rootPath.length());
-            } else {
-                path = path.substring(rootPath.length() + 1);
-            }
-
-            
-            path = Uri.encode(mostSpecific.getKey()) + '/' + Uri.encode(path, "/");
-            return new Uri.Builder().scheme("content")
-                    .authority(mAuthority).encodedPath(path).build();
-        }
-
-        @Override
-        public File getFileForUri(Uri uri) {
-            String path = uri.getEncodedPath();
-
-            final int splitIndex = path.indexOf('/', 1);
-            final String tag = Uri.decode(path.substring(1, splitIndex));
-            path = Uri.decode(path.substring(splitIndex + 1));
-
-            final File root = mRoots.get(tag);
-            if (root == null) {
-                throw new IllegalArgumentException("Unable to find configured root for " + uri);
-            }
-
-            File file = new File(root, path);
-            try {
-                file = file.getCanonicalFile();
-            } catch (IOException e) {
-                throw new IllegalArgumentException("Failed to resolve canonical path for " + file);
-            }
-
-            if (!file.getPath().startsWith(root.getPath())) {
-                throw new SecurityException("Resolved path jumped beyond configured root");
-            }
-
-            return file;
-        }
-    }
-
-    
-    private static int modeToMode(String mode) {
-        int modeBits;
-        if ("r".equals(mode)) {
-            modeBits = ParcelFileDescriptor.MODE_READ_ONLY;
-        } else if ("w".equals(mode) || "wt".equals(mode)) {
-            modeBits = ParcelFileDescriptor.MODE_WRITE_ONLY
-                    | ParcelFileDescriptor.MODE_CREATE
-                    | ParcelFileDescriptor.MODE_TRUNCATE;
-        } else if ("wa".equals(mode)) {
-            modeBits = ParcelFileDescriptor.MODE_WRITE_ONLY
-                    | ParcelFileDescriptor.MODE_CREATE
-                    | ParcelFileDescriptor.MODE_APPEND;
-        } else if ("rw".equals(mode)) {
-            modeBits = ParcelFileDescriptor.MODE_READ_WRITE
-                    | ParcelFileDescriptor.MODE_CREATE;
-        } else if ("rwt".equals(mode)) {
-            modeBits = ParcelFileDescriptor.MODE_READ_WRITE
-                    | ParcelFileDescriptor.MODE_CREATE
-                    | ParcelFileDescriptor.MODE_TRUNCATE;
-        } else {
-            throw new IllegalArgumentException("Invalid mode: " + mode);
-        }
-        return modeBits;
-    }
-
-    private static File buildPath(File base, String... segments) {
-        File cur = base;
-        for (String segment : segments) {
-            if (segment != null) {
-                cur = new File(cur, segment);
-            }
-        }
-        return cur;
-    }
-
-    private static String[] copyOf(String[] original, int newLength) {
-        final String[] result = new String[newLength];
-        System.arraycopy(original, 0, result, 0, newLength);
-        return result;
-    }
-
-    private static Object[] copyOf(Object[] original, int newLength) {
-        final Object[] result = new Object[newLength];
-        System.arraycopy(original, 0, result, 0, newLength);
-        return result;
-    }
-
-    private static File[] getExternalFilesDirs(Context context, String type) {
-        if (Build.VERSION.SDK_INT >= 19) {
-            return context.getExternalFilesDirs(type);
-        } else {
-            return new File[] { context.getExternalFilesDir(type) };
-        }
-    }
-
-    private static File[] getExternalCacheDirs(Context context) {
-        if (Build.VERSION.SDK_INT >= 19) {
-            return context.getExternalCacheDirs();
-        } else {
-            return new File[] { context.getExternalCacheDir() };
-        }
-    }
-}

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

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

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

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

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

@@ -1,70 +0,0 @@
-package com.topjohnwu.magisk.net;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
-public class NoSSLv3SocketFactory extends SSLSocketFactory {
-
-    private final static SSLSocketFactory delegate = HttpsURLConnection.getDefaultSSLSocketFactory();
-
-    @Override
-    public String[] getDefaultCipherSuites() {
-        return delegate.getDefaultCipherSuites();
-    }
-
-    @Override
-    public String[] getSupportedCipherSuites() {
-        return delegate.getSupportedCipherSuites();
-    }
-
-    private Socket createSafeSocket(Socket socket) {
-        if (socket instanceof SSLSocket)
-            return new SSLSocketWrapper((SSLSocket) socket) {
-                @Override
-                public void setEnabledProtocols(String[] protocols) {
-                    List<String> proto = new ArrayList<>(Arrays.asList(getSupportedProtocols()));
-                    proto.remove("SSLv3");
-                    super.setEnabledProtocols(proto.toArray(new String[0]));
-                }
-            };
-        return socket;
-    }
-
-    @Override
-    public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
-        return createSafeSocket(delegate.createSocket(s, host, port, autoClose));
-    }
-
-    @Override
-    public Socket createSocket() throws IOException {
-        return createSafeSocket(delegate.createSocket());
-    }
-
-    @Override
-    public Socket createSocket(String host, int port) throws IOException {
-        return createSafeSocket(delegate.createSocket(host, port));
-    }
-
-    @Override
-    public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException {
-        return createSafeSocket(delegate.createSocket(host, port, localHost, localPort));
-    }
-
-    @Override
-    public Socket createSocket(InetAddress host, int port) throws IOException {
-        return createSafeSocket(delegate.createSocket(host, port));
-    }
-
-    @Override
-    public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
-        return createSafeSocket(delegate.createSocket(address, port, localAddress, localPort));
-    }
-}

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

@@ -1,333 +0,0 @@
-package com.topjohnwu.magisk.net;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.nio.channels.SocketChannel;
-
-import javax.net.ssl.HandshakeCompletedListener;
-import javax.net.ssl.SSLParameters;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-
-class SSLSocketWrapper extends SSLSocket {
-
-    private SSLSocket mBase;
-
-    SSLSocketWrapper(SSLSocket socket) {
-        mBase = socket;
-    }
-
-    @Override
-    public String[] getSupportedCipherSuites() {
-        return mBase.getSupportedCipherSuites();
-    }
-
-    @Override
-    public String[] getEnabledCipherSuites() {
-        return mBase.getEnabledCipherSuites();
-    }
-
-    @Override
-    public void setEnabledCipherSuites(String[] suites) {
-        mBase.setEnabledCipherSuites(suites);
-    }
-
-    @Override
-    public String[] getSupportedProtocols() {
-        return mBase.getSupportedProtocols();
-    }
-
-    @Override
-    public String[] getEnabledProtocols() {
-        return mBase.getEnabledProtocols();
-    }
-
-    @Override
-    public void setEnabledProtocols(String[] protocols) {
-        mBase.setEnabledProtocols(protocols);
-    }
-
-    @Override
-    public SSLSession getSession() {
-        return mBase.getSession();
-    }
-
-    @Override
-    public SSLSession getHandshakeSession() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void addHandshakeCompletedListener(HandshakeCompletedListener listener) {
-        mBase.addHandshakeCompletedListener(listener);
-    }
-
-    @Override
-    public void removeHandshakeCompletedListener(HandshakeCompletedListener listener) {
-        mBase.removeHandshakeCompletedListener(listener);
-    }
-
-    @Override
-    public void startHandshake() throws IOException {
-        mBase.startHandshake();
-    }
-
-    @Override
-    public void setUseClientMode(boolean mode) {
-        mBase.setUseClientMode(mode);
-    }
-
-    @Override
-    public boolean getUseClientMode() {
-        return mBase.getUseClientMode();
-    }
-
-    @Override
-    public void setNeedClientAuth(boolean need) {
-        mBase.setNeedClientAuth(need);
-    }
-
-    @Override
-    public boolean getNeedClientAuth() {
-        return mBase.getNeedClientAuth();
-    }
-
-    @Override
-    public void setWantClientAuth(boolean want) {
-        mBase.setWantClientAuth(want);
-    }
-
-    @Override
-    public boolean getWantClientAuth() {
-        return mBase.getWantClientAuth();
-    }
-
-    @Override
-    public void setEnableSessionCreation(boolean flag) {
-        mBase.setEnableSessionCreation(flag);
-    }
-
-    @Override
-    public boolean getEnableSessionCreation() {
-        return mBase.getEnableSessionCreation();
-    }
-
-    @Override
-    public SSLParameters getSSLParameters() {
-        return mBase.getSSLParameters();
-    }
-
-    @Override
-    public void setSSLParameters(SSLParameters params) {
-        mBase.setSSLParameters(params);
-    }
-
-    @Override
-    public String toString() {
-        return mBase.toString();
-    }
-
-    @Override
-    public void connect(SocketAddress endpoint) throws IOException {
-        mBase.connect(endpoint);
-    }
-
-    @Override
-    public void connect(SocketAddress endpoint, int timeout) throws IOException {
-        mBase.connect(endpoint, timeout);
-    }
-
-    @Override
-    public void bind(SocketAddress bindpoint) throws IOException {
-        mBase.bind(bindpoint);
-    }
-
-    @Override
-    public InetAddress getInetAddress() {
-        return mBase.getInetAddress();
-    }
-
-    @Override
-    public InetAddress getLocalAddress() {
-        return mBase.getLocalAddress();
-    }
-
-    @Override
-    public int getPort() {
-        return mBase.getPort();
-    }
-
-    @Override
-    public int getLocalPort() {
-        return mBase.getLocalPort();
-    }
-
-    @Override
-    public SocketAddress getRemoteSocketAddress() {
-        return mBase.getRemoteSocketAddress();
-    }
-
-    @Override
-    public SocketAddress getLocalSocketAddress() {
-        return mBase.getLocalSocketAddress();
-    }
-
-    @Override
-    public SocketChannel getChannel() {
-        return mBase.getChannel();
-    }
-
-    @Override
-    public InputStream getInputStream() throws IOException {
-        return mBase.getInputStream();
-    }
-
-    @Override
-    public OutputStream getOutputStream() throws IOException {
-        return mBase.getOutputStream();
-    }
-
-    @Override
-    public void setTcpNoDelay(boolean on) throws SocketException {
-        mBase.setTcpNoDelay(on);
-    }
-
-    @Override
-    public boolean getTcpNoDelay() throws SocketException {
-        return mBase.getTcpNoDelay();
-    }
-
-    @Override
-    public void setSoLinger(boolean on, int linger) throws SocketException {
-        mBase.setSoLinger(on, linger);
-    }
-
-    @Override
-    public int getSoLinger() throws SocketException {
-        return mBase.getSoLinger();
-    }
-
-    @Override
-    public void sendUrgentData(int data) throws IOException {
-        mBase.sendUrgentData(data);
-    }
-
-    @Override
-    public void setOOBInline(boolean on) throws SocketException {
-        mBase.setOOBInline(on);
-    }
-
-    @Override
-    public boolean getOOBInline() throws SocketException {
-        return mBase.getOOBInline();
-    }
-
-    @Override
-    public void setSoTimeout(int timeout) throws SocketException {
-        mBase.setSoTimeout(timeout);
-    }
-
-    @Override
-    public int getSoTimeout() throws SocketException {
-        return mBase.getSoTimeout();
-    }
-
-    @Override
-    public void setSendBufferSize(int size) throws SocketException {
-        mBase.setSendBufferSize(size);
-    }
-
-    @Override
-    public int getSendBufferSize() throws SocketException {
-        return mBase.getSendBufferSize();
-    }
-
-    @Override
-    public void setReceiveBufferSize(int size) throws SocketException {
-        mBase.setReceiveBufferSize(size);
-    }
-
-    @Override
-    public int getReceiveBufferSize() throws SocketException {
-        return mBase.getReceiveBufferSize();
-    }
-
-    @Override
-    public void setKeepAlive(boolean on) throws SocketException {
-        mBase.setKeepAlive(on);
-    }
-
-    @Override
-    public boolean getKeepAlive() throws SocketException {
-        return mBase.getKeepAlive();
-    }
-
-    @Override
-    public void setTrafficClass(int tc) throws SocketException {
-        mBase.setTrafficClass(tc);
-    }
-
-    @Override
-    public int getTrafficClass() throws SocketException {
-        return mBase.getTrafficClass();
-    }
-
-    @Override
-    public void setReuseAddress(boolean on) throws SocketException {
-        mBase.setReuseAddress(on);
-    }
-
-    @Override
-    public boolean getReuseAddress() throws SocketException {
-        return mBase.getReuseAddress();
-    }
-
-    @Override
-    public void close() throws IOException {
-        mBase.close();
-    }
-
-    @Override
-    public void shutdownInput() throws IOException {
-        mBase.shutdownInput();
-    }
-
-    @Override
-    public void shutdownOutput() throws IOException {
-        mBase.shutdownOutput();
-    }
-
-    @Override
-    public boolean isConnected() {
-        return mBase.isConnected();
-    }
-
-    @Override
-    public boolean isBound() {
-        return mBase.isBound();
-    }
-
-    @Override
-    public boolean isClosed() {
-        return mBase.isClosed();
-    }
-
-    @Override
-    public boolean isInputShutdown() {
-        return mBase.isInputShutdown();
-    }
-
-    @Override
-    public boolean isOutputShutdown() {
-        return mBase.isOutputShutdown();
-    }
-
-    @Override
-    public void setPerformancePreferences(int connectionTime, int latency, int bandwidth) {
-        mBase.setPerformancePreferences(connectionTime, latency, bandwidth);
-    }
-}

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

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

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,21 +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.FOREGROUND_SERVICE" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="29" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
 
     <application
+        android:name=".core.App"
+        android:extractNativeLibs="true"
         android:icon="@drawable/ic_launcher"
-        android:name="a.e"
-        android:allowBackup="false"
+        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" />
@@ -29,29 +26,27 @@
             </intent-filter>
         </activity>
 
-        <!-- Main -->
-        <activity android:name="a.b" />
-
-        <!-- Superuser -->
         <activity
-            android:name="a.m"
+            android:name=".ui.surequest.SuRequestActivity"
             android:directBootAware="true"
             android:excludeFromRecents="true"
             android:exported="false"
+            android:taskAffinity=""
             tools:ignore="AppLinkUrlError">
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <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" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
@@ -61,37 +56,32 @@
             </intent-filter>
         </receiver>
 
-        <!-- DownloadService -->
-        <service android:name="a.j" />
+        <service
+            android:name=".core.download.DownloadService"
+            android:exported="false" />
+
+        <service
+            android:name=".core.JobService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
-        <!-- FileProvider -->
         <provider
-            android:name="a.p"
+            android:name=".core.Provider"
             android:authorities="${applicationId}.provider"
             android:directBootAware="true"
             android:exported="false"
-            android:grantUriPermissions="true">
-        </provider>
-
-        <!-- Hardcode GMS version -->
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="12451000" />
-
-        <!-- Initialize WorkManager on-demand -->
-        <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
-            tools:node="remove" />
+            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/stubs.kt

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

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

@@ -5,7 +5,6 @@ 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
@@ -14,15 +13,14 @@ import androidx.navigation.NavDirections
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.ktx.startAnimations
 
-abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
-    Fragment(), BaseUIComponent<VM> {
+abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHolder {
 
-    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
-    private val navigation get() = activity.navigation
+    private val navigation get() = activity?.navigation
+    open val snackbarAnchorView: View? get() = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -36,19 +34,19 @@ abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
     ): View? {
         binding = DataBindingUtil.inflate<Binding>(inflater, layoutRes, container, false).also {
             it.setVariable(BR.viewModel, viewModel)
-            it.lifecycleOwner = this
+            it.lifecycleOwner = viewLifecycleOwner
         }
         return binding.root
     }
 
     override fun onStart() {
         super.onStart()
-        activity.supportActionBar?.subtitle = null
+        activity?.supportActionBar?.subtitle = null
     }
 
     override fun onEventDispatched(event: ViewEvent) = when(event) {
         is ContextExecutor -> event(requireContext())
-        is ActivityExecutor -> event(activity)
+        is ActivityExecutor -> activity?.let { event(it) } ?: Unit
         is FragmentExecutor -> event(this)
         else -> Unit
     }
@@ -64,7 +62,7 @@ abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
         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
             }
         })
@@ -84,9 +82,3 @@ abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
     }
 
 }
-
-interface ReselectionTarget {
-
-    fun onReselected()
-
-}

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

@@ -0,0 +1,127 @@
+package com.topjohnwu.magisk.arch
+
+import android.Manifest.permission.REQUEST_INSTALL_PACKAGES
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.widget.Toast
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.databinding.ViewDataBinding
+import androidx.lifecycle.lifecycleScope
+import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.JobService
+import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.tasks.HideAPK
+import com.topjohnwu.magisk.di.ServiceLocator
+import com.topjohnwu.magisk.ui.theme.Theme
+import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.magisk.view.MagiskDialog
+import com.topjohnwu.magisk.view.Notifications
+import com.topjohnwu.magisk.view.Shortcuts
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.launch
+
+abstract class BaseMainActivity<Binding : ViewDataBinding> : NavigationActivity<Binding>() {
+
+    companion object {
+        private var doPreload = true
+    }
+
+    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?)
+
+    @SuppressLint("InlinedApi")
+    private fun showInvalidStateMessage(): Unit = 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 {
+                    withPermission(REQUEST_INSTALL_PACKAGES) {
+                        if (!it) {
+                            Utils.toast(R.string.install_unknown_denied, Toast.LENGTH_SHORT)
+                            showInvalidStateMessage()
+                        } else {
+                            lifecycleScope.launch {
+                                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.cmd("(pm uninstall $APPLICATION_ID)& >/dev/null 2>&1").exec()
+            }
+        } else {
+            if (Config.suManager.isNotEmpty())
+                Config.suManager = ""
+            pkg ?: return
+            if (!Shell.cmd("(pm uninstall $pkg)& >/dev/null 2>&1").exec().isSuccess) {
+                // Uninstall through Android API
+                uninstallAndWait(pkg)
+            }
+        }
+    }
+
+}

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

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

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

@@ -1,9 +1,9 @@
 package com.topjohnwu.magisk.arch
 
-import android.Manifest
-import android.os.Build
+import android.Manifest.permission.REQUEST_INSTALL_PACKAGES
+import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+import android.annotation.SuppressLint
 import androidx.annotation.CallSuper
-import androidx.core.graphics.Insets
 import androidx.databinding.Bindable
 import androidx.databinding.Observable
 import androidx.databinding.PropertyChangeRegistry
@@ -15,16 +15,17 @@ import androidx.navigation.NavDirections
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.base.BaseActivity
-import com.topjohnwu.magisk.events.*
-import com.topjohnwu.magisk.utils.ObservableHost
-import com.topjohnwu.magisk.utils.set
+import 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
-import org.koin.core.KoinComponent
 
 abstract class BaseViewModel(
     initialState: State = State.LOADING
-) : ViewModel(), ObservableHost, KoinComponent {
+) : ViewModel(), ObservableHost {
 
     override var callbacks: PropertyChangeRegistry? = null
 
@@ -42,10 +43,6 @@ abstract class BaseViewModel(
     val isConnected get() = Info.isConnected
     val viewEvents: LiveData<ViewEvent> get() = _viewEvents
 
-    @get:Bindable
-    var insets = Insets.NONE
-        set(value) = set(value, field, { field = it }, BR.insets)
-
     var state= initialState
         set(value) = set(value, field, { field = it }, BR.loading, BR.loaded, BR.loadFailed)
 
@@ -78,16 +75,12 @@ abstract class BaseViewModel(
         super.onCleared()
     }
 
-    fun withView(action: BaseActivity.() -> Unit) {
-        ViewActionEvent(action).publish()
-    }
-
     fun withPermission(permission: String, callback: (Boolean) -> Unit) {
         PermissionEvent(permission, callback).publish()
     }
 
-    fun withExternalRW(callback: () -> Unit) {
-        withPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) {
+    inline fun withExternalRW(crossinline callback: () -> Unit) {
+        withPermission(WRITE_EXTERNAL_STORAGE) {
             if (!it) {
                 SnackbarEvent(R.string.external_rw_permission_denied).publish()
             } else {
@@ -96,6 +89,17 @@ abstract class BaseViewModel(
         }
     }
 
+    @SuppressLint("InlinedApi")
+    inline fun withInstallPermission(crossinline callback: () -> Unit) {
+        withPermission(REQUEST_INSTALL_PACKAGES) {
+            if (!it) {
+                SnackbarEvent(R.string.install_unknown_denied).publish()
+            } else {
+                callback()
+            }
+        }
+    }
+
     fun back() = BackPressEvent().publish()
 
     fun <Event : ViewEvent> Event.publish() {
@@ -107,8 +111,8 @@ abstract class BaseViewModel(
         _viewEvents.postValue(this)
     }
 
-    fun NavDirections.publish() {
-        _viewEvents.postValue(NavigationEvent(this))
+    fun NavDirections.navigate(pop: Boolean = false) {
+        _viewEvents.postValue(NavigationEvent(this, pop))
     }
 
 }

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

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

app/src/main/java/com/topjohnwu/magisk/arch/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/Queryable.kt

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

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

@@ -0,0 +1,95 @@
+package com.topjohnwu.magisk.arch
+
+import android.content.res.Resources
+import android.graphics.Color
+import android.os.Build
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.content.res.use
+import androidx.core.view.WindowCompat
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import com.google.android.material.snackbar.Snackbar
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.base.BaseActivity
+import 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
+    }
+
+    fun showSnackbar(
+        message: CharSequence,
+        length: Int = Snackbar.LENGTH_SHORT,
+        builder: Snackbar.() -> Unit = {}
+    ) = Snackbar.make(snackbarView, message, length)
+        .setAnchorView(snackbarAnchorView).apply(builder).show()
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.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

@@ -18,9 +18,9 @@ interface ContextExecutor {
 }
 
 interface ActivityExecutor {
-    operator fun invoke(activity: BaseUIActivity<*, *>)
+    operator fun invoke(activity: UIActivity<*>)
 }
 
 interface FragmentExecutor {
-    operator fun invoke(fragment: BaseUIFragment<*, *>)
+    operator fun invoke(fragment: BaseFragment<*>)
 }

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

@@ -1,12 +1,10 @@
 package com.topjohnwu.magisk.arch
 
-import android.view.View
 import androidx.lifecycle.LifecycleOwner
 
-interface BaseUIComponent<VM : BaseViewModel> : LifecycleOwner {
+interface ViewModelHolder : LifecycleOwner {
 
-    val viewRoot: View
-    val viewModel: VM
+    val viewModel: BaseViewModel
 
     fun startObserveEvents() {
         viewModel.viewEvents.observe(this) {

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

@@ -1,40 +1,34 @@
 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 android.os.Bundle
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.multidex.MultiDex
-import androidx.work.WorkManager
-import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.DynAPK
-import com.topjohnwu.magisk.core.utils.IODispatcherExecutor
-import com.topjohnwu.magisk.core.utils.RootInit
-import com.topjohnwu.magisk.core.utils.updateConfig
-import com.topjohnwu.magisk.di.koinModules
-import com.topjohnwu.magisk.ktx.unwrap
+import com.topjohnwu.magisk.StubApk
+import com.topjohnwu.magisk.core.utils.*
+import com.topjohnwu.magisk.di.ServiceLocator
+import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
 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 = StubApk.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.setDefaultBuilder(Shell.Builder.create()
-            .setFlags(Shell.FLAG_MOUNT_MASTER)
-            .setInitializers(RootInit::class.java)
-            .setTimeout(2))
-        Shell.EXECUTOR = IODispatcherExecutor()
-
         // Always log full stack trace with Timber
         Timber.plant(Timber.DebugTree())
         Thread.setDefaultUncaughtExceptionHandler { _, e ->
@@ -43,58 +37,68 @@ 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) {
+            StubApk.current(base).path
+        } else {
+            base.packageResourcePath
         }
-        ResMgr.init(impl)
-        app.registerActivityLifecycleCallbacks(ForegroundTracker)
-        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.bindOrTask(
+            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)
     }
 }
 
-object ForegroundTracker : Application.ActivityLifecycleCallbacks {
+@SuppressLint("StaticFieldLeak")
+object ActivityTracker : Application.ActivityLifecycleCallbacks {
 
     @Volatile
     var foreground: Activity? = null
 
-    val hasForeground get() = foreground != null
-
     override fun onActivityResumed(activity: Activity) {
+        if (activity is SuRequestActivity) return
         foreground = activity
     }
 
     override fun onActivityPaused(activity: Activity) {
+        if (activity is SuRequestActivity) return
         foreground = null
     }
 

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

@@ -1,20 +1,16 @@
 package com.topjohnwu.magisk.core
 
 import android.annotation.SuppressLint
-import android.content.Context
 import android.content.SharedPreferences
 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.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.ktx.inject
+import com.topjohnwu.magisk.di.ServiceLocator
 import com.topjohnwu.magisk.ui.theme.Theme
 import org.xmlpull.v1.XmlPullParser
 import java.io.File
@@ -22,9 +18,9 @@ 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() {
@@ -41,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"
 
@@ -63,9 +61,6 @@ object Config : PreferenceModel, DBConfig {
         const val BOOT_ID = "boot_id"
         const val ASKED_HOME = "asked_home"
         const val DOH = "doh"
-
-        // system state
-        const val MAGISKHIDE = "magiskhide"
     }
 
     object Value {
@@ -115,9 +110,10 @@ object Config : PreferenceModel, DBConfig {
         else
             Value.DEFAULT_CHANNEL
 
-    @JvmStatic var keepVerity = false
-    @JvmStatic var keepEnc = false
-    @JvmStatic var recovery = false
+    @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)
@@ -137,7 +133,6 @@ object Config : PreferenceModel, DBConfig {
     var suTapjack by preference(Key.SU_TAPJACK, true)
     var checkUpdate by preference(Key.CHECK_UPDATES, true)
     var doh by preference(Key.DOH, false)
-    var magiskHide by preference(Key.MAGISKHIDE, true)
     var showSystemApp by preference(Key.SHOW_SYSTEM_APP, false)
 
     var customChannelUrl by preference(Key.CUSTOM_CHANNEL, "")
@@ -153,6 +148,8 @@ object Config : PreferenceModel, DBConfig {
     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)
 
@@ -177,12 +174,6 @@ object Config : PreferenceModel, DBConfig {
                 else if (it.toInt() > Value.CANARY_CHANNEL)
                     putString(Key.UPDATE_CHANNEL, Value.CANARY_CHANNEL.toString())
             }
-
-            // 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)
         }
     }
 

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

@@ -1,56 +1,55 @@
 package com.topjohnwu.magisk.core
 
+import android.os.Build
 import android.os.Process
+import com.topjohnwu.magisk.BuildConfig
 
+@Suppress("DEPRECATION")
 object Const {
 
+    val CPU_ABI: String get() = Build.SUPPORTED_ABIS[0]
+
+    // Null if 32-bit only or 64-bit only
+    val CPU_ABI_32 =
+        if (Build.SUPPORTED_64_BIT_ABIS.isEmpty()) null
+        else Build.SUPPORTED_32_BIT_ABIS.firstOrNull()
+
     // Paths
     lateinit var MAGISKTMP: String
     val MAGISK_PATH get() = "$MAGISKTMP/modules"
-    const val TMP_FOLDER_PATH = "/dev/tmp"
+    const val TMPDIR = "/dev/tmp"
     const val MAGISK_LOG = "/cache/magisk.log"
 
-    // Versions
-    const val SNET_EXT_VER = 15
-    const val SNET_REVISION = "18ab78817087c337ae0edd1ecac38aec49217880"
-    const val BOOTCTL_REVISION = "18ab78817087c337ae0edd1ecac38aec49217880"
-
     // Misc
     val USER_ID = Process.myUid() / 100000
+    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 MIN_VERSION = "v21.0"
+        const val MIN_VERCODE = 21000
 
-        fun atLeast_20_2() = Info.env.magiskVersionCode >= 20200 || isCanary()
-        fun atLeast_20_4() = Info.env.magiskVersionCode >= 20400 || isCanary()
-        fun atLeast_21_0() = Info.env.magiskVersionCode >= 21000 || isCanary()
-        fun atLeast_21_2() = Info.env.magiskVersionCode >= 21200 || isCanary()
-        fun isCanary() = Info.env.magiskVersionCode % 100 != 0
+        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_FILE = 3
-        const val MAX_ACTIVITY_RESULT = 10
-
-        // notifications
-        const val MAGISK_UPDATE_NOTIFICATION_ID = 4
-        const val APK_UPDATE_NOTIFICATION_ID = 5
-        const val UPDATE_NOTIFICATION_CHANNEL = "update"
-        const val PROGRESS_NOTIFICATION_CHANNEL = "progress"
-        const val CHECK_MAGISK_UPDATE_WORKER_ID = "magisk_update"
+        const val JOB_SERVICE_ID = 7
     }
 
     object Url {
         const val PATREON_URL = "https://www.patreon.com/topjohnwu"
         const val SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk"
 
+        val CHANGELOG_URL = if (APP_IS_CANARY) Info.remote.magisk.note
+        else "https://topjohnwu.github.io/Magisk/releases/${BuildConfig.VERSION_CODE}.md"
+
         const val GITHUB_RAW_URL = "https://raw.githubusercontent.com/"
         const val GITHUB_API_URL = "https://api.github.com/"
-        const val GITHUB_PAGE_URL = "https://topjohnwu.github.io/magisk_files/"
+        const val GITHUB_PAGE_URL = "https://topjohnwu.github.io/magisk-files/"
         const val JS_DELIVR_URL = "https://cdn.jsdelivr.net/gh/"
-        const val OFFICIAL_REPO = "https://magisk-modules-repo.github.io/submission/modules.json"
     }
 
     object Key {
@@ -70,7 +69,6 @@ object Const {
     object Nav {
         const val HOME = "home"
         const val SETTINGS = "settings"
-        const val HIDE = "hide"
         const val MODULES = "modules"
         const val SUPERUSER = "superuser"
     }

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

@@ -2,11 +2,7 @@
 
 package com.topjohnwu.magisk.core
 
-import android.annotation.SuppressLint
 import android.app.Activity
-import android.app.job.JobInfo
-import android.app.job.JobScheduler
-import android.app.job.JobWorkItem
 import android.content.ComponentName
 import android.content.Context
 import android.content.ContextWrapper
@@ -14,149 +10,50 @@ import android.content.Intent
 import android.content.res.AssetManager
 import android.content.res.Configuration
 import android.content.res.Resources
-import androidx.annotation.RequiresApi
-import com.topjohnwu.magisk.DynAPK
+import android.util.DisplayMetrics
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.download.DownloadService
-import com.topjohnwu.magisk.core.utils.refreshLocale
-import com.topjohnwu.magisk.core.utils.updateConfig
-import com.topjohnwu.magisk.ktx.forceGetDeclaredField
-import com.topjohnwu.magisk.ui.MainActivity
-import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
+import com.topjohnwu.magisk.StubApk
+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) = StubApk.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.stubChk.classToComponent[name] ?: name
-        )
-
-        javaClass.forceGetDeclaredField("service")?.set(this, component)
-        return this
-    }
-}
-
-private object ClassMap {
-
-    private val map = mapOf(
-        App::class.java to a.e::class.java,
-        MainActivity::class.java to a.b::class.java,
-        SplashActivity::class.java to a.c::class.java,
-        Receiver::class.java to a.h::class.java,
-        DownloadService::class.java to a.j::class.java,
-        SuRequestActivity::class.java to a.m::class.java
-    )
-
-    operator fun get(c: Class<*>) = map.getOrElse(c) { c }
-}
-
 // Keep a reference to these resources to prevent it from
 // being removed when running "remove unused resources"
 val shouldKeepResources = listOf(
@@ -164,10 +61,11 @@ val shouldKeepResources = listOf(
     R.string.release_notes,
     R.string.invalid_update_channel,
     R.string.update_available,
-    R.string.safetynet_api_error,
-    R.raw.changelog,
     R.drawable.ic_device,
-    R.drawable.ic_hide_select_md2,
     R.drawable.ic_more,
-    R.drawable.ic_magisk_delete
+    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 android.os.Build
 import androidx.databinding.ObservableBoolean
-import com.topjohnwu.magisk.DynAPK
+import com.topjohnwu.magisk.StubApk
 import com.topjohnwu.magisk.core.model.UpdateInfo
 import com.topjohnwu.magisk.core.utils.net.NetworkObserver
-import com.topjohnwu.magisk.ktx.get
-import com.topjohnwu.magisk.utils.CachedValue
+import com.topjohnwu.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 com.topjohnwu.superuser.internal.UiThreadHandler
-import java.io.FileInputStream
-import java.io.IOException
-import java.util.*
 
 val isRunningAsStub get() = Info.stub != null
 
 object Info {
 
-    val envRef = CachedValue { loadState() }
+    var stub: StubApk.Data? = null
 
-    @JvmStatic val env by envRef
-
-    var stub: DynAPK.Data? = null
-    val stubChk: DynAPK.Data
-        get() = stub as DynAPK.Data
-
-    var remote = UpdateInfo()
+    val EMPTY_REMOTE = UpdateInfo()
+    var remote = EMPTY_REMOTE
+    suspend fun getRemote(svc: NetworkService): UpdateInfo? {
+        return if (remote === EMPTY_REMOTE) {
+            svc.fetchUpdate()?.apply { remote = this }
+        } else remote
+    }
 
     // Device state
-    var crypto = ""
-    @JvmStatic var isSAR = false
-    @JvmStatic var isAB = false
+    @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"
-    @JvmStatic var ramdisk = false
-    @JvmStatic var hasGMS = true
-    @JvmStatic var isPixel = false
-    @JvmStatic val cryptoText get() = crypto.capitalize(Locale.US)
+    @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(get()) {
+            NetworkObserver.observe(AppContext) {
                 UiThreadHandler.run { field.set(it) }
             }
         }
     }
 
-    val isNewReboot by lazy {
-        try {
-            FileInputStream("/proc/sys/kernel/random/boot_id").bufferedReader().use {
-                val id = it.readLine()
-                if (id != Config.bootId) {
-                    Config.bootId = id
-                    true
-                } else {
-                    false
-                }
-            }
-        } catch (e: IOException) {
-            false
-        }
-    }
-
     private fun loadState() = Env(
         fastCmd("magisk -v").split(":".toRegex())[0],
-        runCatching { fastCmd("magisk -V").toInt() }.getOrDefault(-1),
-        Shell.su("magiskhide --status").exec().isSuccess
+        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,61 @@
+package com.topjohnwu.magisk.core
+
+import android.app.job.JobInfo
+import android.app.job.JobParameters
+import android.app.job.JobScheduler
+import android.content.Context
+import androidx.core.content.getSystemService
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.core.base.BaseJobService
+import com.topjohnwu.magisk.di.ServiceLocator
+import com.topjohnwu.magisk.view.Notifications
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import java.util.concurrent.TimeUnit
+
+class JobService : BaseJobService() {
+
+    private val job = Job()
+    private val svc get() = ServiceLocator.networkService
+
+    override fun onStartJob(params: JobParameters): Boolean {
+        val coroutineScope = CoroutineScope(Dispatchers.IO + job)
+        coroutineScope.launch {
+            doWork()
+            jobFinished(params, false)
+        }
+        return false
+    }
+
+    private suspend fun doWork() {
+        svc.fetchUpdate()?.let {
+            Info.remote = it
+            if (Info.env.isActive && BuildConfig.VERSION_CODE < it.magisk.versionCode)
+                Notifications.updateAvailable(this)
+        }
+    }
+
+    override fun onStopJob(params: JobParameters): Boolean {
+        job.cancel()
+        return false
+    }
+
+    companion object {
+        fun schedule(context: Context) {
+            val scheduler = context.getSystemService<JobScheduler>() ?: return
+            if (Config.checkUpdate) {
+                val cmp = JobService::class.java.cmp(context.packageName)
+                val info = JobInfo.Builder(Const.ID.JOB_SERVICE_ID, cmp)
+                    .setPeriodic(TimeUnit.HOURS.toMillis(12))
+                    .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                    .setRequiresDeviceIdle(true)
+                    .build()
+                scheduler.schedule(info)
+            } else {
+                scheduler.cancel(Const.ID.JOB_SERVICE_ID)
+            }
+        }
+    }
+}

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

@@ -1,23 +1,25 @@
 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.FileProvider
 import com.topjohnwu.magisk.core.su.SuCallbackHandler
 import java.io.File
 
-open class Provider : FileProvider() {
+class Provider : ContentProvider() {
 
-    override fun attachInfo(context: Context, info: ProviderInfo?) {
+    override fun attachInfo(context: Context, info: ProviderInfo) {
         super.attachInfo(context.wrap(), info)
     }
 
     override fun call(method: String, arg: String?, extras: Bundle?): Bundle? {
-        SuCallbackHandler(context!!, method, extras)
+        SuCallbackHandler.run(context!!, method, extras)
         return Bundle.EMPTY
     }
 
@@ -36,4 +38,11 @@ open class Provider : FileProvider() {
         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

@@ -1,46 +1,58 @@
 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.core.magiskdb.PolicyDao
-import com.topjohnwu.magisk.core.su.SuCallbackHandler
+import com.topjohnwu.magisk.di.ServiceLocator
+import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import org.koin.core.inject
 
 open class Receiver : BaseReceiver() {
 
-    private val policyDB: PolicyDao by inject()
+    private val policyDB get() = ServiceLocator.policyDB
 
-    private fun getPkg(intent: Intent): String {
-        return intent.data?.encodedSchemeSpecificPart.orEmpty()
+    @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(pkg: String) = GlobalScope.launch {
-            policyDB.delete(pkg)
+        fun rmPolicy(uid: Int) = GlobalScope.launch {
+            policyDB.delete(uid)
         }
 
         when (intent.action ?: return) {
-            Intent.ACTION_REBOOT -> {
-                SuCallbackHandler(context, intent.getStringExtra("action"), intent.extras)
-            }
             Intent.ACTION_PACKAGE_REPLACED -> {
                 // This will only work pre-O
                 if (Config.suReAuth)
-                    rmPolicy(getPkg(intent))
+                    getUid(intent)?.let { rmPolicy(it) }
+            }
+            Intent.ACTION_UID_REMOVED -> {
+                getUid(intent)?.let { rmPolicy(it) }
             }
             Intent.ACTION_PACKAGE_FULLY_REMOVED -> {
-                val pkg = getPkg(intent)
-                rmPolicy(pkg)
-                Shell.su("magiskhide --rm $pkg").submit()
+                getPkg(intent)?.let { Shell.cmd("magisk --denylist rm $it").submit() }
             }
             Intent.ACTION_LOCALE_CHANGED -> Shortcuts.setupDynamic(context)
+            Intent.ACTION_MY_PACKAGE_REPLACED -> {
+                @Suppress("DEPRECATION")
+                val installer = context.packageManager.getInstallerPackageName(context.packageName)
+                if (installer == context.packageName) {
+                    Notifications.updateDone(context)
+                }
+            }
         }
     }
 }

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

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

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

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

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

@@ -1,31 +1,48 @@
 package com.topjohnwu.magisk.core.base
 
+import android.Manifest.permission.REQUEST_INSTALL_PACKAGES
 import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
-import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.content.res.Configuration
+import android.net.Uri
 import android.os.Build
-import android.widget.Toast
-import androidx.annotation.CallSuper
+import android.os.Bundle
+import androidx.activity.result.contract.ActivityResultContracts.GetContent
+import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
+import androidx.annotation.WorkerThread
 import androidx.appcompat.app.AppCompatActivity
-import androidx.collection.SparseArrayCompat
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.utils.RequestInstall
+import com.topjohnwu.magisk.core.utils.UninstallPackage
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.core.wrap
-import com.topjohnwu.magisk.ktx.set
-import com.topjohnwu.magisk.utils.Utils
-import kotlin.random.Random
-
-typealias ActivityResultCallback = BaseActivity.(Int, Intent?) -> Unit
+import com.topjohnwu.magisk.ktx.reflectField
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
 
 abstract class BaseActivity : AppCompatActivity() {
 
-    private val resultCallbacks by lazy { SparseArrayCompat<ActivityResultCallback>() }
+    private var permissionCallback: ((Boolean) -> Unit)? = null
+    private val requestPermission = registerForActivityResult(RequestPermission()) {
+        permissionCallback?.invoke(it)
+        permissionCallback = null
+    }
+    private val requestInstall = registerForActivityResult(RequestInstall()) {
+        permissionCallback?.invoke(it)
+        permissionCallback = null
+    }
+
+    private var contentCallback: ((Uri) -> Unit)? = null
+    private val getContent = registerForActivityResult(GetContent()) {
+        if (it != null) contentCallback?.invoke(it)
+        contentCallback = null
+    }
+
+    private var uninstallLatch = CountDownLatch(1)
+    private val uninstallPkg = registerForActivityResult(UninstallPackage()) {
+        uninstallLatch.countDown()
+    }
 
     override fun applyOverrideConfiguration(config: Configuration?) {
         // Force applying our preferred local
@@ -34,71 +51,44 @@ abstract class BaseActivity : AppCompatActivity() {
     }
 
     override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base.wrap(false))
+        super.attachBaseContext(base.wrap())
     }
 
-    fun withPermission(permission: String, builder: PermissionRequestBuilder.() -> Unit) {
-        val request = PermissionRequestBuilder().apply(builder).build()
+    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 withPermission(permission: String, callback: (Boolean) -> Unit) {
         if (permission == WRITE_EXTERNAL_STORAGE && Build.VERSION.SDK_INT >= 30) {
             // We do not need external rw on 30+
-            request.onSuccess()
+            callback(true)
             return
         }
-
-        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
-            request.onSuccess()
+        permissionCallback = callback
+        if (permission == REQUEST_INSTALL_PACKAGES) {
+            requestInstall.launch(Unit)
         } else {
-            var requestCode: Int
-            do {
-                requestCode = Random.nextInt(Const.ID.MAX_ACTIVITY_RESULT + 1, 1 shl 15)
-            } while (resultCallbacks.containsKey(requestCode))
-            resultCallbacks[requestCode] = { result, _ ->
-                if (result > 0)
-                    request.onSuccess()
-                else
-                    request.onFailure()
-            }
-            ActivityCompat.requestPermissions(this, arrayOf(permission), requestCode)
+            requestPermission.launch(permission)
         }
     }
 
-    fun withExternalRW(builder: PermissionRequestBuilder.() -> Unit) {
-        withPermission(WRITE_EXTERNAL_STORAGE, builder = builder)
+    fun getContent(type: String, callback: (Uri) -> Unit) {
+        contentCallback = callback
+        getContent.launch(type)
     }
 
-    override fun onRequestPermissionsResult(
-        requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        var success = true
-        for (res in grantResults) {
-            if (res != PackageManager.PERMISSION_GRANTED) {
-                success = false
-                break
-            }
-        }
-        resultCallbacks[requestCode]?.also {
-            resultCallbacks.remove(requestCode)
-            it(this, if (success) 1 else -1, null)
-        }
-
-    }
-
-    @CallSuper
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        resultCallbacks[requestCode]?.also { callback ->
-            resultCallbacks.remove(requestCode)
-            callback(this, resultCode, data)
-        }
-    }
-
-    fun startActivityForResult(intent: Intent, requestCode: Int, callback: ActivityResultCallback) {
-        resultCallbacks[requestCode] = callback
-        try {
-            startActivityForResult(intent, requestCode)
-        } catch (e: ActivityNotFoundException) {
-            Utils.toast(R.string.app_not_found, Toast.LENGTH_SHORT)
-        }
+    @WorkerThread
+    fun uninstallAndWait(pkg: String) {
+        uninstallLatch = CountDownLatch(1)
+        uninstallPkg.launch(pkg)
+        uninstallLatch.await(3, TimeUnit.SECONDS)
     }
 
     override fun recreate() {
@@ -106,4 +96,8 @@ abstract class BaseActivity : AppCompatActivity() {
         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/base/PermissionRequestBuilder.kt

@@ -1,40 +0,0 @@
-package com.topjohnwu.magisk.core.base
-
-typealias SimpleCallback = () -> Unit
-typealias PermissionRationaleCallback = (List<String>) -> Unit
-
-class PermissionRequestBuilder {
-
-    private var onSuccessCallback: SimpleCallback = {}
-    private var onFailureCallback: SimpleCallback = {}
-    private var onShowRationaleCallback: PermissionRationaleCallback = {}
-
-    fun onSuccess(callback: SimpleCallback) {
-        onSuccessCallback = callback
-    }
-
-    fun onFailure(callback: SimpleCallback) {
-        onFailureCallback = callback
-    }
-
-    fun onShowRationale(callback: PermissionRationaleCallback) {
-        onShowRationaleCallback = callback
-    }
-
-    fun build(): PermissionRequest {
-        return PermissionRequest(onSuccessCallback, onFailureCallback, onShowRationaleCallback)
-    }
-
-}
-
-class PermissionRequest(
-    private val onSuccessCallback: SimpleCallback,
-    private val onFailureCallback: SimpleCallback,
-    private val onShowRationaleCallback: PermissionRationaleCallback
-) {
-
-    fun onSuccess() = onSuccessCallback()
-    fun onFailure() = onFailureCallback()
-    fun onShowRationale(permissions: List<String>) = onShowRationaleCallback(permissions)
-
-}

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

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

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

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

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

@@ -1,99 +1,205 @@
 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.net.Uri
 import android.os.Build
 import androidx.core.net.toFile
-import com.topjohnwu.magisk.core.download.Action.*
-import com.topjohnwu.magisk.core.download.Action.Flash.Secondary
-import com.topjohnwu.magisk.core.download.Subject.*
-import com.topjohnwu.magisk.core.intent
-import com.topjohnwu.magisk.core.tasks.EnvFixTask
-import com.topjohnwu.magisk.ui.flash.FlashFragment
+import androidx.lifecycle.LifecycleOwner
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.StubApk
+import com.topjohnwu.magisk.core.*
+import com.topjohnwu.magisk.core.tasks.HideAPK
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
+import com.topjohnwu.magisk.ktx.copyAndClose
+import com.topjohnwu.magisk.ktx.forEach
+import com.topjohnwu.magisk.ktx.withStreams
+import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.magisk.utils.APKInstall
-import kotlin.random.Random.Default.nextInt
+import com.topjohnwu.magisk.view.Notifications
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
 
-@SuppressLint("Registered")
-open class DownloadService : BaseDownloader() {
+class DownloadService : NotificationService() {
 
-    private val context get() = this
+    private val job = Job()
 
-    override suspend fun onFinish(subject: Subject, id: Int) = when (subject) {
-        is Magisk -> subject.onFinish(id)
-        is Module -> subject.onFinish(id)
-        is Manager -> subject.onFinish(id)
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        intent.getParcelableExtra<Subject>(SUBJECT_KEY)?.let { download(it) }
+        return START_NOT_STICKY
     }
 
-    private suspend fun Magisk.onFinish(id: Int) = when (val action = action) {
-        Uninstall -> FlashFragment.uninstall(file, id)
-        EnvFix -> {
-            remove(id)
-            EnvFixTask(file).exec()
-            Unit
+    override fun onDestroy() {
+        super.onDestroy()
+        job.cancel()
+    }
+
+    private fun download(subject: Subject) {
+        update(subject.notifyId)
+        val coroutineScope = CoroutineScope(job + Dispatchers.IO)
+        coroutineScope.launch {
+            try {
+                val stream = service.fetchFile(subject.url).toProgressStream(subject)
+                when (subject) {
+                    is Subject.App -> handleApp(stream, subject)
+                    is Subject.Module -> handleModule(stream, subject.file)
+                }
+                val activity = ActivityTracker.foreground
+                if (activity != null && subject.autoLaunch) {
+                    remove(subject.notifyId)
+                    subject.pendingIntent(activity)?.send()
+                } else {
+                    notifyFinish(subject)
+                }
+                subject.postDownload?.invoke()
+                if (!hasNotifications)
+                    stopSelf()
+            } catch (e: Exception) {
+                Timber.e(e)
+                notifyFail(subject)
+            }
         }
-        is Patch -> FlashFragment.patch(file, action.fileUri, id)
-        is Flash -> FlashFragment.flash(file, action is Secondary, id)
-        else -> Unit
     }
 
-    private fun Module.onFinish(id: Int) = when (action) {
-        is Flash -> FlashFragment.install(file, id)
-        else -> Unit
+    private suspend fun handleApp(stream: InputStream, subject: Subject.App) {
+        fun writeTee(output: OutputStream) {
+            val uri =  MediaStoreUtils.getFile("${subject.title}.apk").uri
+            val external = uri.outputStream()
+            stream.copyAndClose(TeeOutputStream(external, output))
+        }
+
+        if (isRunningAsStub) {
+            val updateApk = StubApk.update(this)
+            try {
+                // Download full APK to stub update path
+                writeTee(updateApk.outputStream())
+
+                if (Info.stub!!.version < subject.stub.versionCode) {
+                    // Also upgrade stub
+                    update(subject.notifyId) {
+                        it.setProgress(0, 0, true)
+                            .setContentTitle(getString(R.string.hide_app_title))
+                            .setContentText("")
+                    }
+
+                    // Download
+                    val apk = subject.file.toFile()
+                    service.fetchFile(subject.stub.link).byteStream().writeTo(apk)
+
+                    // Patch and install
+                    val session = APKInstall.startSession(this)
+                    session.openStream(this).use {
+                        val label = applicationInfo.nonLocalizedLabel
+                        if (!HideAPK.patch(this, apk, it, packageName, label)) {
+                            throw IOException("HideAPK patch error")
+                        }
+                    }
+                    apk.delete()
+                    subject.intent = session.waitIntent()
+                } else {
+                    ActivityTracker.foreground?.let {
+                        // Relaunch the process if we are foreground
+                        StubApk.restartProcess(it)
+                    } ?: run {
+                        // Or else kill the current process after posting notification
+                        subject.intent = Notifications.selfLaunchIntent(this)
+                        subject.postDownload = { Runtime.getRuntime().exit(0) }
+                    }
+                    return
+                }
+            } catch (e: Exception) {
+                // If any error occurred, do not let stub load the new APK
+                updateApk.delete()
+                throw e
+            }
+        } else {
+            val session = APKInstall.startSession(this)
+            writeTee(session.openStream(this))
+            subject.intent = session.waitIntent()
+        }
     }
 
-    private fun Manager.onFinish(id: Int) {
-        remove(id)
-        APKInstall.install(context, file.toFile())
+    private fun handleModule(src: InputStream, file: Uri) {
+        val input = ZipInputStream(src.buffered())
+        val output = ZipOutputStream(file.outputStream().buffered())
+
+        withStreams(input, output) { zin, zout ->
+            zout.putNextEntry(ZipEntry("META-INF/"))
+            zout.putNextEntry(ZipEntry("META-INF/com/"))
+            zout.putNextEntry(ZipEntry("META-INF/com/google/"))
+            zout.putNextEntry(ZipEntry("META-INF/com/google/android/"))
+            zout.putNextEntry(ZipEntry("META-INF/com/google/android/update-binary"))
+            assets.open("module_installer.sh").copyTo(zout)
+
+            zout.putNextEntry(ZipEntry("META-INF/com/google/android/updater-script"))
+            zout.write("#MAGISK\n".toByteArray())
+
+            zin.forEach { entry ->
+                val path = entry.name
+                if (path.isNotEmpty() && !path.startsWith("META-INF")) {
+                    zout.putNextEntry(ZipEntry(path))
+                    if (!entry.isDirectory) {
+                        zin.copyTo(zout)
+                    }
+                }
+            }
+        }
     }
 
-    // --- Customize finish notification
-
-    override fun Notification.Builder.setIntent(subject: Subject)
-    = when (subject) {
-        is Magisk -> setIntent(subject)
-        is Module -> setIntent(subject)
-        is Manager -> setIntent(subject)
+    private 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()
+        }
     }
 
-    private fun Notification.Builder.setIntent(subject: Magisk)
-    = when (val action = subject.action) {
-        Uninstall -> setContentIntent(FlashFragment.uninstallIntent(context, subject.file))
-        is Flash -> setContentIntent(FlashFragment.flashIntent(context, subject.file, action is Secondary))
-        is Patch -> setContentIntent(FlashFragment.patchIntent(context, subject.file, action.fileUri))
-        else -> setContentIntent(Intent())
-    }
-
-    private fun Notification.Builder.setIntent(subject: Module)
-    = when (subject.action) {
-        is Flash -> setContentIntent(FlashFragment.installIntent(context, subject.file))
-        else -> setContentIntent(Intent())
-    }
-
-    private fun Notification.Builder.setIntent(subject: Manager)
-    = setContentIntent(APKInstall.installIntent(context, subject.file.toFile()))
-
-    private fun Notification.Builder.setContentIntent(intent: Intent) =
-        setContentIntent(
-            PendingIntent.getActivity(context, nextInt(), intent, PendingIntent.FLAG_ONE_SHOT)
-        )
-
-    // ---
-
     companion object {
+        private const val SUBJECT_KEY = "subject"
+        private const val REQUEST_CODE = 1
+
+        fun observeProgress(owner: LifecycleOwner, callback: (Float, Subject) -> Unit) {
+            progressBroadcast.value = null
+            progressBroadcast.observe(owner) {
+                val (progress, subject) = it ?: return@observe
+                callback(progress, subject)
+            }
+        }
 
         private fun intent(context: Context, subject: Subject) =
-            context.intent<DownloadService>().putExtra(ACTION_KEY, subject)
+            context.intent<DownloadService>().putExtra(SUBJECT_KEY, subject)
 
-        fun pendingIntent(context: Context, subject: Subject): PendingIntent {
+        @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) {
-                PendingIntent.getForegroundService(context, nextInt(),
-                    intent(context, subject), PendingIntent.FLAG_UPDATE_CURRENT)
+                getForegroundService(context, REQUEST_CODE, intent, flag)
             } else {
-                PendingIntent.getService(context, nextInt(),
-                    intent(context, subject), PendingIntent.FLAG_UPDATE_CURRENT)
+                getService(context, REQUEST_CODE, intent, flag)
             }
         }
 
@@ -106,5 +212,4 @@ open class DownloadService : BaseDownloader() {
             }
         }
     }
-
 }

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

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

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

@@ -1,45 +0,0 @@
-package com.topjohnwu.magisk.core.download
-
-import android.net.Uri
-import com.topjohnwu.magisk.ktx.withStreams
-import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
-import java.io.InputStream
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-import java.util.zip.ZipOutputStream
-
-fun InputStream.toModule(file: Uri, installer: InputStream) {
-
-    val input = ZipInputStream(buffered())
-    val output = ZipOutputStream(file.outputStream().buffered())
-
-    withStreams(input, output) { zin, zout ->
-        zout.putNextEntry(ZipEntry("META-INF/"))
-        zout.putNextEntry(ZipEntry("META-INF/com/"))
-        zout.putNextEntry(ZipEntry("META-INF/com/google/"))
-        zout.putNextEntry(ZipEntry("META-INF/com/google/android/"))
-        zout.putNextEntry(ZipEntry("META-INF/com/google/android/update-binary"))
-        installer.copyTo(zout)
-
-        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)
-            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

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

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

@@ -1,109 +1,86 @@
 package com.topjohnwu.magisk.core.download
 
+import android.annotation.SuppressLint
+import android.app.PendingIntent
 import android.content.Context
+import android.content.Intent
 import android.net.Uri
 import android.os.Parcelable
 import androidx.core.net.toUri
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.model.MagiskJson
-import com.topjohnwu.magisk.core.model.ManagerJson
 import com.topjohnwu.magisk.core.model.StubJson
 import com.topjohnwu.magisk.core.model.module.OnlineModule
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
+import com.topjohnwu.magisk.di.AppContext
 import com.topjohnwu.magisk.ktx.cachedFile
-import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.ui.flash.FlashFragment
+import com.topjohnwu.magisk.view.Notifications
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
-private fun cachedFile(name: String) = get<Context>().cachedFile(name).apply { delete() }.toUri()
+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 action: Action
     abstract val title: String
+    abstract val notifyId: Int
+    open val autoLaunch: Boolean get() = true
+    open val postDownload: (() -> Unit)? get() = null
+
+    abstract fun pendingIntent(context: Context): PendingIntent?
 
     @Parcelize
     class Module(
         val module: OnlineModule,
-        override val action: Action
+        val action: Action,
+        override val notifyId: Int = Notifications.nextId()
     ) : Subject() {
-        override val url: String get() = module.zip_url
+        override val url: String get() = module.zipUrl
         override val title: String get() = module.downloadFilename
+        override val autoLaunch: Boolean get() = action == Action.Flash
 
         @IgnoredOnParcel
         override val file by lazy {
             MediaStoreUtils.getFile(title).uri
         }
+
+        override fun pendingIntent(context: Context) =
+            FlashFragment.installIntent(context, file)
     }
 
     @Parcelize
-    class Manager(
-        private val app: ManagerJson = Info.remote.app,
-        val stub: StubJson = Info.remote.stub
+    class App(
+        private val json: MagiskJson = Info.remote.magisk,
+        val stub: StubJson = Info.remote.stub,
+        override val notifyId: Int = Notifications.nextId()
     ) : Subject() {
-        override val action get() = Action.Download
-        override val title: String get() = "MagiskManager-${app.version}(${app.versionCode})"
-        override val url: String get() = app.link
+        override val title: String get() = "Magisk-${json.version}(${json.versionCode})"
+        override val url: String get() = json.link
 
         @IgnoredOnParcel
         override val file by lazy {
             cachedFile("manager.apk")
         }
 
+        @IgnoredOnParcel
+        override var postDownload: (() -> Unit)? = null
+
+        @IgnoredOnParcel
+        var intent: Intent? = null
+        override fun pendingIntent(context: Context) = intent?.toPending(context)
     }
 
-    abstract class Magisk : Subject() {
-
-        val magisk: MagiskJson = Info.remote.magisk
-
-        @Parcelize
-        private class Internal(
-            override val action: Action
-        ) : Magisk() {
-            override val url: String get() = magisk.link
-            override val title: String get() = "Magisk-${magisk.version}(${magisk.versionCode})"
-
-            @IgnoredOnParcel
-            override val file by lazy {
-                cachedFile("magisk.zip")
-            }
-        }
-
-        @Parcelize
-        private class Uninstall : Magisk() {
-            override val action get() = Action.Uninstall
-            override val url: String get() = Info.remote.uninstaller.link
-            override val title: String get() = "uninstall.zip"
-
-            @IgnoredOnParcel
-            override val file by lazy {
-                cachedFile(title)
-            }
-
-        }
-
-        @Parcelize
-        private class Download : Magisk() {
-            override val action get() = Action.Download
-            override val url: String get() = magisk.link
-            override val title: String get() = "Magisk-${magisk.version}(${magisk.versionCode}).zip"
-
-            @IgnoredOnParcel
-            override val file by lazy {
-                MediaStoreUtils.getFile(title).uri
-            }
-        }
-
-        companion object {
-            operator fun invoke(config: Action) = when (config) {
-                Action.Download -> Download()
-                Action.Uninstall -> Uninstall()
-                Action.EnvFix, is Action.Flash, is Action.Patch -> Internal(config)
-            }
-        }
-
+    @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/PolicyDao.kt

@@ -1,11 +1,9 @@
 package com.topjohnwu.magisk.core.magiskdb
 
-import android.content.Context
-import android.content.pm.PackageManager
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.model.su.SuPolicy
-import com.topjohnwu.magisk.core.model.su.toMap
 import com.topjohnwu.magisk.core.model.su.toPolicy
+import com.topjohnwu.magisk.di.AppContext
 import com.topjohnwu.magisk.ktx.now
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -13,9 +11,7 @@ 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
 
@@ -31,12 +27,6 @@ class PolicyDao(
         }
     }.commit()
 
-    suspend fun delete(packageName: String) = buildQuery<Delete> {
-        condition {
-            equals("package_name", packageName)
-        }
-    }.commit()
-
     suspend fun delete(uid: Int) = buildQuery<Delete> {
         condition {
             equals("uid", uid)
@@ -62,14 +52,10 @@ class PolicyDao(
     }
 
     private fun Map<String, String>.toPolicyOrNull(): SuPolicy? {
-        return runCatching { toPolicy(context.packageManager) }.getOrElse {
-            Timber.e(it)
-            if (it is PackageManager.NameNotFoundException) {
-                val uid = getOrElse("uid") { null } ?: return null
-                GlobalScope.launch {
-                    delete(uid.toInt())
-                }
-            }
+        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

@@ -18,7 +18,7 @@ class Query(private val _query: 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 ->
+            Shell.cmd(query).await().out.map { line ->
                 async {
                     line.split("\\|".toRegex())
                         .map { it.split("=", limit = 2) }
@@ -32,7 +32,7 @@ class Query(private val _query: String) {
 
     suspend inline fun query() = query { it }
 
-    suspend inline fun commit() = Shell.su(query).to(null).await()
+    suspend inline fun commit() = Shell.cmd(query).to(null).await()
 }
 
 class Delete : Query.Builder {

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

@@ -6,29 +6,13 @@ 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 = "",
@@ -44,18 +28,10 @@ data class StubJson(
 
 @JsonClass(generateAdapter = true)
 data class ModuleJson(
-    val id: String,
-    val last_update: Long,
-    val prop_url: String,
-    val zip_url: String,
-    val notes_url: String
-)
-
-@JsonClass(generateAdapter = true)
-data class RepoJson(
-    val name: String,
-    val last_update: Long,
-    val modules: List<ModuleJson>
+    val version: String,
+    val versionCode: Int,
+    val zipUrl: String,
+    val changelog: String,
 )
 
 @JsonClass(generateAdapter = true)

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

@@ -1,25 +1,43 @@
 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
 
-class LocalModule(path: String) : Module() {
     override var id: String = ""
     override var name: String = ""
-    override var author: String = ""
     override var version: String = ""
     override var versionCode: Int = -1
-    override var description: String = ""
+    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()
@@ -28,15 +46,15 @@ class LocalModule(path: String) : Module() {
             if (enable) {
                 disableFile.delete()
                 if (Const.Version.atLeast_21_2())
-                    Shell.su("copy_sepolicy_rules").submit()
+                    Shell.cmd("copy_sepolicy_rules").submit()
                 else
-                    Shell.su("mkdir -p $dir", "cp -af $ruleFile $dir").submit()
+                    Shell.cmd("mkdir -p $dir", "cp -af $ruleFile $dir").submit()
             } else {
                 !disableFile.createNewFile()
                 if (Const.Version.atLeast_21_2())
-                    Shell.su("copy_sepolicy_rules").submit()
+                    Shell.cmd("copy_sepolicy_rules").submit()
                 else
-                    Shell.su("rm -rf $dir").submit()
+                    Shell.cmd("rm -rf $dir").submit()
             }
         }
 
@@ -44,23 +62,48 @@ class LocalModule(path: String) : Module() {
         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()
+                    Shell.cmd("copy_sepolicy_rules").submit()
                 else
-                    Shell.su("rm -rf $PERSIST/$id").submit()
+                    Shell.cmd("rm -rf $PERSIST/$id").submit()
             } else {
-                !removeFile.delete()
+                removeFile.delete()
                 if (Const.Version.atLeast_21_2())
-                    Shell.su("copy_sepolicy_rules").submit()
+                    Shell.cmd("copy_sepolicy_rules").submit()
                 else
-                    Shell.su("cp -af $ruleFile $PERSIST/$id").submit()
+                    Shell.cmd("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)
+            parseProps(Shell.cmd("dos2unix < $path/module.prop").exec().out)
         }
 
         if (id.isEmpty()) {
@@ -73,17 +116,35 @@ class LocalModule(path: String) : Module() {
         }
     }
 
+    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 { _, name -> name != "lost+found" && name != ".core" }
+                .listFiles()
                 .orEmpty()
                 .filter { !it.isFile }
                 .map { LocalModule("${Const.MAGISK_PATH}/${it.name}") }
-                .sortedBy { it.name.toLowerCase() }
+                .sortedBy { it.name.lowercase(Locale.ROOT) }
         }
     }
 }

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

@@ -5,37 +5,10 @@ abstract class Module : Comparable<Module> {
         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: Module) = name.compareTo(other.name, true)
+    override operator fun compareTo(other: Module) = id.compareTo(other.id)
 }

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

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

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

@@ -1,12 +1,8 @@
 package com.topjohnwu.magisk.core.model.su
 
 import androidx.room.Entity
-import androidx.room.Ignore
 import androidx.room.PrimaryKey
-import com.topjohnwu.magisk.core.model.su.SuPolicy.Companion.ALLOW
 import com.topjohnwu.magisk.ktx.now
-import com.topjohnwu.magisk.ktx.timeFormatTime
-import com.topjohnwu.magisk.ktx.toTime
 
 @Entity(tableName = "logs")
 data class SuLog(
@@ -17,14 +13,7 @@ data class SuLog(
     val appName: String,
     val command: String,
     val action: Boolean,
-    val time: Long = -1
+    val time: Long = now
 ) {
     @PrimaryKey(autoGenerate = true) var id: Int = 0
-    @Ignore val timeString = time.toTime(timeFormatTime)
 }
-
-fun SuPolicy.toLog(
-    toUid: Int,
-    fromPid: Int,
-    command: String
-) = SuLog(uid, toUid, fromPid, packageName, appName, command, policy == ALLOW, now)

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

@@ -1,13 +1,15 @@
+@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(
-    var uid: Int,
+    val uid: Int,
     val packageName: String,
     val appName: String,
     val icon: Drawable,
@@ -23,22 +25,25 @@ data class SuPolicy(
         const val ALLOW = 2
     }
 
-}
+    fun toLog(toUid: Int, fromPid: Int, command: String) = SuLog(
+        uid, toUid, fromPid, packageName, appName,
+        command, policy == ALLOW)
 
-fun SuPolicy.toMap() = mapOf(
-    "uid" to uid,
-    "package_name" to packageName,
-    "policy" to policy,
-    "until" to until,
-    "logging" to logging,
-    "notification" to notification
-)
+    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.GET_UNINSTALLED_PACKAGES)
+    val info = pm.getApplicationInfo(packageName, PackageManager.MATCH_UNINSTALLED_PACKAGES)
 
     if (info.uid != uid)
         throw PackageManager.NameNotFoundException()
@@ -59,7 +64,7 @@ fun Map<String, String>.toPolicy(pm: PackageManager): SuPolicy {
 fun Int.toPolicy(pm: PackageManager, policy: Int = INTERACTIVE): SuPolicy {
     val pkg = pm.getPackagesForUid(this)?.firstOrNull()
         ?: throw PackageManager.NameNotFoundException()
-    val info = pm.getApplicationInfo(pkg, PackageManager.GET_UNINSTALLED_PACKAGES)
+    val info = pm.getApplicationInfo(pkg, PackageManager.MATCH_UNINSTALLED_PACKAGES)
     return SuPolicy(
         uid = info.uid,
         packageName = pkg,
@@ -68,3 +73,13 @@ fun Int.toPolicy(pm: PackageManager, policy: Int = INTERACTIVE): SuPolicy {
         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,25 +1,16 @@
 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.R
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.intent
 import com.topjohnwu.magisk.core.model.su.SuPolicy
-import com.topjohnwu.magisk.core.model.su.toLog
 import com.topjohnwu.magisk.core.model.su.toPolicy
-import com.topjohnwu.magisk.data.repository.LogRepository
-import com.topjohnwu.magisk.ktx.get
-import com.topjohnwu.magisk.ktx.startActivity
-import com.topjohnwu.magisk.ktx.startActivityWithRoot
-import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
+import com.topjohnwu.magisk.core.model.su.toUidPolicy
+import com.topjohnwu.magisk.di.ServiceLocator
 import com.topjohnwu.magisk.utils.Utils
-import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -29,9 +20,8 @@ object SuCallbackHandler {
     const val REQUEST = "request"
     const val LOG = "log"
     const val NOTIFY = "notify"
-    const val TEST = "test"
 
-    operator fun invoke(context: Context, action: String?, data: Bundle?) {
+    fun run(context: Context, action: String?, data: Bundle?) {
         data ?: return
 
         // Debug messages
@@ -45,88 +35,71 @@ object SuCallbackHandler {
         }
 
         when (action) {
-            REQUEST -> handleRequest(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 Number -> this.toInt()
-            else -> null
-        }
-    }
-
-    private fun handleRequest(context: Context, data: Bundle) {
-        val intent = context.intent<SuRequestActivity>()
-            .setAction(REQUEST)
-            .putExtras(data)
-            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            .addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
-        if (Build.VERSION.SDK_INT >= 29) {
-            // Android Q does not allow starting activity from background
-            intent.startActivityWithRoot()
-        } else {
-            intent.startActivity(context)
+    // https://android.googlesource.com/platform/frameworks/base/+/547bf5487d52b93c9fe183aa6d56459c170b17a4
+    private fun Bundle.getIntComp(key: String, defaultValue: Int): Int {
+        val value = get(key) ?: return defaultValue
+        return when (value) {
+            is Int -> value
+            is Long -> value.toInt()
+            else -> defaultValue
         }
     }
 
     private fun handleLogging(context: Context, data: Bundle) {
-        val fromUid = data["from.uid"].toInt() ?: return
-        if (fromUid == Process.myUid())
-            return
+        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>()
         GlobalScope.launch {
-            logRepo.insert(log)
+            ServiceLocator.logRepo.insert(log)
         }
     }
 
     private fun handleNotify(context: Context, data: Bundle) {
-        val fromUid = data["from.uid"].toInt() ?: return
-        if (fromUid == Process.myUid())
-            return
+        val fromUid = data.getIntComp("from.uid", -1)
+        val allow = data.getIntComp("policy", SuPolicy.ALLOW)
 
         val pm = context.packageManager
-        val allow = data["policy"].toInt() ?: return
 
-        runCatching {
-            val policy = fromUid.toPolicy(pm, allow)
-            if (policy.policy >= 0)
-                notify(context, policy)
+
+        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 (policy.notification && Config.suNotification == Config.Value.NOTIFICATION_TOAST) {
+        if (Config.suNotification == Config.Value.NOTIFICATION_TOAST) {
             val resId = if (policy.policy == SuPolicy.ALLOW)
                 R.string.su_allow_toast
             else

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

@@ -2,21 +2,23 @@ package com.topjohnwu.magisk.core.su
 
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.net.LocalSocket
-import android.net.LocalSocketAddress
-import androidx.collection.ArrayMap
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.magiskdb.PolicyDao
 import com.topjohnwu.magisk.core.model.su.SuPolicy
 import com.topjohnwu.magisk.core.model.su.toPolicy
 import com.topjohnwu.magisk.ktx.now
-import kotlinx.coroutines.*
+import 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.*
+import java.io.Closeable
+import java.io.DataOutputStream
+import java.io.FileOutputStream
+import java.io.IOException
 import java.util.concurrent.TimeUnit
-import java.util.concurrent.TimeUnit.SECONDS
 
 class SuRequestHandler(
     private val pm: PackageManager,
@@ -33,8 +35,10 @@ class SuRequestHandler(
             return false
 
         // Never allow com.topjohnwu.magisk (could be malware)
-        if (policy.packageName == BuildConfig.APPLICATION_ID)
+        if (policy.packageName == BuildConfig.APPLICATION_ID) {
+            Shell.cmd("(pm uninstall ${BuildConfig.APPLICATION_ID})& >/dev/null 2>&1").exec()
             return false
+        }
 
         when (Config.suAutoResponse) {
             Config.Value.SU_AUTO_DENY -> {
@@ -50,12 +54,6 @@ class SuRequestHandler(
         return true
     }
 
-    private suspend fun <T> Deferred<T>.timedAwait() : T? {
-        return withTimeoutOrNull(SECONDS.toMillis(1)) {
-            await()
-        }
-    }
-
     @Throws(IOException::class)
     override fun close() {
         if (::output.isInitialized)
@@ -66,20 +64,9 @@ class SuRequestHandler(
 
     private suspend fun init(intent: Intent) = withContext(Dispatchers.IO) {
         try {
-            val uid: Int
-            if (Const.Version.atLeast_21_0()) {
-                val name = intent.getStringExtra("fifo") ?: throw SuRequestError()
-                uid = intent.getIntExtra("uid", -1).also { if (it < 0) throw SuRequestError() }
-                output = DataOutputStream(FileOutputStream(name).buffered())
-            } else {
-                val name = intent.getStringExtra("socket") ?: throw SuRequestError()
-                val socket = LocalSocket()
-                socket.connect(LocalSocketAddress(name, LocalSocketAddress.Namespace.ABSTRACT))
-                output = DataOutputStream(BufferedOutputStream(socket.outputStream))
-                val input = DataInputStream(BufferedInputStream(socket.inputStream))
-                val map = async { input.readRequest() }.timedAwait() ?: throw SuRequestError()
-                uid = map["uid"]?.toIntOrNull() ?: throw SuRequestError()
-            }
+            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) {
@@ -102,7 +89,6 @@ class SuRequestHandler(
 
         policy.policy = action
         policy.until = until
-        policy.uid = policy.uid % 100000 + Const.USER_ID * 100000
 
         GlobalScope.launch(Dispatchers.IO) {
             try {
@@ -117,23 +103,4 @@ class SuRequestHandler(
             }
         }
     }
-
-    @Throws(IOException::class)
-    private fun DataInputStream.readRequest(): Map<String, String> {
-        fun readString(): String {
-            val len = readInt()
-            val buf = ByteArray(len)
-            readFully(buf)
-            return String(buf, Charsets.UTF_8)
-        }
-        val ret = ArrayMap<String, String>()
-        while (true) {
-            val name = readString()
-            if (name == "eof")
-                break
-            ret[name] = readString()
-        }
-        return ret
-    }
-
 }

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

@@ -1,19 +1,16 @@
 package com.topjohnwu.magisk.core.tasks
 
-import android.content.Context
 import android.net.Uri
-import androidx.core.os.postDelayed
+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.unzip
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
+import com.topjohnwu.magisk.core.utils.unzip
+import com.topjohnwu.magisk.di.AppContext
 import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.superuser.Shell
-import com.topjohnwu.superuser.internal.UiThreadHandler
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.koin.core.KoinComponent
-import org.koin.core.inject
 import timber.log.Timber
 import java.io.File
 import java.io.FileNotFoundException
@@ -23,63 +20,51 @@ open class FlashZip(
     private val mUri: Uri,
     private val console: MutableList<String>,
     private val logs: MutableList<String>
-): KoinComponent {
+) {
 
-    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 {
-            mUri.inputStream().writeTo(tmpFile)
-        }.getOrElse {
-            when (it) {
-                is FileNotFoundException -> console.add("! Invalid Uri")
-                is IOException -> console.add("! Cannot copy to cache")
+        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
+                }
             }
-            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.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.cmd("sh $installDir/update-binary dummy 1 \'$zipFile\'")
+            .to(console, logs).exec().isSuccess
     }
 
     open suspend fun exec() = withContext(Dispatchers.IO) {
@@ -94,25 +79,7 @@ open class FlashZip(
             Timber.e(e)
             false
         } finally {
-            Shell.su("cd /", "rm -rf ${tmpFile.parent} ${Const.TMP_FOLDER_PATH}").submit()
+            Shell.cmd("cd /", "rm -rf $installDir ${Const.TMPDIR}").submit()
         }
     }
-
-    class Uninstall(
-        uri: Uri,
-        console: MutableList<String>,
-        log: MutableList<String>
-    ) : FlashZip(uri, console, log) {
-
-        override suspend fun exec(): Boolean {
-            val success = super.exec()
-            if (success) {
-                UiThreadHandler.handler.postDelayed(3000) {
-                    Shell.su("pm uninstall " + context.packageName).exec()
-                }
-            }
-            return success
-        }
-    }
-
 }

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

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

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

@@ -1,27 +1,23 @@
 package com.topjohnwu.magisk.core.tasks
 
-import android.content.Context
-import android.content.Intent
 import android.net.Uri
-import android.os.Build
+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.R
-import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.StubApk
+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.data.repository.NetworkService
-import com.topjohnwu.magisk.di.Protected
-import com.topjohnwu.magisk.events.dialog.EnvFixDialog
+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.signing.SignBoot
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils
 import com.topjohnwu.superuser.internal.NOPList
@@ -36,157 +32,176 @@ import org.kamranzafar.jtar.TarEntry
 import org.kamranzafar.jtar.TarHeader
 import org.kamranzafar.jtar.TarInputStream
 import org.kamranzafar.jtar.TarOutputStream
-import org.koin.core.KoinComponent
-import org.koin.core.get
-import org.koin.core.inject
 import timber.log.Timber
 import java.io.*
 import java.nio.ByteBuffer
 import java.security.SecureRandom
 import java.util.*
 import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
+import java.util.zip.ZipFile
 
-abstract class MagiskInstallImpl : KoinComponent {
+abstract class MagiskInstallImpl protected constructor(
+    protected val console: MutableList<String> = NOPList.getInstance(),
+    private val logs: MutableList<String> = NOPList.getInstance()
+) {
 
-    protected lateinit var installDir: File
-    private lateinit var srcBoot: String
-    private lateinit var zipUri: Uri
+    protected var installDir = File("xxx")
+    private lateinit var srcBoot: File
 
-    protected val console: MutableList<String>
-    private val logs: MutableList<String>
-    private var tarOut: TarOutputStream? = null
-
-    private val service: NetworkService by inject()
-    protected val context: Context by inject()
-
-    protected constructor() {
-        console = NOPList.getInstance()
-        logs = NOPList.getInstance()
-    }
-
-    protected constructor(zip: Uri, out: MutableList<String>, err: MutableList<String>) {
-        console = out
-        logs = err
-        zipUri = zip
-        installDir = File(get<Context>(Protected).filesDir.parent, "install")
-        "rm -rf $installDir".sh()
-        installDir.mkdirs()
-    }
+    private 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 {
-        srcBoot = "find_boot_image; echo \"\$BOOTIMAGE\"".fsh()
-        if (srcBoot.isEmpty()) {
+        val bootPath = "find_boot_image; echo \"\$BOOTIMAGE\"".fsh()
+        if (bootPath.isEmpty()) {
             console.add("! Unable to detect target image")
             return false
         }
-        console.add("- Target image: $srcBoot")
+        srcBoot = SuFile(bootPath)
+        console.add("- Target image: $bootPath")
         return true
     }
 
-    private fun findSecondaryImage(): Boolean {
+    private fun findSecondary(): Boolean {
         val slot = "echo \$SLOT".fsh()
         val target = if (slot == "_a") "_b" else "_a"
         console.add("- Target slot: $target")
-        srcBoot = arrayOf(
+        val bootPath = arrayOf(
             "SLOT=$target",
             "find_boot_image",
             "SLOT=$slot",
             "echo \"\$BOOTIMAGE\"").fsh()
-        if (srcBoot.isEmpty()) {
+        if (bootPath.isEmpty()) {
             console.add("! Unable to detect target image")
             return false
         }
-        console.add("- Target image: $srcBoot")
+        srcBoot = SuFile(bootPath)
+        console.add("- Target image: $bootPath")
         return true
     }
 
-    @Suppress("DEPRECATION")
-    private fun extractZip(): Boolean {
-        val arch = if (Build.VERSION.SDK_INT >= 21) {
-            val abis = listOf(*Build.SUPPORTED_ABIS)
-            if (abis.contains("x86")) "x86" else "arm"
-        } else {
-            if (Build.CPU_ABI == "x86") "x86" else "arm"
-        }
+    private fun extractFiles(): Boolean {
+        console.add("- Device platform: ${Const.CPU_ABI}")
+        console.add("- Installing: ${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
 
-        console.add("- Device platform: " + Build.CPU_ABI)
-        console.add("- Magisk Manager: ${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
-        console.add("- Install target: ${Info.remote.magisk.version} (${Info.remote.magisk.versionCode})")
+        installDir = File(context.filesDir.parent, "install")
+        installDir.deleteRecursively()
+        installDir.mkdirs()
 
         try {
-            ZipInputStream(zipUri.inputStream().buffered()).use { zi ->
-                lateinit var ze: ZipEntry
-                while (zi.nextEntry?.let { ze = it } != null) {
-                    if (ze.isDirectory)
-                        continue
-                    var name: String? = null
-                    val names = arrayOf("$arch/", "common/", "META-INF/com/google/android/update-binary")
-                    for (n in names) {
-                        ze.name.run {
-                            if (startsWith(n)) {
-                                name = substring(lastIndexOf('/') + 1)
-                            }
-                        }
-                        name ?: continue
-                        break
-                    }
-                    if (name == null && ze.name.startsWith("chromeos/"))
-                        name = ze.name
-                    name?.also {
-                        val dest = if (installDir is SuFile)
-                            SuFile(installDir, it)
-                        else
-                            File(installDir, it)
-                        dest.parentFile!!.mkdirs()
-                        SuFileOutputStream(dest).use { s -> zi.copyTo(s) }
-                    } ?: continue
+            // Extract binaries
+            if (isRunningAsStub) {
+                val zf = ZipFile(StubApk.current(context))
+
+                // Also extract magisk32 on non 64-bit only 64-bit devices
+                val is32lib = Const.CPU_ABI_32?.let {
+                    { entry: ZipEntry -> entry.name == "lib/$it/libmagisk32.so" }
+                } ?: { false }
+
+                zf.entries().asSequence().filter {
+                    !it.isDirectory && (it.name.startsWith("lib/${Const.CPU_ABI}/") || is32lib(it))
+                }.forEach {
+                    val n = it.name.substring(it.name.lastIndexOf('/') + 1)
+                    val name = n.substring(3, n.length - 3)
+                    val dest = File(installDir, name)
+                    zf.getInputStream(it).writeTo(dest)
+                }
+            } else {
+                val info = context.applicationInfo
+                var libs = File(info.nativeLibraryDir).listFiles { _, name ->
+                    name.startsWith("lib") && name.endsWith(".so")
+                } ?: emptyArray()
+
+                // Also symlink magisk32 on non 64-bit only 64-bit devices
+                val lib32 = info.javaClass.getDeclaredField("secondaryNativeLibraryDir").get(info) as String?
+                if (lib32 != null) {
+                    libs += File(lib32, "libmagisk32.so")
+                }
+
+                for (lib in libs) {
+                    val name = lib.name.substring(3, lib.name.length - 3)
+                    Os.symlink(lib.path, "$installDir/$name")
                 }
             }
-        } catch (e: IOException) {
-            console.add("! Cannot unzip zip")
+
+            // 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
         }
 
-        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()
+        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
+            }
         }
-        "cd $installDir; chmod 755 *".sh()
+
         return true
     }
 
-    private fun newEntry(name: String, size: Long): TarEntry {
+    // 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 handleTar(input: InputStream, output: OutputStream): OutputStream {
+    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() =
-                if (entry.name.contains(".lz4")) LZ4FrameInputStream(tarIn) else tarIn
+            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.contains("boot.img") ||
+                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 = File(installDir, name)
-                    FileOutputStream(extract).use { decompressedStream().copyTo(it) }
+                    val extract = installDirFile(name)
+                    decompressedStream().cleanPump(SuFileOutputStream.open(extract))
                 } else if (entry.name.contains("vbmeta.img")) {
-                    val rawData = ByteArrayOutputStream().let {
-                        decompressedStream().copyTo(it)
-                        it.toByteArray()
-                    }
+                    val rawData = decompressedStream().readBytes()
                     // Valid vbmeta.img should be at least 256 bytes
                     if (rawData.size < 256)
                         continue
@@ -195,7 +210,7 @@ abstract class MagiskInstallImpl : KoinComponent {
                     // AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED
                     console.add("-- Patching: vbmeta.img")
                     ByteBuffer.wrap(rawData).putInt(120, 3)
-                    tarOut.putNextEntry(newEntry("vbmeta.img", rawData.size.toLong()))
+                    tarOut.putNextEntry(newTarEntry("vbmeta.img", rawData.size.toLong()))
                     tarOut.write(rawData)
                 } else {
                     console.add("-- Copying: ${entry.name}")
@@ -203,29 +218,33 @@ abstract class MagiskInstallImpl : KoinComponent {
                     tarIn.copyTo(tarOut, bufferSize = 1024 * 1024)
                 }
             }
-            val boot = SuFile.open(installDir, "boot.img")
-            val recovery = SuFile.open(installDir, "recovery.img")
-            if (Config.recovery && recovery.exists() && boot.exists()) {
-                // Install Magisk to recovery
-                srcBoot = recovery.path
-                // Repack boot image to prevent restore
-                arrayOf(
-                    "./magiskboot unpack boot.img",
-                    "./magiskboot repack boot.img",
-                    "./magiskboot cleanup",
-                    "mv new-boot.img boot.img").sh()
-                SuFileInputStream(boot).use {
-                    tarOut.putNextEntry(newEntry("boot.img", boot.length()))
-                    it.copyTo(tarOut)
-                }
-                boot.delete()
-            } else {
-                if (!boot.exists()) {
-                    console.add("! No boot image found")
-                    throw IOException()
-                }
-                srcBoot = boot.path
+        }
+        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
     }
@@ -246,22 +265,24 @@ abstract class MagiskInstallImpl : KoinComponent {
                 src.reset()
 
                 val alpha = "abcdefghijklmnopqrstuvwxyz"
-                val alphaNum = "$alpha${alpha.toUpperCase(Locale.ROOT)}0123456789"
+                val alphaNum = "$alpha${alpha.uppercase(Locale.ROOT)}0123456789"
                 val random = SecureRandom()
-                val suffix = StringBuilder()
-                for (i in 1..5) {
-                    suffix.append(alphaNum[random.nextInt(alphaNum.length)])
+                val filename = StringBuilder("magisk_patched-${BuildConfig.VERSION_CODE}_").run {
+                    for (i in 1..5) {
+                        append(alphaNum[random.nextInt(alphaNum.length)])
+                    }
+                    toString()
                 }
 
-                val filename = "magisk_patched_$suffix"
                 outStream = if (magic.contentEquals("ustar".toByteArray())) {
+                    // tar file
                     outFile = MediaStoreUtils.getFile("$filename.tar", true)
-                    handleTar(src, outFile!!.uri.outputStream())
+                    processTar(src, outFile!!.uri.outputStream())
                 } else {
-                    // Raw image
-                    srcBoot = File(installDir, "boot.img").path
+                    // raw image
+                    srcBoot = installDirFile("boot.img")
                     console.add("- Copying image to cache")
-                    FileOutputStream(srcBoot).use { src.copyTo(it) }
+                    src.cleanPump(SuFileOutputStream.open(srcBoot))
                     outFile = MediaStoreUtils.getFile("$filename.img", true)
                     outFile!!.uri.outputStream()
                 }
@@ -281,13 +302,13 @@ abstract class MagiskInstallImpl : KoinComponent {
 
         // Output file
         try {
-            val patched = SuFile.open(installDir, "new-boot.img")
+            val newBoot = installDirFile("new-boot.img")
             if (outStream is TarOutputStream) {
-                val name = if (srcBoot.contains("recovery")) "recovery.img" else "boot.img"
-                outStream.putNextEntry(newEntry(name, patched.length()))
+                val name = if (srcBoot.path.contains("recovery")) "recovery.img" else "boot.img"
+                outStream.putNextEntry(newTarEntry(name, newBoot.length()))
             }
-            withStreams(SuFileInputStream(patched), outStream) { src, out -> src.copyTo(out) }
-            patched.delete()
+            SuFileInputStream.open(newBoot).cleanPump(outStream)
+            newBoot.delete()
 
             console.add("")
             console.add("****************************")
@@ -301,183 +322,201 @@ abstract class MagiskInstallImpl : KoinComponent {
             return false
         }
 
+        // Fix up binaries
+        srcBoot.delete()
+        "cp_readlink $installDir".sh()
+
         return true
     }
 
     private fun patchBoot(): Boolean {
-        var srcNand = ""
-        if ("[ -c $srcBoot ] && nanddump -f boot.img $srcBoot".sh().isSuccess) {
-            srcNand = srcBoot
-            srcBoot = File(installDir, "boot.img").path
-        }
-
-        var isSigned: Boolean
-        try {
-            SuFileInputStream(srcBoot).use {
-                isSigned = SignBoot.verifySignature(it, null)
-                if (isSigned) {
-                    console.add("- Boot image is signed with AVB 1.0")
+        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
             }
-        } catch (e: IOException) {
-            console.add("! Unable to check signature")
+        }
+
+        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
-        }
 
-        if (!("KEEPFORCEENCRYPT=${Config.keepEnc} KEEPVERITY=${Config.keepVerity} " +
-                "RECOVERYMODE=${Config.recovery} sh update-binary " +
-                "sh boot_patch.sh $srcBoot").sh().isSuccess) {
-            return false
-        }
+        val job = shell.newJob().add("./magiskboot cleanup", "cd /")
 
-        if (srcNand.isNotEmpty()) {
-            srcBoot = srcNand
-        }
-
-        val job = Shell.sh(
-            "./magiskboot cleanup",
-            "mv bin/busybox busybox",
-            "rm -rf magisk.apk bin boot.img update-binary",
-            "cd /")
-
-        val patched = File(installDir, "new-boot.img")
         if (isSigned) {
             console.add("- Signing boot image with verity keys")
-            val signed = File(installDir, "signed.img")
+            val signed = File.createTempFile("signed", ".img", context.cacheDir)
             try {
-                withStreams(SuFileInputStream(patched), signed.outputStream().buffered()) {
-                    input, out -> SignBoot.doSignature(null, null, input, out, "/boot")
+                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("mv -f $signed $patched")
+            job.add("cat $signed > $newBoot", "rm -f $signed")
         }
         job.exec()
         return true
     }
 
-    private fun copySepolicyRules(): Boolean {
-        if (Info.remote.magisk.versionCode >= 21100) return true
-        // Copy existing rules for migration
-        "copy_sepolicy_rules".sh()
-        return true
-    }
+    private fun flashBoot() = "direct_install $installDir $srcBoot".sh().isSuccess
 
-    private fun flashBoot(): Boolean {
-        if (!"direct_install $installDir $srcBoot".sh().isSuccess)
-            return false
-        "run_migrations".sh()
-        return true
-    }
-
-    private suspend fun postOTA(): Boolean {
-        val bootctl = SuFile("/data/adb/bootctl")
+    private fun postOTA(): Boolean {
         try {
-            withStreams(service.fetchBootctl().byteStream(), SuFileOutputStream(bootctl)) {
-                it, out -> it.copyTo(out)
-            }
+            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
         }
 
-        "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)
+    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) = extractZip() && handleFile(patchFile)
+    protected fun doPatchFile(patchFile: Uri) = extractFiles() && handleFile(patchFile)
 
-    protected fun direct() = findImage() && extractZip() && patchBoot() &&
-        copySepolicyRules() && flashBoot()
+    protected fun direct() = findImage() && extractFiles() && patchBoot() && flashBoot()
 
-    protected suspend fun secondSlot() = findSecondaryImage() && extractZip() &&
-        patchBoot() && copySepolicyRules() && flashBoot() && postOTA()
+    protected suspend fun secondSlot() =
+        findSecondary() && extractFiles() && patchBoot() && flashBoot() && postOTA()
 
-    protected fun fixEnv(zip: Uri): Boolean {
-        installDir = SuFile("/data/adb/magisk")
-        Shell.su("rm -rf /data/adb/magisk/*").exec()
-        zipUri = zip
-        return extractZip() && Shell.su("fix_env").exec().isSuccess
-    }
+    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() = withContext(Dispatchers.IO) { operations() }
+    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
+    }
 }
 
-sealed class MagiskInstaller(
-    file: Uri,
+abstract class MagiskInstaller(
     console: MutableList<String>,
     logs: MutableList<String>
-) : MagiskInstallImpl(file, console, logs) {
+) : 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()
+            Shell.cmd("rm -rf $installDir").submit()
             console.add("! Installation failed")
         }
         return success
     }
 
     class Patch(
-        file: Uri,
         private val uri: Uri,
         console: MutableList<String>,
         logs: MutableList<String>
-    ) : MagiskInstaller(file, console, logs) {
+    ) : MagiskInstaller(console, logs) {
         override suspend fun operations() = doPatchFile(uri)
     }
 
     class SecondSlot(
-        file: Uri,
         console: MutableList<String>,
         logs: MutableList<String>
-    ) : MagiskInstaller(file, console, logs) {
+    ) : MagiskInstaller(console, logs) {
         override suspend fun operations() = secondSlot()
     }
 
     class Direct(
-        file: Uri,
         console: MutableList<String>,
         logs: MutableList<String>
-    ) : MagiskInstaller(file, console, logs) {
+    ) : 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: Uri
-) : MagiskInstallImpl() {
-    override suspend fun operations() = fixEnv(zip)
+    class Uninstall(
+        console: MutableList<String>,
+        logs: MutableList<String>
+    ) : MagiskInstallImpl(console, logs) {
+        override suspend fun operations() = uninstall()
 
-    override suspend fun exec(): Boolean {
-        val success = super.exec()
-        LocalBroadcastManager.getInstance(context).sendBroadcast(Intent(EnvFixDialog.DISMISS))
-        Utils.toast(
-            if (success) R.string.reboot_delay_toast else R.string.setup_fail,
-            Toast.LENGTH_LONG
-        )
-        if (success)
-            UiThreadHandler.handler.postDelayed(5000) { reboot() }
-        return success
+        override suspend fun exec(): Boolean {
+            val success = super.exec()
+            if (success) {
+                UiThreadHandler.handler.postDelayed(3000) {
+                    Shell.cmd("pm uninstall ${context.packageName}").exec()
+                }
+            }
+            return success
+        }
+    }
+
+    class FixEnv(private val callback: () -> Unit) : MagiskInstallImpl() {
+        override suspend fun operations() = fixEnv()
+
+        override suspend fun exec(): Boolean {
+            val success = super.exec()
+            callback()
+            Utils.toast(
+                if (success) R.string.reboot_delay_toast else R.string.setup_fail,
+                Toast.LENGTH_LONG
+            )
+            if (success)
+                UiThreadHandler.handler.postDelayed(5000) { reboot() }
+            return success
+        }
     }
 }

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

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

app/src/main/java/com/topjohnwu/magisk/core/utils/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

@@ -1,13 +1,19 @@
 package com.topjohnwu.magisk.core.utils
 
 import kotlinx.coroutines.*
-import java.util.concurrent.*
+import java.util.concurrent.AbstractExecutorService
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
 
-class IODispatcherExecutor : AbstractExecutorService() {
+class DispatcherExecutor(dispatcher: CoroutineDispatcher) : AbstractExecutorService() {
 
-    private val job = SupervisorJob().apply { invokeOnCompletion { future.run() } }
-    private val scope = CoroutineScope(job + Dispatchers.IO)
-    private val future = FutureTask(Callable { true })
+    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 {
@@ -26,11 +32,5 @@ class IODispatcherExecutor : AbstractExecutorService() {
 
     override fun isTerminated() = job.isCancelled && job.isCompleted
 
-    override fun awaitTermination(timeout: Long, unit: TimeUnit): Boolean {
-        return try {
-            future.get(timeout, unit)
-        } catch (e: TimeoutException) {
-            false
-        }
-    }
+    override fun awaitTermination(timeout: Long, unit: TimeUnit) = latch.await(timeout, unit)
 }

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

@@ -5,9 +5,9 @@ import android.content.pm.PackageManager
 import android.util.Base64
 import android.util.Base64OutputStream
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.signing.CryptoUtils.readCertificate
-import com.topjohnwu.signing.CryptoUtils.readPrivateKey
-import com.topjohnwu.signing.KeyData
+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
@@ -41,7 +41,7 @@ class Keygen(context: Context) : CertKeyProvider {
     }
 
     private val start = Calendar.getInstance().apply { add(Calendar.MONTH, -3) }
-    private val end = start.apply { add(Calendar.YEAR, 30) }
+    private val end = (start.clone() as Calendar).apply { add(Calendar.YEAR, 30) }
 
     override val cert get() = provider.cert
     override val key get() = provider.key

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

@@ -3,20 +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.ktx.langTagToLocale
-import com.topjohnwu.magisk.ktx.toLangTag
+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()
@@ -30,11 +25,8 @@ 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
@@ -45,19 +37,17 @@ withContext(Dispatchers.Default) {
         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)
 
     val names = ArrayList<String>(locales.size + 1)
@@ -68,23 +58,30 @@ withContext(Dispatchers.Default) {
 
     locales.forEach { locale ->
         names.add(locale.getDisplayName(locale))
-        values.add(locale.toLangTag())
+        values.add(locale.toLanguageTag())
     }
 
     (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

@@ -1,9 +1,7 @@
 package com.topjohnwu.magisk.core.utils
 
-import android.content.ContentResolver
 import android.content.ContentUris
 import android.content.ContentValues
-import android.content.Context
 import android.net.Uri
 import android.os.Build
 import android.os.Environment
@@ -13,7 +11,7 @@ import androidx.annotation.RequiresApi
 import androidx.core.net.toFile
 import androidx.core.net.toUri
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.di.AppContext
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
@@ -24,7 +22,7 @@ import kotlin.experimental.and
 @Suppress("DEPRECATION")
 object MediaStoreUtils {
 
-    private val cr: ContentResolver by lazy { get<Context>().contentResolver }
+    private val cr get() = AppContext.contentResolver
 
     @get:RequiresApi(api = 29)
     private val tableUri

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

@@ -5,7 +5,7 @@ import java.io.InputStream
 
 class ProgressInputStream(
     base: InputStream,
-    val progressEmitter: (Long) -> Unit = {}
+    val progressEmitter: (Long) -> Unit
 ) : FilterInputStream(base) {
 
     private var bytesRead = 0L
@@ -40,4 +40,9 @@ class ProgressInputStream(
         }
         return sz
     }
+
+    override fun close() {
+        super.close()
+        progressEmitter(bytesRead)
+    }
 }

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

@@ -0,0 +1,34 @@
+package com.topjohnwu.magisk.core.utils
+
+import android.annotation.TargetApi
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.provider.Settings
+import androidx.activity.result.contract.ActivityResultContract
+
+class RequestInstall : ActivityResultContract<Unit, Boolean>() {
+
+    @TargetApi(26)
+    override fun createIntent(context: Context, input: Unit): Intent {
+        // This will only be called on API 26+
+        return Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES)
+            .setData(Uri.parse("package:${context.packageName}"))
+    }
+
+    override fun parseResult(resultCode: Int, intent: Intent?) =
+        resultCode == Activity.RESULT_OK
+
+    override fun getSynchronousResult(
+        context: Context,
+        input: Unit
+    ): SynchronousResult<Boolean>? {
+        if (Build.VERSION.SDK_INT < 26)
+            return SynchronousResult(true)
+        if (context.packageManager.canRequestPackageInstalls())
+            return SynchronousResult(true)
+        return null
+    }
+}

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

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

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

@@ -0,0 +1,54 @@
+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.Shell
+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) {
+        // Always log full stack trace with Timber
+        Timber.plant(Timber.DebugTree())
+        Thread.setDefaultUncaughtExceptionHandler { _, e ->
+            Timber.e(e)
+            exitProcess(1)
+        }
+    }
+
+    private val className: String? = stub?.javaClass?.name
+
+    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: Shell.Task? = null
+    }
+}

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.R
+import com.topjohnwu.magisk.StubApk
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.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?.let { shell.execTask(it) }
+            RootRegistry.bindTask = null
+        }
+        shell.newJob().apply {
+            add("export ASH_STANDALONE=1")
+
+            val localBB: File
+            if (isRunningAsStub) {
+                if (!shell.isRoot)
+                    return true
+                val jar = JarFile(StubApk.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 sh -c \"$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/UninstallPackage.kt

@@ -0,0 +1,21 @@
+package com.topjohnwu.magisk.core.utils
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.activity.result.contract.ActivityResultContract
+
+class 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 == Activity.RESULT_OK
+}

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

@@ -20,11 +20,10 @@ abstract class NetworkObserver(
 
     companion object {
         fun observe(context: Context, callback: ConnectionCallback): NetworkObserver {
-            return when (Build.VERSION.SDK_INT) {
-                in 23 until Int.MAX_VALUE -> MarshmallowNetworkObserver(context, callback)
-                in 21 until 23 -> LollipopNetworkObserver(context, callback)
-                else -> PreLollipopNetworkObserver(context, callback)
-            }.apply { getCurrentState() }
+            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/utils/net/PreLollipopNetworkObserver.kt

@@ -1,38 +0,0 @@
-@file:Suppress("DEPRECATION")
-
-package com.topjohnwu.magisk.core.utils.net
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.net.ConnectivityManager
-import androidx.core.net.ConnectivityManagerCompat
-
-class PreLollipopNetworkObserver(
-    context: Context,
-    callback: ConnectionCallback
-): NetworkObserver(context, callback) {
-
-    private val receiver = ConnectivityBroadcastReceiver()
-
-    init {
-        val filter = IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION)
-        app.registerReceiver(receiver, filter)
-    }
-
-    override fun stopObserving() {
-        app.unregisterReceiver(receiver)
-    }
-
-    override fun getCurrentState() {
-        callback(manager.activeNetworkInfo?.isConnected ?: false)
-    }
-
-    private inner class ConnectivityBroadcastReceiver: BroadcastReceiver() {
-        override fun onReceive(context: Context?, intent: Intent) {
-            val info = ConnectivityManagerCompat.getNetworkInfoFromBroadcast(manager, intent)
-            callback(info?.isConnected ?: false)
-        }
-    }
-}

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

@@ -1,90 +0,0 @@
-package com.topjohnwu.magisk.data.database
-
-import androidx.room.*
-import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.model.module.OnlineModule
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-@Database(version = 8, entities = [OnlineModule::class], exportSchema = false)
-abstract class RepoDatabase : RoomDatabase() {
-    abstract fun repoDao() : RepoDao
-}
-
-@Dao
-abstract class RepoDao(private val db: RepoDatabase) {
-
-    suspend fun clear() = withContext(Dispatchers.IO) { db.clearAllTables() }
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    abstract fun addModule(repo: OnlineModule)
-
-    @Delete
-    abstract fun removeModule(repo: OnlineModule)
-
-    @Query("DELETE FROM modules WHERE id = :id")
-    abstract fun removeModule(id: String)
-
-    @Query("DELETE FROM modules WHERE id IN (:idList)")
-    abstract fun removeModules(idList: Collection<String>)
-
-    @Query("SELECT * FROM modules WHERE id = :id")
-    abstract fun getModule(id: String): OnlineModule?
-
-    @Query("SELECT id, last_update FROM modules")
-    abstract fun getModuleStubs(): List<ModuleStub>
-
-    fun getModules(offset: Int, limit: Int = LIMIT) = when (Config.repoOrder) {
-        Config.Value.ORDER_NAME -> getNameOrder(offset, limit)
-        else -> getDateOrder(offset, limit)
-    }
-
-    fun searchModules(query: String, offset: Int, limit: Int = LIMIT) = when (Config.repoOrder) {
-        Config.Value.ORDER_NAME -> searchNameOrder(query, offset, limit)
-        else -> searchDateOrder(query, offset, limit)
-    }
-
-    @Query("SELECT * FROM modules WHERE id = :id AND versionCode > :versionCode LIMIT 1")
-    abstract fun getUpdatableModule(id: String, versionCode: Int): OnlineModule?
-
-    @Query("SELECT * FROM modules ORDER BY last_update DESC LIMIT :limit OFFSET :offset")
-    protected abstract fun getDateOrder(offset: Int, limit: Int): List<OnlineModule>
-
-    @Query("SELECT * FROM modules ORDER BY name COLLATE NOCASE LIMIT :limit OFFSET :offset")
-    protected abstract fun getNameOrder(offset: Int, limit: Int): List<OnlineModule>
-
-    @Query(
-        """SELECT * 
-        FROM modules
-        WHERE 
-            (author LIKE '%' || :query || '%') ||
-            (name LIKE '%' || :query || '%') ||
-            (description LIKE '%' || :query || '%')
-        ORDER BY last_update DESC
-        LIMIT :limit 
-        OFFSET :offset"""
-    )
-    protected abstract fun searchDateOrder(query: String, offset: Int, limit: Int): List<OnlineModule>
-
-    @Query(
-        """SELECT * 
-        FROM modules
-        WHERE 
-            (author LIKE '%' || :query || '%') ||
-            (name LIKE '%' || :query || '%') ||
-            (description LIKE '%' || :query || '%')
-        ORDER BY name COLLATE NOCASE
-        LIMIT :limit 
-        OFFSET :offset"""
-    )
-    protected abstract fun searchNameOrder(query: String, offset: Int, limit: Int): List<OnlineModule>
-
-    companion object {
-        const val LIMIT = 10
-    }
-}
-
-data class ModuleStub(
-    @PrimaryKey val id: String,
-    val last_update: Long
-)

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

@@ -1,44 +1,19 @@
 package com.topjohnwu.magisk.data.network
 
-import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.model.BranchInfo
-import com.topjohnwu.magisk.core.model.RepoJson
+import com.topjohnwu.magisk.core.model.ModuleJson
 import com.topjohnwu.magisk.core.model.UpdateInfo
 import okhttp3.ResponseBody
 import retrofit2.http.*
 
-private const val REVISION = "revision"
 private const val BRANCH = "branch"
 private const val REPO = "repo"
-
-const val MAGISK_FILES = "topjohnwu/magisk_files"
-const val MAGISK_MAIN = "topjohnwu/Magisk"
+private const val FILE = "file"
 
 interface GithubPageServices {
 
-    @GET("stable.json")
-    suspend fun fetchStableUpdate(): UpdateInfo
-
-    @GET("beta.json")
-    suspend fun fetchBetaUpdate(): UpdateInfo
-}
-
-interface JSDelivrServices {
-
-    @GET("$MAGISK_FILES@{$REVISION}/snet")
-    @Streaming
-    suspend fun fetchSafetynet(@Path(REVISION) revision: String = Const.SNET_REVISION): ResponseBody
-
-    @GET("$MAGISK_FILES@{$REVISION}/bootctl")
-    @Streaming
-    suspend fun fetchBootctl(@Path(REVISION) revision: String = Const.BOOTCTL_REVISION): ResponseBody
-
-    @GET("$MAGISK_FILES@{$REVISION}/canary.json")
-    suspend fun fetchCanaryUpdate(@Path(REVISION) revision: String): UpdateInfo
-
-    @GET("$MAGISK_MAIN@{$REVISION}/scripts/module_installer.sh")
-    @Streaming
-    suspend fun fetchInstaller(@Path(REVISION) revision: String): ResponseBody
+    @GET("{$FILE}")
+    suspend fun fetchUpdateJSON(@Path(FILE) file: String): UpdateInfo
 }
 
 interface RawServices {
@@ -46,9 +21,6 @@ interface RawServices {
     @GET
     suspend fun fetchCustomUpdate(@Url url: String): UpdateInfo
 
-    @GET
-    suspend fun fetchRepoInfo(@Url url: String): RepoJson
-
     @GET
     @Streaming
     suspend fun fetchFile(@Url url: String): ResponseBody
@@ -56,6 +28,9 @@ interface RawServices {
     @GET
     suspend fun fetchString(@Url url: String): String
 
+    @GET
+    suspend fun fetchModuleJson(@Url url: String): ModuleJson
+
 }
 
 interface GithubApiServices {
@@ -67,4 +42,3 @@ interface GithubApiServices {
         @Path(BRANCH) branch: String
     ): BranchInfo
 }
-

app/src/main/java/com/topjohnwu/magisk/data/preference/BooleanProperty.kt

@@ -1,30 +0,0 @@
-package com.topjohnwu.magisk.data.preference
-
-import androidx.core.content.edit
-import com.topjohnwu.magisk.ktx.trimEmptyToNull
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
-
-class BooleanProperty(
-    private val name: String,
-    private val default: Boolean,
-    private val commit: Boolean
-) : Property(), ReadWriteProperty<PreferenceModel, Boolean> {
-
-    override operator fun getValue(
-        thisRef: PreferenceModel,
-        property: KProperty<*>
-    ): Boolean {
-        val prefName = name.trimEmptyToNull() ?: property.name
-        return thisRef.prefs.get(prefName, default)
-    }
-
-    override operator fun setValue(
-        thisRef: PreferenceModel,
-        property: KProperty<*>,
-        value: Boolean
-    ) {
-        val prefName = name.trimEmptyToNull() ?: property.name
-        thisRef.prefs.edit(commit) { put(prefName, value) }
-    }
-}

app/src/main/java/com/topjohnwu/magisk/data/preference/FloatProperty.kt

@@ -1,30 +0,0 @@
-package com.topjohnwu.magisk.data.preference
-
-import androidx.core.content.edit
-import com.topjohnwu.magisk.ktx.trimEmptyToNull
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
-
-class FloatProperty(
-    private val name: String,
-    private val default: Float,
-    private val commit: Boolean
-) : Property(), ReadWriteProperty<PreferenceModel, Float> {
-
-    override operator fun getValue(
-        thisRef: PreferenceModel,
-        property: KProperty<*>
-    ): Float {
-        val prefName = name.trimEmptyToNull() ?: property.name
-        return thisRef.prefs.get(prefName, default)
-    }
-
-    override operator fun setValue(
-        thisRef: PreferenceModel,
-        property: KProperty<*>,
-        value: Float
-    ) {
-        val prefName = name.trimEmptyToNull() ?: property.name
-        thisRef.prefs.edit(commit) { put(prefName, value) }
-    }
-}

app/src/main/java/com/topjohnwu/magisk/data/preference/IntProperty.kt

@@ -1,30 +0,0 @@
-package com.topjohnwu.magisk.data.preference
-
-import androidx.core.content.edit
-import com.topjohnwu.magisk.ktx.trimEmptyToNull
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
-
-class IntProperty(
-    private val name: String,
-    private val default: Int,
-    private val commit: Boolean
-) : Property(), ReadWriteProperty<PreferenceModel, Int> {
-
-    override operator fun getValue(
-        thisRef: PreferenceModel,
-        property: KProperty<*>
-    ): Int {
-        val prefName = name.trimEmptyToNull() ?: property.name
-        return thisRef.prefs.get(prefName, default)
-    }
-
-    override operator fun setValue(
-        thisRef: PreferenceModel,
-        property: KProperty<*>,
-        value: Int
-    ) {
-        val prefName = name.trimEmptyToNull() ?: property.name
-        thisRef.prefs.edit(commit) { put(prefName, value) }
-    }
-}

app/src/main/java/com/topjohnwu/magisk/data/preference/LongProperty.kt

@@ -1,30 +0,0 @@
-package com.topjohnwu.magisk.data.preference
-
-import androidx.core.content.edit
-import com.topjohnwu.magisk.ktx.trimEmptyToNull
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
-
-class LongProperty(
-    private val name: String,
-    private val default: Long,
-    private val commit: Boolean
-) : Property(), ReadWriteProperty<PreferenceModel, Long> {
-
-    override operator fun getValue(
-        thisRef: PreferenceModel,
-        property: KProperty<*>
-    ): Long {
-        val prefName = name.trimEmptyToNull() ?: property.name
-        return thisRef.prefs.get(prefName, default)
-    }
-
-    override operator fun setValue(
-        thisRef: PreferenceModel,
-        property: KProperty<*>,
-        value: Long
-    ) {
-        val prefName = name.trimEmptyToNull() ?: property.name
-        thisRef.prefs.edit(commit) { put(prefName, value) }
-    }
-}

app/src/main/java/com/topjohnwu/magisk/data/preference/Property.kt

@@ -1,6 +1,9 @@
 package com.topjohnwu.magisk.data.preference
 
 import android.content.SharedPreferences
+import androidx.core.content.edit
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
 
 abstract class Property {
 
@@ -19,3 +22,147 @@ abstract class Property {
     fun SharedPreferences.get(name: String, value: Set<String>) = getStringSet(name, value) ?: value
 
 }
+
+class BooleanProperty(
+    private val name: String,
+    private val default: Boolean,
+    private val commit: Boolean
+) : Property(), ReadWriteProperty<PreferenceModel, Boolean> {
+
+    override operator fun getValue(
+        thisRef: PreferenceModel,
+        property: KProperty<*>
+    ): Boolean {
+        val prefName = name.ifBlank { property.name }
+        return thisRef.prefs.get(prefName, default)
+    }
+
+    override operator fun setValue(
+        thisRef: PreferenceModel,
+        property: KProperty<*>,
+        value: Boolean
+    ) {
+        val prefName = name.ifBlank { property.name }
+        thisRef.prefs.edit(commit) { put(prefName, value) }
+    }
+}
+
+class FloatProperty(
+    private val name: String,
+    private val default: Float,
+    private val commit: Boolean
+) : Property(), ReadWriteProperty<PreferenceModel, Float> {
+
+    override operator fun getValue(
+        thisRef: PreferenceModel,
+        property: KProperty<*>
+    ): Float {
+        val prefName = name.ifBlank { property.name }
+        return thisRef.prefs.get(prefName, default)
+    }
+
+    override operator fun setValue(
+        thisRef: PreferenceModel,
+        property: KProperty<*>,
+        value: Float
+    ) {
+        val prefName = name.ifBlank { property.name }
+        thisRef.prefs.edit(commit) { put(prefName, value) }
+    }
+}
+
+class IntProperty(
+    private val name: String,
+    private val default: Int,
+    private val commit: Boolean
+) : Property(), ReadWriteProperty<PreferenceModel, Int> {
+
+    override operator fun getValue(
+        thisRef: PreferenceModel,
+        property: KProperty<*>
+    ): Int {
+        val prefName = name.ifBlank { property.name }
+        return thisRef.prefs.get(prefName, default)
+    }
+
+    override operator fun setValue(
+        thisRef: PreferenceModel,
+        property: KProperty<*>,
+        value: Int
+    ) {
+        val prefName = name.ifBlank { property.name }
+        thisRef.prefs.edit(commit) { put(prefName, value) }
+    }
+}
+
+class LongProperty(
+    private val name: String,
+    private val default: Long,
+    private val commit: Boolean
+) : Property(), ReadWriteProperty<PreferenceModel, Long> {
+
+    override operator fun getValue(
+        thisRef: PreferenceModel,
+        property: KProperty<*>
+    ): Long {
+        val prefName = name.ifBlank { property.name }
+        return thisRef.prefs.get(prefName, default)
+    }
+
+    override operator fun setValue(
+        thisRef: PreferenceModel,
+        property: KProperty<*>,
+        value: Long
+    ) {
+        val prefName = name.ifBlank { property.name }
+        thisRef.prefs.edit(commit) { put(prefName, value) }
+    }
+}
+
+class StringProperty(
+    private val name: String,
+    private val default: String,
+    private val commit: Boolean
+) : Property(), ReadWriteProperty<PreferenceModel, String> {
+
+    override operator fun getValue(
+        thisRef: PreferenceModel,
+        property: KProperty<*>
+    ): String {
+        val prefName = name.ifBlank { property.name }
+        return thisRef.prefs.get(prefName, default)
+    }
+
+    override operator fun setValue(
+        thisRef: PreferenceModel,
+        property: KProperty<*>,
+        value: String
+    ) {
+        val prefName = name.ifBlank { property.name }
+        thisRef.prefs.edit(commit) { put(prefName, value) }
+    }
+}
+
+class StringSetProperty(
+    private val name: String,
+    private val default: Set<String>,
+    private val commit: Boolean
+) : Property(), ReadWriteProperty<PreferenceModel, Set<String>> {
+
+    override operator fun getValue(
+        thisRef: PreferenceModel,
+        property: KProperty<*>
+    ): Set<String> {
+        val prefName = name.ifBlank { property.name }
+        return thisRef.prefs.get(prefName, default)
+    }
+
+    override operator fun setValue(
+        thisRef: PreferenceModel,
+        property: KProperty<*>,
+        value: Set<String>
+    ) {
+        val prefName = name.ifBlank { property.name }
+        thisRef.prefs.edit(commit) { put(prefName, value) }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/data/preference/StringProperty.kt

@@ -1,30 +0,0 @@
-package com.topjohnwu.magisk.data.preference
-
-import androidx.core.content.edit
-import com.topjohnwu.magisk.ktx.trimEmptyToNull
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
-
-class StringProperty(
-    private val name: String,
-    private val default: String,
-    private val commit: Boolean
-) : Property(), ReadWriteProperty<PreferenceModel, String> {
-
-    override operator fun getValue(
-        thisRef: PreferenceModel,
-        property: KProperty<*>
-    ): String {
-        val prefName = name.trimEmptyToNull() ?: property.name
-        return thisRef.prefs.get(prefName, default)
-    }
-
-    override operator fun setValue(
-        thisRef: PreferenceModel,
-        property: KProperty<*>,
-        value: String
-    ) {
-        val prefName = name.trimEmptyToNull() ?: property.name
-        thisRef.prefs.edit(commit) { put(prefName, value) }
-    }
-}

app/src/main/java/com/topjohnwu/magisk/data/preference/StringSetProperty.kt

@@ -1,30 +0,0 @@
-package com.topjohnwu.magisk.data.preference
-
-import androidx.core.content.edit
-import com.topjohnwu.magisk.ktx.trimEmptyToNull
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
-
-class StringSetProperty(
-    private val name: String,
-    private val default: Set<String>,
-    private val commit: Boolean
-) : Property(), ReadWriteProperty<PreferenceModel, Set<String>> {
-
-    override operator fun getValue(
-        thisRef: PreferenceModel,
-        property: KProperty<*>
-    ): Set<String> {
-        val prefName = name.trimEmptyToNull() ?: property.name
-        return thisRef.prefs.get(prefName, default)
-    }
-
-    override operator fun setValue(
-        thisRef: PreferenceModel,
-        property: KProperty<*>,
-        value: Set<String>
-    ) {
-        val prefName = name.trimEmptyToNull() ?: property.name
-        thisRef.prefs.edit(commit) { put(prefName, value) }
-    }
-}

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

@@ -9,8 +9,8 @@ import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
 interface DBConfig {
-    val settingsDao: SettingsDao
-    val stringDao: StringDao
+    val settingsDB: SettingsDao
+    val stringDB: StringDao
 
     fun dbSettings(
         name: String,
@@ -35,14 +35,12 @@ class DBSettingsValue(
     private val default: Int
 ) : ReadWriteProperty<DBConfig, Int> {
 
-    private var value: Int? = null
+    var value: Int? = null
 
     @Synchronized
     override fun getValue(thisRef: DBConfig, property: KProperty<*>): Int {
         if (value == null)
-            value = runBlocking {
-                thisRef.settingsDao.fetch(name, default)
-            }
+            value = runBlocking { thisRef.settingsDB.fetch(name, default) }
         return value as Int
     }
 
@@ -51,12 +49,12 @@ class DBSettingsValue(
             this.value = value
         }
         GlobalScope.launch {
-            thisRef.settingsDao.put(name, value)
+            thisRef.settingsDB.put(name, value)
         }
     }
 }
 
-class DBBoolSettings(
+open class DBBoolSettings(
     name: String,
     default: Boolean
 ) : ReadWriteProperty<DBConfig, Boolean> {
@@ -70,6 +68,17 @@ class DBBoolSettings(
         base.setValue(thisRef, property, if (value) 1 else 0)
 }
 
+class DBBoolSettingsNoWrite(
+    name: String,
+    default: Boolean
+) : DBBoolSettings(name, default) {
+    override fun setValue(thisRef: DBConfig, property: KProperty<*>, value: Boolean) {
+        synchronized(base) {
+            base.value = if (value) 1 else 0
+        }
+    }
+}
+
 class DBStringsValue(
     private val name: String,
     private val default: String,
@@ -82,7 +91,7 @@ class DBStringsValue(
     override fun getValue(thisRef: DBConfig, property: KProperty<*>): String {
         if (value == null)
             value = runBlocking {
-                thisRef.stringDao.fetch(name, default)
+                thisRef.stringDB.fetch(name, default)
             }
         return value!!
     }
@@ -94,21 +103,21 @@ class DBStringsValue(
         if (value.isEmpty()) {
             if (sync) {
                 runBlocking {
-                    thisRef.stringDao.delete(name)
+                    thisRef.stringDB.delete(name)
                 }
             } else {
                 GlobalScope.launch {
-                    thisRef.stringDao.delete(name)
+                    thisRef.stringDB.delete(name)
                 }
             }
         } else {
             if (sync) {
                 runBlocking {
-                    thisRef.stringDao.put(name, value)
+                    thisRef.stringDB.put(name, value)
                 }
             } else {
                 GlobalScope.launch {
-                    thisRef.stringDao.put(name, value)
+                    thisRef.stringDB.put(name, value)
                 }
             }
         }

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

@@ -1,6 +1,7 @@
 package com.topjohnwu.magisk.data.repository
 
 import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.model.su.SuLog
 import com.topjohnwu.magisk.data.database.SuLogDao
 import com.topjohnwu.magisk.ktx.await
@@ -27,14 +28,18 @@ class LogRepository(
                 }
             }
         }
-        Shell.su("cat ${Const.MAGISK_LOG}").to(list).await()
+        if (Info.env.isActive) {
+            Shell.cmd("cat ${Const.MAGISK_LOG} || logcat -d -s Magisk").to(list).await()
+        } else {
+            Shell.cmd("logcat -d").to(list).await()
+        }
         return list.buf.toString()
     }
 
     suspend fun clearLogs() = logDao.deleteAll()
 
     fun clearMagiskLogs(cb: (Shell.Result) -> Unit) =
-        Shell.su("echo -n > ${Const.MAGISK_LOG}").submit(cb)
+        Shell.cmd("echo -n > ${Const.MAGISK_LOG}").submit(cb)
 
     suspend fun insert(log: SuLog) = logDao.insert(log)
 

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

@@ -6,10 +6,10 @@ import com.topjohnwu.magisk.core.Config.Value.CANARY_CHANNEL
 import com.topjohnwu.magisk.core.Config.Value.CUSTOM_CHANNEL
 import com.topjohnwu.magisk.core.Config.Value.DEFAULT_CHANNEL
 import com.topjohnwu.magisk.core.Config.Value.STABLE_CHANNEL
-import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.model.*
-import com.topjohnwu.magisk.data.network.*
+import com.topjohnwu.magisk.data.network.GithubApiServices
+import com.topjohnwu.magisk.data.network.GithubPageServices
+import com.topjohnwu.magisk.data.network.RawServices
 import retrofit2.HttpException
 import timber.log.Timber
 import java.io.IOException
@@ -17,7 +17,6 @@ import java.io.IOException
 class NetworkService(
     private val pages: GithubPageServices,
     private val raw: RawServices,
-    private val jsd: JSDelivrServices,
     private val api: GithubApiServices
 ) {
     suspend fun fetchUpdate() = safe {
@@ -28,37 +27,20 @@ class NetworkService(
             CUSTOM_CHANNEL -> fetchCustomUpdate(Config.customChannelUrl)
             else -> throw IllegalArgumentException()
         }
-        if (info.magisk.versionCode < Info.env.magiskVersionCode &&
+        if (info.magisk.versionCode < Info.env.versionCode &&
             Config.updateChannel == DEFAULT_CHANNEL
         ) {
             Config.updateChannel = BETA_CHANNEL
             info = fetchBetaUpdate()
         }
-        Info.remote = info
         info
     }
 
     // UpdateInfo
-    private suspend fun fetchStableUpdate() = pages.fetchStableUpdate()
-    private suspend fun fetchBetaUpdate() = pages.fetchBetaUpdate()
+    private suspend fun fetchStableUpdate() = pages.fetchUpdateJSON("stable.json")
+    private suspend fun fetchBetaUpdate() = pages.fetchUpdateJSON("beta.json")
+    private suspend fun fetchCanaryUpdate() = pages.fetchUpdateJSON("canary.json")
     private suspend fun fetchCustomUpdate(url: String) = raw.fetchCustomUpdate(url)
-    private suspend fun fetchCanaryUpdate(): UpdateInfo {
-        val sha = fetchCanaryVersion()
-        val info = jsd.fetchCanaryUpdate(sha)
-
-        fun genCDNUrl(name: String) = "${Const.Url.JS_DELIVR_URL}${MAGISK_FILES}@${sha}/${name}"
-        fun ManagerJson.updateCopy() = copy(link = genCDNUrl(link), note = genCDNUrl(note))
-        fun MagiskJson.updateCopy() = copy(link = genCDNUrl(link), note = genCDNUrl(note))
-        fun StubJson.updateCopy() = copy(link = genCDNUrl(link))
-        fun UninstallerJson.updateCopy() = copy(link = genCDNUrl(link))
-
-        return info.copy(
-            app = info.app.updateCopy(),
-            magisk = info.magisk.updateCopy(),
-            stub = info.stub.updateCopy(),
-            uninstaller = info.uninstaller.updateCopy()
-        )
-    }
 
     private inline fun <T> safe(factory: () -> T): T? {
         return try {
@@ -77,21 +59,8 @@ class NetworkService(
         }
     }
 
-    // Modules related
-    suspend fun fetchRepoInfo(url: String = Const.Url.OFFICIAL_REPO) = safe {
-        raw.fetchRepoInfo(url)
-    }
-
     // Fetch files
-    suspend fun fetchSafetynet() = wrap { jsd.fetchSafetynet() }
-    suspend fun fetchBootctl() = wrap { jsd.fetchBootctl() }
-    suspend fun fetchInstaller() = wrap {
-        val sha = fetchMainVersion()
-        jsd.fetchInstaller(sha)
-    }
     suspend fun fetchFile(url: String) = wrap { raw.fetchFile(url) }
     suspend fun fetchString(url: String) = wrap { raw.fetchString(url) }
-
-    private suspend fun fetchCanaryVersion() = api.fetchBranch(MAGISK_FILES, "canary").commit.sha
-    private suspend fun fetchMainVersion() = api.fetchBranch(MAGISK_MAIN, "master").commit.sha
+    suspend fun fetchModuleJson(url: String) = wrap { raw.fetchModuleJson(url) }
 }

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

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

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

@@ -4,6 +4,7 @@ import android.animation.ValueAnimator
 import android.content.res.ColorStateList
 import android.graphics.Paint
 import android.graphics.drawable.Drawable
+import android.text.Spanned
 import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
@@ -28,13 +29,9 @@ import com.google.android.material.card.MaterialCardView
 import com.google.android.material.chip.Chip
 import com.google.android.material.textfield.TextInputLayout
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.ktx.coroutineScope
-import com.topjohnwu.magisk.ktx.get
-import com.topjohnwu.magisk.ktx.replaceRandomWithSpecial
+import com.topjohnwu.magisk.di.ServiceLocator
 import com.topjohnwu.superuser.internal.UiThreadHandler
 import com.topjohnwu.widget.IndeterminateCheckBox
-import io.noties.markwon.Markwon
-import kotlinx.coroutines.*
 import kotlin.math.roundToInt
 
 @BindingAdapter("gone")
@@ -58,11 +55,8 @@ fun setInvisibleUnless(view: View, invisibleUnless: Boolean) {
 }
 
 @BindingAdapter("markdownText")
-fun setMarkdownText(tv: TextView, text: CharSequence) {
-    tv.coroutineScope.launch(Dispatchers.IO) {
-        val markwon = get<Markwon>()
-        markwon.setMarkdown(tv, text.toString())
-    }
+fun setMarkdownText(tv: TextView, markdown: Spanned) {
+    ServiceLocator.markwon.setParsedMarkdown(tv, markdown)
 }
 
 @BindingAdapter("onNavigationClick")
@@ -80,22 +74,6 @@ fun setImageResource(view: ImageView, drawable: Drawable) {
     view.setImageDrawable(drawable)
 }
 
-@BindingAdapter("movieBehavior", "movieBehaviorText")
-fun setMovieBehavior(view: TextView, isMovieBehavior: Boolean, text: String) {
-    (view.tag as? Job)?.cancel()
-    view.tag = null
-    if (isMovieBehavior) {
-        view.tag = GlobalScope.launch(Dispatchers.Main.immediate) {
-            while (true) {
-                delay(150)
-                view.text = text.replaceRandomWithSpecial()
-            }
-        }
-    } else {
-        view.text = text
-    }
-}
-
 @BindingAdapter("onTouch")
 fun setOnTouchListener(view: View, listener: View.OnTouchListener) {
     view.setOnTouchListener(listener)

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

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.utils
+package com.topjohnwu.magisk.databinding
 
 import androidx.annotation.MainThread
 import androidx.databinding.ListChangeRegistry
@@ -13,11 +13,10 @@ import kotlin.collections.ArrayList
  * @param detectMoves True if DiffUtil should try to detect moved items, false otherwise.
  */
 open class DiffObservableList<T>(
-        private val callback: Callback<T>,
-        private val detectMoves: Boolean = true
+    private val callback: Callback<T>,
+    private val detectMoves: Boolean = true
 ) : AbstractList<T>(), ObservableList<T> {
 
-    private val LIST_LOCK = Object()
     protected var list: MutableList<T> = ArrayList()
     private val listeners = ListChangeRegistry()
     protected val listCallback = ObservableListUpdateCallback()
@@ -32,27 +31,25 @@ open class DiffObservableList<T>(
      * list into the given one.
      */
     fun calculateDiff(newItems: List<T>): DiffUtil.DiffResult {
-        val frozenList = synchronized(LIST_LOCK) {
-            ArrayList(list)
-        }
+        val frozenList = ArrayList(list)
         return doCalculateDiff(frozenList, newItems)
     }
 
-    protected fun doCalculateDiff(oldItems: List<T>, newItems: List<T>?): DiffUtil.DiffResult {
+    protected fun doCalculateDiff(oldItems: List<T>, newItems: List<T>): DiffUtil.DiffResult {
         return DiffUtil.calculateDiff(object : DiffUtil.Callback() {
             override fun getOldListSize() = oldItems.size
 
-            override fun getNewListSize() = newItems?.size ?: 0
+            override fun getNewListSize() = newItems.size
 
             override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
                 val oldItem = oldItems[oldItemPosition]
-                val newItem = newItems!![newItemPosition]
+                val newItem = newItems[newItemPosition]
                 return callback.areItemsTheSame(oldItem, newItem)
             }
 
             override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
                 val oldItem = oldItems[oldItemPosition]
-                val newItem = newItems!![newItemPosition]
+                val newItem = newItems[newItemPosition]
                 return callback.areContentsTheSame(oldItem, newItem)
             }
         }, detectMoves)
@@ -67,9 +64,7 @@ open class DiffObservableList<T>(
      */
     @MainThread
     fun update(newItems: List<T>, diffResult: DiffUtil.DiffResult) {
-        synchronized(LIST_LOCK) {
-            list = newItems.toMutableList()
-        }
+        list = newItems.toMutableList()
         diffResult.dispatchUpdatesTo(listCallback)
     }
 
@@ -97,29 +92,14 @@ open class DiffObservableList<T>(
         listeners.remove(listener)
     }
 
-    override fun get(index: Int): T {
-        return list[index]
-    }
-
-    override fun add(element: T): Boolean {
-        list.add(element)
-        notifyAdd(size - 1, 1)
-        return true
-    }
+    override fun get(index: Int) = list[index]
 
     override fun add(index: Int, element: T) {
         list.add(index, element)
         notifyAdd(index, 1)
     }
 
-    override fun addAll(elements: Collection<T>): Boolean {
-        val oldSize = size
-        val added = list.addAll(elements)
-        if (added) {
-            notifyAdd(oldSize, size - oldSize)
-        }
-        return added
-    }
+    override fun addAll(elements: Collection<T>) = addAll(size, elements)
 
     override fun addAll(index: Int, elements: Collection<T>): Boolean {
         val added = list.addAll(index, elements)
@@ -153,14 +133,6 @@ open class DiffObservableList<T>(
         return element
     }
 
-    fun removeLast(): T? {
-        if (size > 0) {
-            val index = size - 1
-            return removeAt(index)
-        }
-        return null
-    }
-
     override fun set(index: Int, element: T): T {
         val old = list.set(index, element)
         listeners.notifyChanged(this, index, 1)
@@ -228,6 +200,5 @@ open class DiffObservableList<T>(
             modCount += 1
             listeners.notifyRemoved(this@DiffObservableList, position, count)
         }
-
     }
-}
+}