Check Magisk version instead of app version

For better Windows portability

.github/actions/setup/action.yml

@@ -0,0 +1,44 @@
+name: Magisk Setup
+runs:
+  using: "composite"
+  steps:
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        distribution: "temurin"
+        java-version: "17"
+
+    - name: Set up Python 3
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.x"
+
+    - name: Set up sccache
+      uses: hendrikmuhs/ccache-action@v1.2
+      with:
+        variant: sccache
+        key: ${{ runner.os }}-${{ github.sha }}
+        restore-keys: ${{ runner.os }}
+        max-size: 10000M
+
+    - name: Cache Gradle dependencies
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+          !~/.gradle/caches/build-cache-*
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+        restore-keys: ${{ runner.os }}-gradle-
+
+    - name: Cache build cache
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.gradle/caches/build-cache-*
+        key: ${{ runner.os }}-build-cache-${{ github.sha }}
+        restore-keys: ${{ runner.os }}-build-cache-
+
+    - name: Set up NDK
+      run: python build.py -v ndk
+      shell: bash

.github/ccache.sh

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

@@ -2,90 +2,153 @@ name: Magisk Build
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
     paths:
-      - 'app/**'
-      - 'native/**'
-      - 'stub/**'
-      - 'buildSrc/**'
-      - 'build.py'
-      - 'gradle.properties'
-      - '.github/workflows/build.yml'
+      - "app/**"
+      - "native/**"
+      - "stub/**"
+      - "buildSrc/**"
+      - "build.py"
+      - "gradle.properties"
+      - ".github/workflows/build.yml"
   pull_request:
-    branches: [ master ]
+    branches: [master]
   workflow_dispatch:
 
 jobs:
   build:
-    name: Build on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    name: Build Magisk artifacts
+    runs-on: ubuntu-latest
+    env:
+      SCCACHE_DIRECT: false
     strategy:
       fail-fast: false
-      matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-    env:
-      NDK_CCACHE: ${{ github.workspace }}/ccache
-      CCACHE_DIR: ${{ github.workspace }}/.ccache
-
     steps:
       - name: Check out
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
           fetch-depth: 0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.x'
-
-      - name: Set up ccache
-        run: bash .github/ccache.sh
-
-      - name: Cache Gradle dependencies
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            !~/.gradle/caches/build-cache-*
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
-          restore-keys: ${{ runner.os }}-gradle-
-
-      - name: Cache build cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            ${{ github.workspace }}/.ccache
-            ~/.gradle/caches/build-cache-*
-          key: ${{ runner.os }}-build-cache-${{ github.sha }}
-          restore-keys: ${{ runner.os }}-build-cache-
-
-      - name: Set up NDK
-        run: python build.py -v ndk
+      - name: Setup environment
+        uses: ./.github/actions/setup
 
       - name: Build release
-        run: |
-          ./ccache -zp
-          python build.py -vr all
+        run: ./build.py -vr all
 
       - name: Build debug
-        run: |
-          python build.py -v all
-          ./ccache -s
+        run: ./build.py -v all
 
       - name: Stop gradle daemon
         run: ./gradlew --stop
 
-      # Only upload artifacts built on Linux
       - name: Upload build artifact
-        if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}
           path: out
+          compression-level: 9
+
+      - name: Upload mapping and native debug symbols
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ github.sha }}-symbols
+          path: app/build/outputs
+          compression-level: 9
+
+  test-build:
+    name: Test building on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    env:
+      SCCACHE_DIRECT: false
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, macos-14]
+    steps:
+      - name: Check out
+        uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+          fetch-depth: 0
+
+      - name: Setup environment
+        uses: ./.github/actions/setup
+
+      - name: Build debug
+        run: python build.py -v all
+
+      - name: Stop gradle daemon
+        run: ./gradlew --stop
+
+  test:
+    name: Test x86_64 on API ${{ matrix.api }}
+    runs-on: ubuntu-latest
+    needs: build
+    strategy:
+      fail-fast: false
+      matrix:
+        api: [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34]
+
+    steps:
+      - name: Check out
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python 3
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ github.sha }}
+          path: out
+
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: AVD test
+        run: scripts/avd_test.sh ${{ matrix.api }}
+
+  test-32:
+    name: Test x86 on API ${{ matrix.api }}
+    runs-on: ubuntu-latest
+    needs: build
+    strategy:
+      fail-fast: false
+      matrix:
+        api: [23, 24, 25, 26, 27, 28, 29, 30]
+
+    steps:
+      - name: Check out
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python 3
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ github.sha }}
+          path: out
+
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: AVD test
+        env:
+          FORCE_32_BIT: 1
+        run: scripts/avd_test.sh ${{ matrix.api }}

.gitmodules

@@ -1,42 +1,42 @@
 [submodule "selinux"]
-	path = native/jni/external/selinux
+	path = native/src/external/selinux
 	url = https://github.com/topjohnwu/selinux.git
 [submodule "busybox"]
-	path = native/jni/external/busybox
+	path = native/src/external/busybox
 	url = https://github.com/topjohnwu/ndk-busybox.git
-[submodule "dtc"]
-	path = native/jni/external/dtc
-	url = https://github.com/dgibson/dtc.git
 [submodule "lz4"]
-	path = native/jni/external/lz4
+	path = native/src/external/lz4
 	url = https://github.com/lz4/lz4.git
 [submodule "bzip2"]
-	path = native/jni/external/bzip2
+	path = native/src/external/bzip2
 	url = https://github.com/nemequ/bzip2.git
 [submodule "xz"]
-	path = native/jni/external/xz
+	path = native/src/external/xz
 	url = https://github.com/xz-mirror/xz.git
-[submodule "nanopb"]
-	path = native/jni/external/nanopb
-	url = https://github.com/nanopb/nanopb.git
-[submodule "mincrypt"]
-	path = native/jni/external/mincrypt
-	url = https://github.com/topjohnwu/mincrypt.git
 [submodule "pcre"]
-	path = native/jni/external/pcre
+	path = native/src/external/pcre
 	url = https://android.googlesource.com/platform/external/pcre
 [submodule "libcxx"]
-	path = native/jni/external/libcxx
+	path = native/src/external/libcxx
 	url = https://github.com/topjohnwu/libcxx.git
 [submodule "zlib"]
-	path = native/jni/external/zlib
+	path = native/src/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 "zopfli"]
+	path = native/src/external/zopfli
+	url = https://github.com/google/zopfli.git
+[submodule "cxx-rs"]
+	path = native/src/external/cxx-rs
+	url = https://github.com/topjohnwu/cxx.git
+[submodule "lsplt"]
+	path = native/src/external/lsplt
+	url = https://github.com/LSPosed/LSPlt.git
+[submodule "system_properties"]
+	path = native/src/external/system_properties
+	url = https://github.com/topjohnwu/system_properties.git
+[submodule "crt0"]
+	path = native/src/external/crt0
+	url = https://github.com/topjohnwu/crt0.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

@@ -6,7 +6,7 @@
 
 ## Introduction
 
-Magisk is a suite of open source software for customizing Android, supporting devices higher than Android 5.0.<br>
+Magisk is a suite of open source software for customizing Android, supporting devices higher than Android 6.0.<br>
 Some highlight features:
 
 - **MagiskSU**: Provide root access for applications
@@ -18,16 +18,16 @@ Some highlight features:
 
 [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.3-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v24.3)
-[![](https://img.shields.io/badge/Magisk%20Beta-v24.3-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v24.3)
+[![](https://img.shields.io/badge/Magisk-v27.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v27.0)
+[![](https://img.shields.io/badge/Magisk%20Beta-v27.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v27.0)
 [![](https://img.shields.io/badge/Magisk-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk-files/canary/app-release.apk)
 [![](https://img.shields.io/badge/Magisk-Debug-red)](https://raw.githubusercontent.com/topjohnwu/magisk-files/canary/app-debug.apk)
 
 ## Useful Links
 
 - [Installation Instruction](https://topjohnwu.github.io/Magisk/install.html)
+- [Building and Development](https://topjohnwu.github.io/Magisk/build.html)
 - [Magisk Documentation](https://topjohnwu.github.io/Magisk/)
-- [Magisk Troubleshoot Wiki](https://www.didgeridoohan.com/magisk/HomePage) (by [@Didgeridoohan](https://github.com/Didgeridoohan))
 
 ## Bug Reports
 
@@ -37,30 +37,6 @@ For installation issues, upload both boot image and install logs.<br>
 For Magisk issues, upload boot logcat or dmesg.<br>
 For Magisk app crashes, record and upload the logcat when the crash occurs.
 
-## Building 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)
-- Configure to use the JDK bundled in Android Studio:
-  - macOS: `export JAVA_HOME="/Applications/Android Studio.app/Contents/jre/Contents/Home"`
-  - Linux: `export PATH="/path/to/androidstudio/jre/bin:$PATH"`
-  - Windows: Add `C:\Path\To\Android Studio\jre\bin` to environment variable `PATH`
-- Set environment variable `ANDROID_SDK_ROOT` to the Android SDK folder (can be found in Android Studio settings)
-- Run `./build.py ndk` to let the script download and install NDK for you
-- To start building, run `build.py` to see your options. \
-  For each action, use `-h` to access help (e.g. `./build.py all -h`)
-- To start development, open the project with Android Studio. The IDE can be used for both app (Kotlin/Java) and native (C++/C) sources.
-- Optionally, set custom configs with `config.prop`. A sample `config.prop.sample` is provided.
-
-## Signing and Distribution
-
-- The certificate of the key used to sign the final Magisk APK product is also directly embedded into some executables. In release builds, Magisk's root daemon will enforce this certificate check and reject and forcefully uninstall any non-matching Magisk apps to protect users from malicious and unverified Magisk APKs.
-- To do any development on Magisk itself, switch to an **official debug build and reinstall Magisk** to bypass the signature check.
-- To distribute your own Magisk builds signed with your own keys, set your signing configs in `config.prop`.
-- Check [Google's Documentation](https://developer.android.com/studio/publish/app-signing.html#generate-key) for more details on generating your own key.
-
 ## Translation Contributions
 
 Default string resources for the Magisk app and its stub APK are located here:

app/.gitignore

@@ -3,10 +3,9 @@
 /local.properties
 .idea/
 /build
-app/release
 *.hprof
 .externalNativeBuild/
 *.apk
-src/main/assets
-src/main/jniLibs
-src/main/resources
+src/*/assets
+src/*/jniLibs
+src/*/resources

app/build.gradle.kts

@@ -26,7 +26,10 @@ android {
         vectorDrawables.useSupportLibrary = true
         versionName = Config.version
         versionCode = Config.versionCode
-        ndk.abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+        ndk {
+            abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+            debugSymbolLevel = "FULL"
+        }
     }
 
     buildTypes {
@@ -39,11 +42,13 @@ android {
 
     buildFeatures {
         dataBinding = true
+        aidl = true
     }
 
-    packagingOptions {
+    packaging {
         resources {
             excludes += "/META-INF/*"
+            excludes += "/META-INF/versions/**"
             excludes += "/org/bouncycastle/**"
             excludes += "/kotlin/**"
             excludes += "/kotlinx/**"
@@ -52,9 +57,6 @@ android {
             excludes += "/*.bin"
             excludes += "/*.json"
         }
-        jniLibs {
-            keepDebugSymbols += "**/*.so"
-        }
     }
 }
 
@@ -68,17 +70,17 @@ configurations.all {
 dependencies {
     implementation(project(":app:shared"))
 
-    implementation("com.github.topjohnwu:jtar:1.0.0")
+    implementation("com.github.topjohnwu:jtar:1.1.0")
     implementation("com.github.topjohnwu:indeterminate-checkbox:1.0.7")
     implementation("com.github.topjohnwu:lz4-java:1.7.1")
     implementation("com.jakewharton.timber:timber:5.0.1")
-    implementation("org.bouncycastle:bcpkix-jdk18on:1.71")
-    implementation("dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0")
-    implementation("dev.rikka.rikkax.insets:insets:1.2.0")
-    implementation("dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1")
+    implementation("org.bouncycastle:bcpkix-jdk18on:1.77")
+    implementation("dev.rikka.rikkax.layoutinflater:layoutinflater:1.3.0")
+    implementation("dev.rikka.rikkax.insets:insets:1.3.0")
+    implementation("dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.2")
     implementation("io.noties.markwon:core:4.6.2")
 
-    val vLibsu = "5.0.2"
+    val vLibsu = "5.2.2"
     implementation("com.github.topjohnwu.libsu:core:${vLibsu}")
     implementation("com.github.topjohnwu.libsu:service:${vLibsu}")
     implementation("com.github.topjohnwu.libsu:nio:${vLibsu}")
@@ -88,33 +90,32 @@ dependencies {
     implementation("com.squareup.retrofit2:converter-moshi:${vRetrofit}")
     implementation("com.squareup.retrofit2:converter-scalars:${vRetrofit}")
 
-    val vOkHttp = "4.9.3"
+    val vOkHttp = "4.12.0"
     implementation("com.squareup.okhttp3:okhttp:${vOkHttp}")
     implementation("com.squareup.okhttp3:logging-interceptor:${vOkHttp}")
     implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:${vOkHttp}")
 
-    val vMoshi = "1.13.0"
+    val vMoshi = "1.15.0"
     implementation("com.squareup.moshi:moshi:${vMoshi}")
     kapt("com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}")
 
-    val vRoom = "2.4.2"
+    val vRoom = "2.6.1"
     implementation("androidx.room:room-runtime:${vRoom}")
     implementation("androidx.room:room-ktx:${vRoom}")
     kapt("androidx.room:room-compiler:${vRoom}")
 
-    val vNav = "2.5.0-rc01"
+    val vNav = "2.7.7"
     implementation("androidx.navigation:navigation-fragment-ktx:${vNav}")
     implementation("androidx.navigation:navigation-ui-ktx:${vNav}")
 
-    implementation("androidx.biometric:biometric:1.1.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    implementation("androidx.appcompat:appcompat:1.4.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.appcompat:appcompat:1.6.1")
+    implementation("androidx.recyclerview:recyclerview:1.3.2")
+    implementation("androidx.fragment:fragment-ktx:1.6.2")
     implementation("androidx.transition:transition:1.4.1")
-    implementation("androidx.core:core-ktx:1.7.0")
-    implementation("androidx.core:core-splashscreen:1.0.0-rc01")
-    implementation("com.google.android.material:material:1.6.0")
+    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.core:core-splashscreen:1.0.1")
+    implementation("androidx.profileinstaller:profileinstaller:1.3.1")
+    implementation("com.google.android.material:material:1.11.0")
 }

app/proguard-rules.pro

@@ -11,12 +11,15 @@
 -assumenosideeffects class java.util.Objects {
     public static ** requireNonNull(...);
 }
+-assumenosideeffects public class kotlin.coroutines.jvm.internal.DebugMetadataKt {
+   private static ** getDebugMetadataAnnotation(...) return null;
+}
 
 # Stub
 -keep class com.topjohnwu.magisk.core.App { <init>(java.lang.Object); }
 -keepclassmembers class androidx.appcompat.app.AppCompatDelegateImpl {
-  boolean mActivityHandlesUiModeChecked;
-  boolean mActivityHandlesUiMode;
+  boolean mActivityHandlesConfigFlagsChecked;
+  int mActivityHandlesConfigFlags;
 }
 
 # main
@@ -30,6 +33,17 @@
   public void d(**);
 }
 
+# https://github.com/square/retrofit/issues/3751#issuecomment-1192043644
+# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
+-keep,allowobfuscation,allowshrinking interface retrofit2.Call
+-keep,allowobfuscation,allowshrinking class retrofit2.Response
+
+# With R8 full mode generic signatures are stripped for classes that are not
+# kept. Suspend functions are wrapped in continuations where the type argument
+# is used.
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+
+
 # Excessive obfuscation
 -repackageclasses 'a'
 -allowaccessmodification

app/shared/build.gradle.kts

@@ -7,7 +7,3 @@ setupCommon()
 android {
     namespace = "com.topjohnwu.shared"
 }
-
-dependencies {
-    api("io.michaelrocks:paranoid-core:0.3.7")
-}

app/shared/src/main/AndroidManifest.xml

@@ -1,14 +1,20 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.topjohnwu.shared"
     android:installLocation="internalOnly">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
     <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.RUN_USER_INITIATED_JOBS" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE"
+        android:maxSdkVersion="33" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="29" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="29"

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

@@ -2,9 +2,6 @@ package com.topjohnwu.magisk;
 
 import android.content.Context;
 
-import io.michaelrocks.paranoid.Obfuscate;
-
-@Obfuscate
 public class ProviderInstaller {
 
     public static boolean install(Context context) {

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

@@ -3,6 +3,7 @@ package com.topjohnwu.magisk;
 import static android.os.Build.VERSION.SDK_INT;
 import static android.os.ParcelFileDescriptor.MODE_READ_ONLY;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -11,6 +12,7 @@ import android.content.res.AssetManager;
 import android.content.res.Resources;
 import android.content.res.loader.ResourcesLoader;
 import android.content.res.loader.ResourcesProvider;
+import android.os.Build;
 import android.os.ParcelFileDescriptor;
 
 import java.io.File;
@@ -18,9 +20,6 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import io.michaelrocks.paranoid.Obfuscate;
-
-@Obfuscate
 public class StubApk {
     private static File dynDir;
     private static Method addAssetPath;
@@ -28,7 +27,7 @@ public class StubApk {
     private static File getDynDir(ApplicationInfo info) {
         if (dynDir == null) {
             final String dataDir;
-            if (SDK_INT >= 24) {
+            if (SDK_INT >= Build.VERSION_CODES.N) {
                 // Use device protected path to allow directBootAware
                 dataDir = info.deviceProtectedDataDir;
             } else {
@@ -56,12 +55,24 @@ public class StubApk {
         return new File(getDynDir(info), "update.apk");
     }
 
+    @TargetApi(Build.VERSION_CODES.R)
+    private static ResourcesLoader getResourcesLoader(File path) throws IOException {
+        var loader = new ResourcesLoader();
+        ResourcesProvider provider;
+        if (path.isDirectory()) {
+            provider = ResourcesProvider.loadFromDirectory(path.getPath(), null);
+        } else {
+            var fd = ParcelFileDescriptor.open(path, MODE_READ_ONLY);
+            provider = ResourcesProvider.loadFromApk(fd);
+        }
+        loader.addProvider(provider);
+        return loader;
+    }
+
     public static void addAssetPath(Resources res, String path) {
-        if (SDK_INT >= 30) {
-            try (var fd = ParcelFileDescriptor.open(new File(path), MODE_READ_ONLY)) {
-                var loader = new ResourcesLoader();
-                loader.addProvider(ResourcesProvider.loadFromApk(fd));
-                res.addLoaders(loader);
+        if (SDK_INT >= Build.VERSION_CODES.R) {
+            try {
+                res.addLoaders(getResourcesLoader(new File(path)));
             } catch (IOException ignored) {}
         } else {
             AssetManager asset = res.getAssets();

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

@@ -25,9 +25,6 @@ import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import io.michaelrocks.paranoid.Obfuscate;
-
-@Obfuscate
 public final class APKInstall {
 
     public static void transfer(InputStream in, OutputStream out) throws IOException {
@@ -39,6 +36,16 @@ public final class APKInstall {
         }
     }
 
+    public static void registerReceiver(
+            Context context, BroadcastReceiver receiver, IntentFilter filter) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            // noinspection InlinedApi
+            context.registerReceiver(receiver, filter, Context.RECEIVER_NOT_EXPORTED);
+        } else {
+            context.registerReceiver(receiver, filter);
+        }
+    }
+
     public static Session startSession(Context context) {
         return startSession(context, null, null, null);
     }
@@ -51,17 +58,15 @@ public final class APKInstall {
             // 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);
+            registerReceiver(context, receiver, filter);
         }
-        context.registerReceiver(receiver, new IntentFilter(receiver.sessionId));
+        registerReceiver(context, 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();
     }
@@ -94,27 +99,25 @@ public final class APKInstall {
             } 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:
+                    case STATUS_PENDING_USER_ACTION ->
+                            userAction = intent.getParcelableExtra(Intent.EXTRA_INTENT);
+                    case STATUS_SUCCESS -> {
                         if (packageName == null) {
                             onSuccess(context);
                         }
-                        break;
-                    default:
+                    }
+                    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());
-                            }
+                        var installer = context.getPackageManager().getPackageInstaller();
+                        try {
+                            installer.abandonSession(id);
+                        } catch (SecurityException ignored) {
                         }
                         if (onFailure != null) {
                             onFailure.run();
                         }
                         context.getApplicationContext().unregisterReceiver(this);
+                    }
                 }
                 latch.countDown();
             }
@@ -162,13 +165,5 @@ public final class APKInstall {
                 }
             };
         }
-
-        @Override
-        public void install(Context context, File apk) throws IOException {
-            try (var src = new FileInputStream(apk);
-                 var out = openStream(context)) {
-                transfer(src, out);
-            }
-        }
     }
 }

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

@@ -1,5 +1,7 @@
 package com.topjohnwu.magisk.utils;
 
+import android.os.Process;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -14,8 +16,8 @@ public class DynamicClassLoader extends BaseDexClassLoader {
     }
 
     public DynamicClassLoader(File apk, ClassLoader parent) {
-        // Set optimizedDirectory to null to bypass DexFile's security checks
-        super(apk.getPath(), null, null, parent);
+        // Set optimizedDirectory to null for RootService to bypass DexFile's security checks
+        super(apk.getPath(), Process.myUid() == 0 ? null : apk.getParentFile(), null, parent);
     }
 
     @Override

app/src/main/AndroidManifest.xml

@@ -2,12 +2,21 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <permission
+        android:name="${applicationId}.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
+        android:protectionLevel="signature"
+        tools:node="remove" />
+
+    <uses-permission
+        android:name="${applicationId}.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
+        tools:node="remove" />
+
     <application
         android:name=".core.App"
-        android:extractNativeLibs="true"
         android:icon="@drawable/ic_launcher"
         android:multiArch="true"
-        tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
+        tools:ignore="UnusedAttribute,GoogleAppIndexingWarning"
+        tools:remove="android:appComponentFactory">
 
         <activity
             android:name=".ui.MainActivity"
@@ -27,6 +36,7 @@
             android:name=".ui.surequest.SuRequestActivity"
             android:directBootAware="true"
             android:exported="false"
+            android:taskAffinity=""
             tools:ignore="AppLinkUrlError">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -51,8 +61,10 @@
         </receiver>
 
         <service
-            android:name=".core.download.DownloadService"
-            android:exported="false" />
+            android:name=".core.Service"
+            android:exported="false"
+            android:enabled="@bool/enable_fg_service"
+            android:foregroundServiceType="dataSync" />
 
         <service
             android:name=".core.JobService"
@@ -71,11 +83,15 @@
             android:name="androidx.room.MultiInstanceInvalidationService"
             tools:node="remove" />
 
-        <!-- We don't need emoji compat -->
+        <!-- We handle initialization ourselves -->
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
+            tools:node="remove" />
+
+        <!-- We handle profile installation ourselves  -->
+        <receiver
+            android:name="androidx.profileinstaller.ProfileInstallReceiver"
             tools:node="remove" />
 
     </application>

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

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

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

@@ -5,13 +5,14 @@ import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.MenuProvider
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.OnRebindCallback
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
 import androidx.navigation.NavDirections
 import com.topjohnwu.magisk.BR
-import com.topjohnwu.magisk.ktx.startAnimations
 
 abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHolder {
 
@@ -37,6 +38,9 @@ abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHo
             it.setVariable(BR.viewModel, viewModel)
             it.lifecycleOwner = viewLifecycleOwner
         }
+        if (this is MenuProvider) {
+            activity?.addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.STARTED)
+        }
         savedInstanceState?.let { viewModel.onRestoreState(it) }
         return binding.root
     }
@@ -76,7 +80,10 @@ abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHo
 
     override fun onResume() {
         super.onResume()
-        viewModel.requestRefresh()
+        viewModel.let {
+            if (it is AsyncLoadViewModel)
+                it.startLoading()
+        }
     }
 
     protected open fun onPreBind(binding: Binding) {
@@ -86,5 +93,4 @@ abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHo
     fun NavDirections.navigate() {
         navigation?.currentDestination?.getAction(actionId)?.let { navigation!!.navigate(this) }
     }
-
 }

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

@@ -1,64 +1,34 @@
 package com.topjohnwu.magisk.arch
 
+import android.Manifest.permission.POST_NOTIFICATIONS
 import android.Manifest.permission.REQUEST_INSTALL_PACKAGES
 import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
 import android.annotation.SuppressLint
 import android.os.Bundle
-import androidx.databinding.Bindable
 import androidx.databinding.PropertyChangeRegistry
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
 import androidx.navigation.NavDirections
-import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.ObservableHost
-import com.topjohnwu.magisk.databinding.set
 import com.topjohnwu.magisk.events.BackPressEvent
+import com.topjohnwu.magisk.events.DialogBuilder
+import com.topjohnwu.magisk.events.DialogEvent
 import com.topjohnwu.magisk.events.NavigationEvent
 import com.topjohnwu.magisk.events.PermissionEvent
 import com.topjohnwu.magisk.events.SnackbarEvent
-import kotlinx.coroutines.Job
 
-abstract class BaseViewModel(
-    initialState: State = State.LOADING
-) : ViewModel(), ObservableHost {
+abstract class BaseViewModel : ViewModel(), ObservableHost {
 
     override var callbacks: PropertyChangeRegistry? = null
 
-    enum class State {
-        LOADED, LOADING, LOADING_FAILED
-    }
-
-    @get:Bindable
-    val loading get() = state == State.LOADING
-    @get:Bindable
-    val loaded get() = state == State.LOADED
-    @get:Bindable
-    val loadFailed get() = state == State.LOADING_FAILED
-
-    val viewEvents: LiveData<ViewEvent> get() = _viewEvents
-
-    var state= initialState
-        set(value) = set(value, field, { field = it }, BR.loading, BR.loaded, BR.loadFailed)
-
     private val _viewEvents = MutableLiveData<ViewEvent>()
-    private var runningJob: Job? = null
+    val viewEvents: LiveData<ViewEvent> get() = _viewEvents
 
     open fun onSaveState(state: Bundle) {}
     open fun onRestoreState(state: Bundle) {}
-
-    /** This should probably never be called manually, it's called manually via delegate. */
-    @Synchronized
-    fun requestRefresh() {
-        if (runningJob?.isActive == true) {
-            return
-        }
-        runningJob = refresh()
-    }
-
-    protected open fun refresh(): Job? = null
+    open fun onNetworkChanged(network: Boolean) {}
 
     fun withPermission(permission: String, callback: (Boolean) -> Unit) {
         PermissionEvent(permission, callback).publish()
@@ -85,15 +55,25 @@ abstract class BaseViewModel(
         }
     }
 
+    @SuppressLint("InlinedApi")
+    inline fun withPostNotificationPermission(crossinline callback: () -> Unit) {
+        withPermission(POST_NOTIFICATIONS) {
+            if (!it) {
+                SnackbarEvent(R.string.post_notifications_denied).publish()
+            } else {
+                callback()
+            }
+        }
+    }
+
     fun back() = BackPressEvent().publish()
 
-    fun <Event : ViewEvent> Event.publish() {
+    fun ViewEvent.publish() {
         _viewEvents.postValue(this)
     }
 
-    fun <Event : ViewEventWithScope> Event.publish() {
-        scope = viewModelScope
-        _viewEvents.postValue(this)
+    fun DialogBuilder.show() {
+        DialogEvent(this).publish()
     }
 
     fun NavDirections.navigate(pop: Boolean = false) {

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

@@ -20,12 +20,14 @@ abstract class NavigationActivity<Binding : ViewDataBinding> : UIActivity<Bindin
     val navigation: NavController get() = navHostFragment.navController
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-        return currentFragment?.onKeyEvent(event) == true || super.dispatchKeyEvent(event)
+        return if (binded && currentFragment?.onKeyEvent(event) == true) true else super.dispatchKeyEvent(event)
     }
 
     override fun onBackPressed() {
-        if (currentFragment?.onBackPressed()?.not() == true) {
-            super.onBackPressed()
+        if (binded) {
+            if (currentFragment?.onBackPressed() == false) {
+                super.onBackPressed()
+            }
         }
     }
 

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

@@ -5,16 +5,20 @@ import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.view.View
+import android.view.ViewGroup
 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 androidx.interpolator.view.animation.FastOutSlowInInterpolator
+import androidx.transition.AutoTransition
+import androidx.transition.TransitionManager
 import com.google.android.material.snackbar.Snackbar
 import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.base.BaseActivity
-import com.topjohnwu.magisk.widget.Pre23CardViewBackgroundColorFixLayoutInflaterListener
 import rikka.insets.WindowInsetsHelper
 import rikka.layoutinflater.view.LayoutInflaterFactory
 
@@ -23,6 +27,8 @@ abstract class UIActivity<Binding : ViewDataBinding> : BaseActivity(), ViewModel
     protected lateinit var binding: Binding
     protected abstract val layoutRes: Int
 
+    protected val binded get() = ::binding.isInitialized
+
     open val snackbarView get() = binding.root
     open val snackbarAnchorView: View? get() = null
 
@@ -33,11 +39,6 @@ abstract class UIActivity<Binding : ViewDataBinding> : BaseActivity(), ViewModel
     override fun onCreate(savedInstanceState: Bundle?) {
         layoutInflater.factory2 = LayoutInflaterFactory(delegate)
             .addOnViewCreatedListener(WindowInsetsHelper.LISTENER)
-            .apply {
-                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-                    this.addOnViewCreatedListener(Pre23CardViewBackgroundColorFixLayoutInflaterListener.getInstance())
-                }
-            }
 
         super.onCreate(savedInstanceState)
 
@@ -89,7 +90,10 @@ abstract class UIActivity<Binding : ViewDataBinding> : BaseActivity(), ViewModel
 
     override fun onResume() {
         super.onResume()
-        viewModel.requestRefresh()
+        viewModel.let {
+            if (it is AsyncLoadViewModel)
+                it.startLoading()
+        }
     }
 
     override fun onEventDispatched(event: ViewEvent) = when (event) {
@@ -98,3 +102,14 @@ abstract class UIActivity<Binding : ViewDataBinding> : BaseActivity(), ViewModel
         else -> Unit
     }
 }
+
+fun ViewGroup.startAnimations() {
+    val transition = AutoTransition()
+        .setInterpolator(FastOutSlowInInterpolator())
+        .setDuration(400)
+        .excludeTarget(R.id.main_toolbar, true)
+    TransitionManager.beginDelayedTransition(
+        this,
+        transition
+    )
+}

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

@@ -1,7 +1,6 @@
 package com.topjohnwu.magisk.arch
 
 import android.content.Context
-import kotlinx.coroutines.CoroutineScope
 
 /**
  * Class for passing events from ViewModels to Activities/Fragments
@@ -9,10 +8,6 @@ import kotlinx.coroutines.CoroutineScope
  */
 abstract class ViewEvent
 
-abstract class ViewEventWithScope: ViewEvent() {
-    lateinit var scope: CoroutineScope
-}
-
 interface ContextExecutor {
     operator fun invoke(context: Context)
 }

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

@@ -17,12 +17,8 @@ interface ViewModelHolder : LifecycleOwner, ViewModelStoreOwner {
     val viewModel: BaseViewModel
 
     fun startObserveLiveData() {
-        viewModel.viewEvents.observe(this) {
-            onEventDispatched(it)
-        }
-        Info.isConnected.observe(this) {
-            viewModel.requestRefresh()
-        }
+        viewModel.viewEvents.observe(this, this::onEventDispatched)
+        Info.isConnected.observe(this, viewModel::onNetworkChanged)
     }
 
     /**
@@ -38,7 +34,8 @@ object VMFactory : ViewModelProvider.Factory {
             HomeViewModel::class.java -> HomeViewModel(ServiceLocator.networkService)
             LogViewModel::class.java -> LogViewModel(ServiceLocator.logRepo)
             SuperuserViewModel::class.java -> SuperuserViewModel(ServiceLocator.policyDB)
-            InstallViewModel::class.java -> InstallViewModel(ServiceLocator.networkService)
+            InstallViewModel::class.java ->
+                InstallViewModel(ServiceLocator.networkService, ServiceLocator.markwon)
             SuRequestViewModel::class.java ->
                 SuRequestViewModel(ServiceLocator.policyDB, ServiceLocator.timeoutPrefs)
             else -> modelClass.newInstance()

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

@@ -5,14 +5,26 @@ import android.app.Application
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Bundle
+import android.system.Os
+import androidx.profileinstaller.ProfileInstaller
+import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.StubApk
 import com.topjohnwu.magisk.core.di.ServiceLocator
-import com.topjohnwu.magisk.core.utils.*
+import com.topjohnwu.magisk.core.utils.DispatcherExecutor
+import com.topjohnwu.magisk.core.utils.NetworkObserver
+import com.topjohnwu.magisk.core.utils.ProcessLifecycle
+import com.topjohnwu.magisk.core.utils.RootUtils
+import com.topjohnwu.magisk.core.utils.ShellInit
+import com.topjohnwu.magisk.core.utils.refreshLocale
+import com.topjohnwu.magisk.core.utils.setConfig
 import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
+import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.internal.UiThreadHandler
 import com.topjohnwu.superuser.ipc.RootService
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.lang.ref.WeakReference
 import kotlin.system.exitProcess
@@ -35,6 +47,8 @@ open class App() : Application() {
             Timber.e(e)
             exitProcess(1)
         }
+
+        Os.setenv("PATH", "${Os.getenv("PATH")}:/debug_ramdisk:/sbin", true)
     }
 
     override fun attachBaseContext(context: Context) {
@@ -70,6 +84,18 @@ open class App() : Application() {
 
         refreshLocale()
         resources.patch()
+        Notifications.setup()
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        ProcessLifecycle.init(this)
+        NetworkObserver.init(this)
+        if (!BuildConfig.DEBUG && !isRunningAsStub) {
+            GlobalScope.launch(Dispatchers.IO) {
+                ProfileInstaller.writeProfile(this@App)
+            }
+        }
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {

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

@@ -1,21 +1,22 @@
 package com.topjohnwu.magisk.core
 
 import android.annotation.SuppressLint
-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.di.AppContext
 import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.ktx.writeTo
 import com.topjohnwu.magisk.core.repository.BoolDBPropertyNoWrite
 import com.topjohnwu.magisk.core.repository.DBConfig
 import com.topjohnwu.magisk.core.repository.PreferenceConfig
 import com.topjohnwu.magisk.core.utils.refreshLocale
 import com.topjohnwu.magisk.ui.theme.Theme
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
-import org.xmlpull.v1.XmlPullParser
+import kotlinx.coroutines.runBlocking
 import java.io.File
-import java.io.InputStream
+import java.io.IOException
 
 object Config : PreferenceConfig, DBConfig {
 
@@ -24,13 +25,12 @@ object Config : PreferenceConfig, DBConfig {
     override val context get() = ServiceLocator.deContext
     override val coroutineScope get() = GlobalScope
 
-    @get:SuppressLint("ApplySharedPref")
-    val prefsFile: File get() {
-        // Flush prefs to disk
-        prefs.edit().apply {
-            remove(Key.ASKED_HOME)
-        }.commit()
-        return File("${context.filesDir.parent}/shared_prefs", "${fileName}.xml")
+    private val prefsFile = File("${context.filesDir.parent}/shared_prefs", "${fileName}.xml")
+
+    @SuppressLint("ApplySharedPref")
+    fun getPrefsFile(): File {
+        prefs.edit().remove(Key.ASKED_HOME).commit()
+        return prefsFile
     }
 
     object Key {
@@ -40,6 +40,7 @@ object Config : PreferenceConfig, DBConfig {
         const val SU_MNT_NS = "mnt_ns"
         const val SU_BIOMETRIC = "su_biometric"
         const val ZYGISK = "zygisk"
+        const val BOOTLOOP = "bootloop"
         const val DENYLIST = "denylist"
         const val SU_MANAGER = "requester"
         const val KEYSTORE = "keystore"
@@ -117,7 +118,6 @@ object Config : PreferenceConfig, DBConfig {
 
     @JvmField var keepVerity = false
     @JvmField var keepEnc = false
-    @JvmField var patchVbmeta = false
     @JvmField var recovery = false
 
     var bootId by preference(Key.BOOT_ID, "")
@@ -136,7 +136,15 @@ object Config : PreferenceConfig, DBConfig {
     var themeOrdinal by preference(Key.THEME_ORDINAL, Theme.Piplup.ordinal)
     var suReAuth by preference(Key.SU_REAUTH, false)
     var suTapjack by preference(Key.SU_TAPJACK, true)
-    var checkUpdate by preference(Key.CHECK_UPDATES, true)
+    private var checkUpdatePrefs by preference(Key.CHECK_UPDATES, true)
+    var checkUpdate
+        get() = checkUpdatePrefs
+        set(value) {
+            if (checkUpdatePrefs != value) {
+                checkUpdatePrefs = value
+                JobService.schedule(AppContext)
+            }
+        }
     var doh by preference(Key.DOH, false)
     var showSystemApp by preference(Key.SHOW_SYSTEM_APP, false)
 
@@ -152,8 +160,14 @@ object Config : PreferenceConfig, DBConfig {
     var rootMode by dbSettings(Key.ROOT_ACCESS, Value.ROOT_ACCESS_APPS_AND_ADB)
     var suMntNamespaceMode by dbSettings(Key.SU_MNT_NS, Value.NAMESPACE_MODE_REQUESTER)
     var suMultiuserMode by dbSettings(Key.SU_MULTIUSER_MODE, Value.MULTIUSER_MODE_OWNER_ONLY)
-    var suBiometric by dbSettings(Key.SU_BIOMETRIC, false)
+    private var suBiometric by dbSettings(Key.SU_BIOMETRIC, false)
+    var userAuth
+        get() = Info.isDeviceSecure && suBiometric
+        set(value) {
+            suBiometric = value
+        }
     var zygisk by dbSettings(Key.ZYGISK, false)
+    var bootloop by dbSettings(Key.BOOTLOOP, 0)
     var denyList by BoolDBPropertyNoWrite(Key.DENYLIST, false)
     var suManager by dbStrings(Key.SU_MANAGER, "", true)
     var keyStoreRaw by dbStrings(Key.KEYSTORE, "", true)
@@ -162,10 +176,15 @@ object Config : PreferenceConfig, DBConfig {
 
     fun load(pkg: String?) {
         // Only try to load prefs when fresh install and a previous package name is set
-        if (pkg != null && prefs.all.isEmpty()) runCatching {
-            context.contentResolver.openInputStream(Provider.preferencesUri(pkg))?.use {
-                prefs.edit { parsePrefs(it) }
+        if (pkg != null && prefs.all.isEmpty()) {
+            runBlocking {
+                try {
+                    context.contentResolver
+                        .openInputStream(Provider.preferencesUri(pkg))
+                        ?.writeTo(prefsFile, dispatcher = Dispatchers.Unconfined)
+                } catch (ignored: IOException) {}
             }
+            return
         }
 
         prefs.edit {
@@ -182,52 +201,4 @@ object Config : PreferenceConfig, DBConfig {
             }
         }
     }
-
-    private fun SharedPreferences.Editor.parsePrefs(input: InputStream) {
-        runCatching {
-            val parser = Xml.newPullParser()
-            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false)
-            parser.setInput(input, "UTF-8")
-            parser.nextTag()
-            parser.require(XmlPullParser.START_TAG, null, "map")
-            while (parser.next() != XmlPullParser.END_TAG) {
-                if (parser.eventType != XmlPullParser.START_TAG)
-                    continue
-                val key: String = parser.getAttributeValue(null, "name")
-                fun value() = parser.getAttributeValue(null, "value")!!
-                when (parser.name) {
-                    "string" -> {
-                        parser.require(XmlPullParser.START_TAG, null, "string")
-                        putString(key, parser.nextText())
-                        parser.require(XmlPullParser.END_TAG, null, "string")
-                    }
-                    "boolean" -> {
-                        parser.require(XmlPullParser.START_TAG, null, "boolean")
-                        putBoolean(key, value().toBoolean())
-                        parser.nextTag()
-                        parser.require(XmlPullParser.END_TAG, null, "boolean")
-                    }
-                    "int" -> {
-                        parser.require(XmlPullParser.START_TAG, null, "int")
-                        putInt(key, value().toInt())
-                        parser.nextTag()
-                        parser.require(XmlPullParser.END_TAG, null, "int")
-                    }
-                    "long" -> {
-                        parser.require(XmlPullParser.START_TAG, null, "long")
-                        putLong(key, value().toLong())
-                        parser.nextTag()
-                        parser.require(XmlPullParser.END_TAG, null, "long")
-                    }
-                    "float" -> {
-                        parser.require(XmlPullParser.START_TAG, null, "int")
-                        putFloat(key, value().toFloat())
-                        parser.nextTag()
-                        parser.require(XmlPullParser.END_TAG, null, "int")
-                    }
-                    else -> parser.next()
-                }
-            }
-        }
-    }
 }

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

@@ -15,8 +15,7 @@ object Const {
         else Build.SUPPORTED_32_BIT_ABIS.firstOrNull()
 
     // Paths
-    lateinit var MAGISKTMP: String
-    val MAGISK_PATH get() = "$MAGISKTMP/modules"
+    const val MAGISK_PATH  = "/data/adb/modules"
     const val TMPDIR = "/dev/tmp"
     const val MAGISK_LOG = "/cache/magisk.log"
 
@@ -36,7 +35,8 @@ object Const {
     }
 
     object ID {
-        const val JOB_SERVICE_ID = 7
+        const val DOWNLOAD_JOB_ID = 6
+        const val CHECK_UPDATE_JOB_ID = 7
     }
 
     object Url {

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

@@ -13,8 +13,8 @@ import android.util.DisplayMetrics
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.StubApk
 import com.topjohnwu.magisk.core.di.AppContext
+import com.topjohnwu.magisk.core.ktx.unwrap
 import com.topjohnwu.magisk.core.utils.syncLocale
-import com.topjohnwu.magisk.ktx.unwrap
 
 lateinit var AppApkPath: String
 

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

@@ -1,16 +1,13 @@
 package com.topjohnwu.magisk.core
 
-import android.os.Build
-import androidx.lifecycle.LiveData
+import android.app.KeyguardManager
 import androidx.lifecycle.MutableLiveData
 import com.topjohnwu.magisk.StubApk
 import com.topjohnwu.magisk.core.di.AppContext
+import com.topjohnwu.magisk.core.ktx.getProperty
 import com.topjohnwu.magisk.core.model.UpdateInfo
 import com.topjohnwu.magisk.core.repository.NetworkService
-import com.topjohnwu.magisk.core.utils.net.NetworkObserver
-import com.topjohnwu.magisk.ktx.getProperty
 import com.topjohnwu.superuser.ShellUtils.fastCmd
-import com.topjohnwu.superuser.internal.UiThreadHandler
 
 val isRunningAsStub get() = Info.stub != null
 
@@ -29,29 +26,31 @@ object Info {
     // Device state
     @JvmStatic val env by lazy { loadState() }
     @JvmField var isSAR = false
+    var legacySAR = false
     var isAB = false
     @JvmField val isZygiskEnabled = System.getenv("ZYGISK_ENABLED") == "1"
     @JvmStatic val isFDE get() = crypto == "block"
     @JvmField var ramdisk = false
-    @JvmField var vbmeta = false
+    var patchBootVbmeta = false
     var crypto = ""
     var noDataExec = false
     var isRooted = false
 
     @JvmField var hasGMS = true
-    val isSamsung = Build.MANUFACTURER.equals("samsung", ignoreCase = true)
     @JvmField val isEmulator =
         getProperty("ro.kernel.qemu", "0") == "1" ||
             getProperty("ro.boot.qemu", "0") == "1"
 
-    val isConnected: LiveData<Boolean> by lazy {
-        MutableLiveData(false).also { field ->
-            NetworkObserver.observe(AppContext) {
-                UiThreadHandler.run { field.value = it }
-            }
-        }
+    val isConnected = MutableLiveData(false)
+
+    val showSuperUser: Boolean get() {
+        return env.isActive && (Const.USER_ID == 0
+                || Config.suMultiuserMode == Config.Value.MULTIUSER_MODE_USER)
     }
 
+    val isDeviceSecure get() =
+        AppContext.getSystemService(KeyguardManager::class.java).isDeviceSecure
+
     private fun loadState(): Env {
         val v = fastCmd("magisk -v").split(":".toRegex())
         return Env(
@@ -67,9 +66,10 @@ object Info {
     ) {
         val versionCode = when {
             code < Const.Version.MIN_VERCODE -> -1
-            else -> if (isRooted) code else -1
+            isRooted ->  code
+            else -> -1
         }
         val isUnsupported = code > 0 && code < Const.Version.MIN_VERCODE
-        val isActive = versionCode >= 0
+        val isActive = versionCode > 0
     }
 }

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

@@ -1,5 +1,8 @@
 package com.topjohnwu.magisk.core
 
+import android.annotation.SuppressLint
+import android.annotation.TargetApi
+import android.app.Notification
 import android.app.job.JobInfo
 import android.app.job.JobParameters
 import android.app.job.JobScheduler
@@ -8,38 +11,78 @@ import androidx.core.content.getSystemService
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.core.base.BaseJobService
 import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.download.DownloadEngine
+import com.topjohnwu.magisk.core.download.Subject
 import com.topjohnwu.magisk.view.Notifications
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import java.util.concurrent.TimeUnit
 
 class JobService : BaseJobService() {
 
-    private val job = Job()
-    private val svc get() = ServiceLocator.networkService
+    private var mSession: Session? = null
 
-    override fun onStartJob(params: JobParameters): Boolean {
-        val coroutineScope = CoroutineScope(Dispatchers.IO + job)
-        coroutineScope.launch {
-            doWork()
+    @TargetApi(value = 34)
+    inner class Session(
+        private var params: JobParameters
+    ) : DownloadEngine.Session {
+
+        override val context get() = this@JobService
+        val engine = DownloadEngine(this)
+
+        fun updateParams(params: JobParameters) {
+            this.params = params
+            engine.reattach()
+        }
+
+        override fun attachNotification(id: Int, builder: Notification.Builder) {
+            setNotification(params, id, builder.build(), JOB_END_NOTIFICATION_POLICY_REMOVE)
+        }
+
+        override fun onDownloadComplete() {
             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)
+    @SuppressLint("NewApi")
+    override fun onStartJob(params: JobParameters): Boolean {
+        return when (params.jobId) {
+            Const.ID.CHECK_UPDATE_JOB_ID -> checkUpdate(params)
+            Const.ID.DOWNLOAD_JOB_ID -> downloadFile(params)
+            else -> false
         }
     }
 
-    override fun onStopJob(params: JobParameters): Boolean {
-        job.cancel()
-        return false
+    override fun onStopJob(params: JobParameters?) = false
+
+    @TargetApi(value = 34)
+    private fun downloadFile(params: JobParameters): Boolean {
+        params.transientExtras.classLoader = Subject::class.java.classLoader
+        val subject = params.transientExtras
+            .getParcelable(DownloadEngine.SUBJECT_KEY, Subject::class.java) ?:
+            return false
+
+        val session = mSession?.also {
+            it.updateParams(params)
+        } ?: run {
+            Session(params).also { mSession = it }
+        }
+
+        session.engine.download(subject)
+        return true
+    }
+
+    private fun checkUpdate(params: JobParameters): Boolean {
+        GlobalScope.launch(Dispatchers.IO) {
+            ServiceLocator.networkService.fetchUpdate()?.let {
+                Info.remote = it
+                if (Info.env.isActive && BuildConfig.VERSION_CODE < it.magisk.versionCode)
+                    Notifications.updateAvailable()
+                jobFinished(params, false)
+            }
+        }
+        return true
     }
 
     companion object {
@@ -47,14 +90,14 @@ class JobService : BaseJobService() {
             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)
+                val info = JobInfo.Builder(Const.ID.CHECK_UPDATE_JOB_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)
+                scheduler.cancel(Const.ID.CHECK_UPDATE_JOB_ID)
             }
         }
     }

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

@@ -6,17 +6,23 @@ import android.os.ParcelFileDescriptor
 import android.os.ParcelFileDescriptor.MODE_READ_ONLY
 import com.topjohnwu.magisk.core.base.BaseProvider
 import com.topjohnwu.magisk.core.su.SuCallbackHandler
+import com.topjohnwu.magisk.core.su.TestHandler
 
 class Provider : BaseProvider() {
 
     override fun call(method: String, arg: String?, extras: Bundle?): Bundle? {
-        SuCallbackHandler.run(context!!, method, extras)
-        return Bundle.EMPTY
+        return when (method) {
+            SuCallbackHandler.LOG, SuCallbackHandler.NOTIFY -> {
+                SuCallbackHandler.run(context!!, method, extras)
+                Bundle.EMPTY
+            }
+            else -> TestHandler.run(method)
+        }
     }
 
     override fun openFile(uri: Uri, mode: String): ParcelFileDescriptor? {
         return when (uri.encodedPath ?: return null) {
-            "/prefs_file" -> ParcelFileDescriptor.open(Config.prefsFile, MODE_READ_ONLY)
+            "/prefs_file" -> ParcelFileDescriptor.open(Config.getPrefsFile(), MODE_READ_ONLY)
             else -> super.openFile(uri, mode)
         }
     }

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

@@ -3,8 +3,11 @@ package com.topjohnwu.magisk.core
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
+import androidx.core.content.IntentCompat
 import com.topjohnwu.magisk.core.base.BaseReceiver
 import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.download.DownloadEngine
+import com.topjohnwu.magisk.core.download.Subject
 import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
@@ -35,6 +38,12 @@ open class Receiver : BaseReceiver() {
         }
 
         when (intent.action ?: return) {
+            DownloadEngine.ACTION -> {
+                IntentCompat.getParcelableExtra(
+                    intent, DownloadEngine.SUBJECT_KEY, Subject::class.java)?.let {
+                        DownloadEngine.start(context, it)
+                    }
+            }
             Intent.ACTION_PACKAGE_REPLACED -> {
                 // This will only work pre-O
                 if (Config.suReAuth)
@@ -51,7 +60,7 @@ open class Receiver : BaseReceiver() {
                 @Suppress("DEPRECATION")
                 val installer = context.packageManager.getInstallerPackageName(context.packageName)
                 if (installer == context.packageName) {
-                    Notifications.updateDone(context)
+                    Notifications.updateDone()
                 }
             }
         }

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

@@ -0,0 +1,38 @@
+package com.topjohnwu.magisk.core
+
+import android.app.Notification
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.ServiceCompat
+import androidx.core.content.IntentCompat
+import com.topjohnwu.magisk.core.base.BaseService
+import com.topjohnwu.magisk.core.download.DownloadEngine
+import com.topjohnwu.magisk.core.download.Subject
+
+class Service : BaseService(), DownloadEngine.Session {
+
+    private var mEngine: DownloadEngine? = null
+    override val context get() = this
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        if (intent.action == DownloadEngine.ACTION) {
+            IntentCompat
+                .getParcelableExtra(intent, DownloadEngine.SUBJECT_KEY, Subject::class.java)
+                ?.let { subject ->
+                    val engine = mEngine ?: DownloadEngine(this).also { mEngine = it }
+                    engine.download(subject)
+                }
+        }
+        return START_NOT_STICKY
+    }
+
+    override fun attachNotification(id: Int, builder: Notification.Builder) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
+            builder.setForegroundServiceBehavior(Notification.FOREGROUND_SERVICE_IMMEDIATE)
+        startForeground(id, builder.build())
+    }
+
+    override fun onDownloadComplete() {
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk.core.base
 
+import android.Manifest.permission.POST_NOTIFICATIONS
 import android.Manifest.permission.REQUEST_INSTALL_PACKAGES
 import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
 import android.app.Activity
@@ -17,10 +18,11 @@ import androidx.activity.result.contract.ActivityResultContracts.RequestPermissi
 import androidx.appcompat.app.AppCompatActivity
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.ktx.reflectField
+import com.topjohnwu.magisk.core.ktx.toast
+import com.topjohnwu.magisk.core.utils.RequestAuthentication
 import com.topjohnwu.magisk.core.utils.RequestInstall
 import com.topjohnwu.magisk.core.wrap
-import com.topjohnwu.magisk.ktx.reflectField
-import com.topjohnwu.magisk.utils.Utils
 
 interface ContentResultCallback: ActivityResultCallback<Uri>, Parcelable {
     fun onActivityLaunch() {}
@@ -35,9 +37,17 @@ abstract class BaseActivity : AppCompatActivity() {
         permissionCallback?.invoke(it)
         permissionCallback = null
     }
+
+    private var installCallback: ((Boolean) -> Unit)? = null
     private val requestInstall = registerForActivityResult(RequestInstall()) {
-        permissionCallback?.invoke(it)
-        permissionCallback = null
+        installCallback?.invoke(it)
+        installCallback = null
+    }
+
+    var authenticateCallback: ((Boolean) -> Unit)? = null
+    val requestAuthenticate = registerForActivityResult(RequestAuthentication()) {
+        authenticateCallback?.invoke(it)
+        authenticateCallback = null
     }
 
     private var contentCallback: ContentResultCallback? = null
@@ -52,9 +62,7 @@ abstract class BaseActivity : AppCompatActivity() {
 
     val realCallingPackage: String? get() {
         callingPackage?.let { return it }
-        if (Build.VERSION.SDK_INT >= 22) {
-            mReferrerField.get(this)?.let { return it as String }
-        }
+        mReferrerField.get(this)?.let { return it as String }
         return null
     }
 
@@ -67,8 +75,8 @@ abstract class BaseActivity : AppCompatActivity() {
             // 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)
+            clz.reflectField("mActivityHandlesConfigFlagsChecked").set(delegate, true)
+            clz.reflectField("mActivityHandlesConfigFlags").set(delegate, 0)
         }
         contentCallback = savedInstanceState?.getParcelable(CONTENT_CALLBACK_KEY)
         super.onCreate(savedInstanceState)
@@ -82,15 +90,23 @@ abstract class BaseActivity : AppCompatActivity() {
     }
 
     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+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
+            permission == WRITE_EXTERNAL_STORAGE) {
+            // We do not need external rw on R+
+            callback(true)
+            return
+        }
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU &&
+            permission == POST_NOTIFICATIONS) {
+            // All apps have notification permissions before T
             callback(true)
             return
         }
-        permissionCallback = callback
         if (permission == REQUEST_INSTALL_PACKAGES) {
+            installCallback = callback
             requestInstall.launch(Unit)
         } else {
+            permissionCallback = callback
             requestPermission.launch(permission)
         }
     }
@@ -101,7 +117,7 @@ abstract class BaseActivity : AppCompatActivity() {
             getContent.launch(type)
             callback.onActivityLaunch()
         } catch (e: ActivityNotFoundException) {
-            Utils.toast(R.string.app_not_found, Toast.LENGTH_SHORT)
+            toast(R.string.app_not_found, Toast.LENGTH_SHORT)
         }
     }
 

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

@@ -4,7 +4,11 @@ import com.topjohnwu.magisk.core.model.BranchInfo
 import com.topjohnwu.magisk.core.model.ModuleJson
 import com.topjohnwu.magisk.core.model.UpdateInfo
 import okhttp3.ResponseBody
-import retrofit2.http.*
+import retrofit2.http.GET
+import retrofit2.http.Headers
+import retrofit2.http.Path
+import retrofit2.http.Streaming
+import retrofit2.http.Url
 
 private const val BRANCH = "branch"
 private const val REPO = "repo"
@@ -12,15 +16,12 @@ private const val FILE = "file"
 
 interface GithubPageServices {
 
-    @GET("{$FILE}")
-    suspend fun fetchUpdateJSON(@Path(FILE) file: String): UpdateInfo
+    @GET
+    suspend fun fetchUpdateJSON(@Url file: String): UpdateInfo
 }
 
 interface RawServices {
 
-    @GET
-    suspend fun fetchCustomUpdate(@Url url: String): UpdateInfo
-
     @GET
     @Streaming
     suspend fun fetchFile(@Url url: String): ResponseBody

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

@@ -1,15 +1,31 @@
 package com.topjohnwu.magisk.core.data
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Database
+import androidx.room.Insert
+import androidx.room.Query
+import androidx.room.RoomDatabase
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.topjohnwu.magisk.core.model.su.SuLog
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import java.util.*
+import java.util.Calendar
 
-@Database(version = 1, entities = [SuLog::class], exportSchema = false)
+@Database(version = 2, entities = [SuLog::class], exportSchema = false)
 abstract class SuLogDatabase : RoomDatabase() {
 
     abstract fun suLogDao(): SuLogDao
+
+    companion object {
+        val MIGRATION_1_2 = object : Migration(1, 2) {
+            override fun migrate(database: SupportSQLiteDatabase) = with(database) {
+                execSQL("ALTER TABLE logs ADD COLUMN target INTEGER NOT NULL DEFAULT -1")
+                execSQL("ALTER TABLE logs ADD COLUMN context TEXT NOT NULL DEFAULT ''")
+                execSQL("ALTER TABLE logs ADD COLUMN gids TEXT NOT NULL DEFAULT ''")
+            }
+        }
+    }
 }
 
 @Dao

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

@@ -1,6 +1,6 @@
 package com.topjohnwu.magisk.core.data.magiskdb
 
-import com.topjohnwu.magisk.ktx.await
+import com.topjohnwu.magisk.core.ktx.await
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

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

@@ -9,9 +9,9 @@ import com.topjohnwu.magisk.core.data.SuLogDatabase
 import com.topjohnwu.magisk.core.data.magiskdb.PolicyDao
 import com.topjohnwu.magisk.core.data.magiskdb.SettingsDao
 import com.topjohnwu.magisk.core.data.magiskdb.StringDao
+import com.topjohnwu.magisk.core.ktx.deviceProtectedContext
 import com.topjohnwu.magisk.core.repository.LogRepository
 import com.topjohnwu.magisk.core.repository.NetworkService
-import com.topjohnwu.magisk.ktx.deviceProtectedContext
 import io.noties.markwon.Markwon
 import io.noties.markwon.utils.NoCopySpannableFactory
 
@@ -39,13 +39,13 @@ object ServiceLocator {
         NetworkService(
             createApiService(retrofit, Const.Url.GITHUB_PAGE_URL),
             createApiService(retrofit, Const.Url.GITHUB_RAW_URL),
-            createApiService(retrofit, Const.Url.GITHUB_API_URL)
         )
     }
 }
 
 private fun createSuLogDatabase(context: Context) =
     Room.databaseBuilder(context, SuLogDatabase::class.java, "sulogs.db")
+        .addMigrations(SuLogDatabase.MIGRATION_1_2)
         .fallbackToDestructiveMigration()
         .build()
 

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

@@ -0,0 +1,373 @@
+package com.topjohnwu.magisk.core.download
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.app.Notification
+import android.app.PendingIntent
+import android.app.job.JobInfo
+import android.app.job.JobScheduler
+import android.content.Context
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import androidx.collection.SparseArrayCompat
+import androidx.collection.isNotEmpty
+import androidx.core.content.getSystemService
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.MutableLiveData
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.StubApk
+import com.topjohnwu.magisk.core.ActivityTracker
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.JobService
+import com.topjohnwu.magisk.core.base.BaseActivity
+import com.topjohnwu.magisk.core.cmp
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.intent
+import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.ktx.cachedFile
+import com.topjohnwu.magisk.core.ktx.copyAll
+import com.topjohnwu.magisk.core.ktx.copyAndClose
+import com.topjohnwu.magisk.core.ktx.forEach
+import com.topjohnwu.magisk.core.ktx.set
+import com.topjohnwu.magisk.core.ktx.withStreams
+import com.topjohnwu.magisk.core.ktx.writeTo
+import com.topjohnwu.magisk.core.tasks.HideAPK
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
+import com.topjohnwu.magisk.core.utils.ProgressInputStream
+import com.topjohnwu.magisk.utils.APKInstall
+import com.topjohnwu.magisk.view.Notifications
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import okhttp3.ResponseBody
+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.ZipFile
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
+
+/**
+ * This class drives the execution of file downloads and notification management.
+ *
+ * Each download engine instance has to be paired with a "session" that is managed by the operating
+ * system. A session is an Android component that allows executing long lasting operations and
+ * have its state tied to a notification to show progress.
+ *
+ * A session can only have one single notification representing its state, and the operating system
+ * also uses the notification to manage the lifecycle of a session. One goal of this class is
+ * to support concurrent download tasks using only one single session, so internally it manages
+ * all active tasks and notifications and properly re-assign notifications to be attached to
+ * the session to make sure all download operations can be completed without the operating system
+ * killing the session.
+ *
+ * For API 23 - 33, we use a foreground service as a session.
+ * For API 34 and higher, we use user-initiated job services as a session.
+ */
+class DownloadEngine(
+    private val session: Session
+) {
+
+    interface Session {
+        val context: Context
+
+        fun attachNotification(id: Int, builder: Notification.Builder)
+        fun onDownloadComplete()
+    }
+
+    companion object {
+        const val ACTION = "com.topjohnwu.magisk.DOWNLOAD"
+        const val SUBJECT_KEY = "subject"
+        private const val REQUEST_CODE = 1
+
+        private val progressBroadcast = MutableLiveData<Pair<Float, Subject>?>()
+
+        private fun broadcast(progress: Float, subject: Subject) {
+            progressBroadcast.postValue(progress to 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 createIntent(context: Context, subject: Subject) =
+            if (Build.VERSION.SDK_INT >= 34) {
+                context.intent<com.topjohnwu.magisk.core.Receiver>()
+                    .setAction(ACTION)
+                    .putExtra(SUBJECT_KEY, subject)
+            } else {
+                context.intent<com.topjohnwu.magisk.core.Service>()
+                    .setAction(ACTION)
+                    .putExtra(SUBJECT_KEY, subject)
+            }
+
+        @SuppressLint("InlinedApi")
+        fun getPendingIntent(context: Context, subject: Subject): PendingIntent {
+            val flag = PendingIntent.FLAG_IMMUTABLE or
+                PendingIntent.FLAG_UPDATE_CURRENT or
+                PendingIntent.FLAG_ONE_SHOT
+            val intent = createIntent(context, subject)
+            return if (Build.VERSION.SDK_INT >= 34) {
+                // On API 34+, download tasks are handled with a user-initiated job.
+                // However, there is no way to schedule a new job directly with a pending intent.
+                // As a workaround, we send the subject to a broadcast receiver and have it
+                // schedule the job for us.
+                PendingIntent.getBroadcast(context, REQUEST_CODE, intent, flag)
+            } else if (Build.VERSION.SDK_INT >= 26) {
+                PendingIntent.getForegroundService(context, REQUEST_CODE, intent, flag)
+            } else {
+                PendingIntent.getService(context, REQUEST_CODE, intent, flag)
+            }
+        }
+
+        @SuppressLint("InlinedApi")
+        fun startWithActivity(activity: BaseActivity, subject: Subject) {
+            activity.withPermission(Manifest.permission.POST_NOTIFICATIONS) {
+                // Always download regardless of notification permission status
+                start(activity.applicationContext, subject)
+            }
+        }
+
+        fun start(context: Context, subject: Subject) {
+            if (Build.VERSION.SDK_INT >= 34) {
+                val scheduler = context.getSystemService<JobScheduler>()!!
+                val cmp = JobService::class.java.cmp(context.packageName)
+                val extras = Bundle()
+                extras.putParcelable(SUBJECT_KEY, subject)
+                val info = JobInfo.Builder(Const.ID.DOWNLOAD_JOB_ID, cmp)
+                    .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                    .setUserInitiated(true)
+                    .setTransientExtras(extras)
+                    .build()
+                scheduler.schedule(info)
+            } else if (Build.VERSION.SDK_INT >= 26) {
+                context.startForegroundService(createIntent(context, subject))
+            } else {
+                context.startService(createIntent(context, subject))
+            }
+        }
+    }
+
+    fun download(subject: Subject) {
+        notifyUpdate(subject.notifyId)
+        CoroutineScope(job + Dispatchers.IO).launch {
+            try {
+                val stream = network.fetchFile(subject.url).toProgressStream(subject)
+                when (subject) {
+                    is Subject.App -> handleApp(stream, subject)
+                    is Subject.Module -> handleModule(stream, subject.file)
+                    else -> stream.copyAndClose(subject.file.outputStream())
+                }
+                val activity = ActivityTracker.foreground
+                if (activity != null && subject.autoLaunch) {
+                    notifyRemove(subject.notifyId)
+                    subject.pendingIntent(activity)?.send()
+                } else {
+                    notifyFinish(subject)
+                }
+            } catch (e: IOException) {
+                Timber.e(e)
+                notifyFail(subject)
+            }
+        }
+    }
+
+    @Synchronized
+    fun reattach() {
+        val builder = notifications[attachedId] ?: return
+        session.attachNotification(attachedId, builder)
+    }
+
+    private val notifications = SparseArrayCompat<Notification.Builder>()
+    private var attachedId = -1
+
+    private val job = Job()
+
+    private val context get() = session.context
+    private val network get() = ServiceLocator.networkService
+
+    private fun finalNotify(id: Int, editor: (Notification.Builder) -> Unit): Int {
+        val notification = notifyRemove(id)?.also(editor) ?: return -1
+        val newId = Notifications.nextId()
+        Notifications.mgr.notify(newId, notification.build())
+        return newId
+    }
+
+    private fun notifyFail(subject: Subject) = finalNotify(subject.notifyId) {
+        broadcast(-2f, subject)
+        it.setContentText(context.getString(R.string.download_file_error))
+            .setSmallIcon(android.R.drawable.stat_notify_error)
+            .setOngoing(false)
+    }
+
+    private fun notifyFinish(subject: Subject) = finalNotify(subject.notifyId) {
+        broadcast(1f, subject)
+        it.setContentTitle(subject.title)
+            .setContentText(context.getString(R.string.download_complete))
+            .setSmallIcon(android.R.drawable.stat_sys_download_done)
+            .setProgress(0, 0, false)
+            .setOngoing(false)
+            .setAutoCancel(true)
+        subject.pendingIntent(context)?.let { intent -> it.setContentIntent(intent) }
+    }
+
+    private fun attachNotification(id: Int, notification: Notification.Builder) {
+        attachedId = id
+        session.attachNotification(id, notification)
+    }
+
+    @Synchronized
+    private fun notifyUpdate(id: Int, editor: (Notification.Builder) -> Unit = {}) {
+        val notification = (notifications[id] ?: Notifications.startProgress("").also {
+            notifications[id] = it
+        }).apply(editor)
+
+        if (attachedId < 0)
+            attachNotification(id, notification)
+        else
+            Notifications.mgr.notify(id, notification.build())
+    }
+
+    @Synchronized
+    private fun notifyRemove(id: Int): Notification.Builder? {
+        val idx = notifications.indexOfKey(id)
+        var n: Notification.Builder? = null
+
+        if (idx >= 0) {
+            n = notifications.valueAt(idx)
+            notifications.removeAt(idx)
+
+            // The cancelled notification is the one attached to the session, need special handling
+            if (attachedId == id) {
+                if (notifications.isNotEmpty()) {
+                    // There are still remaining notifications, pick one and attach to the session
+                    val anotherId = notifications.keyAt(0)
+                    val notification = notifications.valueAt(0)
+                    attachNotification(anotherId, notification)
+                } else {
+                    // No more notifications left, terminate the session
+                    attachedId = -1
+                    session.onDownloadComplete()
+                }
+            }
+        }
+
+        Notifications.mgr.cancel(id)
+        return n
+    }
+
+    private suspend fun handleApp(stream: InputStream, subject: Subject.App) {
+        val external = subject.file.outputStream()
+
+        if (isRunningAsStub) {
+            val updateApk = StubApk.update(context)
+            try {
+                // Download full APK to stub update path
+                stream.copyAndClose(TeeOutputStream(external, updateApk.outputStream()))
+
+                // Also upgrade stub
+                notifyUpdate(subject.notifyId) {
+                    it.setProgress(0, 0, true)
+                        .setContentTitle(context.getString(R.string.hide_app_title))
+                        .setContentText("")
+                }
+
+                // Extract stub
+                val zf = ZipFile(updateApk)
+                val apk = context.cachedFile("stub.apk")
+                apk.delete()
+                zf.getInputStream(zf.getEntry("assets/stub.apk")).writeTo(apk)
+                zf.close()
+
+                // Patch and install
+                subject.intent = HideAPK.upgrade(context, apk)
+                    ?: throw IOException("HideAPK patch error")
+                apk.delete()
+            } catch (e: Exception) {
+                // If any error occurred, do not let stub load the new APK
+                updateApk.delete()
+                throw e
+            }
+        } else {
+            val session = APKInstall.startSession(context)
+            stream.copyAndClose(TeeOutputStream(external, session.openStream(context)))
+            subject.intent = session.waitIntent()
+        }
+    }
+
+    private suspend fun handleModule(src: InputStream, file: Uri) {
+        val input = ZipInputStream(src)
+        val output = ZipOutputStream(file.outputStream())
+
+        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"))
+            context.assets.open("module_installer.sh").use { it.copyAll(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.copyAll(zout)
+                    }
+                }
+            }
+        }
+    }
+
+    private class TeeOutputStream(
+        private val o1: OutputStream,
+        private val o2: OutputStream
+    ) : OutputStream() {
+        override fun write(b: Int) {
+            o1.write(b)
+            o2.write(b)
+        }
+        override fun write(b: ByteArray?, off: Int, len: Int) {
+            o1.write(b, off, len)
+            o2.write(b, off, len)
+        }
+        override fun close() {
+            o1.close()
+            o2.close()
+        }
+    }
+
+    private fun ResponseBody.toProgressStream(subject: Subject): InputStream {
+        val max = contentLength()
+        val total = max.toFloat() / 1048576
+        val id = subject.notifyId
+
+        notifyUpdate(id) { it.setContentTitle(subject.title) }
+
+        return ProgressInputStream(byteStream()) {
+            val progress = it.toFloat() / 1048576
+            notifyUpdate(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))
+                }
+            }
+        }
+    }
+}

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

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

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

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

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

@@ -9,22 +9,16 @@ import android.os.Parcelable
 import androidx.core.net.toUri
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.di.AppContext
+import com.topjohnwu.magisk.core.ktx.cachedFile
 import com.topjohnwu.magisk.core.model.MagiskJson
-import com.topjohnwu.magisk.core.model.StubJson
 import com.topjohnwu.magisk.core.model.module.OnlineModule
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
-import com.topjohnwu.magisk.ktx.cachedFile
 import com.topjohnwu.magisk.ui.flash.FlashFragment
 import com.topjohnwu.magisk.view.Notifications
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-
-private fun cachedFile(name: String) = AppContext.cachedFile(name).apply { delete() }.toUri()
-
-enum class Action {
-    Flash,
-    Download
-}
+import java.io.File
+import java.util.UUID
 
 sealed class Subject : Parcelable {
 
@@ -33,19 +27,17 @@ sealed class Subject : Parcelable {
     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?
+    open fun pendingIntent(context: Context): PendingIntent? = null
 
     @Parcelize
     class Module(
-        val module: OnlineModule,
-        val action: Action,
+        private val module: OnlineModule,
+        override val autoLaunch: Boolean,
         override val notifyId: Int = Notifications.nextId()
     ) : Subject() {
         override val url: String get() = module.zipUrl
         override val title: String get() = module.downloadFilename
-        override val autoLaunch: Boolean get() = action == Action.Flash
 
         @IgnoredOnParcel
         override val file by lazy {
@@ -59,7 +51,6 @@ sealed class Subject : Parcelable {
     @Parcelize
     class App(
         private val json: MagiskJson = Info.remote.magisk,
-        val stub: StubJson = Info.remote.stub,
         override val notifyId: Int = Notifications.nextId()
     ) : Subject() {
         override val title: String get() = "Magisk-${json.version}(${json.versionCode})"
@@ -67,17 +58,24 @@ sealed class Subject : Parcelable {
 
         @IgnoredOnParcel
         override val file by lazy {
-            cachedFile("manager.apk")
+            MediaStoreUtils.getFile("${title}.apk").uri
         }
 
-        @IgnoredOnParcel
-        override var postDownload: (() -> Unit)? = null
-
         @IgnoredOnParcel
         var intent: Intent? = null
         override fun pendingIntent(context: Context) = intent?.toPending(context)
     }
 
+    @Parcelize
+    class Test(
+        override val notifyId: Int = Notifications.nextId(),
+        override val title: String = UUID.randomUUID().toString().substring(0, 6)
+    ) : Subject() {
+        override val url get() = "https://link.testfile.org/250MB"
+        override val file get() = File("/dev/null").toUri()
+        override val autoLaunch get() = false
+    }
+
     @SuppressLint("InlinedApi")
     protected fun Intent.toPending(context: Context): PendingIntent {
         return PendingIntent.getActivity(context, notifyId, this,

app/src/main/java/com/topjohnwu/magisk/core/ktx/XAndroid.kt

@@ -0,0 +1,152 @@
+package com.topjohnwu.magisk.core.ktx
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.*
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.res.Configuration
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.AdaptiveIconDrawable
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.LayerDrawable
+import android.os.Build
+import android.os.Build.VERSION.SDK_INT
+import android.os.Process
+import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.Toast
+import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.content.getSystemService
+import com.topjohnwu.magisk.core.utils.RootUtils
+import com.topjohnwu.magisk.core.utils.currentLocale
+import com.topjohnwu.magisk.utils.APKInstall
+import com.topjohnwu.superuser.internal.UiThreadHandler
+import java.io.File
+import kotlin.String
+
+fun Context.rawResource(id: Int) = resources.openRawResource(id)
+
+fun Context.getBitmap(id: Int): Bitmap {
+    var drawable = AppCompatResources.getDrawable(this, id)!!
+    if (drawable is BitmapDrawable)
+        return drawable.bitmap
+    if (SDK_INT >= Build.VERSION_CODES.O && drawable is AdaptiveIconDrawable) {
+        drawable = LayerDrawable(arrayOf(drawable.background, drawable.foreground))
+    }
+    val bitmap = Bitmap.createBitmap(
+        drawable.intrinsicWidth, drawable.intrinsicHeight,
+        Bitmap.Config.ARGB_8888
+    )
+    val canvas = Canvas(bitmap)
+    drawable.setBounds(0, 0, canvas.width, canvas.height)
+    drawable.draw(canvas)
+    return bitmap
+}
+
+val Context.deviceProtectedContext: Context get() =
+    if (SDK_INT >= Build.VERSION_CODES.N) {
+        createDeviceProtectedStorageContext()
+    } else { this }
+
+fun Context.cachedFile(name: String) = File(cacheDir, name)
+
+fun ApplicationInfo.getLabel(pm: PackageManager): String {
+    runCatching {
+        if (labelRes > 0) {
+            val res = pm.getResourcesForApplication(this)
+            val config = Configuration()
+            config.setLocale(currentLocale)
+            res.updateConfiguration(config, res.displayMetrics)
+            return res.getString(labelRes)
+        }
+    }
+
+    return loadLabel(pm).toString()
+}
+
+fun Context.unwrap(): Context {
+    var context = this
+    while (context is ContextWrapper)
+        context = context.baseContext
+    return context
+}
+
+fun Activity.hideKeyboard() {
+    val view = currentFocus ?: return
+    getSystemService<InputMethodManager>()
+        ?.hideSoftInputFromWindow(view.windowToken, 0)
+    view.clearFocus()
+}
+
+val View.activity: Activity get() {
+    var context = context
+    while(true) {
+        if (context !is ContextWrapper)
+            error("View is not attached to activity")
+        if (context is Activity)
+            return context
+        context = context.baseContext
+    }
+}
+
+@SuppressLint("PrivateApi")
+fun getProperty(key: String, def: String): String {
+    runCatching {
+        val clazz = Class.forName("android.os.SystemProperties")
+        val get = clazz.getMethod("get", String::class.java, String::class.java)
+        return get.invoke(clazz, key, def) as String
+    }
+    return def
+}
+
+@SuppressLint("InlinedApi")
+@Throws(PackageManager.NameNotFoundException::class)
+fun PackageManager.getPackageInfo(uid: Int, pid: Int): PackageInfo? {
+    val flag = PackageManager.MATCH_UNINSTALLED_PACKAGES
+    val pkgs = getPackagesForUid(uid) ?: throw PackageManager.NameNotFoundException()
+    if (pkgs.size > 1) {
+        if (pid <= 0) {
+            return null
+        }
+        // Try to find package name from PID
+        val proc = RootUtils.obj?.getAppProcess(pid)
+        if (proc == null) {
+            if (uid == Process.SHELL_UID) {
+                // It is possible that some apps installed are sharing UID with shell.
+                // We will not be able to find a package from the active process list,
+                // because the client is forked from ADB shell, not any app process.
+                return getPackageInfo("com.android.shell", flag)
+            }
+        } else if (uid == proc.uid) {
+            return getPackageInfo(proc.pkgList[0], flag)
+        }
+
+        return null
+    }
+    if (pkgs.size == 1) {
+        return getPackageInfo(pkgs[0], flag)
+    }
+    throw PackageManager.NameNotFoundException()
+}
+
+fun Context.registerRuntimeReceiver(receiver: BroadcastReceiver, filter: IntentFilter) {
+    APKInstall.registerReceiver(this, receiver, filter)
+}
+
+fun Context.selfLaunchIntent(): Intent {
+    val pm = packageManager
+    val intent = pm.getLaunchIntentForPackage(packageName)!!
+    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+    return intent
+}
+
+fun Context.toast(msg: CharSequence, duration: Int) {
+    UiThreadHandler.run { Toast.makeText(this, msg, duration).show() }
+}
+
+fun Context.toast(resId: Int, duration: Int) {
+    UiThreadHandler.run { Toast.makeText(this, resId, duration).show() }
+}

app/src/main/java/com/topjohnwu/magisk/core/ktx/XJVM.kt

@@ -1,17 +1,22 @@
-package com.topjohnwu.magisk.ktx
+package com.topjohnwu.magisk.core.ktx
 
 import androidx.collection.SparseArrayCompat
 import com.topjohnwu.magisk.core.utils.currentLocale
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flatMapMerge
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.withContext
 import java.io.File
+import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
 import java.lang.reflect.Field
 import java.text.DateFormat
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Collections
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 
@@ -35,9 +40,38 @@ inline fun <In : InputStream, Out : OutputStream> withStreams(
     }
 }
 
-fun InputStream.copyAndClose(out: OutputStream) = withStreams(this, out) { i, o -> i.copyTo(o) }
+@Throws(IOException::class)
+suspend fun InputStream.copyAll(
+    out: OutputStream,
+    bufferSize: Int = DEFAULT_BUFFER_SIZE,
+    dispatcher: CoroutineDispatcher = Dispatchers.IO
+): Long {
+    return withContext(dispatcher) {
+        var bytesCopied: Long = 0
+        val buffer = ByteArray(bufferSize)
+        var bytes = read(buffer)
+        while (isActive && bytes >= 0) {
+            out.write(buffer, 0, bytes)
+            bytesCopied += bytes
+            bytes = read(buffer)
+        }
+        bytesCopied
+    }
+}
 
-fun InputStream.writeTo(file: File) = copyAndClose(file.outputStream())
+@Throws(IOException::class)
+suspend inline fun InputStream.copyAndClose(
+    out: OutputStream,
+    bufferSize: Int = DEFAULT_BUFFER_SIZE,
+    dispatcher: CoroutineDispatcher = Dispatchers.IO
+) = withStreams(this, out) { i, o -> i.copyAll(o, bufferSize, dispatcher) }
+
+@Throws(IOException::class)
+suspend inline fun InputStream.writeTo(
+    file: File,
+    bufferSize: Int = DEFAULT_BUFFER_SIZE,
+    dispatcher: CoroutineDispatcher = Dispatchers.IO
+) = copyAndClose(file.outputStream(), bufferSize, dispatcher)
 
 operator fun <E> SparseArrayCompat<E>.set(key: Int, value: E) {
     put(key, value)

app/src/main/java/com/topjohnwu/magisk/core/ktx/XSU.kt

@@ -1,8 +1,6 @@
-package com.topjohnwu.magisk.ktx
+package com.topjohnwu.magisk.core.ktx
 
-import android.content.Context
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -15,12 +13,4 @@ fun reboot(reason: String = if (Config.recovery) "recovery" else "") {
     Shell.cmd("/system/bin/svc power reboot $reason || /system/bin/reboot $reason").submit()
 }
 
-fun relaunchApp(context: Context) {
-    val intent = context.packageManager.getLaunchIntentForPackage(context.packageName) ?: return
-    val args = mutableListOf("am", "start", "--user", Const.USER_ID.toString())
-    val cmd = intent.toCommand(args).joinToString(separator = " ")
-    Shell.cmd("run_delay 1 \"$cmd\"").exec()
-    Runtime.getRuntime().exit(0)
-}
-
 suspend fun Shell.Job.await() = withContext(Dispatchers.IO) { exec() }

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

@@ -7,7 +7,6 @@ import kotlinx.parcelize.Parcelize
 @JsonClass(generateAdapter = true)
 data class UpdateInfo(
     val magisk: MagiskJson = MagiskJson(),
-    val stub: StubJson = StubJson()
 )
 
 @Parcelize
@@ -19,13 +18,6 @@ data class MagiskJson(
     val note: String = ""
 ) : Parcelable
 
-@Parcelize
-@JsonClass(generateAdapter = true)
-data class StubJson(
-    val versionCode: Int = -1,
-    val link: String = ""
-) : Parcelable
-
 @JsonClass(generateAdapter = true)
 data class ModuleJson(
     val version: String,

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

@@ -43,10 +43,10 @@ data class LocalModule(
         set(enable) {
             if (enable) {
                 disableFile.delete()
-                Shell.cmd("copy_sepolicy_rules").submit()
+                Shell.cmd("copy_preinit_files").submit()
             } else {
                 !disableFile.createNewFile()
-                Shell.cmd("copy_sepolicy_rules").submit()
+                Shell.cmd("copy_preinit_files").submit()
             }
         }
 
@@ -56,10 +56,10 @@ data class LocalModule(
             if (remove) {
                 if (updateFile.exists()) return
                 removeFile.createNewFile()
-                Shell.cmd("copy_sepolicy_rules").submit()
+                Shell.cmd("copy_preinit_files").submit()
             } else {
                 removeFile.delete()
-                Shell.cmd("copy_sepolicy_rules").submit()
+                Shell.cmd("copy_preinit_files").submit()
             }
         }
 
@@ -122,15 +122,13 @@ data class LocalModule(
 
     companion object {
 
-        private val PERSIST get() = "${Const.MAGISKTMP}/mirror/persist/magisk"
-
         fun loaded() = RootUtils.fs.getFile(Const.MAGISK_PATH).exists()
 
         suspend fun installed() = withContext(Dispatchers.IO) {
             RootUtils.fs.getFile(Const.MAGISK_PATH)
                 .listFiles()
                 .orEmpty()
-                .filter { !it.isFile }
+                .filter { !it.isFile && !it.isHidden }
                 .map { LocalModule("${Const.MAGISK_PATH}/${it.name}") }
                 .sortedBy { it.name.lowercase(Locale.ROOT) }
         }

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

@@ -4,7 +4,7 @@ import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.topjohnwu.magisk.ktx.getLabel
+import com.topjohnwu.magisk.core.ktx.getLabel
 
 @Entity(tableName = "logs")
 class SuLog(
@@ -14,7 +14,10 @@ class SuLog(
     val packageName: String,
     val appName: String,
     val command: String,
-    val action: Boolean,
+    val action: Int,
+    val target: Int,
+    val context: String,
+    val gids: String,
     val time: Long = System.currentTimeMillis()
 ) {
     @PrimaryKey(autoGenerate = true) var id: Int = 0
@@ -25,7 +28,10 @@ fun PackageManager.createSuLog(
     toUid: Int,
     fromPid: Int,
     command: String,
-    policy: Int
+    policy: Int,
+    target: Int,
+    context: String,
+    gids: String,
 ): SuLog {
     val appInfo = info.applicationInfo
     return SuLog(
@@ -35,7 +41,10 @@ fun PackageManager.createSuLog(
         packageName = getNameForUid(appInfo.uid)!!,
         appName = appInfo.getLabel(this),
         command = command,
-        action = policy == SuPolicy.ALLOW
+        action = policy,
+        target = target,
+        context = context,
+        gids = gids,
     )
 }
 
@@ -44,7 +53,10 @@ fun createSuLog(
     toUid: Int,
     fromPid: Int,
     command: String,
-    policy: Int
+    policy: Int,
+    target: Int,
+    context: String,
+    gids: String,
 ): SuLog {
     return SuLog(
         fromUid = fromUid,
@@ -53,6 +65,9 @@ fun createSuLog(
         packageName = "[UID] $fromUid",
         appName = "[UID] $fromUid",
         command = command,
-        action = policy == SuPolicy.ALLOW
+        action = policy,
+        target = target,
+        context = context,
+        gids = gids,
     )
 }

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

@@ -3,8 +3,8 @@ package com.topjohnwu.magisk.core.repository
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.data.SuLogDao
+import com.topjohnwu.magisk.core.ktx.await
 import com.topjohnwu.magisk.core.model.su.SuLog
-import com.topjohnwu.magisk.ktx.await
 import com.topjohnwu.superuser.Shell
 
 

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

@@ -8,7 +8,6 @@ import com.topjohnwu.magisk.core.Config.Value.DEBUG_CHANNEL
 import com.topjohnwu.magisk.core.Config.Value.DEFAULT_CHANNEL
 import com.topjohnwu.magisk.core.Config.Value.STABLE_CHANNEL
 import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.data.GithubApiServices
 import com.topjohnwu.magisk.core.data.GithubPageServices
 import com.topjohnwu.magisk.core.data.RawServices
 import retrofit2.HttpException
@@ -17,8 +16,7 @@ import java.io.IOException
 
 class NetworkService(
     private val pages: GithubPageServices,
-    private val raw: RawServices,
-    private val api: GithubApiServices
+    private val raw: RawServices
 ) {
     suspend fun fetchUpdate() = safe {
         var info = when (Config.updateChannel) {
@@ -42,11 +40,14 @@ class NetworkService(
     private suspend fun fetchBetaUpdate() = pages.fetchUpdateJSON("beta.json")
     private suspend fun fetchCanaryUpdate() = pages.fetchUpdateJSON("canary.json")
     private suspend fun fetchDebugUpdate() = pages.fetchUpdateJSON("debug.json")
-    private suspend fun fetchCustomUpdate(url: String) = raw.fetchCustomUpdate(url)
+    private suspend fun fetchCustomUpdate(url: String) = pages.fetchUpdateJSON(url)
 
     private inline fun <T> safe(factory: () -> T): T? {
         return try {
-            factory()
+            if (Info.isConnected.value == true)
+                factory()
+            else
+                null
         } catch (e: Exception) {
             Timber.e(e)
             null

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

@@ -7,11 +7,11 @@ import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.ktx.getLabel
+import com.topjohnwu.magisk.core.ktx.getPackageInfo
+import com.topjohnwu.magisk.core.ktx.toast
 import com.topjohnwu.magisk.core.model.su.SuPolicy
 import com.topjohnwu.magisk.core.model.su.createSuLog
-import com.topjohnwu.magisk.ktx.getLabel
-import com.topjohnwu.magisk.ktx.getPackageInfo
-import com.topjohnwu.magisk.utils.Utils
 import kotlinx.coroutines.runBlocking
 import timber.log.Timber
 
@@ -57,17 +57,20 @@ object SuCallbackHandler {
         val toUid = data.getIntComp("to.uid", -1)
         val pid = data.getIntComp("pid", -1)
         val command = data.getString("command", "")
+        val target = data.getIntComp("target", -1)
+        val seContext = data.getString("context", "")
+        val gids = data.getString("gids", "")
 
         val pm = context.packageManager
 
         val log = runCatching {
             pm.getPackageInfo(fromUid, pid)?.let {
-                pm.createSuLog(it, toUid, pid, command, policy)
+                pm.createSuLog(it, toUid, pid, command, policy, target, seContext, gids)
             }
-        }.getOrNull() ?: createSuLog(fromUid, toUid, pid, command, policy)
+        }.getOrNull() ?: createSuLog(fromUid, toUid, pid, command, policy, target, seContext, gids)
 
         if (notify)
-            notify(context, log.action, log.appName)
+            notify(context, log.action == SuPolicy.ALLOW, log.appName)
 
         runBlocking { ServiceLocator.logRepo.insert(log) }
     }
@@ -93,7 +96,7 @@ object SuCallbackHandler {
             else
                 R.string.su_deny_toast
 
-            Utils.toast(context.getString(resId, appName), Toast.LENGTH_SHORT)
+            context.toast(context.getString(resId, appName), Toast.LENGTH_SHORT)
         }
     }
 }

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

@@ -6,13 +6,14 @@ import android.content.pm.PackageManager
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.data.magiskdb.PolicyDao
+import com.topjohnwu.magisk.core.ktx.getPackageInfo
 import com.topjohnwu.magisk.core.model.su.SuPolicy
-import com.topjohnwu.magisk.ktx.getPackageInfo
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.io.DataOutputStream
+import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.util.concurrent.TimeUnit
@@ -22,7 +23,7 @@ class SuRequestHandler(
     private val policyDB: PolicyDao
 ) {
 
-    private lateinit var output: DataOutputStream
+    private lateinit var output: File
     private lateinit var policy: SuPolicy
     lateinit var pkgInfo: PackageInfo
         private set
@@ -52,37 +53,32 @@ class SuRequestHandler(
         return true
     }
 
-    private fun close() {
-        if (::output.isInitialized)
-            runCatching { output.close() }
-    }
-
-    private suspend fun init(intent: Intent) = withContext(Dispatchers.IO) {
-        try {
-            val fifo = intent.getStringExtra("fifo") ?: throw IOException("fifo == null")
-            output = DataOutputStream(FileOutputStream(fifo))
-            val uid = intent.getIntExtra("uid", -1)
-            if (uid <= 0) {
-                throw IOException("uid == $uid")
-            }
-            policy = SuPolicy(uid)
-            val pid = intent.getIntExtra("pid", -1)
-            try {
-                pkgInfo = pm.getPackageInfo(uid, pid) ?: PackageInfo().apply {
-                    val name = pm.getNameForUid(uid) ?: throw PackageManager.NameNotFoundException()
-                    // We only fill in sharedUserId and leave other fields uninitialized
-                    sharedUserId = name.split(":")[0]
-                }
-                return@withContext true
-            } catch (e: PackageManager.NameNotFoundException) {
-                respond(SuPolicy.DENY, -1)
-                return@withContext false
-            }
-        } catch (e: IOException) {
-            Timber.e(e)
-            close()
-            return@withContext false
+    private suspend fun init(intent: Intent): Boolean {
+        val uid = intent.getIntExtra("uid", -1)
+        val pid = intent.getIntExtra("pid", -1)
+        val fifo = intent.getStringExtra("fifo")
+        if (uid <= 0 || pid <= 0 || fifo == null) {
+            Timber.e("Unexpected extras: uid=[${uid}], pid=[${pid}], fifo=[${fifo}]")
+            return false
         }
+        output = File(fifo)
+        policy = SuPolicy(uid)
+        try {
+            pkgInfo = pm.getPackageInfo(uid, pid) ?: PackageInfo().apply {
+                val name = pm.getNameForUid(uid) ?: throw PackageManager.NameNotFoundException()
+                // We only fill in sharedUserId and leave other fields uninitialized
+                sharedUserId = name.split(":")[0]
+            }
+        } catch (e: PackageManager.NameNotFoundException) {
+            Timber.e(e)
+            respond(SuPolicy.DENY, -1)
+            return false
+        }
+        if (!output.canWrite()) {
+            Timber.e("Cannot write to $output")
+            return false
+        }
+        return true
     }
 
     suspend fun respond(action: Int, time: Int) {
@@ -97,14 +93,15 @@ class SuRequestHandler(
 
         withContext(Dispatchers.IO) {
             try {
-                output.writeInt(policy.policy)
-                output.flush()
+                DataOutputStream(FileOutputStream(output)).use {
+                    it.writeInt(policy.policy)
+                    it.flush()
+                }
             } catch (e: IOException) {
                 Timber.e(e)
-            } finally {
-                close()
-                if (until >= 0)
-                    policyDB.update(policy)
+            }
+            if (until >= 0) {
+                policyDB.update(policy)
             }
         }
     }

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

@@ -0,0 +1,68 @@
+package com.topjohnwu.magisk.core.su
+
+import android.os.Bundle
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.tasks.MagiskInstaller
+import com.topjohnwu.magisk.core.utils.RootUtils
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.internal.NOPList
+import kotlinx.coroutines.runBlocking
+
+object TestHandler {
+
+    fun run(method: String): Bundle {
+        val r = Bundle()
+
+        fun setup(): Boolean {
+            val nop = NOPList.getInstance()
+            return runBlocking {
+                MagiskInstaller.Emulator(nop, nop).exec()
+            }
+        }
+
+        fun test(): Boolean {
+            // Make sure Zygisk works correctly
+            if (!Info.isZygiskEnabled) {
+                r.putString("reason", "zygisk not enabled")
+                return false
+            }
+
+            // Make sure the Magisk app can get root
+            val shell = Shell.getShell()
+            if (!shell.isRoot) {
+                r.putString("reason", "shell not root")
+                return false
+            }
+
+            // Make sure the root service is running
+            RootUtils.Connection.await()
+
+            // Clear existing grant for ADB shell
+            runBlocking {
+                ServiceLocator.policyDB.delete(2000)
+                Config.suAutoResponse = Config.Value.SU_AUTO_ALLOW
+                Config.prefs.edit().commit()
+            }
+            return true
+        }
+
+        val b = runCatching {
+            when (method) {
+                "setup" -> setup()
+                "test" -> test()
+                else -> {
+                    r.putString("reason", "unknown method")
+                    false
+                }
+            }
+        }.getOrElse {
+            r.putString("reason", it.stackTraceToString())
+            false
+        }
+
+        r.putBoolean("result", b)
+        return r
+    }
+}

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

@@ -4,10 +4,10 @@ import android.net.Uri
 import androidx.core.net.toFile
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.di.AppContext
+import com.topjohnwu.magisk.core.ktx.writeTo
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.displayName
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
 import com.topjohnwu.magisk.core.utils.unzip
-import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -26,7 +26,7 @@ open class FlashZip(
     private lateinit var zipFile: File
 
     @Throws(IOException::class)
-    private fun flash(): Boolean {
+    private suspend fun flash(): Boolean {
         installDir.deleteRecursively()
         installDir.mkdirs()
 
@@ -47,13 +47,13 @@ open class FlashZip(
             }
         }
 
-        val isValid = runCatching {
+        val isValid = try {
             zipFile.unzip(installDir, "META-INF/com/google/android", true)
             val script = File(installDir, "updater-script")
             script.readText().contains("#MAGISK")
-        }.getOrElse {
+        } catch (e: IOException) {
             console.add("! Unzip error")
-            throw it
+            throw e
         }
 
         if (!isValid) {

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

@@ -4,22 +4,22 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.widget.Toast
+import androidx.annotation.WorkerThread
 import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.StubApk
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Const
-import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.Provider
-import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.ktx.await
+import com.topjohnwu.magisk.core.ktx.copyAndClose
+import com.topjohnwu.magisk.core.ktx.toast
+import com.topjohnwu.magisk.core.ktx.writeTo
 import com.topjohnwu.magisk.core.utils.AXML
 import com.topjohnwu.magisk.core.utils.Keygen
-import com.topjohnwu.magisk.ktx.await
-import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.magisk.signing.JarMap
 import com.topjohnwu.magisk.signing.SignApk
 import com.topjohnwu.magisk.utils.APKInstall
-import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Runnable
@@ -30,6 +30,7 @@ import java.io.FileOutputStream
 import java.io.IOException
 import java.io.OutputStream
 import java.security.SecureRandom
+import kotlin.random.asKotlinRandom
 
 object HideAPK {
 
@@ -39,8 +40,7 @@ object HideAPK {
 
     // Some arbitrary limit
     const val MAX_LABEL_LENGTH = 32
-
-    private val svc get() = ServiceLocator.networkService
+    const val PLACEHOLDER = "COMPONENT_PLACEHOLDER"
 
     private fun genPackageName(): String {
         val random = SecureRandom()
@@ -65,20 +65,87 @@ object HideAPK {
         return builder.toString()
     }
 
-    fun patch(
+    private fun classNameGenerator() = sequence {
+        val c1 = mutableListOf<String>()
+        val c2 = mutableListOf<String>()
+        val c3 = mutableListOf<String>()
+        val random = SecureRandom()
+        val kRandom = random.asKotlinRandom()
+
+        fun <T> chain(vararg iters: Iterable<T>) = sequence {
+            iters.forEach { it.forEach { v -> yield(v) } }
+        }
+
+        for (a in chain('a'..'z', 'A'..'Z')) {
+            if (a != 'a' && a != 'A') {
+                c1.add("$a")
+            }
+            for (b in chain('a'..'z', 'A'..'Z', '0'..'9')) {
+                c2.add("$a$b")
+                for (c in chain('a'..'z', 'A'..'Z', '0'..'9')) {
+                    c3.add("$a$b$c")
+                }
+            }
+        }
+
+        c1.shuffle(random)
+        c2.shuffle(random)
+        c3.shuffle(random)
+
+        fun notJavaKeyword(name: String) = when (name) {
+            "do", "if", "for", "int", "new", "try" -> false
+            else -> true
+        }
+
+        fun List<String>.process() = asSequence().filter(::notJavaKeyword)
+
+        val names = mutableListOf<String>()
+        names.addAll(c1)
+        names.addAll(c2.process().take(30))
+        names.addAll(c3.process().take(30))
+
+        while (true) {
+            val seg = 2 + random.nextInt(4)
+            val cls = StringBuilder()
+            for (i in 0 until seg) {
+                cls.append(names.random(kRandom))
+                if (i != seg - 1)
+                    cls.append('.')
+            }
+            // Old Android does not support capitalized package names
+            // Check Android 7.0.0 PackageParser#buildClassName
+            cls[0] = cls[0].lowercaseChar()
+            yield(cls.toString())
+        }
+    }.distinct().iterator()
+
+    private fun patch(
         context: Context,
         apk: File, out: OutputStream,
         pkg: String, label: CharSequence
     ): Boolean {
         val info = context.packageManager.getPackageArchiveInfo(apk.path, 0) ?: return false
-        val name = info.applicationInfo.nonLocalizedLabel.toString()
+        val origLabel = info.applicationInfo.nonLocalizedLabel.toString()
         try {
             JarMap.open(apk, true).use { jar ->
                 val je = jar.getJarEntry(ANDROID_MANIFEST)
                 val xml = AXML(jar.getRawData(je))
+                val generator = classNameGenerator()
 
-                if (!xml.findAndPatch(APPLICATION_ID to pkg, name to label.toString()))
+                if (!xml.patchStrings {
+                    for (i in it.indices) {
+                        val s = it[i]
+                        if (s.contains(APPLICATION_ID)) {
+                            it[i] = s.replace(APPLICATION_ID, pkg)
+                        } else if (s.contains(PLACEHOLDER)) {
+                            it[i] = generator.next()
+                        } else if (s == origLabel) {
+                            it[i] = label.toString()
+                        }
+                    }
+                }) {
                     return false
+                }
 
                 // Write apk changes
                 jar.getOutputStream(je).use { it.write(xml.bytes) }
@@ -94,7 +161,6 @@ object HideAPK {
 
     private fun launchApp(activity: Activity, pkg: String) {
         val intent = activity.packageManager.getLaunchIntentForPackage(pkg) ?: return
-        Config.suManager = if (pkg == APPLICATION_ID) "" else pkg
         val self = activity.packageName
         val flag = Intent.FLAG_GRANT_READ_URI_PERMISSION
         activity.grantUriPermission(pkg, Provider.preferencesUri(self), flag)
@@ -103,17 +169,13 @@ object HideAPK {
         activity.finish()
     }
 
-    @Suppress("BlockingMethodInNonBlockingContext")
     private suspend fun patchAndHide(activity: Activity, label: String, onFailure: Runnable): Boolean {
         val stub = File(activity.cacheDir, "stub.apk")
         try {
-            svc.fetchFile(Info.remote.stub.link).byteStream().writeTo(stub)
+            activity.assets.open("stub.apk").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
+            return false
         }
 
         // Generate a new random package name and signature
@@ -129,11 +191,12 @@ object HideAPK {
             launchApp(activity, pkg)
         }
 
-        val cmd = "adb_pm_install $repack ${activity.applicationInfo.uid}"
+        Config.suManager = pkg
+        val cmd = "adb_pm_install $repack $pkg"
         if (Shell.cmd(cmd).exec().isSuccess) return true
 
         try {
-            session.install(activity, repack)
+            repack.inputStream().copyAndClose(session.openStream(activity))
         } catch (e: IOException) {
             Timber.e(e)
             return false
@@ -152,7 +215,7 @@ object HideAPK {
         }
         val onFailure = Runnable {
             dialog.dismiss()
-            Utils.toast(R.string.failure, Toast.LENGTH_LONG)
+            activity.toast(R.string.failure, Toast.LENGTH_LONG)
         }
         val success = withContext(Dispatchers.IO) {
             patchAndHide(activity, label, onFailure)
@@ -170,18 +233,19 @@ object HideAPK {
         }
         val onFailure = Runnable {
             dialog.dismiss()
-            Utils.toast(R.string.failure, Toast.LENGTH_LONG)
+            activity.toast(R.string.failure, Toast.LENGTH_LONG)
         }
         val apk = StubApk.current(activity)
         val session = APKInstall.startSession(activity, APPLICATION_ID, onFailure) {
             launchApp(activity, APPLICATION_ID)
             dialog.dismiss()
         }
-        val cmd = "adb_pm_install $apk ${activity.applicationInfo.uid}"
+        Config.suManager = ""
+        val cmd = "adb_pm_install $apk $APPLICATION_ID"
         if (Shell.cmd(cmd).await().isSuccess) return
         val success = withContext(Dispatchers.IO) {
             try {
-                session.install(activity, apk)
+                apk.inputStream().copyAndClose(session.openStream(activity))
             } catch (e: IOException) {
                 Timber.e(e)
                 return@withContext false
@@ -191,4 +255,17 @@ object HideAPK {
         }
         if (!success) onFailure.run()
     }
+
+    @WorkerThread
+    fun upgrade(context: Context, apk: File): Intent? {
+        val label = context.applicationInfo.nonLocalizedLabel
+        val pkg = context.packageName
+        val session = APKInstall.startSession(context)
+        session.openStream(context).use {
+            if (!patch(context, apk, it, pkg, label)) {
+                return null
+            }
+        }
+        return session.waitIntent()
+    }
 }

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

@@ -1,24 +1,32 @@
 package com.topjohnwu.magisk.core.tasks
 
 import android.net.Uri
+import android.os.Process
+import android.system.ErrnoException
 import android.system.Os
+import android.system.OsConstants
+import android.system.OsConstants.O_WRONLY
 import android.widget.Toast
 import androidx.annotation.WorkerThread
 import androidx.core.os.postDelayed
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.StubApk
-import com.topjohnwu.magisk.core.*
+import com.topjohnwu.magisk.core.AppApkPath
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.ktx.copyAll
+import com.topjohnwu.magisk.core.ktx.copyAndClose
+import com.topjohnwu.magisk.core.ktx.reboot
+import com.topjohnwu.magisk.core.ktx.toast
+import com.topjohnwu.magisk.core.ktx.writeTo
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
 import com.topjohnwu.magisk.core.utils.RootUtils
-import com.topjohnwu.magisk.ktx.reboot
-import com.topjohnwu.magisk.ktx.withStreams
-import com.topjohnwu.magisk.ktx.writeTo
-import com.topjohnwu.magisk.signing.SignBoot
-import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils
 import com.topjohnwu.superuser.internal.NOPList
@@ -37,8 +45,10 @@ import java.io.*
 import java.nio.ByteBuffer
 import java.security.SecureRandom
 import java.util.*
+import java.util.concurrent.atomic.AtomicBoolean
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
+import java.util.zip.ZipInputStream
 
 abstract class MagiskInstallImpl protected constructor(
     protected val console: MutableList<String> = NOPList.getInstance(),
@@ -57,7 +67,7 @@ abstract class MagiskInstallImpl protected constructor(
     private val localFS get() = FileSystemManager.getLocal()
 
     private fun findImage(): Boolean {
-        val bootPath = "find_boot_image; echo \"\$BOOTIMAGE\"".fsh()
+        val bootPath = "RECOVERYMODE=${Config.recovery} find_boot_image; echo \"\$BOOTIMAGE\"".fsh()
         if (bootPath.isEmpty()) {
             console.add("! Unable to detect target image")
             return false
@@ -85,7 +95,7 @@ abstract class MagiskInstallImpl protected constructor(
         return true
     }
 
-    private fun extractFiles(): Boolean {
+    private suspend fun extractFiles(): Boolean {
         console.add("- Device platform: ${Const.CPU_ABI}")
         console.add("- Installing: ${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
 
@@ -96,20 +106,23 @@ abstract class MagiskInstallImpl protected constructor(
         try {
             // Extract binaries
             if (isRunningAsStub) {
-                val zf = ZipFile(StubApk.current(context))
+                ZipFile(StubApk.current(context)).use { zf ->
+                    zf.entries().asSequence().filter {
+                        !it.isDirectory && it.name.startsWith("/lib/${Const.CPU_ABI}/")
+                    }.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)
+                        dest.setExecutable(true)
+                    }
 
-                // 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)
+                    val abi32 = Const.CPU_ABI_32
+                    if (Process.is64Bit() && abi32 != null) {
+                        val magisk32 = File(installDir, "magisk32")
+                        zf.getInputStream(ZipEntry("lib/$abi32/libmagisk.so")).writeTo(magisk32)
+                        magisk32.setExecutable(true)
+                    }
                 }
             } else {
                 val info = context.applicationInfo
@@ -117,20 +130,21 @@ abstract class MagiskInstallImpl protected constructor(
                     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")
                 }
+
+                // Also symlink magisk32 on 64-bit devices that supports 32-bit
+                val lib32 = info.javaClass.getDeclaredField("secondaryNativeLibraryDir")
+                    .get(info) as String?
+                if (lib32 != null) {
+                    Os.symlink("$lib32/libmagisk.so", "$installDir/magisk32");
+                }
             }
 
             // Extract scripts
-            for (script in listOf("util_functions.sh", "boot_patch.sh", "addon.d.sh")) {
+            for (script in listOf("util_functions.sh", "boot_patch.sh", "addon.d.sh", "stub.apk")) {
                 val dest = File(installDir, script)
                 context.assets.open(script).writeTo(dest)
             }
@@ -163,101 +177,221 @@ abstract class MagiskInstallImpl protected constructor(
         return true
     }
 
-    private fun InputStream.cleanPump(out: OutputStream) = withStreams(this, out) { src, _ ->
-        src.copyTo(out)
-    }
+    private suspend fun InputStream.copyAndCloseOut(out: OutputStream) = out.use { copyAll(it) }
 
     private fun newTarEntry(name: String, size: Long): TarEntry {
         console.add("-- Writing: $name")
         return TarEntry(TarHeader.createHeader(name, size, 0, false, 420 /* 0644 */))
     }
 
-    @Throws(IOException::class)
-    private fun processTar(input: InputStream, output: OutputStream): OutputStream {
-        console.add("- Processing tar file")
-        val tarOut = TarOutputStream(output)
-        TarInputStream(input).use { tarIn ->
-            lateinit var entry: TarEntry
-
-            fun decompressedStream(): InputStream {
-                val src = if (entry.name.endsWith(".lz4")) LZ4FrameInputStream(tarIn) else tarIn
-                return object : FilterInputStream(src) {
-                    override fun available() = 0  /* Workaround bug in LZ4FrameInputStream */
-                    override fun close() { /* Never close src stream */ }
-                }
-            }
-
-            while (tarIn.nextEntry?.let { entry = it } != null) {
-                if (entry.name.startsWith("boot.img") ||
-                    (Config.recovery && entry.name.contains("recovery.img"))) {
-                    val name = entry.name.replace(".lz4", "")
-                    console.add("-- Extracting: $name")
-
-                    val extract = installDir.getChildFile(name)
-                    decompressedStream().cleanPump(extract.newOutputStream())
-                } else if (entry.name.contains("vbmeta.img")) {
-                    val rawData = decompressedStream().readBytes()
-                    // Valid vbmeta.img should be at least 256 bytes
-                    if (rawData.size < 256)
-                        continue
-
-                    // Patch flags to AVB_VBMETA_IMAGE_FLAGS_HASHTREE_DISABLED |
-                    // AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED
-                    console.add("-- Patching: vbmeta.img")
-                    ByteBuffer.wrap(rawData).putInt(120, 3)
-                    tarOut.putNextEntry(newTarEntry("vbmeta.img", rawData.size.toLong()))
-                    tarOut.write(rawData)
-                } else {
-                    console.add("-- Copying: ${entry.name}")
-                    tarOut.putNextEntry(entry)
-                    tarIn.copyTo(tarOut, bufferSize = 1024 * 1024)
-                }
-            }
-        }
-        val boot = installDir.getChildFile("boot.img")
-        val recovery = installDir.getChildFile("recovery.img")
-        if (Config.recovery && recovery.exists() && boot.exists()) {
-            // Install to recovery
-            srcBoot = recovery
-            // Repack boot image to prevent auto restore
-            arrayOf(
-                "cd $installDir",
-                "chmod -R 755 .",
-                "./magiskboot unpack boot.img",
-                "./magiskboot repack boot.img",
-                "cat new-boot.img > boot.img",
-                "./magiskboot cleanup",
-                "rm -f new-boot.img",
-                "cd /").sh()
-            boot.newInputStream().use {
-                tarOut.putNextEntry(newTarEntry("boot.img", boot.length()))
-                it.copyTo(tarOut)
-            }
-            boot.delete()
-        } else {
-            if (!boot.exists()) {
-                console.add("! No boot image found")
-                throw IOException()
-            }
-            srcBoot = boot
-        }
-        return tarOut
+    private class NoAvailableStream(s: InputStream) : FilterInputStream(s) {
+        // Make sure available is never called on the actual stream and always return 0
+        // 1. Workaround bug in LZ4FrameInputStream
+        // 2. Reduce max buffer size to prevent OOM
+        override fun available() = 0
     }
 
-    private fun handleFile(uri: Uri): Boolean {
+    private class NoBootException : IOException()
+
+    @Throws(IOException::class)
+    private suspend fun processTar(tarIn: TarInputStream, tarOut: TarOutputStream): ExtendedFile {
+        console.add("- Processing tar file")
+        lateinit var entry: TarEntry
+
+        fun decompressedStream(): InputStream {
+            val stream = if (entry.name.endsWith(".lz4")) LZ4FrameInputStream(tarIn) else tarIn
+            return NoAvailableStream(stream)
+        }
+
+        while (tarIn.nextEntry?.let { entry = it } != null) {
+            if (entry.name.startsWith("boot.img") ||
+                entry.name.startsWith("init_boot.img") ||
+                (Config.recovery && entry.name.contains("recovery.img"))) {
+                val name = entry.name.replace(".lz4", "")
+                console.add("-- Extracting: $name")
+
+                val extract = installDir.getChildFile(name)
+                decompressedStream().copyAndCloseOut(extract.newOutputStream())
+            } else if (entry.name.contains("vbmeta.img")) {
+                val rawData = decompressedStream().readBytes()
+                // Valid vbmeta.img should be at least 256 bytes
+                if (rawData.size < 256)
+                    continue
+
+                // Patch flags to AVB_VBMETA_IMAGE_FLAGS_HASHTREE_DISABLED |
+                // AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED
+                console.add("-- Patching: vbmeta.img")
+                ByteBuffer.wrap(rawData).putInt(120, 3)
+                tarOut.putNextEntry(newTarEntry("vbmeta.img", rawData.size.toLong()))
+                tarOut.write(rawData)
+                // vbmeta partition exist, disable boot vbmeta patch
+                Info.patchBootVbmeta = false
+            } else if (entry.name.contains("userdata.img")) {
+                continue
+            } else {
+                console.add("-- Copying: ${entry.name}")
+                tarOut.putNextEntry(entry)
+                tarIn.copyAll(tarOut, bufferSize = 1024 * 1024)
+            }
+        }
+
+        val boot = installDir.getChildFile("boot.img")
+        val initBoot = installDir.getChildFile("init_boot.img")
+        val recovery = installDir.getChildFile("recovery.img")
+
+        suspend fun ExtendedFile.copyToTar() {
+            newInputStream().use {
+                tarOut.putNextEntry(newTarEntry(name, length()))
+                it.copyAll(tarOut)
+            }
+            delete()
+        }
+
+        // Patch priority: recovery > init_boot > boot
+        return when {
+            recovery.exists() -> {
+                if (boot.exists()) {
+                    // Repack boot image to prevent auto restore
+                    arrayOf(
+                        "cd $installDir",
+                        "chmod -R 755 .",
+                        "./magiskboot unpack boot.img",
+                        "./magiskboot repack boot.img",
+                        "cat new-boot.img > boot.img",
+                        "./magiskboot cleanup",
+                        "rm -f new-boot.img",
+                        "cd /").sh()
+                    boot.copyToTar()
+                }
+                recovery
+            }
+            initBoot.exists() -> {
+                if (boot.exists())
+                    boot.copyToTar()
+                initBoot
+            }
+            boot.exists() -> boot
+            else -> throw NoBootException()
+        }
+    }
+
+    @Throws(IOException::class)
+    private suspend fun processZip(zipIn: ZipInputStream): ExtendedFile {
+        console.add("- Processing zip file")
+        val boot = installDir.getChildFile("boot.img")
+        val initBoot = installDir.getChildFile("init_boot.img")
+        lateinit var entry: ZipEntry
+        while (zipIn.nextEntry?.also { entry = it } != null) {
+            if (entry.isDirectory) continue
+            when (entry.name.substringAfterLast('/')) {
+                "payload.bin" -> {
+                    try {
+                        return processPayload(zipIn)
+                    } catch (e: IOException) {
+                        // No boot image in payload.bin, continue to find boot images
+                    }
+                }
+                "init_boot.img" -> {
+                    console.add("- Extracting init_boot.img")
+                    zipIn.copyAndCloseOut(initBoot.newOutputStream())
+                    return initBoot
+                }
+                "boot.img" -> {
+                    console.add("- Extracting boot.img")
+                    zipIn.copyAndCloseOut(boot.newOutputStream())
+                    // Don't return here since there might be an init_boot.img
+                }
+            }
+        }
+        if (boot.exists()) {
+            return boot
+        } else {
+            throw NoBootException()
+        }
+    }
+
+    @Throws(IOException::class)
+    private fun processPayload(input: InputStream): ExtendedFile {
+        var fifo: File? = null
+        try {
+            console.add("- Processing payload.bin")
+            fifo = File.createTempFile("payload-fifo-", null, installDir)
+            fifo.delete()
+            Os.mkfifo(fifo.path, 420 /* 0644 */)
+
+            // Enqueue the shell command first, or the subsequent FIFO open will block
+            val future = arrayOf(
+                "cd $installDir",
+                "./magiskboot extract $fifo",
+                "cd /"
+            ).eq()
+
+            val fd = Os.open(fifo.path, O_WRONLY, 0)
+            try {
+                val bufSize = 1024 * 1024
+                val buf = ByteBuffer.allocate(bufSize)
+                buf.position(input.read(buf.array()).coerceAtLeast(0)).flip()
+                while (buf.hasRemaining()) {
+                    try {
+                        Os.write(fd, buf)
+                    } catch (e: ErrnoException) {
+                        if (e.errno != OsConstants.EPIPE)
+                            throw e
+                        // If SIGPIPE, then the other side is closed, we're done
+                        break
+                    }
+                    if (!buf.hasRemaining()) {
+                        buf.limit(bufSize)
+                        buf.position(input.read(buf.array()).coerceAtLeast(0)).flip()
+                    }
+                }
+            } finally {
+                Os.close(fd)
+            }
+
+            val success = try { future.get().isSuccess } catch (e: Exception) { false }
+            if (!success) {
+                console.add("! Error while extracting payload.bin")
+                throw IOException()
+            }
+            val boot = installDir.getChildFile("boot.img")
+            val initBoot = installDir.getChildFile("init_boot.img")
+            return when {
+                initBoot.exists() -> {
+                    console.add("-- Extract init_boot.img")
+                    initBoot
+                }
+                boot.exists() -> {
+                    console.add("-- Extract boot.img")
+                    boot
+                }
+                else -> {
+                    throw NoBootException()
+                }
+            }
+        } catch (e: ErrnoException) {
+            throw IOException(e)
+        } finally {
+            fifo?.delete()
+        }
+    }
+
+    private suspend fun handleFile(uri: Uri): Boolean {
         val outStream: OutputStream
-        var outFile: MediaStoreUtils.UriFile? = null
+        val outFile: MediaStoreUtils.UriFile
 
         // Process input file
         try {
-            uri.inputStream().buffered().use { src ->
-                src.mark(500)
-                val magic = ByteArray(5)
-                if (src.skip(257) != 257L || src.read(magic) != magic.size) {
+            PushbackInputStream(uri.inputStream(), 512).use { src ->
+                val head = ByteArray(512)
+                if (src.read(head) != head.size) {
                     console.add("! Invalid input file")
                     return false
                 }
-                src.reset()
+                src.unread(head)
+
+                val magic = head.copyOf(4)
+                val tarMagic = Arrays.copyOfRange(head, 257, 262)
 
                 val alpha = "abcdefghijklmnopqrstuvwxyz"
                 val alphaNum = "$alpha${alpha.uppercase(Locale.ROOT)}0123456789"
@@ -269,29 +403,52 @@ abstract class MagiskInstallImpl protected constructor(
                     toString()
                 }
 
-                outStream = if (magic.contentEquals("ustar".toByteArray())) {
+                srcBoot = if (tarMagic.contentEquals("ustar".toByteArray())) {
                     // tar file
                     outFile = MediaStoreUtils.getFile("$filename.tar", true)
-                    processTar(src, outFile!!.uri.outputStream())
+                    outStream = TarOutputStream(outFile.uri.outputStream())
+
+                    try {
+                        processTar(TarInputStream(src), outStream)
+                    } catch (e: IOException) {
+                        outStream.close()
+                        outFile.delete()
+                        throw e
+                    }
                 } else {
                     // raw image
-                    srcBoot = installDir.getChildFile("boot.img")
-                    console.add("- Copying image to cache")
-                    src.cleanPump(srcBoot.newOutputStream())
                     outFile = MediaStoreUtils.getFile("$filename.img", true)
-                    outFile!!.uri.outputStream()
+                    outStream = outFile.uri.outputStream()
+
+                    try {
+                        if (magic.contentEquals("CrAU".toByteArray())) {
+                            processPayload(src)
+                        } else if (magic.contentEquals("PK\u0003\u0004".toByteArray())) {
+                            processZip(ZipInputStream(src))
+                        } else {
+                            console.add("- Copying image to cache")
+                            installDir.getChildFile("boot.img").also {
+                                src.copyAndCloseOut(it.newOutputStream())
+                            }
+                        }
+                    } catch (e: IOException) {
+                        outStream.close()
+                        outFile.delete()
+                        throw e
+                    }
                 }
             }
         } catch (e: IOException) {
+            if (e is NoBootException)
+                console.add("! No boot image found")
             console.add("! Process error")
-            outFile?.delete()
             Timber.e(e)
             return false
         }
 
         // Patch file
         if (!patchBoot()) {
-            outFile!!.delete()
+            outFile.delete()
             return false
         }
 
@@ -299,10 +456,16 @@ abstract class MagiskInstallImpl protected constructor(
         try {
             val newBoot = installDir.getChildFile("new-boot.img")
             if (outStream is TarOutputStream) {
-                val name = if (srcBoot.path.contains("recovery")) "recovery.img" else "boot.img"
+                val name = with(srcBoot.path) {
+                    when {
+                        contains("recovery") -> "recovery.img"
+                        contains("init_boot") -> "init_boot.img"
+                        else -> "boot.img"
+                    }
+                }
                 outStream.putNextEntry(newTarEntry(name, newBoot.length()))
             }
-            newBoot.newInputStream().cleanPump(outStream)
+            newBoot.newInputStream().copyAndClose(outStream)
             newBoot.delete()
 
             console.add("")
@@ -312,7 +475,7 @@ abstract class MagiskInstallImpl protected constructor(
             console.add("****************************")
         } catch (e: IOException) {
             console.add("! Failed to output to $outFile")
-            outFile!!.delete()
+            outFile.delete()
             Timber.e(e)
             return false
         }
@@ -325,22 +488,6 @@ abstract class MagiskInstallImpl protected constructor(
     }
 
     private fun patchBoot(): Boolean {
-        var isSigned = false
-        if (!srcBoot.isCharacter) {
-            try {
-                srcBoot.newInputStream().use {
-                    if (SignBoot.verifySignature(it, null)) {
-                        isSigned = true
-                        console.add("- Boot image is signed with AVB 1.0")
-                    }
-                }
-            } catch (e: IOException) {
-                console.add("! Unable to check signature")
-                Timber.e(e)
-                return false
-            }
-        }
-
         val newBoot = installDir.getChildFile("new-boot.img")
         if (!useRootDir) {
             // Create output files before hand
@@ -352,38 +499,20 @@ abstract class MagiskInstallImpl protected constructor(
             "cd $installDir",
             "KEEPFORCEENCRYPT=${Config.keepEnc} " +
             "KEEPVERITY=${Config.keepVerity} " +
-            "PATCHVBMETAFLAG=${Config.patchVbmeta} " +
+            "PATCHVBMETAFLAG=${Info.patchBootVbmeta} " +
             "RECOVERYMODE=${Config.recovery} " +
+            "LEGACYSAR=${Info.legacySAR} " +
             "sh boot_patch.sh $srcBoot")
+        val isSuccess = cmds.sh().isSuccess
 
-        if (!cmds.sh().isSuccess)
-            return false
+        shell.newJob().add("./magiskboot cleanup", "cd /").exec()
 
-        val job = shell.newJob().add("./magiskboot cleanup", "cd /")
-
-        if (isSigned) {
-            console.add("- Signing boot image with verity keys")
-            val signed = File.createTempFile("signed", ".img", context.cacheDir)
-            try {
-                val src = newBoot.newInputStream().buffered()
-                val out = signed.outputStream().buffered()
-                withStreams(src, out) { _, _ ->
-                    SignBoot.doSignature(null, null, src, out, "/boot")
-                }
-            } catch (e: IOException) {
-                console.add("! Unable to sign image")
-                Timber.e(e)
-                return false
-            }
-            job.add("cat $signed > $newBoot", "rm -f $signed")
-        }
-        job.exec()
-        return true
+        return isSuccess
     }
 
     private fun flashBoot() = "direct_install $installDir $srcBoot".sh().isSuccess
 
-    private fun postOTA(): Boolean {
+    private suspend fun postOTA(): Boolean {
         try {
             val bootctl = File.createTempFile("bootctl", null, context.cacheDir)
             context.assets.open("bootctl").writeTo(bootctl)
@@ -394,25 +523,27 @@ abstract class MagiskInstallImpl protected constructor(
             return false
         }
 
-        console.add("***************************************")
+        console.add("*************************************************************")
         console.add(" Next reboot will boot to second slot!")
-        console.add("***************************************")
+        console.add(" Go back to System Updates and press Restart to complete OTA")
+        console.add("*************************************************************")
         return true
     }
 
+    private fun Array<String>.eq() = shell.newJob().add(*this).to(console, logs).enqueue()
     private fun String.sh() = shell.newJob().add(this).to(console, logs).exec()
     private fun Array<String>.sh() = shell.newJob().add(*this).to(console, logs).exec()
     private fun String.fsh() = ShellUtils.fastCmd(shell, this)
     private fun Array<String>.fsh() = ShellUtils.fastCmd(shell, *this)
 
-    protected fun patchFile(file: Uri) = extractFiles() && handleFile(file)
+    protected suspend fun patchFile(file: Uri) = extractFiles() && handleFile(file)
 
-    protected fun direct() = findImage() && extractFiles() && patchBoot() && flashBoot()
+    protected suspend fun direct() = findImage() && extractFiles() && patchBoot() && flashBoot()
 
-    protected fun secondSlot() =
+    protected suspend fun secondSlot() =
         findSecondary() && extractFiles() && patchBoot() && flashBoot() && postOTA()
 
-    protected fun fixEnv() = extractFiles() && "fix_env $installDir".sh().isSuccess
+    protected suspend fun fixEnv() = extractFiles() && "fix_env $installDir".sh().isSuccess
 
     protected fun uninstall() = "run_uninstaller $AppApkPath".sh().isSuccess
 
@@ -420,20 +551,15 @@ abstract class MagiskInstallImpl protected constructor(
     protected abstract suspend fun operations(): Boolean
 
     open suspend fun exec(): Boolean {
-        synchronized(Companion) {
-            if (haveActiveSession)
-                return false
-            haveActiveSession = true
-        }
+        if (haveActiveSession.getAndSet(true))
+            return false
         val result = withContext(Dispatchers.IO) { operations() }
-        synchronized(Companion) {
-            haveActiveSession = false
-        }
+        haveActiveSession.set(false)
         return result
     }
 
     companion object {
-        private var haveActiveSession = false
+        private var haveActiveSession = AtomicBoolean(false)
     }
 }
 
@@ -505,7 +631,7 @@ abstract class MagiskInstaller(
         override suspend fun exec(): Boolean {
             val success = super.exec()
             callback()
-            Utils.toast(
+            context.toast(
                 if (success) R.string.reboot_delay_toast else R.string.setup_fail,
                 Toast.LENGTH_LONG
             )

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

@@ -29,7 +29,7 @@ class AXML(b: ByteArray) {
      * Followed by an array of uint32_t with size = number of strings
      * Each entry points to an offset into the string data
      */
-    fun findAndPatch(vararg patterns: Pair<String, String>): Boolean {
+    fun patchStrings(patchFn: (Array<String>) -> Unit): Boolean {
         val buffer = ByteBuffer.wrap(bytes).order(LITTLE_ENDIAN)
 
         fun findStringPool(): Int {
@@ -42,7 +42,6 @@ class AXML(b: ByteArray) {
             return -1
         }
 
-        var patch = false
         val start = findStringPool()
         if (start < 0)
             return false
@@ -57,34 +56,26 @@ class AXML(b: ByteArray) {
         val dataOff = start + intBuf.get()
         intBuf.get()
 
-        val strings = ArrayList<String>(count)
-        // Read and patch all strings
-        loop@ for (i in 0 until count) {
+        val strList = ArrayList<String>(count)
+        // Collect all strings in the pool
+        for (i in 0 until count) {
             val off = dataOff + intBuf.get()
             val len = buffer.getShort(off)
-            val str = String(bytes, off + 2, len * 2, UTF_16LE)
-            for ((from, to) in patterns) {
-                if (str.contains(from)) {
-                    strings.add(str.replace(from, to))
-                    patch = true
-                    continue@loop
-                }
-            }
-            strings.add(str)
+            strList.add(String(bytes, off + 2, len * 2, UTF_16LE))
         }
 
-        if (!patch)
-            return false
+        val strArr = strList.toTypedArray()
+        patchFn(strArr)
 
         // Write everything before string data, will patch values later
         val baos = RawByteStream()
         baos.write(bytes, 0, dataOff)
 
         // Write string data
-        val strList = IntArray(count)
+        val offList = IntArray(count)
         for (i in 0 until count) {
-            strList[i] = baos.size() - dataOff
-            val str = strings[i]
+            offList[i] = baos.size() - dataOff
+            val str = strArr[i]
             baos.write(str.length.toShortBytes())
             baos.write(str.toByteArray(UTF_16LE))
             // Null terminate
@@ -103,7 +94,7 @@ class AXML(b: ByteArray) {
         // Patch index table
         newBuffer.position(start + STRING_INDICES_OFF)
         val newIntBuf = newBuffer.asIntBuffer()
-        strList.forEach { newIntBuf.put(it) }
+        offList.forEach { newIntBuf.put(it) }
 
         // Write the rest of the chunks
         val nextOff = start + size

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

@@ -1,59 +0,0 @@
-package com.topjohnwu.magisk.core.utils
-
-import androidx.biometric.BiometricManager
-import androidx.biometric.BiometricPrompt
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.FragmentActivity
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.di.AppContext
-
-object BiometricHelper {
-
-    private val mgr by lazy { BiometricManager.from(AppContext) }
-
-    val isSupported get() = when (mgr.canAuthenticate()) {
-        BiometricManager.BIOMETRIC_SUCCESS -> true
-        else -> false
-    }
-
-    val isEnabled: Boolean get() {
-        val enabled = Config.suBiometric
-        if (enabled && !isSupported) {
-            Config.suBiometric = false
-            return false
-        }
-        return enabled
-    }
-
-    fun authenticate(
-        activity: FragmentActivity,
-        onError: () -> Unit = {},
-        onSuccess: () -> Unit): BiometricPrompt {
-        val prompt = BiometricPrompt(activity,
-            ContextCompat.getMainExecutor(activity),
-            object : BiometricPrompt.AuthenticationCallback() {
-                override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
-                    onError()
-                }
-
-                override fun onAuthenticationFailed() {
-                    onError()
-                }
-
-                override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
-                    onSuccess()
-                }
-            }
-        )
-        val info = BiometricPrompt.PromptInfo.Builder()
-            .setConfirmationRequired(true)
-            .setDeviceCredentialAllowed(false)
-            .setTitle(activity.getString(R.string.authenticate))
-            .setNegativeButtonText(activity.getString(android.R.string.cancel))
-            .build()
-        prompt.authenticate(info)
-        return prompt
-    }
-
-}

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

@@ -1,6 +1,10 @@
 package com.topjohnwu.magisk.core.utils
 
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Runnable
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
 import java.util.concurrent.AbstractExecutorService
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit

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

@@ -14,7 +14,9 @@ import java.security.KeyPairGenerator
 import java.security.KeyStore
 import java.security.PrivateKey
 import java.security.cert.X509Certificate
-import java.util.*
+import java.util.Calendar
+import java.util.Locale
+import java.util.Random
 import java.util.zip.GZIPInputStream
 import java.util.zip.GZIPOutputStream
 

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

@@ -12,7 +12,7 @@ import com.topjohnwu.magisk.core.createNewResources
 import com.topjohnwu.magisk.core.di.AppContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import java.util.*
+import java.util.Locale
 
 var currentLocale: Locale = Locale.getDefault()
 

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

@@ -15,9 +15,6 @@ import com.topjohnwu.magisk.core.di.AppContext
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
-import java.io.OutputStream
-import java.security.MessageDigest
-import kotlin.experimental.and
 
 @Suppress("DEPRECATION")
 object MediaStoreUtils {
@@ -87,7 +84,7 @@ object MediaStoreUtils {
 
     @Throws(IOException::class)
     fun getFile(displayName: String, skipQuery: Boolean = false): UriFile {
-        if (Build.VERSION.SDK_INT < 30) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
             // Fallback to file based I/O pre Android 11
             val parent = File(Environment.getExternalStorageDirectory(), relativePath)
             parent.mkdirs()
@@ -102,6 +99,8 @@ object MediaStoreUtils {
 
     fun Uri.outputStream() = cr.openOutputStream(this, "rwt") ?: throw FileNotFoundException()
 
+    fun Uri.fileDescriptor(mode: String) = cr.openFileDescriptor(this, mode) ?: throw FileNotFoundException()
+
     val Uri.displayName: String get() {
         if (scheme == "file") {
             // Simple uri wrapper over file, directly get file name
@@ -118,24 +117,6 @@ object MediaStoreUtils {
         return this.toString()
     }
 
-    fun Uri.checkSum(alg: String, reference: String) = runCatching {
-        this.inputStream().use {
-            val digest = MessageDigest.getInstance(alg)
-            it.copyTo(object : OutputStream() {
-                override fun write(b: Int) {
-                    digest.update(b.toByte())
-                }
-
-                override fun write(b: ByteArray, off: Int, len: Int) {
-                    digest.update(b, off, len)
-                }
-            })
-            val sb = StringBuilder()
-            digest.digest().forEach { b -> sb.append("%02x".format(b and 0xff.toByte())) }
-            sb.toString() == reference
-        }
-    }.getOrElse { false }
-
     interface UriFile {
         val uri: Uri
         fun delete(): Boolean

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

@@ -0,0 +1,80 @@
+package com.topjohnwu.magisk.core.utils
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import android.os.PowerManager
+import androidx.collection.ArraySet
+import androidx.core.content.getSystemService
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ProcessLifecycleOwner
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.ktx.registerRuntimeReceiver
+
+class NetworkObserver(context: Context): DefaultLifecycleObserver {
+    private val manager = context.getSystemService<ConnectivityManager>()!!
+
+    private val networkCallback = object : ConnectivityManager.NetworkCallback() {
+        private val activeList = ArraySet<Network>()
+
+        override fun onAvailable(network: Network) {
+            activeList.add(network)
+            postValue(true)
+        }
+        override fun onLost(network: Network) {
+            activeList.remove(network)
+            postValue(!activeList.isEmpty())
+        }
+    }
+
+    private val receiver = object : BroadcastReceiver() {
+        private fun Context.isIdleMode(): Boolean {
+            val pwm = getSystemService<PowerManager>() ?: return true
+            val isIgnoringOptimizations = pwm.isIgnoringBatteryOptimizations(packageName)
+            return pwm.isDeviceIdleMode && !isIgnoringOptimizations
+        }
+        override fun onReceive(context: Context, intent: Intent) {
+            if (context.isIdleMode()) {
+                postValue(false)
+            } else {
+                postCurrentState()
+            }
+        }
+    }
+
+    init {
+        val request = NetworkRequest.Builder()
+            .addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+            .build()
+        manager.registerNetworkCallback(request, networkCallback)
+        val filter = IntentFilter(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED)
+        context.applicationContext.registerRuntimeReceiver(receiver, filter)
+        ProcessLifecycleOwner.get().lifecycle.addObserver(this)
+    }
+
+    override fun onStart(owner: LifecycleOwner) {
+        postCurrentState()
+    }
+
+    private fun postCurrentState() {
+        postValue(manager.getNetworkCapabilities(manager.activeNetwork)
+            ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) ?: false)
+    }
+
+    private fun postValue(b: Boolean) {
+        Info.remote = Info.EMPTY_REMOTE
+        Info.isConnected.postValue(b)
+    }
+
+    companion object {
+        fun init(context: Context): NetworkObserver {
+            return NetworkObserver(context).apply { postCurrentState() }
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/core/utils/ProcessLifecycle.java

@@ -0,0 +1,15 @@
+package com.topjohnwu.magisk.core.utils;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LifecycleDispatcher;
+import androidx.lifecycle.ProcessLifecycleOwner;
+
+// Use Java to bypass Kotlin internal visibility modifier
+public class ProcessLifecycle {
+    public static void init(@NonNull Context context) {
+        LifecycleDispatcher.init(context);
+        ProcessLifecycleOwner.init$lifecycle_process_release(context);
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.topjohnwu.magisk.core.utils
+
+import android.app.Activity
+import android.app.KeyguardManager
+import android.content.Context
+import android.content.Intent
+import androidx.activity.result.contract.ActivityResultContract
+
+class RequestAuthentication: ActivityResultContract<Unit, Boolean>() {
+
+    override fun createIntent(context: Context, input: Unit) =
+        context.getSystemService(KeyguardManager::class.java)
+            .createConfirmDeviceCredentialIntent(null, null)
+
+    override fun parseResult(resultCode: Int, intent: Intent?) =
+        resultCode == Activity.RESULT_OK
+}

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

@@ -25,7 +25,7 @@ class RequestInstall : ActivityResultContract<Unit, Boolean>() {
         context: Context,
         input: Unit
     ): SynchronousResult<Boolean>? {
-        if (Build.VERSION.SDK_INT < 26)
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
             return SynchronousResult(true)
         if (context.packageManager.canRequestPackageInstalls())
             return SynchronousResult(true)

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

@@ -111,15 +111,23 @@ class RootUtils(stub: Any?) : RootService() {
         }
 
         fun await() {
-            // We cannot await on the main thread
-            if (Info.isRooted && !ShellUtils.onMainThread())
+            if (!Info.isRooted)
+                return
+            if (!ShellUtils.onMainThread()) {
                 acquireSharedInterruptibly(1)
+            } else if (state != 0) {
+                throw IllegalStateException("Cannot await on the main thread")
+            }
         }
     }
 
     companion object {
         var bindTask: Shell.Task? = null
-        var fs = FileSystemManager.getLocal()
+        var fs: FileSystemManager = FileSystemManager.getLocal()
+            get() {
+                Connection.await()
+                return field
+            }
             private set
         var obj: IRootUtils? = null
             get() {

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

@@ -7,12 +7,14 @@ 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.magisk.core.ktx.cachedFile
+import com.topjohnwu.magisk.core.ktx.deviceProtectedContext
+import com.topjohnwu.magisk.core.ktx.rawResource
+import com.topjohnwu.magisk.core.ktx.writeTo
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
 import java.io.File
 import java.util.jar.JarFile
 
@@ -34,14 +36,16 @@ class ShellInit : Shell.Initializer() {
                 val bb = jar.getJarEntry("lib/${Const.CPU_ABI}/libbusybox.so")
                 localBB = context.deviceProtectedContext.cachedFile("busybox")
                 localBB.delete()
-                jar.getInputStream(bb).writeTo(localBB)
+                runBlocking {
+                    jar.getInputStream(bb).writeTo(localBB, dispatcher = Dispatchers.Unconfined)
+                }
                 localBB.setExecutable(true)
             } else {
                 localBB = File(context.applicationInfo.nativeLibraryDir, "libbusybox.so")
             }
 
             if (shell.isRoot) {
-                add("export MAGISKTMP=\$(magisk --path)/.magisk")
+                add("export MAGISKTMP=\$(magisk --path)")
                 // Test if we can properly execute stuff in /data
                 Info.noDataExec = !shell.newJob().add("$localBB sh -c \"$localBB true\"").exec().isSuccess
             }
@@ -49,12 +53,12 @@ class ShellInit : Shell.Initializer() {
             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",
+                    "if [ -x \$MAGISKTMP/.magisk/busybox/busybox ]; then",
+                    "  cp -af $localBB \$MAGISKTMP/.magisk/busybox/busybox",
+                    "  exec \$MAGISKTMP/.magisk/busybox/busybox sh",
                     "else",
-                    "  cp -af $localBB /dev/.busybox",
-                    "  exec /dev/.busybox sh",
+                    "  cp -af $localBB /dev/busybox",
+                    "  exec /dev/busybox sh",
                     "fi"
                 )
             } else {
@@ -73,18 +77,17 @@ class ShellInit : Shell.Initializer() {
         fun getVar(name: String) = fastCmd("echo \$$name")
         fun getBool(name: String) = getVar(name).toBoolean()
 
-        Const.MAGISKTMP = getVar("MAGISKTMP")
-        Info.isSAR = getBool("SYSTEM_ROOT")
+        Info.isSAR = getBool("SYSTEM_AS_ROOT")
         Info.ramdisk = getBool("RAMDISKEXIST")
-        Info.vbmeta = getBool("VBMETAEXIST")
         Info.isAB = getBool("ISAB")
         Info.crypto = getVar("CRYPTOTYPE")
+        Info.patchBootVbmeta = getBool("PATCHVBMETAFLAG")
+        Info.legacySAR = getBool("LEGACYSAR")
 
         // 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/ZipUtils.kt

@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk.core.utils
 
+import com.topjohnwu.magisk.core.ktx.copyAll
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
@@ -7,14 +8,14 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 
 @Throws(IOException::class)
-fun File.unzip(folder: File, path: String = "", junkPath: Boolean = false) {
+suspend fun File.unzip(folder: File, path: String = "", junkPath: Boolean = false) {
     inputStream().buffered().use {
         it.unzip(folder, path, junkPath)
     }
 }
 
 @Throws(IOException::class)
-fun InputStream.unzip(folder: File, path: String, junkPath: Boolean) {
+suspend fun InputStream.unzip(folder: File, path: String, junkPath: Boolean) {
     try {
         val zin = ZipInputStream(this)
         var entry: ZipEntry
@@ -34,7 +35,7 @@ fun InputStream.unzip(folder: File, path: String, junkPath: Boolean) {
                 if (!it.exists())
                     it.mkdirs()
             }
-            dest.outputStream().use { out -> zin.copyTo(out) }
+            dest.outputStream().use { out -> zin.copyAll(out) }
         }
     } catch (e: IllegalArgumentException) {
         throw IOException(e)

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

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

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

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

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

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

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

@@ -8,7 +8,12 @@ import android.text.Spanned
 import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
+import android.widget.ArrayAdapter
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.ProgressBar
+import android.widget.Spinner
+import android.widget.TextView
 import androidx.annotation.DrawableRes
 import androidx.appcompat.widget.Toolbar
 import androidx.cardview.widget.CardView
@@ -20,7 +25,11 @@ import androidx.databinding.BindingAdapter
 import androidx.databinding.InverseBindingAdapter
 import androidx.databinding.InverseBindingListener
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
-import androidx.recyclerview.widget.*
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.chip.Chip

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

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

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

@@ -1,85 +0,0 @@
-package com.topjohnwu.magisk.databinding
-
-import android.os.Handler
-import android.os.HandlerThread
-import android.os.Looper
-import java.util.*
-
-class FilterableDiffObservableList<T>(
-    callback: Callback<T>
-) : DiffObservableList<T>(callback) {
-
-    var filter: ((T) -> Boolean)? = null
-        set(value) {
-            field = value
-            queueUpdate()
-        }
-    @Volatile
-    private var sublist: MutableList<T> = super.list
-
-    // ---
-
-    private val ui by lazy { Handler(Looper.getMainLooper()) }
-    private val handler = Handler(HandlerThread("List${hashCode()}").apply { start() }.looper)
-    private val updater = Runnable {
-        val filter = filter ?: { true }
-        val newList = super.list.filter(filter)
-        val diff = synchronized(this) { doCalculateDiff(sublist, newList) }
-        ui.post {
-            sublist = Collections.synchronizedList(newList)
-            diff.dispatchUpdatesTo(listCallback)
-        }
-    }
-
-    private fun queueUpdate() {
-        handler.removeCallbacks(updater)
-        handler.post(updater)
-    }
-
-    fun hasFilter() = filter != null
-
-    fun filter(switch: (T) -> Boolean) {
-        filter = switch
-    }
-
-    fun reset() {
-        filter = null
-    }
-
-    // ---
-
-    override fun get(index: Int): T {
-        return sublist.get(index)
-    }
-
-    override fun add(element: T): Boolean {
-        return sublist.add(element)
-    }
-
-    override fun add(index: Int, element: T) {
-        sublist.add(index, element)
-    }
-
-    override fun addAll(elements: Collection<T>): Boolean {
-        return sublist.addAll(elements)
-    }
-
-    override fun addAll(index: Int, elements: Collection<T>): Boolean {
-        return sublist.addAll(index, elements)
-    }
-
-    override fun remove(element: T): Boolean {
-        return sublist.remove(element)
-    }
-
-    override fun removeAt(index: Int): T {
-        return sublist.removeAt(index)
-    }
-
-    override fun set(index: Int, element: T): T {
-        return sublist.set(index, element)
-    }
-
-    override val size: Int
-        get() = sublist.size
-}

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

@@ -1,7 +0,0 @@
-package com.topjohnwu.magisk.databinding
-
-fun <T : AnyDiffRvItem> diffListOf() =
-    DiffObservableList(DiffRvItem.callback<T>())
-
-fun <T : AnyDiffRvItem> filterableListOf() =
-    FilterableDiffObservableList(DiffRvItem.callback<T>())

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

@@ -3,7 +3,7 @@ package com.topjohnwu.magisk.databinding
 import androidx.databinding.ListChangeRegistry
 import androidx.databinding.ObservableList
 import androidx.databinding.ObservableList.OnListChangedCallback
-import java.util.*
+import java.util.AbstractList
 
 @Suppress("UNCHECKED_CAST")
 class MergeObservableList<T> : AbstractList<T>(), ObservableList<T> {
@@ -46,11 +46,11 @@ class MergeObservableList<T> : AbstractList<T>(), ObservableList<T> {
         return this
     }
 
-    fun insertList(list: ObservableList<out T>): MergeObservableList<T> {
+    fun insertList(list: List<T>): MergeObservableList<T> {
         val idx = size
         lists.add(list)
         ++modCount
-        (list as ObservableList<T>).addOnListChangedCallback(callback)
+        (list as? ObservableList<T>)?.addOnListChangedCallback(callback)
         if (list.isNotEmpty())
             listeners.notifyInserted(this, idx, list.size)
         return this
@@ -72,11 +72,11 @@ class MergeObservableList<T> : AbstractList<T>(), ObservableList<T> {
         return false
     }
 
-    fun removeList(listToRemove: ObservableList<out T>): Boolean {
+    fun removeList(listToRemove: List<T>): Boolean {
         var idx = 0
         for ((i, list) in lists.withIndex()) {
             if (listToRemove === list) {
-                (list as ObservableList<T>).removeOnListChangedCallback(callback)
+                (list as? ObservableList<T>)?.removeOnListChangedCallback(callback)
                 lists.removeAt(i)
                 ++modCount
                 listeners.notifyRemoved(this, idx, list.size)
@@ -90,8 +90,8 @@ class MergeObservableList<T> : AbstractList<T>(), ObservableList<T> {
     override fun clear() {
         val sz = size
         for (list in lists) {
-            if (list is ObservableList<*>) {
-                (list as ObservableList<T>).removeOnListChangedCallback(callback)
+            if (list is ObservableList) {
+                list.removeOnListChangedCallback(callback)
             }
         }
         ++modCount

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

@@ -8,60 +8,28 @@ abstract class RvItem {
     abstract val layoutRes: Int
 }
 
-interface RvContainer<E> {
-    val item: E
-}
-
-interface ViewAwareRvItem {
-    fun onBind(binding: ViewDataBinding, recyclerView: RecyclerView)
-}
-
-interface ComparableRv<T> : Comparable<T> {
-    @Suppress("UNCHECKED_CAST")
-    fun comparableEqual(o: Any?) =
-        o != null && o::class == this::class && compareTo(o as T) == 0
-}
-
-abstract class DiffRvItem<T> : RvItem() {
-
-    // Defer to contentSameAs by default
-    open fun itemSameAs(other: T) = true
-
-    open fun contentSameAs(other: T) =
-        when (this) {
-            is RvContainer<*> -> item == (other as RvContainer<*>).item
-            is ComparableRv<*> -> comparableEqual(other)
-            else -> this == other
-        }
-
-    companion object {
-        private val callback = object : DiffObservableList.Callback<DiffRvItem<Any>> {
-            override fun areItemsTheSame(
-                oldItem: DiffRvItem<Any>,
-                newItem: DiffRvItem<Any>
-            ): Boolean {
-                return oldItem::class == newItem::class && oldItem.itemSameAs(newItem)
-            }
-
-            override fun areContentsTheSame(
-                oldItem: DiffRvItem<Any>,
-                newItem: DiffRvItem<Any>
-            ): Boolean {
-                return oldItem.contentSameAs(newItem)
-            }
-        }
-
-        @Suppress("UNCHECKED_CAST")
-        fun <T : AnyDiffRvItem> callback() = callback as DiffObservableList.Callback<T>
-    }
-}
-
-typealias AnyDiffRvItem = DiffRvItem<*>
-
-abstract class ObservableDiffRvItem<T> : DiffRvItem<T>(), ObservableHost {
-    override var callbacks: PropertyChangeRegistry? = null
-}
-
 abstract class ObservableRvItem : RvItem(), ObservableHost {
     override var callbacks: PropertyChangeRegistry? = null
 }
+
+interface ItemWrapper<E> {
+    val item: E
+}
+
+interface ViewAwareItem {
+    fun onBind(binding: ViewDataBinding, recyclerView: RecyclerView)
+}
+
+interface DiffItem<T : Any> {
+
+    fun itemSameAs(other: T): Boolean {
+        if (this === other) return true
+        return when (this) {
+            is ItemWrapper<*> -> item == (other as ItemWrapper<*>).item
+            is Comparable<*> -> compareValues(this, other as Comparable<*>) == 0
+            else -> this == other
+        }
+    }
+
+    fun contentSameAs(other: T) = true
+}

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

@@ -15,8 +15,8 @@ import androidx.recyclerview.widget.RecyclerView
 import com.topjohnwu.magisk.BR
 
 class RvItemAdapter<T: RvItem>(
-    private val items: List<T>,
-    private val extraBindings: SparseArray<*>?
+    val items: List<T>,
+    val extraBindings: SparseArray<*>?
 ) : RecyclerView.Adapter<RvItemAdapter.ViewHolder>() {
 
     private var lifecycleOwner: LifecycleOwner? = null
@@ -53,7 +53,7 @@ class RvItemAdapter<T: RvItem>(
         holder.binding.lifecycleOwner = lifecycleOwner
         holder.binding.executePendingBindings()
         recyclerView?.let {
-            if (item is ViewAwareRvItem)
+            if (item is ViewAwareItem)
                 item.onBind(holder.binding, it)
         }
     }
@@ -113,6 +113,9 @@ inline fun bindExtra(body: (SparseArray<Any?>) -> Unit) = SparseArray<Any?>().al
 @BindingAdapter("items", "extraBindings", requireAll = false)
 fun <T: RvItem> RecyclerView.setAdapter(items: List<T>?, extraBindings: SparseArray<*>?) {
     if (items != null) {
-        adapter = RvItemAdapter(items, extraBindings)
+        val rva = (adapter as? RvItemAdapter<*>)
+        if (rva == null || rva.items !== items || rva.extraBindings !== extraBindings) {
+            adapter = RvItemAdapter(items, extraBindings)
+        }
     }
 }

app/src/main/java/com/topjohnwu/magisk/dialog/DarkThemeDialog.kt

@@ -1,13 +1,14 @@
-package com.topjohnwu.magisk.events.dialog
+package com.topjohnwu.magisk.dialog
 
 import android.app.Activity
 import androidx.appcompat.app.AppCompatDelegate
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.UIActivity
 import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.events.DialogBuilder
 import com.topjohnwu.magisk.view.MagiskDialog
 
-class DarkThemeDialog : DialogEvent() {
+class DarkThemeDialog : DialogBuilder {
 
     override fun build(dialog: MagiskDialog) {
         val activity = dialog.ownerActivity!!

app/src/main/java/com/topjohnwu/magisk/dialog/EnvFixDialog.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.events.dialog
+package com.topjohnwu.magisk.dialog
 
 import androidx.lifecycle.lifecycleScope
 import com.topjohnwu.magisk.BuildConfig
@@ -6,11 +6,12 @@ import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.base.BaseActivity
 import com.topjohnwu.magisk.core.tasks.MagiskInstaller
+import com.topjohnwu.magisk.events.DialogBuilder
 import com.topjohnwu.magisk.ui.home.HomeViewModel
 import com.topjohnwu.magisk.view.MagiskDialog
 import kotlinx.coroutines.launch
 
-class EnvFixDialog(private val vm: HomeViewModel) : DialogEvent() {
+class EnvFixDialog(private val vm: HomeViewModel, private val code: Int) : DialogBuilder {
 
     override fun build(dialog: MagiskDialog) {
         dialog.apply {
@@ -38,8 +39,10 @@ class EnvFixDialog(private val vm: HomeViewModel) : DialogEvent() {
             }
         }
 
-        if (Info.env.versionCode != BuildConfig.VERSION_CODE ||
+        if (code == 2 || // No rules block, module policy not loaded
+            Info.env.versionCode != BuildConfig.VERSION_CODE ||
             Info.env.versionString != BuildConfig.VERSION_NAME) {
+            dialog.setMessage(R.string.env_full_fix_msg)
             dialog.setButton(MagiskDialog.ButtonType.POSITIVE) {
                 text = android.R.string.ok
                 onClick {

app/src/main/java/com/topjohnwu/magisk/dialog/LocalModuleInstallDialog.kt

@@ -0,0 +1,33 @@
+package com.topjohnwu.magisk.dialog
+
+import android.net.Uri
+import com.topjohnwu.magisk.MainDirections
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.events.DialogBuilder
+import com.topjohnwu.magisk.ui.module.ModuleViewModel
+import com.topjohnwu.magisk.view.MagiskDialog
+
+class LocalModuleInstallDialog(
+    private val viewModel: ModuleViewModel,
+    private val uri: Uri,
+    private val displayName: String
+) : DialogBuilder {
+    override fun build(dialog: MagiskDialog) {
+        dialog.apply {
+            setTitle(R.string.confirm_install_title)
+            setMessage(context.getString(R.string.confirm_install, displayName))
+            setButton(MagiskDialog.ButtonType.POSITIVE) {
+                text = android.R.string.ok
+                onClick {
+                    viewModel.apply {
+                        MainDirections.actionFlashFragment(Const.Value.FLASH_ZIP, uri).navigate()
+                    }
+                }
+            }
+            setButton(MagiskDialog.ButtonType.NEGATIVE) {
+                text = android.R.string.cancel
+            }
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/dialog/ManagerInstallDialog.kt

@@ -1,10 +1,10 @@
-package com.topjohnwu.magisk.events.dialog
+package com.topjohnwu.magisk.dialog
 
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.di.AppContext
 import com.topjohnwu.magisk.core.di.ServiceLocator
-import com.topjohnwu.magisk.core.download.DownloadService
+import com.topjohnwu.magisk.core.download.DownloadEngine
 import com.topjohnwu.magisk.core.download.Subject
 import com.topjohnwu.magisk.view.MagiskDialog
 import java.io.File
@@ -29,7 +29,7 @@ class ManagerInstallDialog : MarkDownDialog() {
             setCancelable(true)
             setButton(MagiskDialog.ButtonType.POSITIVE) {
                 text = R.string.install
-                onClick { DownloadService.start(context, Subject.App()) }
+                onClick { DownloadEngine.startWithActivity(activity, Subject.App()) }
             }
             setButton(MagiskDialog.ButtonType.NEGATIVE) {
                 text = android.R.string.cancel

app/src/main/java/com/topjohnwu/magisk/dialog/MarkDownDialog.kt

@@ -1,12 +1,12 @@
-package com.topjohnwu.magisk.events.dialog
+package com.topjohnwu.magisk.dialog
 
 import android.view.LayoutInflater
 import android.widget.TextView
 import androidx.annotation.CallSuper
 import androidx.lifecycle.lifecycleScope
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.base.BaseActivity
 import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.events.DialogBuilder
 import com.topjohnwu.magisk.view.MagiskDialog
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -14,7 +14,7 @@ import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.io.IOException
 
-abstract class MarkDownDialog : DialogEvent() {
+abstract class MarkDownDialog : DialogBuilder {
 
     abstract suspend fun getMarkdownText(): String
 
@@ -24,7 +24,7 @@ abstract class MarkDownDialog : DialogEvent() {
             val view = LayoutInflater.from(context).inflate(R.layout.markdown_window_md2, null)
             setView(view)
             val tv = view.findViewById<TextView>(R.id.md_txt)
-            (ownerActivity as BaseActivity).lifecycleScope.launch {
+            activity.lifecycleScope.launch {
                 try {
                     val text = withContext(Dispatchers.IO) { getMarkdownText() }
                     ServiceLocator.markwon.setMarkdown(tv, text)

app/src/main/java/com/topjohnwu/magisk/dialog/OnlineModuleInstallDialog.kt

@@ -1,14 +1,13 @@
-package com.topjohnwu.magisk.events.dialog
+package com.topjohnwu.magisk.dialog
 
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.di.ServiceLocator
-import com.topjohnwu.magisk.core.download.Action
-import com.topjohnwu.magisk.core.download.DownloadService
+import com.topjohnwu.magisk.core.download.DownloadEngine
 import com.topjohnwu.magisk.core.download.Subject
 import com.topjohnwu.magisk.core.model.module.OnlineModule
 import com.topjohnwu.magisk.view.MagiskDialog
 
-class ModuleInstallDialog(private val item: OnlineModule) : MarkDownDialog() {
+class OnlineModuleInstallDialog(private val item: OnlineModule) : MarkDownDialog() {
 
     private val svc get() = ServiceLocator.networkService
 
@@ -22,9 +21,7 @@ class ModuleInstallDialog(private val item: OnlineModule) : MarkDownDialog() {
         dialog.apply {
 
             fun download(install: Boolean) {
-                val action = if (install) Action.Flash else Action.Download
-                val subject = Subject.Module(item, action)
-                DownloadService.start(context, subject)
+                DownloadEngine.startWithActivity(activity, Subject.Module(item, install))
             }
 
             val title = context.getString(R.string.repo_install_title,

app/src/main/java/com/topjohnwu/magisk/dialog/SecondSlotWarningDialog.kt

@@ -1,9 +1,10 @@
-package com.topjohnwu.magisk.events.dialog
+package com.topjohnwu.magisk.dialog
 
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.events.DialogBuilder
 import com.topjohnwu.magisk.view.MagiskDialog
 
-class SecondSlotWarningDialog : DialogEvent() {
+class SecondSlotWarningDialog : DialogBuilder {
 
     override fun build(dialog: MagiskDialog) {
         dialog.apply {

app/src/main/java/com/topjohnwu/magisk/dialog/SuperuserRevokeDialog.kt

@@ -0,0 +1,25 @@
+package com.topjohnwu.magisk.dialog
+
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.events.DialogBuilder
+import com.topjohnwu.magisk.view.MagiskDialog
+
+class SuperuserRevokeDialog(
+    private val appName: String,
+    private val onSuccess: () -> Unit
+) : DialogBuilder {
+
+    override fun build(dialog: MagiskDialog) {
+        dialog.apply {
+            setTitle(R.string.su_revoke_title)
+            setMessage(R.string.su_revoke_msg, appName)
+            setButton(MagiskDialog.ButtonType.POSITIVE) {
+                text = android.R.string.ok
+                onClick { onSuccess() }
+            }
+            setButton(MagiskDialog.ButtonType.NEGATIVE) {
+                text = android.R.string.cancel
+            }
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/dialog/UninstallDialog.kt

@@ -1,16 +1,17 @@
-package com.topjohnwu.magisk.events.dialog
+package com.topjohnwu.magisk.dialog
 
 import android.app.ProgressDialog
 import android.content.Context
 import android.widget.Toast
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.NavigationActivity
+import com.topjohnwu.magisk.core.ktx.toast
+import com.topjohnwu.magisk.events.DialogBuilder
 import com.topjohnwu.magisk.ui.flash.FlashFragment
-import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.superuser.Shell
 
-class UninstallDialog : DialogEvent() {
+class UninstallDialog : DialogBuilder {
 
     override fun build(dialog: MagiskDialog) {
         dialog.apply {
@@ -37,9 +38,9 @@ class UninstallDialog : DialogEvent() {
         Shell.cmd("restore_imgs").submit { result ->
             dialog.dismiss()
             if (result.isSuccess) {
-                Utils.toast(R.string.restore_done, Toast.LENGTH_SHORT)
+                context.toast(R.string.restore_done, Toast.LENGTH_SHORT)
             } else {
-                Utils.toast(R.string.restore_fail, Toast.LENGTH_LONG)
+                context.toast(R.string.restore_fail, Toast.LENGTH_LONG)
             }
         }
     }

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

@@ -5,10 +5,15 @@ import android.view.View
 import androidx.annotation.StringRes
 import androidx.navigation.NavDirections
 import com.google.android.material.snackbar.Snackbar
-import com.topjohnwu.magisk.arch.*
+import com.topjohnwu.magisk.arch.ActivityExecutor
+import com.topjohnwu.magisk.arch.ContextExecutor
+import com.topjohnwu.magisk.arch.NavigationActivity
+import com.topjohnwu.magisk.arch.UIActivity
+import com.topjohnwu.magisk.arch.ViewEvent
 import com.topjohnwu.magisk.core.base.ContentResultCallback
 import com.topjohnwu.magisk.utils.TextHolder
 import com.topjohnwu.magisk.utils.asText
+import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.magisk.view.Shortcuts
 
 class PermissionEvent(
@@ -46,6 +51,16 @@ class RecreateEvent : ViewEvent(), ActivityExecutor {
     }
 }
 
+class AuthEvent(
+    private val callback: () -> Unit
+) : ViewEvent(), ActivityExecutor {
+
+    override fun invoke(activity: UIActivity<*>) {
+        activity.authenticateCallback = { if (it) callback() }
+        activity.requestAuthenticate.launch(Unit)
+    }
+}
+
 class GetContentEvent(
     private val type: String,
     private val callback: ContentResultCallback
@@ -95,3 +110,15 @@ class SnackbarEvent(
         activity.showSnackbar(msg.getText(activity.resources), length, builder)
     }
 }
+
+class DialogEvent(
+    private val builder: DialogBuilder
+) : ViewEvent(), ActivityExecutor {
+    override fun invoke(activity: UIActivity<*>) {
+        MagiskDialog(activity).apply(builder::build).show()
+    }
+}
+
+interface DialogBuilder {
+    fun build(dialog: MagiskDialog)
+}

app/src/main/java/com/topjohnwu/magisk/events/dialog/BiometricEvent.kt

@@ -1,38 +0,0 @@
-package com.topjohnwu.magisk.events.dialog
-
-import com.topjohnwu.magisk.arch.ActivityExecutor
-import com.topjohnwu.magisk.arch.UIActivity
-import com.topjohnwu.magisk.arch.ViewEvent
-import com.topjohnwu.magisk.core.utils.BiometricHelper
-
-class BiometricEvent(
-    builder: Builder.() -> Unit
-) : ViewEvent(), ActivityExecutor {
-
-    private var listenerOnFailure: GenericDialogListener = {}
-    private var listenerOnSuccess: GenericDialogListener = {}
-
-    init {
-        builder(Builder())
-    }
-
-    override fun invoke(activity: UIActivity<*>) {
-        BiometricHelper.authenticate(
-            activity,
-            onError = listenerOnFailure,
-            onSuccess = listenerOnSuccess
-        )
-    }
-
-    inner class Builder internal constructor() {
-
-        fun onFailure(listener: GenericDialogListener) {
-            listenerOnFailure = listener
-        }
-
-        fun onSuccess(listener: GenericDialogListener) {
-            listenerOnSuccess = listener
-        }
-    }
-
-}

app/src/main/java/com/topjohnwu/magisk/events/dialog/DialogEvent.kt

@@ -1,20 +0,0 @@
-package com.topjohnwu.magisk.events.dialog
-
-import com.topjohnwu.magisk.arch.ActivityExecutor
-import com.topjohnwu.magisk.arch.UIActivity
-import com.topjohnwu.magisk.arch.ViewEvent
-import com.topjohnwu.magisk.view.MagiskDialog
-
-abstract class DialogEvent : ViewEvent(), ActivityExecutor {
-
-    override fun invoke(activity: UIActivity<*>) {
-        MagiskDialog(activity)
-            .apply { setOwnerActivity(activity) }
-            .apply(this::build).show()
-    }
-
-    abstract fun build(dialog: MagiskDialog)
-
-}
-
-typealias GenericDialogListener = () -> Unit

app/src/main/java/com/topjohnwu/magisk/events/dialog/SuperuserRevokeDialog.kt

@@ -1,35 +0,0 @@
-package com.topjohnwu.magisk.events.dialog
-
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.view.MagiskDialog
-
-class SuperuserRevokeDialog(
-    builder: Builder.() -> Unit
-) : DialogEvent() {
-
-    private val callbacks = Builder().apply(builder)
-
-    override fun build(dialog: MagiskDialog) {
-        dialog.apply {
-            setTitle(R.string.su_revoke_title)
-            setMessage(R.string.su_revoke_msg, callbacks.appName)
-            setButton(MagiskDialog.ButtonType.POSITIVE) {
-                text = android.R.string.ok
-                onClick { callbacks.listenerOnSuccess() }
-            }
-            setButton(MagiskDialog.ButtonType.NEGATIVE) {
-                text = android.R.string.cancel
-            }
-        }
-    }
-
-    inner class Builder internal constructor() {
-        var appName: String = ""
-
-        internal var listenerOnSuccess: GenericDialogListener = {}
-
-        fun onSuccess(listener: GenericDialogListener) {
-            listenerOnSuccess = listener
-        }
-    }
-}

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

@@ -1,267 +0,0 @@
-package com.topjohnwu.magisk.ktx
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.ComponentName
-import android.content.Context
-import android.content.ContextWrapper
-import android.content.Intent
-import android.content.pm.ApplicationInfo
-import android.content.pm.PackageInfo
-import android.content.pm.PackageManager
-import android.content.pm.PackageManager.PERMISSION_GRANTED
-import android.content.res.Configuration
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.drawable.AdaptiveIconDrawable
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.LayerDrawable
-import android.net.Uri
-import android.os.Build.VERSION.SDK_INT
-import android.os.Process
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
-import androidx.appcompat.content.res.AppCompatResources
-import androidx.core.content.ContextCompat
-import androidx.core.content.getSystemService
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator
-import androidx.transition.AutoTransition
-import androidx.transition.TransitionManager
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.Const
-import com.topjohnwu.magisk.core.utils.RootUtils
-import com.topjohnwu.magisk.core.utils.currentLocale
-import com.topjohnwu.superuser.Shell
-import java.io.File
-import kotlin.Array
-import kotlin.String
-import java.lang.reflect.Array as JArray
-
-fun Context.rawResource(id: Int) = resources.openRawResource(id)
-
-fun Context.getBitmap(id: Int): Bitmap {
-    var drawable = AppCompatResources.getDrawable(this, id)!!
-    if (drawable is BitmapDrawable)
-        return drawable.bitmap
-    if (SDK_INT >= 26 && drawable is AdaptiveIconDrawable) {
-        drawable = LayerDrawable(arrayOf(drawable.background, drawable.foreground))
-    }
-    val bitmap = Bitmap.createBitmap(
-        drawable.intrinsicWidth, drawable.intrinsicHeight,
-        Bitmap.Config.ARGB_8888
-    )
-    val canvas = Canvas(bitmap)
-    drawable.setBounds(0, 0, canvas.width, canvas.height)
-    drawable.draw(canvas)
-    return bitmap
-}
-
-val Context.deviceProtectedContext: Context get() =
-    if (SDK_INT >= 24) {
-        createDeviceProtectedStorageContext()
-    } else { this }
-
-fun Intent.startActivityWithRoot() {
-    val args = mutableListOf("am", "start", "--user", Const.USER_ID.toString())
-    val cmd = toCommand(args).joinToString(" ")
-    Shell.cmd(cmd).submit()
-}
-
-fun Intent.toCommand(args: MutableList<String> = mutableListOf()): MutableList<String> {
-    action?.also {
-        args.add("-a")
-        args.add(it)
-    }
-    component?.also {
-        args.add("-n")
-        args.add(it.flattenToString())
-    }
-    data?.also {
-        args.add("-d")
-        args.add(it.toString())
-    }
-    categories?.also {
-        for (cat in it) {
-            args.add("-c")
-            args.add(cat)
-        }
-    }
-    type?.also {
-        args.add("-t")
-        args.add(it)
-    }
-    extras?.also {
-        loop@ for (key in it.keySet()) {
-            val v = it[key] ?: continue
-            var value: Any = v
-            val arg: String
-            when {
-                v is String -> arg = "--es"
-                v is Boolean -> arg = "--ez"
-                v is Int -> arg = "--ei"
-                v is Long -> arg = "--el"
-                v is Float -> arg = "--ef"
-                v is Uri -> arg = "--eu"
-                v is ComponentName -> {
-                    arg = "--ecn"
-                    value = v.flattenToString()
-                }
-                v is List<*> -> {
-                    if (v.isEmpty())
-                        continue@loop
-
-                    arg = if (v[0] is Int)
-                        "--eial"
-                    else if (v[0] is Long)
-                        "--elal"
-                    else if (v[0] is Float)
-                        "--efal"
-                    else if (v[0] is String)
-                        "--esal"
-                    else
-                        continue@loop  /* Unsupported */
-
-                    val sb = StringBuilder()
-                    for (o in v) {
-                        sb.append(o.toString().replace(",", "\\,"))
-                        sb.append(',')
-                    }
-                    // Remove trailing comma
-                    sb.deleteCharAt(sb.length - 1)
-                    value = sb
-                }
-                v.javaClass.isArray -> {
-                    arg = if (v is IntArray)
-                        "--eia"
-                    else if (v is LongArray)
-                        "--ela"
-                    else if (v is FloatArray)
-                        "--efa"
-                    else if (v is Array<*> && v.isArrayOf<String>())
-                        "--esa"
-                    else
-                        continue@loop  /* Unsupported */
-
-                    val sb = StringBuilder()
-                    val len = JArray.getLength(v)
-                    for (i in 0 until len) {
-                        sb.append(JArray.get(v, i)!!.toString().replace(",", "\\,"))
-                        sb.append(',')
-                    }
-                    // Remove trailing comma
-                    sb.deleteCharAt(sb.length - 1)
-                    value = sb
-                }
-                else -> continue@loop
-            }  /* Unsupported */
-
-            args.add(arg)
-            args.add(key)
-            args.add(value.toString())
-        }
-    }
-    args.add("-f")
-    args.add(flags.toString())
-    return args
-}
-
-fun Context.cachedFile(name: String) = File(cacheDir, name)
-
-fun ApplicationInfo.getLabel(pm: PackageManager): String {
-    runCatching {
-        if (labelRes > 0) {
-            val res = pm.getResourcesForApplication(this)
-            val config = Configuration()
-            config.setLocale(currentLocale)
-            res.updateConfiguration(config, res.displayMetrics)
-            return res.getString(labelRes)
-        }
-    }
-
-    return loadLabel(pm).toString()
-}
-
-fun Context.unwrap(): Context {
-    var context = this
-    while (true) {
-        if (context is ContextWrapper)
-            context = context.baseContext
-        else
-            break
-    }
-    return context
-}
-
-fun Context.hasPermissions(vararg permissions: String) = permissions.all {
-    ContextCompat.checkSelfPermission(this, it) == PERMISSION_GRANTED
-}
-
-fun Activity.hideKeyboard() {
-    val view = currentFocus ?: return
-    getSystemService<InputMethodManager>()
-        ?.hideSoftInputFromWindow(view.windowToken, 0)
-    view.clearFocus()
-}
-
-fun ViewGroup.startAnimations() {
-    val transition = AutoTransition()
-        .setInterpolator(FastOutSlowInInterpolator())
-        .setDuration(400)
-        .excludeTarget(R.id.main_toolbar, true)
-    TransitionManager.beginDelayedTransition(
-        this,
-        transition
-    )
-}
-
-val View.activity: Activity get() {
-    var context = context
-    while(true) {
-        if (context !is ContextWrapper)
-            error("View is not attached to activity")
-        if (context is Activity)
-            return context
-        context = context.baseContext
-    }
-}
-
-@SuppressLint("PrivateApi")
-fun getProperty(key: String, def: String): String {
-    runCatching {
-        val clazz = Class.forName("android.os.SystemProperties")
-        val get = clazz.getMethod("get", String::class.java, String::class.java)
-        return get.invoke(clazz, key, def) as String
-    }
-    return def
-}
-
-@SuppressLint("InlinedApi")
-@Throws(PackageManager.NameNotFoundException::class)
-fun PackageManager.getPackageInfo(uid: Int, pid: Int): PackageInfo? {
-    val flag = PackageManager.MATCH_UNINSTALLED_PACKAGES
-    val pkgs = getPackagesForUid(uid) ?: throw PackageManager.NameNotFoundException()
-    if (pkgs.size > 1) {
-        if (pid <= 0) {
-            return null
-        }
-        // Try to find package name from PID
-        val proc = RootUtils.obj?.getAppProcess(pid)
-        if (proc == null) {
-            if (uid == Process.SHELL_UID) {
-                // It is possible that some apps installed are sharing UID with shell.
-                // We will not be able to find a package from the active process list,
-                // because the client is forked from ADB shell, not any app process.
-                return getPackageInfo("com.android.shell", flag)
-            }
-        } else if (uid == proc.uid) {
-            return getPackageInfo(proc.pkgList[0], flag)
-        }
-
-        return null
-    }
-    if (pkgs.size == 1) {
-        return getPackageInfo(pkgs[0], flag)
-    }
-    throw PackageManager.NameNotFoundException()
-}

app/src/main/java/com/topjohnwu/magisk/signing/ApkSignerV2.java

@@ -680,7 +680,7 @@ public abstract class ApkSignerV2 {
                 return "SHA-512";
             default:
                 throw new IllegalArgumentException(
-                        "Unknown content digest algorthm: " + digestAlgorithm);
+                        "Unknown content digest algorithm: " + digestAlgorithm);
         }
     }
 
@@ -692,7 +692,7 @@ public abstract class ApkSignerV2 {
                 return 512 / 8;
             default:
                 throw new IllegalArgumentException(
-                        "Unknown content digest algorthm: " + digestAlgorithm);
+                        "Unknown content digest algorithm: " + digestAlgorithm);
         }
     }
 

app/src/main/java/com/topjohnwu/magisk/signing/CryptoUtils.java

@@ -1,115 +0,0 @@
-package com.topjohnwu.magisk.signing;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.security.Key;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.spec.ECPrivateKeySpec;
-import java.security.spec.ECPublicKeySpec;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.HashMap;
-import java.util.Map;
-
-public class CryptoUtils {
-
-    static final Map<String, String> ID_TO_ALG;
-    static final Map<String, String> ALG_TO_ID;
-
-    static {
-        ID_TO_ALG = new HashMap<>();
-        ALG_TO_ID = new HashMap<>();
-        ID_TO_ALG.put(X9ObjectIdentifiers.ecdsa_with_SHA256.getId(), "SHA256withECDSA");
-        ID_TO_ALG.put(X9ObjectIdentifiers.ecdsa_with_SHA384.getId(), "SHA384withECDSA");
-        ID_TO_ALG.put(X9ObjectIdentifiers.ecdsa_with_SHA512.getId(), "SHA512withECDSA");
-        ID_TO_ALG.put(PKCSObjectIdentifiers.sha1WithRSAEncryption.getId(), "SHA1withRSA");
-        ID_TO_ALG.put(PKCSObjectIdentifiers.sha256WithRSAEncryption.getId(), "SHA256withRSA");
-        ID_TO_ALG.put(PKCSObjectIdentifiers.sha512WithRSAEncryption.getId(), "SHA512withRSA");
-        ALG_TO_ID.put("SHA256withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA256.getId());
-        ALG_TO_ID.put("SHA384withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA384.getId());
-        ALG_TO_ID.put("SHA512withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA512.getId());
-        ALG_TO_ID.put("SHA1withRSA", PKCSObjectIdentifiers.sha1WithRSAEncryption.getId());
-        ALG_TO_ID.put("SHA256withRSA", PKCSObjectIdentifiers.sha256WithRSAEncryption.getId());
-        ALG_TO_ID.put("SHA512withRSA", PKCSObjectIdentifiers.sha512WithRSAEncryption.getId());
-    }
-
-    static String getSignatureAlgorithm(Key key) throws Exception {
-        if ("EC".equals(key.getAlgorithm())) {
-            int curveSize;
-            KeyFactory factory = KeyFactory.getInstance("EC");
-            if (key instanceof PublicKey) {
-                ECPublicKeySpec spec = factory.getKeySpec(key, ECPublicKeySpec.class);
-                curveSize = spec.getParams().getCurve().getField().getFieldSize();
-            } else if (key instanceof PrivateKey) {
-                ECPrivateKeySpec spec = factory.getKeySpec(key, ECPrivateKeySpec.class);
-                curveSize = spec.getParams().getCurve().getField().getFieldSize();
-            } else {
-                throw new InvalidKeySpecException();
-            }
-            if (curveSize <= 256) {
-                return "SHA256withECDSA";
-            } else if (curveSize <= 384) {
-                return "SHA384withECDSA";
-            } else {
-                return "SHA512withECDSA";
-            }
-        } else if ("RSA".equals(key.getAlgorithm())) {
-            return "SHA256withRSA";
-        } else {
-            throw new IllegalArgumentException("Unsupported key type " + key.getAlgorithm());
-        }
-    }
-
-    static AlgorithmIdentifier getSignatureAlgorithmIdentifier(Key key) throws Exception {
-        String id = ALG_TO_ID.get(getSignatureAlgorithm(key));
-        if (id == null) {
-            throw new IllegalArgumentException("Unsupported key type " + key.getAlgorithm());
-        }
-        return new AlgorithmIdentifier(new ASN1ObjectIdentifier(id));
-    }
-
-    public static X509Certificate readCertificate(InputStream input)
-            throws IOException, GeneralSecurityException {
-        try {
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            return (X509Certificate) cf.generateCertificate(input);
-        } finally {
-            input.close();
-        }
-    }
-
-    /** Read a PKCS#8 format private key. */
-    public static PrivateKey readPrivateKey(InputStream input)
-            throws IOException, GeneralSecurityException {
-        try {
-            ByteArrayStream buf = new ByteArrayStream();
-            buf.readFrom(input);
-            byte[] bytes = buf.toByteArray();
-            /* Check to see if this is in an EncryptedPrivateKeyInfo structure. */
-            PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(bytes);
-            /*
-             * Now it's in a PKCS#8 PrivateKeyInfo structure. Read its Algorithm
-             * OID and use that to construct a KeyFactory.
-             */
-            ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(spec.getEncoded()));
-            PrivateKeyInfo pki = PrivateKeyInfo.getInstance(bIn.readObject());
-            String algOid = pki.getPrivateKeyAlgorithm().getAlgorithm().getId();
-            return KeyFactory.getInstance(algOid).generatePrivate(spec);
-        } finally {
-            input.close();
-        }
-    }
-}

app/src/main/java/com/topjohnwu/magisk/signing/SignBoot.java

@@ -1,382 +0,0 @@
-package com.topjohnwu.magisk.signing;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.Signature;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.Arrays;
-
-public class SignBoot {
-
-    private static final int BOOT_IMAGE_HEADER_V1_RECOVERY_DTBO_SIZE_OFFSET = 1632;
-    private static final int BOOT_IMAGE_HEADER_V2_DTB_SIZE_OFFSET = 1648;
-
-    // Arbitrary maximum header version value; when greater assume the field is dt/extra size
-    private static final int BOOT_IMAGE_HEADER_VERSION_MAXIMUM = 8;
-
-    // Maximum header size byte value to read (currently the bootimg minimum page size)
-    private static final int BOOT_IMAGE_HEADER_SIZE_MAXIMUM = 2048;
-
-    private static class PushBackRWStream extends FilterInputStream {
-        private OutputStream out;
-        private int pos = 0;
-        private byte[] backBuf;
-
-        PushBackRWStream(InputStream in, OutputStream o) {
-            super(in);
-            out = o;
-        }
-
-        @Override
-        public int read() throws IOException {
-            int b;
-            if (backBuf != null && backBuf.length > pos) {
-                b = backBuf[pos++];
-            } else {
-                b = super.read();
-                out.write(b);
-            }
-            return b;
-        }
-
-        @Override
-        public int read(byte[] bytes, int off, int len) throws IOException {
-            int read = 0;
-            if (backBuf != null && backBuf.length > pos) {
-                read = Math.min(len, backBuf.length - pos);
-                System.arraycopy(backBuf, pos, bytes, off, read);
-                pos += read;
-                off += read;
-                len -= read;
-            }
-            if (len > 0) {
-                int ar = super.read(bytes, off, len);
-                read += ar;
-                out.write(bytes, off, ar);
-            }
-            return read;
-        }
-
-        void unread(byte[] buf) {
-            backBuf = buf;
-        }
-    }
-
-    private static int fullRead(InputStream in, byte[] b) throws IOException {
-        return fullRead(in, b, 0, b.length);
-    }
-
-    private static int fullRead(InputStream in, byte[] b, int off, int len) throws IOException {
-        int n = 0;
-        while (n < len) {
-            int count = in.read(b, off + n, len - n);
-            if (count <= 0)
-                break;
-            n += count;
-        }
-        return n;
-    }
-
-    public static boolean doSignature(
-            @Nullable X509Certificate cert, @Nullable PrivateKey key,
-            @NonNull InputStream imgIn, @NonNull OutputStream imgOut, @NonNull String target
-    ) {
-        try {
-            PushBackRWStream in = new PushBackRWStream(imgIn, imgOut);
-            byte[] hdr = new byte[BOOT_IMAGE_HEADER_SIZE_MAXIMUM];
-            // First read the header
-            fullRead(in, hdr);
-            int signableSize = getSignableImageSize(hdr);
-            // Unread header
-            in.unread(hdr);
-            BootSignature bootsig = new BootSignature(target, signableSize);
-            if (cert == null) {
-                cert = CryptoUtils.readCertificate(
-                        new ByteArrayInputStream(KeyData.verityCert()));
-            }
-            bootsig.setCertificate(cert);
-            if (key == null) {
-                key = CryptoUtils.readPrivateKey(
-                        new ByteArrayInputStream(KeyData.verityKey()));
-            }
-            byte[] sig = bootsig.sign(key, in, signableSize);
-            bootsig.setSignature(sig, CryptoUtils.getSignatureAlgorithmIdentifier(key));
-            byte[] encoded_bootsig = bootsig.getEncoded();
-            imgOut.write(encoded_bootsig);
-            imgOut.flush();
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    public static boolean verifySignature(InputStream imgIn, X509Certificate cert) {
-        try {
-            // Read the header for size
-            byte[] hdr = new byte[BOOT_IMAGE_HEADER_SIZE_MAXIMUM];
-            if (fullRead(imgIn, hdr) != hdr.length) {
-                System.err.println("Unable to read image header");
-                return false;
-            }
-            int signableSize = getSignableImageSize(hdr);
-
-            // Read the rest of the image
-            byte[] rawImg = Arrays.copyOf(hdr, signableSize);
-            int remain = signableSize - hdr.length;
-            if (fullRead(imgIn, rawImg, hdr.length, remain) != remain) {
-                System.err.println("Unable to read image");
-                return false;
-            }
-
-            // Read footer, which contains the signature
-            byte[] signature = new byte[4096];
-            if (imgIn.read(signature) == -1 || Arrays.equals(signature, new byte [signature.length])) {
-                System.err.println("Invalid image: not signed");
-                return false;
-            }
-
-            BootSignature bootsig = new BootSignature(signature);
-            if (cert != null) {
-                bootsig.setCertificate(cert);
-            }
-            if (bootsig.verify(rawImg, signableSize)) {
-                System.err.println("Signature is VALID");
-                return true;
-            } else {
-                System.err.println("Signature is INVALID");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-        return false;
-    }
-
-    public static int getSignableImageSize(byte[] data) throws Exception {
-        if (!Arrays.equals(Arrays.copyOfRange(data, 0, 8),
-                "ANDROID!".getBytes("US-ASCII"))) {
-            throw new IllegalArgumentException("Invalid image header: missing magic");
-        }
-        ByteBuffer image = ByteBuffer.wrap(data);
-        image.order(ByteOrder.LITTLE_ENDIAN);
-        image.getLong(); // magic
-        int kernelSize = image.getInt();
-        image.getInt(); // kernel_addr
-        int ramdskSize = image.getInt();
-        image.getInt(); // ramdisk_addr
-        int secondSize = image.getInt();
-        image.getLong(); // second_addr + tags_addr
-        int pageSize = image.getInt();
-        if (pageSize >= 0x02000000) {
-            throw new IllegalArgumentException("Invalid image header: PXA header detected");
-        }
-        int length = pageSize // include the page aligned image header
-                + ((kernelSize + pageSize - 1) / pageSize) * pageSize
-                + ((ramdskSize + pageSize - 1) / pageSize) * pageSize
-                + ((secondSize + pageSize - 1) / pageSize) * pageSize;
-        int headerVersion = image.getInt(); // boot image header version or dt/extra size
-        if (headerVersion > 0 && headerVersion < BOOT_IMAGE_HEADER_VERSION_MAXIMUM) {
-            image.position(BOOT_IMAGE_HEADER_V1_RECOVERY_DTBO_SIZE_OFFSET);
-            int recoveryDtboLength = image.getInt();
-            length += ((recoveryDtboLength + pageSize - 1) / pageSize) * pageSize;
-            image.getLong(); // recovery_dtbo address
-            int headerSize = image.getInt();
-            if (headerVersion == 2) {
-                image.position(BOOT_IMAGE_HEADER_V2_DTB_SIZE_OFFSET);
-                int dtbLength = image.getInt();
-                length += ((dtbLength + pageSize - 1) / pageSize) * pageSize;
-                image.getLong(); // dtb address
-            }
-            if (image.position() != headerSize) {
-                throw new IllegalArgumentException("Invalid image header: invalid header length");
-            }
-        } else {
-            // headerVersion is 0 or actually dt/extra size in this case
-            length += ((headerVersion + pageSize - 1) / pageSize) * pageSize;
-        }
-        length = ((length + pageSize - 1) / pageSize) * pageSize;
-        if (length <= 0) {
-            throw new IllegalArgumentException("Invalid image header: invalid length");
-        }
-        return length;
-    }
-
-    static class BootSignature extends ASN1Object {
-        private ASN1Integer formatVersion;
-        private ASN1Encodable certificate;
-        private AlgorithmIdentifier algId;
-        private DERPrintableString target;
-        private ASN1Integer length;
-        private DEROctetString signature;
-        private PublicKey publicKey;
-        private static final int FORMAT_VERSION = 1;
-
-        /**
-         * Initializes the object for signing an image file
-         * @param target Target name, included in the signed data
-         * @param length Length of the image, included in the signed data
-         */
-        public BootSignature(String target, int length) {
-            this.formatVersion = new ASN1Integer(FORMAT_VERSION);
-            this.target = new DERPrintableString(target);
-            this.length = new ASN1Integer(length);
-        }
-
-        /**
-         * Initializes the object for verifying a signed image file
-         * @param signature Signature footer
-         */
-        public BootSignature(byte[] signature) throws Exception {
-            ASN1InputStream stream = new ASN1InputStream(signature);
-            ASN1Sequence sequence = (ASN1Sequence) stream.readObject();
-            formatVersion = (ASN1Integer) sequence.getObjectAt(0);
-            if (formatVersion.getValue().intValue() != FORMAT_VERSION) {
-                throw new IllegalArgumentException("Unsupported format version");
-            }
-            certificate = sequence.getObjectAt(1);
-            byte[] encoded = ((ASN1Object) certificate).getEncoded();
-            ByteArrayInputStream bis = new ByteArrayInputStream(encoded);
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            X509Certificate c = (X509Certificate) cf.generateCertificate(bis);
-            publicKey = c.getPublicKey();
-            ASN1Sequence algId = (ASN1Sequence) sequence.getObjectAt(2);
-            this.algId = new AlgorithmIdentifier((ASN1ObjectIdentifier) algId.getObjectAt(0));
-            ASN1Sequence attrs = (ASN1Sequence) sequence.getObjectAt(3);
-            target = (DERPrintableString) attrs.getObjectAt(0);
-            length = (ASN1Integer) attrs.getObjectAt(1);
-            this.signature = (DEROctetString) sequence.getObjectAt(4);
-        }
-
-        public ASN1Object getAuthenticatedAttributes() {
-            ASN1EncodableVector attrs = new ASN1EncodableVector();
-            attrs.add(target);
-            attrs.add(length);
-            return new DERSequence(attrs);
-        }
-
-        public byte[] getEncodedAuthenticatedAttributes() throws IOException {
-            return getAuthenticatedAttributes().getEncoded();
-        }
-
-        public void setSignature(byte[] sig, AlgorithmIdentifier algId) {
-            this.algId = algId;
-            signature = new DEROctetString(sig);
-        }
-
-        public void setCertificate(X509Certificate cert)
-                throws CertificateEncodingException, IOException {
-            ASN1InputStream s = new ASN1InputStream(cert.getEncoded());
-            certificate = s.readObject();
-            publicKey = cert.getPublicKey();
-        }
-
-        public byte[] sign(PrivateKey key, InputStream is, int len) throws Exception {
-            Signature signer = Signature.getInstance(CryptoUtils.getSignatureAlgorithm(key));
-            signer.initSign(key);
-            int read;
-            byte buffer[] = new byte[4096];
-            while ((read = is.read(buffer, 0, Math.min(len, buffer.length))) > 0) {
-                signer.update(buffer, 0, read);
-                len -= read;
-            }
-            signer.update(getEncodedAuthenticatedAttributes());
-            return signer.sign();
-        }
-
-        public boolean verify(byte[] image, int length) throws Exception {
-            if (this.length.getValue().intValue() != length) {
-                throw new IllegalArgumentException("Invalid image length");
-            }
-            String algName = CryptoUtils.ID_TO_ALG.get(algId.getAlgorithm().getId());
-            if (algName == null) {
-                throw new IllegalArgumentException("Unsupported algorithm " + algId.getAlgorithm());
-            }
-            Signature verifier = Signature.getInstance(algName);
-            verifier.initVerify(publicKey);
-            verifier.update(image, 0, length);
-            verifier.update(getEncodedAuthenticatedAttributes());
-            return verifier.verify(signature.getOctets());
-        }
-
-        @Override
-        public ASN1Primitive toASN1Primitive() {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-            v.add(formatVersion);
-            v.add(certificate);
-            v.add(algId);
-            v.add(getAuthenticatedAttributes());
-            v.add(signature);
-            return new DERSequence(v);
-        }
-
-    }
-
-    public static void main(String[] args) throws Exception {
-        if (args.length > 0 && "-verify".equals(args[0])) {
-            X509Certificate cert = null;
-            if (args.length >= 2) {
-                // args[1] is the path to a public key certificate
-                cert = CryptoUtils.readCertificate(new FileInputStream(args[1]));
-            }
-            boolean signed = SignBoot.verifySignature(System.in, cert);
-            System.exit(signed ? 0 : 1);
-        } else if (args.length > 0 && "-sign".equals(args[0])) {
-            X509Certificate cert = null;
-            PrivateKey key = null;
-            String name = "/boot";
-
-            if (args.length >= 3) {
-                cert = CryptoUtils.readCertificate(new FileInputStream(args[1]));
-                key = CryptoUtils.readPrivateKey(new FileInputStream(args[2]));
-            }
-            if (args.length == 2) {
-                name = args[1];
-            } else if (args.length >= 4) {
-                name = args[3];
-            }
-
-            boolean result = SignBoot.doSignature(cert, key, System.in, System.out, name);
-            System.exit(result ? 0 : 1);
-        } else {
-            System.err.println(
-                    "BootSigner <actions> [args]\n" +
-                    "Input from stdin, output to stdout\n" +
-                    "\n" +
-                    "Actions:\n" +
-                    "   -verify [x509.pem]\n" +
-                    "      verify image. cert is optional.\n" +
-                    "   -sign [x509.pem] [pk8] [name]\n" +
-                    "      sign image. name and the cert/key pair are optional.\n" +
-                    "      name should be either /boot (default) or /recovery.\n"
-            );
-        }
-    }
-
-}

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

@@ -1,5 +1,7 @@
 package com.topjohnwu.magisk.ui
 
+import android.Manifest
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.os.Bundle
@@ -14,6 +16,7 @@ import androidx.navigation.NavDirections
 import com.topjohnwu.magisk.MainDirections
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.arch.startAnimations
 import com.topjohnwu.magisk.arch.viewModel
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Const
@@ -21,9 +24,7 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.isRunningAsStub
 import com.topjohnwu.magisk.core.model.module.LocalModule
 import com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
-import com.topjohnwu.magisk.ktx.startAnimations
 import com.topjohnwu.magisk.ui.home.HomeFragmentDirections
-import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.magisk.view.Shortcuts
 import java.io.File
@@ -52,11 +53,19 @@ class MainActivity : SplashActivity<ActivityMainMd2Binding>() {
 
     private var isRootFragment = true
 
+    @SuppressLint("InlinedApi")
     override fun showMainUI(savedInstanceState: Bundle?) {
         setContentView()
         showUnsupportedMessage()
         askForHomeShortcut()
 
+        // Ask permission to post notifications for background update check
+        if (Config.checkUpdate) {
+            withPermission(Manifest.permission.POST_NOTIFICATIONS) {
+                Config.checkUpdate = it
+            }
+        }
+
         window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
 
         navigation.addOnDestinationChangedListener { _, destination, _ ->
@@ -88,7 +97,7 @@ class MainActivity : SplashActivity<ActivityMainMd2Binding>() {
             // https://issuetracker.google.com/issues/124538620
         }
         binding.mainNavigation.menu.apply {
-            findItem(R.id.superuserFragment)?.isEnabled = Utils.showSuperUser()
+            findItem(R.id.superuserFragment)?.isEnabled = Info.showSuperUser
             findItem(R.id.modulesFragment)?.isEnabled = Info.env.isActive && LocalModule.loaded()
         }
 

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

@@ -6,36 +6,46 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.databinding.ViewDataBinding
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
+import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.StubApk
 import com.topjohnwu.magisk.arch.NavigationActivity
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.JobService
 import com.topjohnwu.magisk.core.di.ServiceLocator
 import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.ktx.toast
+import com.topjohnwu.magisk.core.ktx.writeTo
 import com.topjohnwu.magisk.core.tasks.HideAPK
 import com.topjohnwu.magisk.core.utils.RootUtils
 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.Dispatchers
 import kotlinx.coroutines.launch
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
 
 @SuppressLint("CustomSplashScreen")
 abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Binding>() {
 
     companion object {
-        private var skipSplash = false
+        private var splashShown = false
     }
 
+    private var needShowMainUI = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         setTheme(Theme.selected.themeRes)
 
-        if (isRunningAsStub && !skipSplash) {
+        if (isRunningAsStub && !splashShown) {
             // Manually apply splash theme for stub
             theme.applyStyle(R.style.StubSplashTheme, true)
         }
@@ -44,22 +54,27 @@ abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Bi
 
         if (!isRunningAsStub) {
             val splashScreen = installSplashScreen()
-            splashScreen.setKeepOnScreenCondition { !skipSplash }
+            splashScreen.setKeepOnScreenCondition { !splashShown }
         }
 
-        if (skipSplash) {
-            showMainUI(savedInstanceState)
+        if (splashShown) {
+            doShowMainUI(savedInstanceState)
         } else {
             Shell.getShell(Shell.EXECUTOR) {
                 if (isRunningAsStub && !it.isRoot) {
                     showInvalidStateMessage()
                     return@getShell
                 }
-                preLoad(savedInstanceState)
+                initialize(savedInstanceState)
             }
         }
     }
 
+    private fun doShowMainUI(savedInstanceState: Bundle?) {
+        needShowMainUI = false
+        showMainUI(savedInstanceState)
+    }
+
     abstract fun showMainUI(savedInstanceState: Bundle?)
 
     @SuppressLint("InlinedApi")
@@ -72,7 +87,7 @@ abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Bi
                 onClick {
                     withPermission(REQUEST_INSTALL_PACKAGES) {
                         if (!it) {
-                            Utils.toast(R.string.install_unknown_denied, Toast.LENGTH_SHORT)
+                            toast(R.string.install_unknown_denied, Toast.LENGTH_SHORT)
                             showInvalidStateMessage()
                         } else {
                             lifecycleScope.launch {
@@ -87,7 +102,14 @@ abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Bi
         }
     }
 
-    private fun preLoad(savedState: Bundle?) {
+    override fun onResume() {
+        super.onResume()
+        if (needShowMainUI) {
+            doShowMainUI(null)
+        }
+    }
+
+    private fun initialize(savedState: Bundle?) {
         val prevPkg = intent.getStringExtra(Const.Key.PREV_PKG)?.let {
             // Make sure the calling package matches (prevent DoS)
             if (it == realCallingPackage)
@@ -97,16 +119,54 @@ abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Bi
         }
 
         Config.load(prevPkg)
-        handleRepackage(prevPkg)
-        if (prevPkg != null && !isRunningAsStub) {
+
+        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 = ""
+            if (prevPkg != null) {
+                Shell.cmd("(pm uninstall $prevPkg)& >/dev/null 2>&1").exec()
+            }
+        }
+
+        if (prevPkg != null) {
             runOnUiThread {
-                // Might have new configuration loaded, relaunch the activity
-                relaunch()
+                // Relaunch the process after package migration
+                StubApk.restartProcess(this)
+            }
+            return
+        }
+
+        // Validate stub APK
+        if (isRunningAsStub && (
+                // Version mismatch
+                Info.stub!!.version != BuildConfig.STUB_VERSION ||
+                // Not properly patched
+                intent.component!!.className.contains(HideAPK.PLACEHOLDER)
+            )) {
+            withPermission(REQUEST_INSTALL_PACKAGES) { granted ->
+                if (granted) {
+                    lifecycleScope.launch(Dispatchers.IO) {
+                        val apk = File(cacheDir, "stub.apk")
+                        try {
+                            assets.open("stub.apk").writeTo(apk)
+                            HideAPK.upgrade(this@SplashActivity, apk)?.let {
+                                startActivity(it)
+                            }
+                        } catch (e: IOException) {
+                            Timber.e(e)
+                        }
+                    }
+                }
             }
             return
         }
 
-        Notifications.setup(this)
         JobService.schedule(this)
         Shortcuts.setupDynamic(this)
 
@@ -117,29 +177,17 @@ abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Bi
         RootUtils.Connection.await()
 
         runOnUiThread {
-            skipSplash = true
+            splashShown = true
             if (isRunningAsStub) {
                 // Re-launch main activity without splash theme
                 relaunch()
             } else {
-                showMainUI(savedState)
+                if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
+                    doShowMainUI(savedState)
+                } else {
+                    needShowMainUI = true
+                }
             }
         }
     }
-
-    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 (!Const.Version.atLeast_25_0() && Config.suManager.isNotEmpty())
-                Config.suManager = ""
-            pkg ?: return
-            Shell.cmd("(pm uninstall $pkg)& >/dev/null 2>&1").exec()
-        }
-    }
-
 }

app/src/main/java/com/topjohnwu/magisk/ui/deny/AppProcessInfo.kt

@@ -4,14 +4,20 @@ import android.annotation.SuppressLint
 import android.content.pm.ApplicationInfo
 import android.content.pm.ComponentInfo
 import android.content.pm.PackageManager
-import android.content.pm.PackageManager.*
+import android.content.pm.PackageManager.GET_ACTIVITIES
+import android.content.pm.PackageManager.GET_PROVIDERS
+import android.content.pm.PackageManager.GET_RECEIVERS
+import android.content.pm.PackageManager.GET_SERVICES
+import android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS
+import android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES
 import android.content.pm.ServiceInfo
 import android.graphics.drawable.Drawable
+import android.os.Build
 import android.os.Build.VERSION.SDK_INT
 import androidx.core.os.ProcessCompat
+import com.topjohnwu.magisk.core.ktx.getLabel
 import com.topjohnwu.magisk.core.utils.currentLocale
-import com.topjohnwu.magisk.ktx.getLabel
-import java.util.*
+import java.util.TreeSet
 
 class CmdlineListItem(line: String) {
     val packageName: String
@@ -67,7 +73,8 @@ class AppProcessInfo(
                 val proc = info.processName ?: info.packageName
                 createProcess("${proc}_zygote")
             } else {
-                val proc = if (SDK_INT >= 29) "${it.getProcName()}:${it.name}" else it.getProcName()
+                val proc = if (SDK_INT >= Build.VERSION_CODES.Q)
+                    "${it.getProcName()}:${it.name}" else it.getProcName()
                 createProcess(proc, ISOLATED_MAGIC)
             }
         } else {

app/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListFragment.kt

@@ -1,33 +1,32 @@
 package com.topjohnwu.magisk.ui.deny
 
-import android.content.Context
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.widget.SearchView
+import androidx.core.view.MenuProvider
 import androidx.recyclerview.widget.RecyclerView
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.BaseFragment
 import com.topjohnwu.magisk.arch.viewModel
+import com.topjohnwu.magisk.core.ktx.hideKeyboard
 import com.topjohnwu.magisk.databinding.FragmentDenyMd2Binding
-import com.topjohnwu.magisk.ktx.hideKeyboard
 import rikka.recyclerview.addEdgeSpacing
 import rikka.recyclerview.addItemSpacing
 import rikka.recyclerview.fixEdgeEffect
 
-class DenyListFragment : BaseFragment<FragmentDenyMd2Binding>() {
+class DenyListFragment : BaseFragment<FragmentDenyMd2Binding>(), MenuProvider {
 
     override val layoutRes = R.layout.fragment_deny_md2
     override val viewModel by viewModel<DenyListViewModel>()
 
     private lateinit var searchView: SearchView
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
+    override fun onStart() {
+        super.onStart()
         activity?.setTitle(R.string.denylist)
-        setHasOptionsMenu(true)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -56,7 +55,7 @@ class DenyListFragment : BaseFragment<FragmentDenyMd2Binding>() {
         return super.onBackPressed()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.menu_deny_md2, menu)
         searchView = menu.findItem(R.id.action_search).actionView as SearchView
         searchView.queryHint = searchView.context.getString(R.string.hide_filter_hint)
@@ -73,7 +72,7 @@ class DenyListFragment : BaseFragment<FragmentDenyMd2Binding>() {
         })
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+    override fun onMenuItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_show_system -> {
                 val check = !item.isChecked
@@ -91,7 +90,7 @@ class DenyListFragment : BaseFragment<FragmentDenyMd2Binding>() {
         return super.onOptionsItemSelected(item)
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu) {
+    override fun onPrepareMenu(menu: Menu) {
         val showSystem = menu.findItem(R.id.action_show_system)
         val showOS = menu.findItem(R.id.action_show_OS)
         showOS.isEnabled = showSystem.isChecked

app/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListRvItem.kt

@@ -5,17 +5,17 @@ import android.view.ViewGroup
 import androidx.databinding.Bindable
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.databinding.ComparableRv
-import com.topjohnwu.magisk.databinding.ObservableDiffRvItem
+import com.topjohnwu.magisk.arch.startAnimations
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ObservableRvItem
 import com.topjohnwu.magisk.databinding.addOnPropertyChangedCallback
 import com.topjohnwu.magisk.databinding.set
-import com.topjohnwu.magisk.ktx.startAnimations
 import com.topjohnwu.superuser.Shell
 import kotlin.math.roundToInt
 
 class DenyListRvItem(
     val info: AppProcessInfo
-) : ObservableDiffRvItem<DenyListRvItem>(), ComparableRv<DenyListRvItem> {
+) : ObservableRvItem(), DiffItem<DenyListRvItem>, Comparable<DenyListRvItem> {
 
     override val layoutRes get() = R.layout.item_hide_md2
 
@@ -44,9 +44,18 @@ class DenyListRvItem(
                 processes
                     .filterNot { it.isEnabled }
                     .filter { isExpanded || it.defaultSelection }
+                    .forEach { it.toggle() }
             } else {
-                processes.filter { it.isEnabled }
-            }.forEach { it.toggle() }
+                Shell.cmd("magisk --denylist rm ${info.packageName}").submit()
+                processes.filter { it.isEnabled }.forEach {
+                    if (it.process.isIsolated) {
+                        it.toggle()
+                    } else {
+                        it.isEnabled = !it.isEnabled
+                        notifyPropertyChanged(BR.enabled)
+                    }
+                }
+            }
         }
 
     init {
@@ -91,7 +100,7 @@ class DenyListRvItem(
 
 class ProcessRvItem(
     val process: ProcessInfo
-) : ObservableDiffRvItem<ProcessRvItem>() {
+) : ObservableRvItem(), DiffItem<ProcessRvItem> {
 
     override val layoutRes get() = R.layout.item_hide_process_md2
 
@@ -113,10 +122,9 @@ class ProcessRvItem(
     val defaultSelection get() =
         process.isIsolated || process.isAppZygote || process.name == process.packageName
 
-    override fun contentSameAs(other: ProcessRvItem) =
-        process.isEnabled == other.process.isEnabled
-
     override fun itemSameAs(other: ProcessRvItem) =
         process.name == other.process.name && process.packageName == other.process.packageName
 
+    override fun contentSameAs(other: ProcessRvItem) =
+        process.isEnabled == other.process.isEnabled
 }

app/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListViewModel.kt

@@ -2,55 +2,55 @@ package com.topjohnwu.magisk.ui.deny
 
 import android.annotation.SuppressLint
 import android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES
+import androidx.databinding.Bindable
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
-import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.arch.AsyncLoadViewModel
 import com.topjohnwu.magisk.core.di.AppContext
+import com.topjohnwu.magisk.core.ktx.concurrentMap
 import com.topjohnwu.magisk.databinding.bindExtra
-import com.topjohnwu.magisk.databinding.filterableListOf
-import com.topjohnwu.magisk.ktx.concurrentMap
-import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.magisk.databinding.filterList
+import com.topjohnwu.magisk.databinding.set
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.toCollection
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class DenyListViewModel : BaseViewModel() {
+class DenyListViewModel : AsyncLoadViewModel() {
 
     var isShowSystem = false
         set(value) {
             field = value
-            query()
+            doQuery(query)
         }
 
     var isShowOS = false
         set(value) {
             field = value
-            query()
+            doQuery(query)
         }
 
     var query = ""
         set(value) {
             field = value
-            query()
+            doQuery(value)
         }
 
-    val items = filterableListOf<DenyListRvItem>()
+    val items = filterList<DenyListRvItem>(viewModelScope)
     val extraBindings = bindExtra {
         it.put(BR.viewModel, this)
     }
 
+    @get:Bindable
+    var loading = true
+        private set(value) = set(value, field, { field = it }, BR.loading)
+
     @SuppressLint("InlinedApi")
-    override fun refresh() = viewModelScope.launch {
-        if (!Utils.showSuperUser()) {
-            state = State.LOADING_FAILED
-            return@launch
-        }
-        state = State.LOADING
-        val (apps, diff) = withContext(Dispatchers.Default) {
+    override suspend fun doLoadWork() {
+        loading = true
+        val apps = withContext(Dispatchers.Default) {
             val pm = AppContext.packageManager
             val denyList = Shell.cmd("magisk --denylist ls").exec().out
                 .map { CmdlineListItem(it) }
@@ -63,27 +63,27 @@ class DenyListViewModel : BaseViewModel() {
                     .toCollection(ArrayList(size))
             }
             apps.sort()
-            apps to items.calculateDiff(apps)
+            apps
         }
-        items.update(apps, diff)
-        query()
+        items.set(apps)
+        doQuery(query)
     }
 
-    fun query() {
+    private fun doQuery(s: String) {
         items.filter {
             fun filterSystem() = isShowSystem || !it.info.isSystemApp()
 
             fun filterOS() = (isShowSystem && isShowOS) || it.info.isApp()
 
             fun filterQuery(): Boolean {
-                fun inName() = it.info.label.contains(query, true)
-                fun inPackage() = it.info.packageName.contains(query, true)
-                fun inProcesses() = it.processes.any { p -> p.process.name.contains(query, true) }
+                fun inName() = it.info.label.contains(s, true)
+                fun inPackage() = it.info.packageName.contains(s, true)
+                fun inProcesses() = it.processes.any { p -> p.process.name.contains(s, true) }
                 return inName() || inPackage() || inProcesses()
             }
 
             (it.isChecked || (filterSystem() && filterOS())) && filterQuery()
         }
-        state = State.LOADED
+        loading = false
     }
 }