Remove unused file

Fix #4225

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/workflows/build.yml

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

.github/workflows/issues.yml

@@ -0,0 +1,26 @@
+name: Check Issues
+
+on:
+  issues:
+    types: [opened]
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out
+        uses: actions/checkout@v2
+      - name: Read latest version code
+        run: |
+          ver=$(sed -n 's/^magisk.versionCode=//p' gradle.properties)
+          echo MAGISK_VERSION_CODE=$ver >> $GITHUB_ENV
+      - if: contains(github.event.issue.body, format('Magisk version code{0} ', ':')) != true
+        id: close
+        name: Close Issue(template)
+        uses: peter-evans/close-issue@v1
+        with:
+          comment: This issue is being automatically closed because it does not follow the issue template.
+      - if: steps.close.conclusion == 'skipped' && contains(github.event.issue.body, format('Magisk version code{0} {1}', ':', env.MAGISK_VERSION_CODE)) != true
+        name: Close Issue(latest canary)
+        uses: peter-evans/close-issue@v1
+        with:
+          comment: This issue is being automatically closed because latest canary Magisk version code is ${{ env.MAGISK_VERSION_CODE }}.

.gitmodules

@@ -6,7 +6,7 @@
 	url = https://github.com/topjohnwu/ndk-busybox.git
 [submodule "dtc"]
 	path = native/jni/external/dtc
-	url = https://github.com/dgibson/dtc
+	url = https://github.com/dgibson/dtc.git
 [submodule "lz4"]
 	path = native/jni/external/lz4
 	url = https://github.com/lz4/lz4.git
@@ -25,6 +25,15 @@
 [submodule "pcre"]
 	path = native/jni/external/pcre
 	url = https://android.googlesource.com/platform/external/pcre
+[submodule "xhook"]
+	path = native/jni/external/xhook
+	url = https://github.com/iqiyi/xHook.git
+[submodule "libcxx"]
+	path = native/jni/external/libcxx
+	url = https://github.com/topjohnwu/libcxx.git
+[submodule "zlib"]
+	path = native/jni/external/zlib
+	url = https://android.googlesource.com/platform/external/zlib
 [submodule "termux-elf-cleaner"]
 	path = tools/termux-elf-cleaner
 	url = https://github.com/termux/termux-elf-cleaner.git

README.MD

@@ -1,25 +1,24 @@
 ![](docs/images/logo.png)
 
-![ZIP Downloads](https://img.shields.io/badge/dynamic/json?color=blue&label=ZIP%20Downloads&query=magisk&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk_files%2Fcount%2Fcount.json&cacheSeconds=1800)
+[![Downloads](https://img.shields.io/badge/dynamic/json?color=green&label=Downloads&query=totalString&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk-files%2Fcount%2Fcount.json&cacheSeconds=1800)](https://raw.githubusercontent.com/topjohnwu/magisk-files/count/count.json)
-![APK Downloads](https://img.shields.io/badge/dynamic/json?color=green&label=APK%20Downloads&query=manager&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk_files%2Fcount%2Fcount.json&cacheSeconds=1800)
 
 ## Introduction
 
-Magisk is a suite of open source tools for customizing Android, supporting devices higher than Android 4.2. It covers fundamental parts of Android customization: root, boot scripts, SELinux patches, AVB2.0 / dm-verity / forceencrypt removals etc.
+Magisk is a suite of open source software for customizing Android, supporting devices higher than Android 5.0.<br>
-
 Here are some feature highlights:
 
-- **MagiskSU**: Provide root access to your device
+- **MagiskSU**: Provide root access for applications
 - **Magisk Modules**: Modify read-only partitions by installing modules
 - **MagiskHide**: Hide Magisk from root detections / system integrity checks
+- **MagiskBoot**: The most complete tool for unpacking and repacking Android boot images
 
 ## Downloads
 
-[![](https://img.shields.io/badge/Magisk%20Manager-v8.0.1-green)](https://github.com/topjohnwu/Magisk/releases/download/manager-v8.0.1/MagiskManager-v8.0.1.apk)
+[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%20Manager-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk_files/canary/app-debug.apk)
+
-<br>
+[![](https://img.shields.io/badge/Magisk-v22.1-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v22.1)
-[![](https://img.shields.io/badge/Magisk-v20.4-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v20.4)
+[![](https://img.shields.io/badge/Magisk%20Beta-v22.1-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v22.1)
-[![](https://img.shields.io/badge/Magisk%20Beta-v21.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v21.0)
+[![](https://img.shields.io/badge/Magisk-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk-files/canary/app-debug.apk)
 
 ## Useful Links
 
@@ -28,23 +27,13 @@ Here are some feature highlights:
 - [Magisk Documentation](https://topjohnwu.github.io/Magisk/)
 - [Magisk Troubleshoot Wiki](https://www.didgeridoohan.com/magisk/HomePage) (by [@Didgeridoohan](https://github.com/Didgeridoohan))
 
-## Android Version Support
-
-- Android 4.2+: MagiskSU and Magisk Modules Only
-- Android 4.4+: All core features available
-- Android 6.0+: Guaranteed MagiskHide support
-- Android 7.0+: Full MagiskHide protection
-- Android 9.0+: Magisk Manager stealth mode
-
 ## Bug Reports
 
-Canary Channels are cutting edge builds for those adventurous. To access canary builds, install the Canary Magisk Manager, switch to the Canary Channel in settings and upgrade.
-
 **Only bug reports from Canary builds will be accepted.**
 
 For installation issues, upload both boot image and install logs.<br>
 For Magisk issues, upload boot logcat or dmesg.<br>
-For Magisk Manager crashes, record and upload the logcat when the crash occurs.
+For Magisk app crashes, record and upload the logcat when the crash occurs.
 
 ## Building and Development
 
@@ -56,17 +45,17 @@ For Magisk Manager crashes, record and upload the logcat when the crash occurs.
 	- macOS: `export JAVA_HOME="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home"`
 	- Linux: `export PATH="/path/to/androidstudio/jre/bin:$PATH"`
 	- Windows: Add `C:\Path\To\Android Studio\jre\bin` to environment variable `PATH`
-- Set environment variable `ANDROID_HOME` to the Android SDK folder (can be found in Android Studio settings)
+- 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
-- Set configurations in `config.prop`. A sample `config.prop.sample` is provided.
 - To start building, run `build.py` to see your options. \
 For each action, use `-h` to access help (e.g. `./build.py all -h`)
-- To start development, open the project in Android Studio. Both app (Kotlin/Java) and native (C++/C) source code can be properly developed using the IDE, but *always* use `build.py` for building.
+- To start development, open the project with Android Studio. The IDE can be used for both app (Kotlin/Java) and native (C++/C) sources.
-- `build.py` builds in debug mode by default. If you want release builds (with `-r, --release`), you need a Java Keystore to sign APKs and zips. For more information, check [Google's Documentation](https://developer.android.com/studio/publish/app-signing.html#generate-key).
+- Optionally, set custom configs with `config.prop`. A sample `config.prop.sample` is provided.
+- To sign APKs and zips with your own private keys, set signing configs in `config.prop`. For more info, check [Google's Documentation](https://developer.android.com/studio/publish/app-signing.html#generate-key).
 
 ## Translation Contributions
 
-Default string resources for Magisk Manager and its stub APK are located here:
+Default string resources for the Magisk app and its stub APK are located here:
 
 - `app/src/main/res/values/strings.xml`
 - `stub/src/main/res/values/strings.xml`

app/.gitignore

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

app/build.gradle.kts

@@ -1,7 +1,10 @@
+import org.apache.tools.ant.filters.FixCrLfFilter
+import java.io.PrintStream
+
 plugins {
     id("com.android.application")
     kotlin("android")
-    kotlin("android.extensions")
+    kotlin("plugin.parcelize")
     kotlin("kapt")
     id("androidx.navigation.safeargs.kotlin")
 }
@@ -13,20 +16,18 @@ kapt {
     javacOptions {
         option("-Xmaxerrs", 1000)
     }
+    arguments {
+        arg("room.incremental", "true")
+    }
 }
 
 android {
     defaultConfig {
         applicationId = "com.topjohnwu.magisk"
         vectorDrawables.useSupportLibrary = true
-        multiDexEnabled = true
+        versionName = Config.version
-        versionName = Config["appVersion"]
+        versionCode = Config.versionCode
-        versionCode = Config["appVersionCode"]?.toInt()
+        ndk.abiFilters("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
-        buildConfigField("int", "LATEST_MAGISK", Config["versionCode"] ?: "Integer.MAX_VALUE")
-
-        javaCompileOptions.annotationProcessorOptions.arguments(
-                mapOf("room.incremental" to "true")
-        )
     }
 
     buildTypes {
@@ -50,12 +51,14 @@ android {
     }
 
     packagingOptions {
-        exclude("/META-INF/**")
+        exclude("/META-INF/*")
-        exclude("/androidsupportmultidexversion.txt")
         exclude("/org/bouncycastle/**")
         exclude("/kotlin/**")
         exclude("/kotlinx/**")
         exclude("/okhttp3/**")
+        exclude("/*.txt")
+        exclude("/*.bin")
+        doNotStrip("**/*.so")
     }
 
     kotlinOptions {
@@ -63,67 +66,166 @@ android {
     }
 }
 
-androidExtensions {
+val syncLibs by tasks.registering(Sync::class) {
-    isExperimental = true
+    into("src/main/jniLibs")
+    into("armeabi-v7a") {
+        from(rootProject.file("native/out/armeabi-v7a")) {
+            include("busybox", "magiskboot", "magiskinit", "magisk")
+            rename { if (it == "magisk") "libmagisk32.so" else "lib$it.so" }
+        }
+        from(rootProject.file("native/out/arm64-v8a")) {
+            include("magisk")
+            rename { if (it == "magisk") "libmagisk64.so" else "lib$it.so" }
+        }
+    }
+    into("x86") {
+        from(rootProject.file("native/out/x86")) {
+            include("busybox", "magiskboot", "magiskinit", "magisk")
+            rename { if (it == "magisk") "libmagisk32.so" else "lib$it.so" }
+        }
+        from(rootProject.file("native/out/x86_64")) {
+            include("magisk")
+            rename { if (it == "magisk") "libmagisk64.so" else "lib$it.so" }
+        }
+    }
+    onlyIf {
+        if (inputs.sourceFiles.files.size != 10)
+            throw StopExecutionException("Please build binaries first! (./build.py binary)")
+        true
+    }
 }
 
-val copyUtils = tasks.register("copyUtils", Copy::class) {
+val createStubLibs by tasks.registering {
-    from(rootProject.file("scripts/util_functions.sh"))
+    dependsOn(syncLibs)
-    into("src/main/res/raw")
+    doLast {
+        val arm64 = project.file("src/main/jniLibs/arm64-v8a/libstub.so")
+        arm64.parentFile.mkdirs()
+        arm64.createNewFile()
+        val x64 = project.file("src/main/jniLibs/x86_64/libstub.so")
+        x64.parentFile.mkdirs()
+        x64.createNewFile()
+    }
 }
 
-tasks["preBuild"]?.dependsOn(copyUtils)
+val syncAssets by tasks.registering(Sync::class) {
+    dependsOn(createStubLibs)
+    inputs.property("version", Config.version)
+    inputs.property("versionCode", Config.versionCode)
+    into("src/main/assets")
+    from(rootProject.file("scripts")) {
+        include("util_functions.sh", "boot_patch.sh", "uninstaller.sh", "addon.d.sh")
+    }
+    into("chromeos") {
+        from(rootProject.file("tools/futility"))
+        from(rootProject.file("tools/keys")) {
+            include("kernel_data_key.vbprivk", "kernel.keyblock")
+        }
+    }
+    filesMatching("**/util_functions.sh") {
+        filter {
+            it.replace("#MAGISK_VERSION_STUB",
+                "MAGISK_VER='${Config.version}'\n" +
+                "MAGISK_VER_CODE=${Config.versionCode}")
+        }
+        filter<FixCrLfFilter>("eol" to FixCrLfFilter.CrLf.newInstance("lf"))
+    }
+}
+
+val syncResources by tasks.registering(Sync::class) {
+    dependsOn(syncAssets)
+    into("src/main/resources/META-INF/com/google/android")
+    from(rootProject.file("scripts/update_binary.sh")) {
+        rename { "update-binary" }
+    }
+    from(rootProject.file("scripts/flash_script.sh")) {
+        rename { "updater-script" }
+    }
+}
+
+tasks["preBuild"]?.dependsOn(syncResources)
+
+android.applicationVariants.all {
+    val keysDir = rootProject.file("tools/keys")
+    val outSrcDir = File(buildDir, "generated/source/keydata/$name")
+    val outSrc = File(outSrcDir, "com/topjohnwu/signing/KeyData.java")
+
+    fun PrintStream.newField(name: String, file: File) {
+        println("public static byte[] $name() {")
+        print("byte[] buf = {")
+        val bytes = file.readBytes()
+        print(bytes.joinToString(",") { "(byte)(${it.toInt() and 0xff})" })
+        println("};")
+        println("return buf;")
+        println("}")
+    }
+
+    val genSrcTask = tasks.register("generate${name.capitalize()}KeyData") {
+        inputs.dir(keysDir)
+        outputs.file(outSrc)
+        doLast {
+            outSrc.parentFile.mkdirs()
+            PrintStream(outSrc).use {
+                it.println("package com.topjohnwu.signing;")
+                it.println("public final class KeyData {")
+
+                it.newField("testCert", File(keysDir, "testkey.x509.pem"))
+                it.newField("testKey", File(keysDir, "testkey.pk8"))
+                it.newField("verityCert", File(keysDir, "verity.x509.pem"))
+                it.newField("verityKey", File(keysDir, "verity.pk8"))
+
+                it.println("}")
+            }
+        }
+    }
+    registerJavaGeneratingTask(genSrcTask.get(), outSrcDir)
+}
 
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
     implementation(kotlin("stdlib"))
+    // Some dependencies request JDK 8 stdlib, specify manually here to prevent version mismatch
+    implementation(kotlin("stdlib-jdk8"))
     implementation(project(":app:shared"))
-    implementation(project(":app:signing"))
 
     implementation("com.github.topjohnwu:jtar:1.0.0")
     implementation("com.github.topjohnwu:indeterminate-checkbox:1.0.7")
     implementation("com.github.topjohnwu:lz4-java:1.7.1")
     implementation("com.jakewharton.timber:timber:4.7.1")
 
+    val vBC = "1.68"
+    implementation("org.bouncycastle:bcprov-jdk15on:${vBC}")
+    implementation("org.bouncycastle:bcpkix-jdk15on:${vBC}")
+
     val vBAdapt = "4.0.0"
     val bindingAdapter = "me.tatarka.bindingcollectionadapter2:bindingcollectionadapter"
     implementation("${bindingAdapter}:${vBAdapt}")
     implementation("${bindingAdapter}-recyclerview:${vBAdapt}")
 
-    val vMarkwon = "4.6.0"
+    val vMarkwon = "4.6.2"
     implementation("io.noties.markwon:core:${vMarkwon}")
     implementation("io.noties.markwon:html:${vMarkwon}")
     implementation("io.noties.markwon:image:${vMarkwon}")
     implementation("com.caverock:androidsvg:1.4")
 
-    val vLibsu = "3.0.2"
+    val vLibsu = "3.1.2"
     implementation("com.github.topjohnwu.libsu:core:${vLibsu}")
     implementation("com.github.topjohnwu.libsu:io:${vLibsu}")
 
-    val vKoin = "2.1.6"
-    implementation("org.koin:koin-core:${vKoin}")
-    implementation("org.koin:koin-android:${vKoin}")
-    implementation("org.koin:koin-androidx-viewmodel:${vKoin}")
-
     val vRetrofit = "2.9.0"
     implementation("com.squareup.retrofit2:retrofit:${vRetrofit}")
     implementation("com.squareup.retrofit2:converter-moshi:${vRetrofit}")
     implementation("com.squareup.retrofit2:converter-scalars:${vRetrofit}")
 
-    val vOkHttp = "3.12.12"
+    val vOkHttp = "4.9.1"
-    implementation("com.squareup.okhttp3:okhttp") {
+    implementation("com.squareup.okhttp3:okhttp:${vOkHttp}")
-        version {
-            strictly(vOkHttp)
-        }
-    }
     implementation("com.squareup.okhttp3:logging-interceptor:${vOkHttp}")
     implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:${vOkHttp}")
 
-    val vMoshi = "1.11.0"
+    val vMoshi = "1.12.0"
     implementation("com.squareup.moshi:moshi:${vMoshi}")
     kapt("com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}")
 
-    val vRoom = "2.2.5"
+    val vRoom = "2.3.0"
     implementation("androidx.room:room-runtime:${vRoom}")
     implementation("androidx.room:room-ktx:${vRoom}")
     kapt("androidx.room:room-compiler:${vRoom}")
@@ -132,17 +234,15 @@ dependencies {
     implementation("androidx.navigation:navigation-fragment-ktx:${vNav}")
     implementation("androidx.navigation:navigation-ui-ktx:${vNav}")
 
-    implementation("androidx.biometric:biometric:1.0.1")
+    implementation("androidx.biometric:biometric:1.1.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.0.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.0.4")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    implementation("androidx.browser:browser:1.2.0")
+    implementation("androidx.browser:browser:1.3.0")
     implementation("androidx.preference:preference:1.1.1")
-    implementation("androidx.recyclerview:recyclerview:1.1.0")
+    implementation("androidx.recyclerview:recyclerview:1.2.0")
-    implementation("androidx.fragment:fragment-ktx:1.2.5")
+    implementation("androidx.fragment:fragment-ktx:1.3.3")
-    implementation("androidx.work:work-runtime-ktx:2.4.0")
+    implementation("androidx.work:work-runtime-ktx:2.5.0")
-    implementation("androidx.transition:transition:1.3.1")
+    implementation("androidx.transition:transition:1.4.1")
-    implementation("androidx.multidex:multidex:2.0.1")
     implementation("androidx.core:core-ktx:1.3.2")
-    implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.0.0")
+    implementation("com.google.android.material:material:1.3.0")
-    implementation("com.google.android.material:material:1.2.1")
 }

app/proguard-rules.pro

@@ -18,40 +18,38 @@
 
 # Kotlin
 -assumenosideeffects class kotlin.jvm.internal.Intrinsics {
-	public static void checkExpressionValueIsNotNull(...);
+	public static void check*(...);
-	public static void checkNotNullExpressionValue(...);
+	public static void throw*(...);
-	public static void checkReturnedValueIsNotNull(...);
-	public static void checkFieldIsNotNull(...);
-	public static void checkParameterIsNotNull(...);
 }
 
-# Stubs
--keep class a.* { *; }
-
 # Snet
 -keepclassmembers class com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper { *; }
 -keep,allowobfuscation interface com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper$Callback
--keepclassmembers class * implements com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper$Callback {
+-keepclassmembers class * implements com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper$Callback { *; }
-  void onResponse(org.json.JSONObject);
+
+# Stub
+-keep class com.topjohnwu.magisk.core.App { <init>(java.lang.Object); }
+-keepclassmembers class androidx.appcompat.app.AppCompatDelegateImpl {
+  boolean mActivityHandlesUiModeChecked;
+  boolean mActivityHandlesUiMode;
 }
 
-# Fragments
-# TODO: Remove when AGP 4.1 release
-# https://issuetracker.google.com/issues/142601969
--keep,allowobfuscation class * extends androidx.fragment.app.Fragment
--keepnames class androidx.navigation.fragment.NavHostFragment
-
 # Strip Timber verbose and debug logging
--assumenosideeffects class timber.log.Timber.Tree {
+-assumenosideeffects class timber.log.Timber$Tree {
   public void v(**);
   public void d(**);
 }
 
 # Excessive obfuscation
--repackageclasses
+-repackageclasses 'a'
 -allowaccessmodification
 
-# QOL
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
--dontnote **
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
--dontwarn com.caverock.androidsvg.**
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
--dontwarn ru.noties.markwon.**
+-dontwarn org.commonmark.ext.gfm.strikethrough.Strikethrough
+-dontwarn org.conscrypt.Conscrypt*
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE

app/shared/proguard-rules.pro

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

app/shared/src/main/AndroidManifest.xml

@@ -1,23 +1,27 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.topjohnwu.shared">
+    package="com.topjohnwu.shared"
+    android:installLocation="internalOnly">
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="29"
+        tools:ignore="ScopedStorage" />
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
 
     <application
-        android:label="Magisk Manager"
+        android:allowBackup="false"
-        android:installLocation="internalOnly"
+        android:label="Magisk"
-        android:usesCleartextTraffic="true"
+        android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
         android:theme="@android:style/Theme.Translucent.NoTitleBar"
-        tools:ignore="UnusedAttribute">
+        android:usesCleartextTraffic="true"
+        tools:ignore="UnusedAttribute" />
 
-        <provider
-            android:name="a.p"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-        </provider>
-    </application>
 </manifest>

app/shared/src/main/java/a/p.java

@@ -1,7 +0,0 @@
-package a;
-
-import com.topjohnwu.magisk.FileProvider;
-
-public class p extends FileProvider {
-    /* Stub */
-}

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

@@ -7,8 +7,6 @@ import android.content.pm.ProviderInfo;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
 import android.os.Environment;
 import android.os.ParcelFileDescriptor;
 import android.provider.OpenableColumns;
@@ -25,17 +23,14 @@ import java.util.Map;
  * Modified from androidx.core.content.FileProvider
  */
 public class FileProvider extends ContentProvider {
-    private static final String[] COLUMNS = {
+    private static final String[] COLUMNS = {OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE};
-            OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE };
 
     private static final File DEVICE_ROOT = new File("/");
 
-    private static HashMap<String, PathStrategy> sCache = new HashMap<>();
+    private static final HashMap<String, PathStrategy> sCache = new HashMap<>();
 
     private PathStrategy mStrategy;
 
-    public static ProviderCallHandler callHandler;
-
     @Override
     public boolean onCreate() {
         return true;
@@ -45,7 +40,6 @@ public class FileProvider extends ContentProvider {
     public void attachInfo(Context context, ProviderInfo info) {
         super.attachInfo(context, info);
 
-        
         if (info.exported) {
             throw new SecurityException("Provider must not be exported");
         }
@@ -53,21 +47,16 @@ public class FileProvider extends ContentProvider {
             throw new SecurityException("Provider must grant uri permissions");
         }
 
-        mStrategy = getPathStrategy(context, info.authority);
+        mStrategy = getPathStrategy(context, info.authority.split(";")[0]);
     }
 
-    
+    public static Uri getUriForFile(Context context, String authority, File file) {
-    public static Uri getUriForFile(Context context, String authority,
-                                    File file) {
         final PathStrategy strategy = getPathStrategy(context, authority);
         return strategy.getUriForFile(file);
     }
 
     @Override
-    public Cursor query(Uri uri, String[] projection, String selection,
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-                        String[] selectionArgs,
-                        String sortOrder) {
-        
         final File file = mStrategy.getFileForUri(uri);
 
         if (projection == null) {
@@ -97,7 +86,6 @@ public class FileProvider extends ContentProvider {
 
     @Override
     public String getType(Uri uri) {
-        
         final File file = mStrategy.getFileForUri(uri);
 
         final int lastDot = file.getName().lastIndexOf('.');
@@ -118,30 +106,18 @@ public class FileProvider extends ContentProvider {
     }
 
     @Override
-    public int update(Uri uri, ContentValues values, String selection,
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-                      String[] selectionArgs) {
         throw new UnsupportedOperationException("No external updates");
     }
 
     @Override
-    public int delete(Uri uri, String selection,
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
-                      String[] selectionArgs) {
-        
         final File file = mStrategy.getFileForUri(uri);
         return file.delete() ? 1 : 0;
     }
 
     @Override
-    public Bundle call(String method, String arg, Bundle extras) {
+    public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
-        if (callHandler != null)
-            return callHandler.call(getContext(), method, arg, extras);
-        return Bundle.EMPTY;
-    }
-
-    @Override
-    public ParcelFileDescriptor openFile(Uri uri, String mode)
-            throws FileNotFoundException {
-        
         final File file = mStrategy.getFileForUri(uri);
         final int fileMode = modeToMode(mode);
         return ParcelFileDescriptor.open(file, fileMode);
@@ -166,30 +142,24 @@ public class FileProvider extends ContentProvider {
         strat.addRoot("internal_files", buildPath(context.getFilesDir(), "."));
         strat.addRoot("cache_files", buildPath(context.getCacheDir(), "."));
         strat.addRoot("external_files", buildPath(Environment.getExternalStorageDirectory(), "."));
-        {
+
-            File[] externalFilesDirs = getExternalFilesDirs(context, null);
+        File[] externalFilesDirs = context.getExternalFilesDirs(null);
-            if (externalFilesDirs.length > 0) {
+        if (externalFilesDirs.length > 0) {
-                strat.addRoot("external_file_files", buildPath(externalFilesDirs[0], "."));
+            strat.addRoot("external_file_files", buildPath(externalFilesDirs[0], "."));
-            }
         }
-        {
+        File[] externalCacheDirs = context.getExternalCacheDirs();
-            File[] externalCacheDirs = getExternalCacheDirs(context);
+        if (externalCacheDirs.length > 0) {
-            if (externalCacheDirs.length > 0) {
+            strat.addRoot("external_cache_files", buildPath(externalCacheDirs[0], "."));
-                strat.addRoot("external_cache_files", buildPath(externalCacheDirs[0], "."));
-            }
         }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        File[] externalMediaDirs = context.getExternalMediaDirs();
-            File[] externalMediaDirs = context.getExternalMediaDirs();
+        if (externalMediaDirs.length > 0) {
-            if (externalMediaDirs.length > 0) {
+            strat.addRoot("external_media_files", buildPath(externalMediaDirs[0], "."));
-                strat.addRoot("external_media_files", buildPath(externalMediaDirs[0], "."));
-            }
         }
 
         return strat;
     }
 
     interface PathStrategy {
-        
         Uri getUriForFile(File file);
 
         File getFileForUri(Uri uri);
@@ -209,7 +179,6 @@ public class FileProvider extends ContentProvider {
             }
 
             try {
-                
                 root = root.getCanonicalFile();
             } catch (IOException e) {
                 throw new IllegalArgumentException(
@@ -228,7 +197,6 @@ public class FileProvider extends ContentProvider {
                 throw new IllegalArgumentException("Failed to resolve canonical path for " + file);
             }
 
-            
             Map.Entry<String, File> mostSpecific = null;
             for (Map.Entry<String, File> root : mRoots.entrySet()) {
                 final String rootPath = root.getValue().getPath();
@@ -243,7 +211,6 @@ public class FileProvider extends ContentProvider {
                         "Failed to find configured root that contains " + path);
             }
 
-            
             final String rootPath = mostSpecific.getValue().getPath();
             if (rootPath.endsWith("/")) {
                 path = path.substring(rootPath.length());
@@ -251,7 +218,6 @@ public class FileProvider extends ContentProvider {
                 path = path.substring(rootPath.length() + 1);
             }
 
-            
             path = Uri.encode(mostSpecific.getKey()) + '/' + Uri.encode(path, "/");
             return new Uri.Builder().scheme("content")
                     .authority(mAuthority).encodedPath(path).build();
@@ -285,7 +251,6 @@ public class FileProvider extends ContentProvider {
         }
     }
 
-    
     private static int modeToMode(String mode) {
         int modeBits;
         if ("r".equals(mode)) {
@@ -332,20 +297,4 @@ public class FileProvider extends ContentProvider {
         System.arraycopy(original, 0, result, 0, newLength);
         return result;
     }
-
-    private static File[] getExternalFilesDirs(Context context, String type) {
-        if (Build.VERSION.SDK_INT >= 19) {
-            return context.getExternalFilesDirs(type);
-        } else {
-            return new File[] { context.getExternalFilesDir(type) };
-        }
-    }
-
-    private static File[] getExternalCacheDirs(Context context) {
-        if (Build.VERSION.SDK_INT >= 19) {
-            return context.getExternalCacheDirs();
-        } else {
-            return new File[] { context.getExternalCacheDir() };
-        }
-    }
 }

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

@@ -1,8 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Context;
-import android.os.Bundle;
-
-public interface ProviderCallHandler {
-    Bundle call(Context context, String method, String arg, Bundle extras);
-}

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

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

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

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

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

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

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

@@ -1,7 +1,10 @@
 package com.topjohnwu.magisk.utils;
 
+import android.app.Activity;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Build;
 
@@ -10,20 +13,36 @@ import com.topjohnwu.magisk.FileProvider;
 import java.io.File;
 
 public class APKInstall {
+
+    public static Intent installIntent(Context c, File apk) {
+        Intent intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if (Build.VERSION.SDK_INT >= 24) {
+            intent.setData(FileProvider.getUriForFile(c, c.getPackageName() + ".provider", apk));
+        } else {
+            //noinspection ResultOfMethodCallIgnored SetWorldReadable
+            apk.setReadable(true, false);
+            intent.setData(Uri.fromFile(apk));
+        }
+        return intent;
+    }
+
     public static void install(Context c, File apk) {
         c.startActivity(installIntent(c, apk));
     }
 
-    public static Intent installIntent(Context c, File apk) {
+    public static void registerInstallReceiver(Context c, BroadcastReceiver r) {
-        Intent install = new Intent(Intent.ACTION_INSTALL_PACKAGE);
+        IntentFilter filter = new IntentFilter();
-        install.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
-        install.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        filter.addDataScheme("package");
-            install.setData(FileProvider.getUriForFile(c, c.getPackageName() + ".provider", apk));
+        c.getApplicationContext().registerReceiver(r, filter);
-        } else {
+    }
-            apk.setReadable(true, false);
+
-            install.setData(Uri.fromFile(apk));
+    public static void installHideResult(Activity c, File apk) {
-        }
+        Intent intent = installIntent(c, apk);
-        return install;
+        intent.putExtra(Intent.EXTRA_RETURN_RESULT, true);
+        c.startActivityForResult(intent, 0); // Ignore result, use install receiver
     }
 }

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

@@ -9,7 +9,11 @@ import dalvik.system.DexClassLoader;
 
 public class DynamicClassLoader extends DexClassLoader {
 
-    private ClassLoader base = Object.class.getClassLoader();
+    private static final ClassLoader base = Object.class.getClassLoader();
+
+    public DynamicClassLoader(File apk) {
+        super(apk.getPath(), apk.getParent(), null, base);
+    }
 
     public DynamicClassLoader(File apk, ClassLoader parent) {
         super(apk.getPath(), apk.getParent(), null, parent);
@@ -18,7 +22,7 @@ public class DynamicClassLoader extends DexClassLoader {
     @Override
     protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
         // First check if already loaded
-        Class cls = findLoadedClass(name);
+        Class<?> cls = findLoadedClass(name);
         if (cls != null)
             return cls;
 

app/signing/.gitignore

@@ -1 +0,0 @@
-/build

app/signing/build.gradle.kts

@@ -1,35 +0,0 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
-plugins {
-    id("java-library")
-    id("java")
-    id("com.github.johnrengelman.shadow") version "6.0.0"
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-val jar by tasks.getting(Jar::class) {
-    manifest {
-        attributes["Main-Class"] = "com.topjohnwu.signing.ZipSigner"
-    }
-}
-
-val shadowJar by tasks.getting(ShadowJar::class) {
-    archiveBaseName.set("zipsigner")
-    archiveClassifier.set(null as String?)
-    archiveVersion.set("4.0")
-}
-
-repositories {
-    jcenter()
-}
-
-dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-
-    api("org.bouncycastle:bcprov-jdk15on:1.66")
-    api("org.bouncycastle:bcpkix-jdk15on:1.66")
-}

app/signing/src/main/java/com/topjohnwu/signing/BootSigner.java

@@ -1,49 +0,0 @@
-package com.topjohnwu.signing;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-public class BootSigner {
-
-    public static void main(String[] args) throws Exception {
-        if (args.length > 0 && "-verify".equals(args[0])) {
-            String certPath = "";
-            if (args.length >= 2) {
-                /* args[1] is the path to a public key certificate */
-                certPath = args[1];
-            }
-            boolean signed = SignBoot.verifySignature(System.in,
-                    certPath.isEmpty() ? null : new FileInputStream(certPath));
-            System.exit(signed ? 0 : 1);
-        } else if (args.length > 0 && "-sign".equals(args[0])) {
-            InputStream cert = null;
-            InputStream key = null;
-            String name = "/boot";
-
-            if (args.length >= 3) {
-                cert = new FileInputStream(args[1]);
-                key = new FileInputStream(args[2]);
-            }
-            if (args.length == 2) {
-                name = args[1];
-            } else if (args.length >= 4) {
-                name = args[3];
-            }
-
-            boolean success = SignBoot.doSignature(name, System.in, System.out, cert, key);
-            System.exit(success ? 0 : 1);
-        } else {
-            System.err.println(
-                    "BootSigner <actions> [args]\n" +
-                    "Input from stdin, outputs 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, cert and key pair are optional\n" +
-                    "      name should be /boot (default) or /recovery\n"
-            );
-        }
-    }
-}

app/signing/src/main/java/com/topjohnwu/signing/ZipSigner.java

@@ -1,81 +0,0 @@
-package com.topjohnwu.signing;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.Security;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-public class ZipSigner {
-
-    private static void usage() {
-        System.err.println("ZipSigner usage:");
-        System.err.println("  zipsigner.jar input.jar output.jar");
-        System.err.println("    sign jar with AOSP test keys");
-        System.err.println("  zipsigner.jar x509.pem pk8 input.jar output.jar");
-        System.err.println("    sign jar with certificate / private key pair");
-        System.err.println("  zipsigner.jar keyStore keyStorePass alias keyPass input.jar output.jar");
-        System.err.println("    sign jar with Java KeyStore");
-        System.exit(2);
-    }
-
-    private static void sign(JarMap input, FileOutputStream output) throws Exception {
-        sign(SignApk.class.getResourceAsStream("/keys/testkey.x509.pem"),
-                SignApk.class.getResourceAsStream("/keys/testkey.pk8"), input, output);
-    }
-
-    private static void sign(InputStream certIs, InputStream keyIs,
-                             JarMap input, FileOutputStream output) throws Exception {
-        X509Certificate cert = CryptoUtils.readCertificate(certIs);
-        PrivateKey key = CryptoUtils.readPrivateKey(keyIs);
-        SignApk.sign(cert, key, input, output);
-    }
-
-    private static void sign(String keyStore, String keyStorePass, String alias, String keyPass,
-                             JarMap in, FileOutputStream out) throws Exception {
-        KeyStore ks;
-        try {
-            ks = KeyStore.getInstance("JKS");
-            try (InputStream is = new FileInputStream(keyStore)) {
-                ks.load(is, keyStorePass.toCharArray());
-            }
-        } catch (KeyStoreException|IOException|CertificateException|NoSuchAlgorithmException e) {
-            ks = KeyStore.getInstance("PKCS12");
-            try (InputStream is = new FileInputStream(keyStore)) {
-                ks.load(is, keyStorePass.toCharArray());
-            }
-        }
-        X509Certificate cert = (X509Certificate) ks.getCertificate(alias);
-        PrivateKey key = (PrivateKey) ks.getKey(alias, keyPass.toCharArray());
-        SignApk.sign(cert, key, in, out);
-    }
-
-    public static void main(String[] args) throws Exception {
-        if (args.length != 2 && args.length != 4 && args.length != 6)
-            usage();
-
-        Security.insertProviderAt(new BouncyCastleProvider(), 1);
-
-        try (JarMap in = JarMap.open(args[args.length - 2], false);
-             FileOutputStream out = new FileOutputStream(args[args.length - 1])) {
-            if (args.length == 2) {
-                sign(in, out);
-            } else if (args.length == 4) {
-                try (InputStream cert = new FileInputStream(args[0]);
-                     InputStream key = new FileInputStream(args[1])) {
-                    sign(cert, key, in, out);
-                }
-            } else if (args.length == 6) {
-                sign(args[0], args[1], args[2], args[3], in, out);
-            }
-        }
-    }
-}

app/src/main/AndroidManifest.xml

@@ -3,22 +3,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28" />
 
     <application
+        android:name=".core.App"
+        android:extractNativeLibs="true"
         android:icon="@drawable/ic_launcher"
-        android:name="a.e"
+        android:multiArch="true"
-        android:allowBackup="true"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
 
         <!-- Splash -->
         <activity
-            android:name="a.c"
+            android:name=".core.SplashActivity"
+            android:exported="true"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -31,39 +28,47 @@
         </activity>
 
         <!-- Main -->
-        <activity android:name="a.b" />
+        <activity android:name=".ui.MainActivity" />
 
         <!-- Superuser -->
         <activity
-            android:name="a.m"
+            android:name=".ui.surequest.SuRequestActivity"
             android:directBootAware="true"
             android:excludeFromRecents="true"
             android:exported="false"
             tools:ignore="AppLinkUrlError">
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
         <!-- Receiver -->
         <receiver
-            android:name="a.h"
+            android:name=".core.Receiver"
-            android:directBootAware="true">
+            android:directBootAware="true"
+            android:exported="false">
             <intent-filter>
-                <action android:name="android.intent.action.REBOOT" />
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
+                <action android:name="android.intent.action.UID_REMOVED" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
 
                 <data android:scheme="package" />
             </intent-filter>
         </receiver>
 
         <!-- DownloadService -->
-        <service android:name="a.j" />
+        <service android:name=".core.download.DownloadService" />
+
+        <!-- FileProvider -->
+        <provider
+            android:name=".core.Provider"
+            android:authorities="${applicationId}.provider"
+            android:directBootAware="true"
+            android:exported="false"
+            android:grantUriPermissions="true" />
 
         <!-- Hardcode GMS version -->
         <meta-data
@@ -74,16 +79,12 @@
         <provider
             android:name="androidx.work.impl.WorkManagerInitializer"
             android:authorities="${applicationId}.workmanager-init"
-            tools:node="remove" />
+            tools:node="remove"
+            tools:ignore="ExportedContentProvider" />
 
         <!-- We don't invalidate Room -->
         <service
             android:name="androidx.room.MultiInstanceInvalidationService"
-            tools:node="remove"/>
-
-        <!-- We don't use Device Credentials -->
-        <activity
-            android:name="androidx.biometric.DeviceCredentialHandlerActivity"
             tools:node="remove" />
 
     </application>

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

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

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

@@ -1,5 +1,8 @@
 package com.topjohnwu.magisk.arch
 
+import android.content.res.Resources
+import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
@@ -7,13 +10,13 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.res.use
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
-import androidx.lifecycle.MutableLiveData
 import androidx.navigation.NavController
 import androidx.navigation.NavDirections
 import androidx.navigation.fragment.NavHostFragment
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.base.BaseActivity
+import com.topjohnwu.magisk.ui.inflater.LayoutInflaterFactory
 import com.topjohnwu.magisk.ui.theme.Theme
 
 abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
@@ -24,7 +27,7 @@ abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
     protected open val themeRes: Int = Theme.selected.themeRes
 
     private val navHostFragment by lazy {
-        supportFragmentManager.findFragmentById(navHost) as? NavHostFragment
+        supportFragmentManager.findFragmentById(navHostId) as? NavHostFragment
     }
     private val topFragment get() = navHostFragment?.childFragmentManager?.fragments?.getOrNull(0)
     protected val currentFragment get() = topFragment as? BaseUIFragment<*, *>
@@ -32,7 +35,7 @@ abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
     override val viewRoot: View get() = binding.root
     open val navigation: NavController? get() = navHostFragment?.navController
 
-    open val navHost: Int = 0
+    open val navHostId: Int = 0
     open val snackbarView get() = binding.root
 
     init {
@@ -41,6 +44,8 @@ abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        layoutInflater.factory2 = LayoutInflaterFactory(delegate)
+
         setTheme(themeRes)
         super.onCreate(savedInstanceState)
 
@@ -52,11 +57,26 @@ abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
             .use { it.getDrawable(0) }
             .also { window.setBackgroundDrawable(it) }
 
-        directionsDispatcher.observe(this) {
+        window?.decorView?.let {
-            it?.navigate()
+            it.systemUiVisibility = (it.systemUiVisibility
-            // we don't want the directions to be re-dispatched, so we preemptively set them to null
+                    or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-            if (it != null) {
+                    or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                directionsDispatcher.value = null
+                    or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION)
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            window?.decorView?.post {
+                // If navigation bar is short enough (gesture navigation enabled), make it transparent
+                if (window.decorView.rootWindowInsets?.systemWindowInsetBottom ?: 0 < Resources.getSystem().displayMetrics.density * 40) {
+                    window.navigationBarColor = Color.TRANSPARENT
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                        window.navigationBarDividerColor = Color.TRANSPARENT
+                    }
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                        window.isNavigationBarContrastEnforced = false
+                        window.isStatusBarContrastEnforced = false
+                    }
+                }
             }
         }
     }
@@ -66,8 +86,10 @@ abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
             it.setVariable(BR.viewModel, viewModel)
             it.lifecycleOwner = this
         }
+    }
 
-        ensureInsets()
+    fun setAccessibilityDelegate(delegate: View.AccessibilityDelegate?) {
+        viewRoot.rootView.accessibilityDelegate = delegate
     }
 
     override fun onResume() {
@@ -79,7 +101,7 @@ abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
         return currentFragment?.onKeyEvent(event) == true || super.dispatchKeyEvent(event)
     }
 
-    override fun onEventDispatched(event: ViewEvent) = when(event) {
+    override fun onEventDispatched(event: ViewEvent) = when (event) {
         is ContextExecutor -> event(this)
         is ActivityExecutor -> event(this)
         else -> Unit
@@ -94,14 +116,4 @@ abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
     fun NavDirections.navigate() {
         navigation?.navigate(this)
     }
-
-    companion object {
-
-        private val directionsDispatcher = MutableLiveData<NavDirections?>()
-
-        fun postDirections(navDirections: NavDirections) =
-            directionsDispatcher.postValue(navDirections)
-
-    }
-
 }

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

@@ -1,12 +1,9 @@
 package com.topjohnwu.magisk.arch
 
 import android.view.View
-import androidx.core.graphics.Insets
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.LifecycleOwner
 
-interface BaseUIComponent<VM : BaseViewModel>: LifecycleOwner {
+interface BaseUIComponent<VM : BaseViewModel> : LifecycleOwner {
 
     val viewRoot: View
     val viewModel: VM
@@ -17,47 +14,8 @@ interface BaseUIComponent<VM : BaseViewModel>: LifecycleOwner {
         }
     }
 
-    fun consumeSystemWindowInsets(insets: Insets): Insets? = null
-
     /**
      * Called for all [ViewEvent]s published by associated viewModel.
      */
     fun onEventDispatched(event: ViewEvent) {}
-
-    fun ensureInsets() {
-        ViewCompat.setOnApplyWindowInsetsListener(viewRoot) { _, insets ->
-            insets.asInsets()
-                .also { viewModel.insets = it }
-                .let { consumeSystemWindowInsets(it) }
-                ?.subtractBy(insets) ?: insets
-        }
-        if (ViewCompat.isAttachedToWindow(viewRoot)) {
-            ViewCompat.requestApplyInsets(viewRoot)
-        } else {
-            viewRoot.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
-                override fun onViewDetachedFromWindow(v: View) = Unit
-                override fun onViewAttachedToWindow(v: View) {
-                    ViewCompat.requestApplyInsets(v)
-                }
-            })
-        }
-    }
-
-    private fun WindowInsetsCompat.asInsets() = Insets.of(
-        systemWindowInsetLeft,
-        systemWindowInsetTop,
-        systemWindowInsetRight,
-        systemWindowInsetBottom
-    )
-
-    private fun Insets.subtractBy(insets: WindowInsetsCompat) =
-        WindowInsetsCompat.Builder(insets).setSystemWindowInsets(
-            Insets.of(
-                insets.systemWindowInsetLeft - left,
-                insets.systemWindowInsetTop - top,
-                insets.systemWindowInsetRight - right,
-                insets.systemWindowInsetBottom - bottom
-            )
-        ).build()
-
 }

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

@@ -5,7 +5,6 @@ import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.graphics.Insets
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.OnRebindCallback
 import androidx.databinding.ViewDataBinding
@@ -24,8 +23,6 @@ abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
     override val viewRoot: View get() = binding.root
     private val navigation get() = activity.navigation
 
-    override fun consumeSystemWindowInsets(insets: Insets) = insets
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         startObserveEvents()
@@ -43,6 +40,11 @@ abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
         return binding.root
     }
 
+    override fun onStart() {
+        super.onStart()
+        activity.supportActionBar?.subtitle = null
+    }
+
     override fun onEventDispatched(event: ViewEvent) = when(event) {
         is ContextExecutor -> event(requireContext())
         is ActivityExecutor -> event(activity)
@@ -65,7 +67,6 @@ abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
                 return true
             }
         })
-        ensureInsets()
     }
 
     override fun onResume() {

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

@@ -1,9 +1,7 @@
 package com.topjohnwu.magisk.arch
 
 import android.Manifest
-import android.os.Build
 import androidx.annotation.CallSuper
-import androidx.core.graphics.Insets
 import androidx.databinding.Bindable
 import androidx.databinding.Observable
 import androidx.databinding.PropertyChangeRegistry
@@ -15,16 +13,17 @@ import androidx.navigation.NavDirections
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.base.BaseActivity
+import com.topjohnwu.magisk.events.BackPressEvent
-import com.topjohnwu.magisk.events.*
+import com.topjohnwu.magisk.events.NavigationEvent
+import com.topjohnwu.magisk.events.PermissionEvent
+import com.topjohnwu.magisk.events.SnackbarEvent
 import com.topjohnwu.magisk.utils.ObservableHost
 import com.topjohnwu.magisk.utils.set
 import kotlinx.coroutines.Job
-import org.koin.core.KoinComponent
 
 abstract class BaseViewModel(
     initialState: State = State.LOADING
-) : ViewModel(), ObservableHost, KoinComponent {
+) : ViewModel(), ObservableHost {
 
     override var callbacks: PropertyChangeRegistry? = null
 
@@ -42,10 +41,6 @@ abstract class BaseViewModel(
     val isConnected get() = Info.isConnected
     val viewEvents: LiveData<ViewEvent> get() = _viewEvents
 
-    @get:Bindable
-    var insets = Insets.NONE
-        set(value) = set(value, field, { field = it }, BR.insets)
-
     var state= initialState
         set(value) = set(value, field, { field = it }, BR.loading, BR.loaded, BR.loadFailed)
 
@@ -78,10 +73,6 @@ abstract class BaseViewModel(
         super.onCleared()
     }
 
-    fun withView(action: BaseActivity.() -> Unit) {
-        ViewActionEvent(action).publish()
-    }
-
     fun withPermission(permission: String, callback: (Boolean) -> Unit) {
         PermissionEvent(permission, callback).publish()
     }
@@ -107,7 +98,7 @@ abstract class BaseViewModel(
         _viewEvents.postValue(this)
     }
 
-    fun NavDirections.publish() {
+    fun NavDirections.navigate() {
         _viewEvents.postValue(NavigationEvent(this))
     }
 

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

@@ -9,18 +9,18 @@ import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
 import me.tatarka.bindingcollectionadapter2.ItemBinding
 import me.tatarka.bindingcollectionadapter2.OnItemBind
 
-inline fun <T : ComparableRvItem<*>> diffListOf(
+fun <T : ComparableRvItem<*>> diffListOf(
     vararg newItems: T
 ) = diffListOf(newItems.toList())
 
-inline fun <T : ComparableRvItem<*>> diffListOf(
+fun <T : ComparableRvItem<*>> diffListOf(
     newItems: List<T>
 ) = DiffObservableList(object : DiffObservableList.Callback<T> {
     override fun areItemsTheSame(oldItem: T, newItem: T) = oldItem.genericItemSameAs(newItem)
     override fun areContentsTheSame(oldItem: T, newItem: T) = oldItem.genericContentSameAs(newItem)
 }).also { it.update(newItems) }
 
-inline fun <T : ComparableRvItem<*>> filterableListOf(
+fun <T : ComparableRvItem<*>> filterableListOf(
     vararg newItems: T
 ) = FilterableDiffObservableList(object : DiffObservableList.Callback<T> {
     override fun areItemsTheSame(oldItem: T, newItem: T) = oldItem.genericItemSameAs(newItem)

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

@@ -1,26 +1,23 @@
 package com.topjohnwu.magisk.core
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Application
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.multidex.MultiDex
 import androidx.work.WorkManager
-import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.DynAPK
-import com.topjohnwu.magisk.FileProvider
+import com.topjohnwu.magisk.core.utils.AppShellInit
-import com.topjohnwu.magisk.core.su.SuCallbackHandler
+import com.topjohnwu.magisk.core.utils.BusyBoxInit
 import com.topjohnwu.magisk.core.utils.IODispatcherExecutor
-import com.topjohnwu.magisk.core.utils.RootInit
 import com.topjohnwu.magisk.core.utils.updateConfig
-import com.topjohnwu.magisk.di.koinModules
+import com.topjohnwu.magisk.di.ServiceLocator
 import com.topjohnwu.magisk.ktx.unwrap
 import com.topjohnwu.superuser.Shell
-import org.koin.android.ext.koin.androidContext
-import org.koin.core.context.startKoin
 import timber.log.Timber
+import java.io.File
 import kotlin.system.exitProcess
 
 open class App() : Application() {
@@ -33,10 +30,9 @@ open class App() : Application() {
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
         Shell.setDefaultBuilder(Shell.Builder.create()
             .setFlags(Shell.FLAG_MOUNT_MASTER)
-            .setInitializers(RootInit::class.java)
+            .setInitializers(BusyBoxInit::class.java, AppShellInit::class.java)
             .setTimeout(2))
         Shell.EXECUTOR = IODispatcherExecutor()
-        FileProvider.callHandler = SuCallbackHandler
 
         // Always log full stack trace with Timber
         Timber.plant(Timber.DebugTree())
@@ -47,10 +43,6 @@ open class App() : Application() {
     }
 
     override fun attachBaseContext(base: Context) {
-        // Basic setup
-        if (BuildConfig.DEBUG)
-            MultiDex.install(base)
-
         // Some context magic
         val app: Application
         val impl: Context
@@ -64,12 +56,14 @@ open class App() : Application() {
         val wrapped = impl.wrap()
         super.attachBaseContext(wrapped)
 
-        // Normal startup
+        val info = base.applicationInfo
-        startKoin {
+        val libDir = runCatching {
-            androidContext(wrapped)
+            info.javaClass.getDeclaredField("secondaryNativeLibraryDir").get(info) as String?
-            modules(koinModules)
+        }.getOrNull() ?: info.nativeLibraryDir
-        }
+        Const.NATIVE_LIB_DIR = File(libDir)
-        ResMgr.init(impl)
+
+        ServiceLocator.context = wrapped
+        AssetHack.init(impl)
         app.registerActivityLifecycleCallbacks(ForegroundTracker)
         WorkManager.initialize(impl.wrapJob(), androidx.work.Configuration.Builder().build())
     }
@@ -86,6 +80,7 @@ open class App() : Application() {
     }
 }
 
+@SuppressLint("StaticFieldLeak")
 object ForegroundTracker : Application.ActivityLifecycleCallbacks {
 
     @Volatile

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

@@ -1,33 +1,35 @@
 package com.topjohnwu.magisk.core
 
-import android.content.Context
+import android.annotation.SuppressLint
 import android.content.SharedPreferences
 import android.util.Xml
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.edit
 import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.core.magiskdb.SettingsDao
-import com.topjohnwu.magisk.core.magiskdb.StringDao
 import com.topjohnwu.magisk.core.utils.BiometricHelper
-import com.topjohnwu.magisk.core.utils.defaultLocale
 import com.topjohnwu.magisk.core.utils.refreshLocale
 import com.topjohnwu.magisk.data.preference.PreferenceModel
 import com.topjohnwu.magisk.data.repository.DBConfig
-import com.topjohnwu.magisk.di.Protected
+import com.topjohnwu.magisk.di.ServiceLocator
-import com.topjohnwu.magisk.ktx.get
-import com.topjohnwu.magisk.ktx.inject
 import com.topjohnwu.magisk.ui.theme.Theme
-import com.topjohnwu.superuser.Shell
-import com.topjohnwu.superuser.io.SuFile
-import com.topjohnwu.superuser.io.SuFileInputStream
 import org.xmlpull.v1.XmlPullParser
 import java.io.File
+import java.io.InputStream
 
 object Config : PreferenceModel, DBConfig {
 
-    override val stringDao: StringDao by inject()
+    override val stringDB get() = ServiceLocator.stringDB
-    override val settingsDao: SettingsDao by inject()
+    override val settingsDB get() = ServiceLocator.settingsDB
-    override val context: Context by inject(Protected)
+    override val context get() = ServiceLocator.deContext
+
+    @get:SuppressLint("ApplySharedPref")
+    val prefsFile: File get() {
+        // Flush prefs to disk
+        prefs.edit().apply {
+            remove(Key.ASKED_HOME)
+        }.commit()
+        return File("${context.filesDir.parent}/shared_prefs", "${fileName}.xml")
+    }
 
     object Key {
         // db configs
@@ -43,6 +45,7 @@ object Config : PreferenceModel, DBConfig {
         const val SU_AUTO_RESPONSE = "su_auto_response"
         const val SU_NOTIFICATION = "su_notification"
         const val SU_REAUTH = "su_reauth"
+        const val SU_TAPJACK = "su_tapjack"
         const val CHECK_UPDATES = "check_update"
         const val UPDATE_CHANNEL = "update_channel"
         const val CUSTOM_CHANNEL = "custom_channel"
@@ -119,7 +122,7 @@ object Config : PreferenceModel, DBConfig {
     var repoOrder by preference(Key.REPO_ORDER, Value.ORDER_DATE)
 
     var suDefaultTimeout by preferenceStrInt(Key.SU_REQUEST_TIMEOUT, 10)
-    var suAutoReponse by preferenceStrInt(Key.SU_AUTO_RESPONSE, Value.SU_PROMPT)
+    var suAutoResponse by preferenceStrInt(Key.SU_AUTO_RESPONSE, Value.SU_PROMPT)
     var suNotification by preferenceStrInt(Key.SU_NOTIFICATION, Value.NOTIFICATION_TOAST)
     var updateChannel by preferenceStrInt(Key.UPDATE_CHANNEL, defaultChannel)
 
@@ -127,8 +130,9 @@ object Config : PreferenceModel, DBConfig {
     var darkTheme by preference(Key.DARK_THEME, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
     var themeOrdinal by preference(Key.THEME_ORDINAL, Theme.Piplup.ordinal)
     var suReAuth by preference(Key.SU_REAUTH, false)
+    var suTapjack by preference(Key.SU_TAPJACK, true)
     var checkUpdate by preference(Key.CHECK_UPDATES, true)
-    var doh by preference(Key.DOH, defaultLocale.country == "CN")
+    var doh by preference(Key.DOH, false)
     var magiskHide by preference(Key.MAGISKHIDE, true)
     var showSystemApp by preference(Key.SHOW_SYSTEM_APP, false)
 
@@ -150,8 +154,13 @@ object Config : PreferenceModel, DBConfig {
 
     private const val SU_FINGERPRINT = "su_fingerprint"
 
-    fun initialize() {
+    fun load(pkg: String?) {
-        prefs.edit { parsePrefs() }
+        // Only try to load prefs when fresh install and a previous package name is set
+        if (pkg != null && prefs.all.isEmpty()) runCatching {
+            context.contentResolver.openInputStream(Provider.PREFS_URI(pkg))?.use {
+                prefs.edit { parsePrefs(it) }
+            }
+        }
 
         prefs.edit {
             // Settings migration
@@ -173,10 +182,8 @@ object Config : PreferenceModel, DBConfig {
         }
     }
 
-    private fun SharedPreferences.Editor.parsePrefs() {
+    private fun SharedPreferences.Editor.parsePrefs(input: InputStream) {
-        val config = SuFile.open("/data/adb", Const.MANAGER_CONFIGS)
+        runCatching {
-        if (config.exists()) runCatching {
-            val input = SuFileInputStream(config)
             val parser = Xml.newPullParser()
             parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false)
             parser.setInput(input, "UTF-8")
@@ -220,21 +227,6 @@ object Config : PreferenceModel, DBConfig {
                     else -> parser.next()
                 }
             }
-            config.delete()
         }
     }
-
-    fun export() {
-        // Flush prefs to disk
-        prefs.edit().apply {
-            remove(Key.ASKED_HOME)
-        }.commit()
-        val context = get<Context>(Protected)
-        val xml = File(
-            "${context.filesDir.parent}/shared_prefs",
-            "${context.packageName}_preferences.xml"
-        )
-        Shell.su("cat $xml > /data/adb/${Const.MANAGER_CONFIGS}").exec()
-    }
-
 }

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

@@ -1,67 +1,66 @@
 package com.topjohnwu.magisk.core
 
+import android.os.Build
 import android.os.Process
+import com.topjohnwu.magisk.BuildConfig
+import java.io.File
 
+@Suppress("DEPRECATION")
 object Const {
 
+    val CPU_ABI: String = Build.SUPPORTED_ABIS[0]
+    val CPU_ABI_32: String = Build.SUPPORTED_32_BIT_ABIS.firstOrNull() ?: CPU_ABI
+
     // Paths
     lateinit var MAGISKTMP: String
+    lateinit var NATIVE_LIB_DIR: File
     val MAGISK_PATH get() = "$MAGISKTMP/modules"
-    const val TMP_FOLDER_PATH = "/dev/tmp"
+    const val TMPDIR = "/dev/tmp"
     const val MAGISK_LOG = "/cache/magisk.log"
 
     // Versions
-    const val SNET_EXT_VER = 15
+    const val SNET_EXT_VER = 17
-    const val SNET_REVISION = "18ab78817087c337ae0edd1ecac38aec49217880"
+    const val SNET_REVISION = "23.0"
-    const val BOOTCTL_REVISION = "18ab78817087c337ae0edd1ecac38aec49217880"
+    const val BOOTCTL_REVISION = "22.0"
 
     // Misc
-    const val ANDROID_MANIFEST = "AndroidManifest.xml"
-    const val MAGISK_INSTALL_LOG_FILENAME = "magisk_install_log_%s.log"
-    const val MANAGER_CONFIGS = ".tmp.magisk.config"
     val USER_ID = Process.myUid() / 100000
 
     object Version {
-        const val MIN_VERSION = "v19.0"
+        const val MIN_VERSION = "v20.4"
-        const val MIN_VERCODE = 19000
+        const val MIN_VERCODE = 20400
 
-        fun atLeast_20_2() = Info.env.magiskVersionCode >= 20200 || isCanary()
-        fun atLeast_20_4() = Info.env.magiskVersionCode >= 20400 || isCanary()
         fun atLeast_21_0() = Info.env.magiskVersionCode >= 21000 || isCanary()
+        fun atLeast_21_2() = Info.env.magiskVersionCode >= 21200 || isCanary()
         fun isCanary() = Info.env.magiskVersionCode % 100 != 0
     }
 
     object ID {
-        const val FETCH_ZIP = 2
-        const val SELECT_FILE = 3
-        const val MAX_ACTIVITY_RESULT = 10
-
         // notifications
-        const val MAGISK_UPDATE_NOTIFICATION_ID = 4
         const val APK_UPDATE_NOTIFICATION_ID = 5
-        const val HIDE_MANAGER_NOTIFICATION_ID = 8
         const val UPDATE_NOTIFICATION_CHANNEL = "update"
         const val PROGRESS_NOTIFICATION_CHANNEL = "progress"
         const val CHECK_MAGISK_UPDATE_WORKER_ID = "magisk_update"
     }
 
     object Url {
-        const val ZIP_URL = "https://github.com/Magisk-Modules-Repo/%s/archive/master.zip"
         const val PATREON_URL = "https://www.patreon.com/topjohnwu"
         const val SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk"
 
+        val CHANGELOG_URL = if (BuildConfig.VERSION_CODE % 100 != 0) Info.remote.magisk.note
+        else "https://topjohnwu.github.io/Magisk/releases/${BuildConfig.VERSION_CODE}.md"
+
         const val GITHUB_RAW_URL = "https://raw.githubusercontent.com/"
         const val GITHUB_API_URL = "https://api.github.com/"
-        const val GITHUB_PAGE_URL = "https://topjohnwu.github.io/magisk_files/"
+        const val GITHUB_PAGE_URL = "https://topjohnwu.github.io/magisk-files/"
         const val JS_DELIVR_URL = "https://cdn.jsdelivr.net/gh/"
+        const val OFFICIAL_REPO = "https://magisk-modules-repo.github.io/submission/modules.json"
     }
 
     object Key {
-        // others
-        const val LINK_KEY = "Link"
-        const val ETAG_KEY = "ETag"
         // intents
         const val OPEN_SECTION = "section"
+        const val PREV_PKG = "prev_pkg"
     }
 
     object Value {

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

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

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

@@ -14,44 +14,38 @@ import android.content.Intent
 import android.content.res.AssetManager
 import android.content.res.Configuration
 import android.content.res.Resources
+import android.util.DisplayMetrics
 import androidx.annotation.RequiresApi
 import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.core.utils.refreshLocale
 import com.topjohnwu.magisk.core.utils.updateConfig
-import com.topjohnwu.magisk.ktx.forceGetDeclaredField
-import com.topjohnwu.magisk.ui.MainActivity
-import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
 
 fun AssetManager.addAssetPath(path: String) {
     DynAPK.addAssetPath(this, path)
 }
 
-fun Context.wrap(global: Boolean = true): Context =
+fun Context.wrap(inject: Boolean = false): Context =
-    if (global) GlobalResContext(this) else ResContext(this)
+    if (inject) ReInjectedContext(this) else InjectedContext(this)
 
-fun Context.wrapJob(): Context = object : GlobalResContext(this) {
+fun Context.wrapJob(): Context = object : InjectedContext(this) {
 
-    override fun getApplicationContext(): Context {
+    override fun getApplicationContext() = this
-        return this
-    }
 
     @SuppressLint("NewApi")
     override fun getSystemService(name: String): Any? {
-        return if (!isRunningAsStub) super.getSystemService(name) else
+        return super.getSystemService(name).let {
-            when (name) {
+            when {
-                Context.JOB_SCHEDULER_SERVICE ->
+                !isRunningAsStub -> it
-                    JobSchedulerWrapper(super.getSystemService(name) as JobScheduler)
+                name == JOB_SCHEDULER_SERVICE -> JobSchedulerWrapper(it as JobScheduler)
-                else -> super.getSystemService(name)
+                else -> it
             }
+        }
     }
 }
 
-fun Class<*>.cmp(pkg: String): ComponentName {
+fun Class<*>.cmp(pkg: String) =
-    val name = ClassMap[this].name
+    ComponentName(pkg, Info.stub?.classToComponent?.get(name) ?: name)
-    return ComponentName(pkg, Info.stub?.classToComponent?.get(name) ?: name)
-}
 
 inline fun <reified T> Activity.redirect() = Intent(intent)
     .setComponent(T::class.java.cmp(packageName))
@@ -59,34 +53,27 @@ inline fun <reified T> Activity.redirect() = Intent(intent)
 
 inline fun <reified T> Context.intent() = Intent().setComponent(T::class.java.cmp(packageName))
 
-private open class GlobalResContext(base: Context) : ContextWrapper(base) {
+private open class InjectedContext(base: Context) : ContextWrapper(base) {
-    open val mRes: Resources get() = ResMgr.resource
+    open val res: Resources get() = AssetHack.resource
-
+    override fun getAssets(): AssetManager = res.assets
-    override fun getResources(): Resources {
+    override fun getResources() = res
-        return mRes
+    override fun getClassLoader() = javaClass.classLoader!!
-    }
-
-    override fun getClassLoader(): ClassLoader {
-        return javaClass.classLoader!!
-    }
-
     override fun createConfigurationContext(config: Configuration): Context {
-        return ResContext(super.createConfigurationContext(config))
+        return super.createConfigurationContext(config).wrap(true)
     }
 }
 
-private class ResContext(base: Context) : GlobalResContext(base) {
+private class ReInjectedContext(base: Context) : InjectedContext(base) {
-    override val mRes by lazy { base.resources.patch() }
+    override val res by lazy { base.resources.patch() }
-
     private fun Resources.patch(): Resources {
         updateConfig()
         if (isRunningAsStub)
-            assets.addAssetPath(ResMgr.apk)
+            assets.addAssetPath(AssetHack.apk)
         return this
     }
 }
 
-object ResMgr {
+object AssetHack {
 
     lateinit var resource: Resources
     lateinit var apk: String
@@ -101,62 +88,39 @@ object ResMgr {
             apk = context.packageResourcePath
         }
     }
+
+    fun newResource(): Resources {
+        val asset = AssetManager::class.java.newInstance()
+        asset.addAssetPath(apk)
+        val config = Configuration(resource.configuration)
+        val metrics = DisplayMetrics()
+        metrics.setTo(resource.displayMetrics)
+        return Resources(asset, metrics, config)
+    }
 }
 
 @RequiresApi(28)
 private class JobSchedulerWrapper(private val base: JobScheduler) : JobScheduler() {
-
+    override fun schedule(job: JobInfo) = base.schedule(job.patch())
-    override fun schedule(job: JobInfo): Int {
+    override fun enqueue(job: JobInfo, work: JobWorkItem) = base.enqueue(job.patch(), work)
-        return base.schedule(job.patch())
+    override fun cancel(jobId: Int) = base.cancel(jobId)
-    }
+    override fun cancelAll() = base.cancelAll()
-
+    override fun getAllPendingJobs(): List<JobInfo> = base.allPendingJobs
-    override fun enqueue(job: JobInfo, work: JobWorkItem): Int {
+    override fun getPendingJob(jobId: Int) = base.getPendingJob(jobId)
-        return base.enqueue(job.patch(), work)
-    }
-
-    override fun cancel(jobId: Int) {
-        base.cancel(jobId)
-    }
-
-    override fun cancelAll() {
-        base.cancelAll()
-    }
-
-    override fun getAllPendingJobs(): List<JobInfo> {
-        return base.allPendingJobs
-    }
-
-    override fun getPendingJob(jobId: Int): JobInfo? {
-        return base.getPendingJob(jobId)
-    }
-
     private fun JobInfo.patch(): JobInfo {
-        // We need to swap out the service of JobInfo
+        // Swap out the service of JobInfo
-        val name = service.className
+        val component = service.run {
-        val component = ComponentName(
+            ComponentName(packageName,
-            service.packageName,
+                Info.stub?.classToComponent?.get(className) ?: className)
-            Info.stubChk.classToComponent[name] ?: name
+        }
-        )
+        javaClass.getDeclaredField("service").apply {
+            isAccessible = true
+        }.set(this, component)
 
-        javaClass.forceGetDeclaredField("service")?.set(this, component)
         return this
     }
 }
 
-private object ClassMap {
-
-    private val map = mapOf(
-        App::class.java to a.e::class.java,
-        MainActivity::class.java to a.b::class.java,
-        SplashActivity::class.java to a.c::class.java,
-        GeneralReceiver::class.java to a.h::class.java,
-        DownloadService::class.java to a.j::class.java,
-        SuRequestActivity::class.java to a.m::class.java
-    )
-
-    operator fun get(c: Class<*>) = map.getOrElse(c) { c }
-}
-
 // Keep a reference to these resources to prevent it from
 // being removed when running "remove unused resources"
 val shouldKeepResources = listOf(
@@ -165,7 +129,6 @@ val shouldKeepResources = listOf(
     R.string.invalid_update_channel,
     R.string.update_available,
     R.string.safetynet_api_error,
-    R.raw.changelog,
     R.drawable.ic_device,
     R.drawable.ic_hide_select_md2,
     R.drawable.ic_more,

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

@@ -1,45 +1,49 @@
 package com.topjohnwu.magisk.core
 
+import android.os.Build
 import androidx.databinding.ObservableBoolean
 import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.core.model.UpdateInfo
 import com.topjohnwu.magisk.core.utils.net.NetworkObserver
-import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.data.repository.NetworkService
-import com.topjohnwu.magisk.utils.CachedValue
+import com.topjohnwu.magisk.di.AppContext
+import com.topjohnwu.magisk.ktx.getProperty
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils.fastCmd
 import com.topjohnwu.superuser.internal.UiThreadHandler
-import java.io.FileInputStream
+import java.io.File
 import java.io.IOException
-import java.util.*
 
 val isRunningAsStub get() = Info.stub != null
 
 object Info {
 
-    val envRef = CachedValue { loadState() }
-
-    @JvmStatic val env by envRef
-
     var stub: DynAPK.Data? = null
-    val stubChk: DynAPK.Data
-        get() = stub as DynAPK.Data
 
-    var remote = UpdateInfo()
+    val EMPTY_REMOTE = UpdateInfo()
+    var remote = EMPTY_REMOTE
+    suspend fun getRemote(svc: NetworkService): UpdateInfo? {
+        return if (remote === EMPTY_REMOTE) {
+            svc.fetchUpdate()?.apply { remote = this }
+        } else remote
+    }
 
     // Device state
-    var crypto = ""
+    @JvmStatic val env by lazy { loadState() }
-    @JvmStatic var isSAR = false
+    @JvmField var isSAR = false
-    @JvmStatic var isAB = false
+    @JvmField var isAB = false
+    @JvmField val isVirtualAB = getProperty("ro.virtual_ab.enabled", "false") == "true"
     @JvmStatic val isFDE get() = crypto == "block"
-    @JvmStatic var ramdisk = false
+    @JvmField var ramdisk = false
-    @JvmStatic var hasGMS = true
+    @JvmField var hasGMS = true
-    @JvmStatic var isPixel = false
+    @JvmField val isPixel = Build.BRAND == "google"
-    @JvmStatic val cryptoText get() = crypto.capitalize(Locale.US)
+    @JvmField val isEmulator = getProperty("ro.kernel.qemu", "0") == "1"
+    var crypto = ""
+    var noDataExec = false
 
     val isConnected by lazy {
         ObservableBoolean(false).also { field ->
-            NetworkObserver.observe(get()) {
+            NetworkObserver.observe(AppContext) {
                 UiThreadHandler.run { field.set(it) }
             }
         }
@@ -47,14 +51,12 @@ object Info {
 
     val isNewReboot by lazy {
         try {
-            FileInputStream("/proc/sys/kernel/random/boot_id").bufferedReader().use {
+            val id = File("/proc/sys/kernel/random/boot_id").readText()
-                val id = it.readLine()
+            if (id != Config.bootId) {
-                if (id != Config.bootId) {
+                Config.bootId = id
-                    Config.bootId = id
+                true
-                    true
+            } else {
-                } else {
+                false
-                    false
-                }
             }
         } catch (e: IOException) {
             false
@@ -64,7 +66,7 @@ object Info {
     private fun loadState() = Env(
         fastCmd("magisk -v").split(":".toRegex())[0],
         runCatching { fastCmd("magisk -V").toInt() }.getOrDefault(-1),
-        Shell.su("magiskhide --status").exec().isSuccess
+        Shell.su("magiskhide status").exec().isSuccess
     )
 
     class Env(
@@ -73,8 +75,8 @@ object Info {
         hide: Boolean = false
     ) {
         val magiskHide get() = Config.magiskHide
-        val magiskVersionCode = when (code) {
+        val magiskVersionCode = when {
-            in Int.MIN_VALUE..Const.Version.MIN_VERCODE -> -1
+            code < Const.Version.MIN_VERCODE -> -1
             else -> if (Shell.rootAccess()) code else -1
         }
         val isUnsupported = code > 0 && code < Const.Version.MIN_VERCODE

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

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

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

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

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

@@ -1,68 +1,90 @@
 package com.topjohnwu.magisk.core
 
-import android.app.Activity
+import android.content.Intent
-import android.content.Context
+import android.net.Uri
 import android.os.Bundle
-import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.data.network.GithubRawServices
+import com.topjohnwu.magisk.core.base.BaseActivity
-import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.core.tasks.HideAPK
+import com.topjohnwu.magisk.di.ServiceLocator
 import com.topjohnwu.magisk.ui.MainActivity
+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 java.util.concurrent.CountDownLatch
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 
-open class SplashActivity : Activity() {
+open class SplashActivity : BaseActivity() {
 
-    override fun attachBaseContext(base: Context) {
+    private val latch = CountDownLatch(1)
-        super.attachBaseContext(base.wrap())
-    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         setTheme(R.style.SplashTheme)
         super.onCreate(savedInstanceState)
-        GlobalScope.launch(Dispatchers.IO) {
+        // Pre-initialize root shell
-            initAndStart()
+        Shell.getShell(null) { initAndStart() }
-        }
     }
 
-    private fun handleRepackage() {
+    private fun handleRepackage(pkg: String?) {
-        val pkg = Config.suManager
+        if (packageName != APPLICATION_ID) {
-        if (Config.suManager.isNotEmpty() && packageName == BuildConfig.APPLICATION_ID) {
-            Config.suManager = ""
-            Shell.su("(pm uninstall $pkg)& >/dev/null 2>&1").exec()
-        }
-        if (pkg == packageName) {
             runCatching {
-                // We are the manager, remove com.topjohnwu.magisk as it could be malware
+                // Hidden, remove com.topjohnwu.magisk if exist as it could be malware
-                packageManager.getApplicationInfo(BuildConfig.APPLICATION_ID, 0)
+                packageManager.getApplicationInfo(APPLICATION_ID, 0)
-                Shell.su("(pm uninstall ${BuildConfig.APPLICATION_ID})& >/dev/null 2>&1").exec()
+                Shell.su("(pm uninstall $APPLICATION_ID)& >/dev/null 2>&1").exec()
             }
+        } else {
+            if (Config.suManager.isNotEmpty())
+                Config.suManager = ""
+            pkg ?: return
+            if (!Shell.su("(pm uninstall $pkg)& >/dev/null 2>&1").exec().isSuccess)
+                uninstallApp(pkg)
         }
     }
 
     private fun initAndStart() {
-        // Pre-initialize root shell
+        if (isRunningAsStub && !Shell.rootAccess()) {
-        Shell.getShell()
+            runOnUiThread {
+                MagiskDialog(this)
+                    .applyTitle(R.string.unsupport_nonroot_stub_title)
+                    .applyMessage(R.string.unsupport_nonroot_stub_msg)
+                    .applyButton(MagiskDialog.ButtonType.POSITIVE) {
+                        titleRes = R.string.install
+                        onClick { HideAPK.restore(this@SplashActivity) }
+                    }
+                    .cancellable(false)
+                    .reveal()
+            }
+            return
+        }
 
-        Config.initialize()
+        val prevPkg = intent.getStringExtra(Const.Key.PREV_PKG)
-        handleRepackage()
+
+        Config.load(prevPkg)
+        handleRepackage(prevPkg)
         Notifications.setup(this)
         UpdateCheckService.schedule(this)
         Shortcuts.setupDynamic(this)
 
-        // Pre-fetch network stuffs
+        // Pre-fetch network services
-        get<GithubRawServices>()
+        ServiceLocator.networkService
 
         DONE = true
-
+        startActivity(redirect<MainActivity>())
-        redirect<MainActivity>().also { startActivity(it) }
         finish()
     }
 
+    @Suppress("DEPRECATION")
+    private fun uninstallApp(pkg: String) {
+        val uri = Uri.Builder().scheme("package").opaquePart(pkg).build()
+        val intent = Intent(Intent.ACTION_UNINSTALL_PACKAGE, uri)
+        intent.putExtra(Intent.EXTRA_RETURN_RESULT, true)
+        startActivityForResult(intent) { _, _ ->
+            latch.countDown()
+        }
+        latch.await()
+    }
+
     companion object {
         var DONE = false
     }

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

@@ -1,37 +1,28 @@
 package com.topjohnwu.magisk.core
 
+import android.annotation.SuppressLint
 import android.content.Context
 import androidx.work.*
 import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.di.ServiceLocator
 import com.topjohnwu.magisk.view.Notifications
-import com.topjohnwu.superuser.Shell
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import org.koin.core.KoinComponent
-import org.koin.core.inject
 import java.util.concurrent.TimeUnit
 
 class UpdateCheckService(context: Context, workerParams: WorkerParameters)
-    : CoroutineWorker(context, workerParams), KoinComponent {
+    : CoroutineWorker(context, workerParams) {
 
-    private val svc: NetworkService by inject()
+    private val svc get() = ServiceLocator.networkService
 
     override suspend fun doWork(): Result {
-        // Make sure shell initializer was ran
+        return svc.fetchUpdate()?.run {
-        withContext(Dispatchers.IO) {
+            if (Info.env.isActive && BuildConfig.VERSION_CODE < magisk.versionCode)
-            Shell.getShell()
-        }
-        return svc.fetchUpdate()?.let {
-            if (BuildConfig.VERSION_CODE < it.app.versionCode)
                 Notifications.managerUpdate(applicationContext)
-            else if (Info.env.isActive && Info.env.magiskVersionCode < it.magisk.versionCode)
-                Notifications.magiskUpdate(applicationContext)
             Result.success()
         } ?: Result.failure()
     }
 
     companion object {
+        @SuppressLint("NewApi")
         fun schedule(context: Context) {
             if (Config.checkUpdate) {
                 val constraints = Constraints.Builder()

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

@@ -1,12 +1,13 @@
 package com.topjohnwu.magisk.core.base
 
-import android.Manifest
+import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.os.Build
+import android.os.Bundle
 import android.widget.Toast
 import androidx.annotation.CallSuper
 import androidx.appcompat.app.AppCompatActivity
@@ -14,9 +15,9 @@ import androidx.collection.SparseArrayCompat
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.core.wrap
+import com.topjohnwu.magisk.ktx.reflectField
 import com.topjohnwu.magisk.ktx.set
 import com.topjohnwu.magisk.utils.Utils
 import kotlin.random.Random
@@ -26,6 +27,13 @@ typealias ActivityResultCallback = BaseActivity.(Int, Intent?) -> Unit
 abstract class BaseActivity : AppCompatActivity() {
 
     private val resultCallbacks by lazy { SparseArrayCompat<ActivityResultCallback>() }
+    private val newRequestCode: Int get() {
+        var requestCode: Int
+        do {
+            requestCode = Random.nextInt(0, 1 shl 15)
+        } while (resultCallbacks.containsKey(requestCode))
+        return requestCode
+    }
 
     override fun applyOverrideConfiguration(config: Configuration?) {
         // Force applying our preferred local
@@ -34,14 +42,23 @@ abstract class BaseActivity : AppCompatActivity() {
     }
 
     override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base.wrap(false))
+        super.attachBaseContext(base.wrap(true))
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        // Overwrite private members to avoid nasty "false" stack traces being logged
+        val delegate = delegate
+        val clz = delegate.javaClass
+        clz.reflectField("mActivityHandlesUiModeChecked").set(delegate, true)
+        clz.reflectField("mActivityHandlesUiMode").set(delegate, false)
+        super.onCreate(savedInstanceState)
     }
 
     fun withPermission(permission: String, builder: PermissionRequestBuilder.() -> Unit) {
         val request = PermissionRequestBuilder().apply(builder).build()
 
-        if (permission == Manifest.permission.WRITE_EXTERNAL_STORAGE && Build.VERSION.SDK_INT >= 29) {
+        if (permission == WRITE_EXTERNAL_STORAGE && Build.VERSION.SDK_INT >= 30) {
-            // We do not need external rw on 29+
+            // We do not need external rw on 30+
             request.onSuccess()
             return
         }
@@ -49,10 +66,7 @@ abstract class BaseActivity : AppCompatActivity() {
         if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
             request.onSuccess()
         } else {
-            var requestCode: Int
+            val requestCode = newRequestCode
-            do {
-                requestCode = Random.nextInt(Const.ID.MAX_ACTIVITY_RESULT + 1, 1 shl 15)
-            } while (resultCallbacks.containsKey(requestCode))
             resultCallbacks[requestCode] = { result, _ ->
                 if (result > 0)
                     request.onSuccess()
@@ -64,11 +78,12 @@ abstract class BaseActivity : AppCompatActivity() {
     }
 
     fun withExternalRW(builder: PermissionRequestBuilder.() -> Unit) {
-        withPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, builder = builder)
+        withPermission(WRITE_EXTERNAL_STORAGE, builder = builder)
     }
 
     override fun onRequestPermissionsResult(
         requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         var success = true
         for (res in grantResults) {
             if (res != PackageManager.PERMISSION_GRANTED) {
@@ -92,7 +107,8 @@ abstract class BaseActivity : AppCompatActivity() {
         }
     }
 
-    fun startActivityForResult(intent: Intent, requestCode: Int, callback: ActivityResultCallback) {
+    fun startActivityForResult(intent: Intent, callback: ActivityResultCallback) {
+        val requestCode = newRequestCode
         resultCallbacks[requestCode] = callback
         try {
             startActivityForResult(intent, requestCode)

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

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

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

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

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

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

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

@@ -8,19 +8,14 @@ import androidx.lifecycle.MutableLiveData
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.ForegroundTracker
 import com.topjohnwu.magisk.core.base.BaseService
-import com.topjohnwu.magisk.core.utils.MediaStoreUtils.checkSum
-import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
 import com.topjohnwu.magisk.core.utils.ProgressInputStream
-import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.di.ServiceLocator
-import com.topjohnwu.magisk.ktx.withStreams
 import com.topjohnwu.magisk.view.Notifications
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import okhttp3.ResponseBody
-import org.koin.android.ext.android.inject
-import org.koin.core.KoinComponent
 import timber.log.Timber
 import java.io.IOException
 import java.io.InputStream
@@ -28,13 +23,13 @@ import java.util.*
 import kotlin.collections.HashMap
 import kotlin.random.Random.Default.nextInt
 
-abstract class BaseDownloader : BaseService(), KoinComponent {
+abstract class BaseDownloader : BaseService() {
 
     private val hasNotifications get() = notifications.isNotEmpty()
     private val notifications = Collections.synchronizedMap(HashMap<Int, Notification.Builder>())
     private val coroutineScope = CoroutineScope(Dispatchers.IO)
 
-    val service: NetworkService by inject()
+    val service get() = ServiceLocator.networkService
 
     // -- Service overrides
 
@@ -69,18 +64,11 @@ abstract class BaseDownloader : BaseService(), KoinComponent {
     // -- Download logic
 
     private suspend fun Subject.startDownload() {
-        val skip = this is Subject.Magisk && file.checkSum("MD5", magisk.md5)
+        val stream = service.fetchFile(url).toProgressStream(this)
-        if (!skip) {
+        when (this) {
-            val stream = service.fetchFile(url).toProgressStream(this)
+            is Subject.Module ->  // Download and process on-the-fly
-            when (this) {
+                stream.toModule(file, service.fetchInstaller().byteStream())
-                is Subject.Module ->  // Download and process on-the-fly
+            is Subject.Manager -> handleAPK(this, stream)
-                    stream.toModule(file, service.fetchInstaller().byteStream())
-                else -> {
-                    withStreams(stream, file.outputStream()) { it, out -> it.copyTo(out) }
-                    if (this is Subject.Manager)
-                        handleAPK(this)
-                }
-            }
         }
         val newId = notifyFinish(this)
         if (ForegroundTracker.hasForeground)
@@ -117,7 +105,7 @@ abstract class BaseDownloader : BaseService(), KoinComponent {
     fun Subject.notifyID() = hashCode()
 
     private fun notifyFail(subject: Subject) = lastNotify(subject.notifyID()) {
-        broadcast(-1f, subject)
+        broadcast(-2f, subject)
         it.setContentText(getString(R.string.download_file_error))
             .setSmallIcon(android.R.drawable.stat_notify_error)
             .setOngoing(false)
@@ -184,10 +172,10 @@ abstract class BaseDownloader : BaseService(), KoinComponent {
 
     // ---
 
-    companion object : KoinComponent {
+    companion object {
         const val ACTION_KEY = "download_action"
 
-        private val progressBroadcast = MutableLiveData<Pair<Float, Subject>>()
+        private val progressBroadcast = MutableLiveData<Pair<Float, Subject>?>()
 
         fun observeProgress(owner: LifecycleOwner, callback: (Float, Subject) -> Unit) {
             progressBroadcast.value = null

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

@@ -1,46 +1,38 @@
 package com.topjohnwu.magisk.core.download
 
-import android.annotation.SuppressLint
 import android.app.Notification
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.os.Build
 import androidx.core.net.toFile
-import com.topjohnwu.magisk.core.download.Action.*
+import com.topjohnwu.magisk.arch.BaseUIActivity
-import com.topjohnwu.magisk.core.download.Action.Flash.Secondary
+import com.topjohnwu.magisk.core.ForegroundTracker
-import com.topjohnwu.magisk.core.download.Subject.*
+import com.topjohnwu.magisk.core.download.Action.Flash
+import com.topjohnwu.magisk.core.download.Subject.Manager
+import com.topjohnwu.magisk.core.download.Subject.Module
 import com.topjohnwu.magisk.core.intent
-import com.topjohnwu.magisk.core.tasks.EnvFixTask
 import com.topjohnwu.magisk.ui.flash.FlashFragment
 import com.topjohnwu.magisk.utils.APKInstall
+import com.topjohnwu.superuser.internal.UiThreadHandler
 import kotlin.random.Random.Default.nextInt
 
-@SuppressLint("Registered")
 open class DownloadService : BaseDownloader() {
 
     private val context get() = this
 
     override suspend fun onFinish(subject: Subject, id: Int) = when (subject) {
-        is Magisk -> subject.onFinish(id)
         is Module -> subject.onFinish(id)
         is Manager -> subject.onFinish(id)
     }
 
-    private suspend fun Magisk.onFinish(id: Int) = when (val action = action) {
-        Uninstall -> FlashFragment.uninstall(file, id)
-        EnvFix -> {
-            remove(id)
-            EnvFixTask(file).exec()
-            Unit
-        }
-        is Patch -> FlashFragment.patch(file, action.fileUri, id)
-        is Flash -> FlashFragment.flash(file, action is Secondary, id)
-        else -> Unit
-    }
-
     private fun Module.onFinish(id: Int) = when (action) {
-        is Flash -> FlashFragment.install(file, id)
+        Flash -> {
+            UiThreadHandler.run {
+                (ForegroundTracker.foreground as? BaseUIActivity<*, *>)
+                    ?.navigation?.navigate(FlashFragment.install(file, id))
+            }
+        }
         else -> Unit
     }
 
@@ -53,30 +45,18 @@ open class DownloadService : BaseDownloader() {
 
     override fun Notification.Builder.setIntent(subject: Subject)
     = when (subject) {
-        is Magisk -> setIntent(subject)
         is Module -> setIntent(subject)
         is Manager -> setIntent(subject)
     }
 
-    private fun Notification.Builder.setIntent(subject: Magisk)
-    = when (val action = subject.action) {
-        Uninstall -> setContentIntent(FlashFragment.uninstallIntent(context, subject.file))
-        is Flash -> setContentIntent(FlashFragment.flashIntent(context, subject.file, action is Secondary))
-        is Patch -> setContentIntent(FlashFragment.patchIntent(context, subject.file, action.fileUri))
-        else -> setContentIntent(Intent())
-    }
-
     private fun Notification.Builder.setIntent(subject: Module)
     = when (subject.action) {
-        is Flash -> setContentIntent(FlashFragment.installIntent(context, subject.file))
+        Flash -> setContentIntent(FlashFragment.installIntent(context, subject.file))
         else -> setContentIntent(Intent())
     }
 
     private fun Notification.Builder.setIntent(subject: Manager)
-    = when (subject.action) {
+    = setContentIntent(APKInstall.installIntent(context, subject.file.toFile()))
-        APK.Upgrade -> setContentIntent(APKInstall.installIntent(context, subject.file.toFile()))
-        else -> setContentIntent(Intent())
-    }
 
     private fun Notification.Builder.setContentIntent(intent: Intent) =
         setContentIntent(

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

@@ -2,23 +2,22 @@ package com.topjohnwu.magisk.core.download
 
 import android.content.Context
 import androidx.core.net.toFile
-import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.download.Action.APK.Restore
-import com.topjohnwu.magisk.core.download.Action.APK.Upgrade
 import com.topjohnwu.magisk.core.isRunningAsStub
-import com.topjohnwu.magisk.core.tasks.PatchAPK
+import com.topjohnwu.magisk.core.tasks.HideAPK
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
 import com.topjohnwu.magisk.ktx.relaunchApp
+import com.topjohnwu.magisk.ktx.withStreams
 import com.topjohnwu.magisk.ktx.writeTo
-import com.topjohnwu.superuser.Shell
 import java.io.File
+import java.io.InputStream
+import java.io.OutputStream
 
 private fun Context.patch(apk: File) {
     val patched = File(apk.parent, "patched.apk")
-    PatchAPK.patch(this, apk.path, patched.path, packageName, applicationInfo.nonLocalizedLabel)
+    HideAPK.patch(this, apk, patched, packageName, applicationInfo.nonLocalizedLabel)
     apk.delete()
     patched.renameTo(apk)
 }
@@ -26,47 +25,51 @@ private fun Context.patch(apk: File) {
 private fun BaseDownloader.notifyHide(id: Int) {
     update(id) {
         it.setProgress(0, 0, true)
-            .setContentTitle(getString(R.string.hide_manager_title))
+            .setContentTitle(getString(R.string.hide_app_title))
             .setContentText("")
     }
 }
 
-private suspend fun BaseDownloader.upgrade(subject: Subject.Manager) {
+private class DupOutputStream(
-    val apk = subject.file.toFile()
+    private val o1: OutputStream,
-    val id = subject.notifyID()
+    private val o2: OutputStream
+) : OutputStream() {
+    override fun write(b: Int) {
+        o1.write(b)
+        o2.write(b)
+    }
+    override fun write(b: ByteArray?, off: Int, len: Int) {
+        o1.write(b, off, len)
+        o2.write(b, off, len)
+    }
+    override fun close() {
+        o1.close()
+        o2.close()
+    }
+}
+
+suspend fun BaseDownloader.handleAPK(subject: Subject.Manager, stream: InputStream) {
+    fun write(output: OutputStream) {
+        val ext = subject.externalFile.outputStream()
+        val o = DupOutputStream(ext, output)
+        withStreams(stream, o) { src, out -> src.copyTo(out) }
+    }
+
     if (isRunningAsStub) {
-        // Move to upgrade location
+        val apk = subject.file.toFile()
-        apk.copyTo(DynAPK.update(this), overwrite = true)
+        val id = subject.notifyID()
-        apk.delete()
+        write(DynAPK.update(this).outputStream())
-        if (Info.stubChk.version < subject.stub.versionCode) {
+        if (Info.stub!!.version < subject.stub.versionCode) {
-            notifyHide(id)
             // Also upgrade stub
-            service.fetchFile(subject.stub.link).byteStream().use { it.writeTo(apk) }
+            notifyHide(id)
+            service.fetchFile(subject.stub.link).byteStream().writeTo(apk)
             patch(apk)
         } else {
             // Simply relaunch the app
             stopSelf()
             relaunchApp(this)
         }
-    } else if (packageName != BuildConfig.APPLICATION_ID) {
+    } else {
-        notifyHide(id)
+        write(subject.file.outputStream())
-        patch(apk)
     }
 }
-
-private fun BaseDownloader.restore(apk: File, id: Int) {
-    update(id) {
-        it.setProgress(0, 0, true)
-            .setProgress(0, 0, true)
-            .setContentTitle(getString(R.string.restore_img_msg))
-            .setContentText("")
-    }
-    Config.export()
-    Shell.su("pm install $apk && pm uninstall $packageName").exec()
-}
-
-suspend fun BaseDownloader.handleAPK(subject: Subject.Manager) =
-    when (subject.action) {
-        is Upgrade -> upgrade(subject)
-        is Restore -> restore(subject.file.toFile(), subject.notifyID())
-    }

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

@@ -1,8 +1,9 @@
 package com.topjohnwu.magisk.core.download
 
 import android.net.Uri
-import com.topjohnwu.magisk.ktx.withStreams
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
+import com.topjohnwu.magisk.ktx.forEach
+import com.topjohnwu.magisk.ktx.withStreams
 import java.io.InputStream
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
@@ -25,8 +26,7 @@ fun InputStream.toModule(file: Uri, installer: InputStream) {
         zout.write("#MAGISK\n".toByteArray(charset("UTF-8")))
 
         var off = -1
-        var entry: ZipEntry? = zin.nextEntry
+        zin.forEach { entry ->
-        while (entry != null) {
             if (off < 0) {
                 off = entry.name.indexOf('/') + 1
             }
@@ -38,8 +38,6 @@ fun InputStream.toModule(file: Uri, installer: InputStream) {
                     zin.copyTo(zout)
                 }
             }
-
-            entry = zin.nextEntry
         }
     }
 }

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

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

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

@@ -1,11 +1,11 @@
 package com.topjohnwu.magisk.core.magiskdb
 
-import android.content.Context
 import android.content.pm.PackageManager
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.model.su.SuPolicy
 import com.topjohnwu.magisk.core.model.su.toMap
 import com.topjohnwu.magisk.core.model.su.toPolicy
+import com.topjohnwu.magisk.di.AppContext
 import com.topjohnwu.magisk.ktx.now
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -13,9 +13,7 @@ import timber.log.Timber
 import java.util.concurrent.TimeUnit
 
 
-class PolicyDao(
+class PolicyDao : BaseDao() {
-    private val context: Context
-) : BaseDao() {
 
     override val table: String = Table.POLICY
 
@@ -31,12 +29,6 @@ class PolicyDao(
         }
     }.commit()
 
-    suspend fun delete(packageName: String) = buildQuery<Delete> {
-        condition {
-            equals("package_name", packageName)
-        }
-    }.commit()
-
     suspend fun delete(uid: Int) = buildQuery<Delete> {
         condition {
             equals("uid", uid)
@@ -62,7 +54,7 @@ class PolicyDao(
     }
 
     private fun Map<String, String>.toPolicyOrNull(): SuPolicy? {
-        return runCatching { toPolicy(context.packageManager) }.getOrElse {
+        return runCatching { toPolicy(AppContext.packageManager) }.getOrElse {
             Timber.e(it)
             if (it is PackageManager.NameNotFoundException) {
                 val uid = getOrElse("uid") { null } ?: return null

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

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

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

@@ -1,41 +0,0 @@
-package com.topjohnwu.magisk.core.model.module
-
-abstract class BaseModule : Comparable<BaseModule> {
-    abstract var id: String
-        protected set
-    abstract var name: String
-        protected set
-    abstract var author: String
-        protected set
-    abstract var version: String
-        protected set
-    abstract var versionCode: Int
-        protected set
-    abstract var description: String
-        protected set
-
-    @Throws(NumberFormatException::class)
-    protected fun parseProps(props: List<String>) {
-        for (line in props) {
-            val prop = line.split("=".toRegex(), 2).map { it.trim() }
-            if (prop.size != 2)
-                continue
-
-            val key = prop[0]
-            val value = prop[1]
-            if (key.isEmpty() || key[0] == '#')
-                continue
-
-            when (key) {
-                "id" -> id = value
-                "name" -> name = value
-                "version" -> version = value
-                "versionCode" -> versionCode = value.toInt()
-                "author" -> author = value
-                "description" -> description = value
-            }
-        }
-    }
-
-    override operator fun compareTo(other: BaseModule) = name.compareTo(other.name, true)
-}

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

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

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

@@ -1,77 +1,41 @@
 package com.topjohnwu.magisk.core.model.module
 
-import com.topjohnwu.magisk.core.Const
+abstract class Module : Comparable<Module> {
-import com.topjohnwu.superuser.Shell
+    abstract var id: String
-import com.topjohnwu.superuser.io.SuFile
+        protected set
-import kotlinx.coroutines.Dispatchers
+    abstract var name: String
-import kotlinx.coroutines.withContext
+        protected set
+    abstract var author: String
+        protected set
+    abstract var version: String
+        protected set
+    abstract var versionCode: Int
+        protected set
+    abstract var description: String
+        protected set
 
-class Module(path: String) : BaseModule() {
+    @Throws(NumberFormatException::class)
-    override var id: String = ""
+    protected fun parseProps(props: List<String>) {
-    override var name: String = ""
+        for (line in props) {
-    override var author: String = ""
+            val prop = line.split("=".toRegex(), 2).map { it.trim() }
-    override var version: String = ""
+            if (prop.size != 2)
-    override var versionCode: Int = -1
+                continue
-    override var description: String = ""
 
-    private val removeFile = SuFile(path, "remove")
+            val key = prop[0]
-    private val disableFile = SuFile(path, "disable")
+            val value = prop[1]
-    private val updateFile = SuFile(path, "update")
+            if (key.isEmpty() || key[0] == '#')
-    private val ruleFile = SuFile(path, "sepolicy.rule")
+                continue
 
-    val updated: Boolean get() = updateFile.exists()
+            when (key) {
-
+                "id" -> id = value
-    var enable: Boolean
+                "name" -> name = value
-        get() = !disableFile.exists()
+                "version" -> version = value
-        set(enable) {
+                "versionCode" -> versionCode = value.toInt()
-            val dir = "$PERSIST/$id"
+                "author" -> author = value
-            if (enable) {
+                "description" -> description = value
-                Shell.su("mkdir -p $dir", "cp -af $ruleFile $dir").submit()
-                disableFile.delete()
-            } else {
-                Shell.su("rm -rf $dir").submit()
-                !disableFile.createNewFile()
             }
         }
-
-    var remove: Boolean
-        get() = removeFile.exists()
-        set(remove) {
-            if (remove) {
-                Shell.su("rm -rf $PERSIST/$id").submit()
-                removeFile.createNewFile()
-            } else {
-                Shell.su("cp -af $ruleFile $PERSIST/$id").submit()
-                !removeFile.delete()
-            }
-        }
-
-    init {
-        runCatching {
-            parseProps(Shell.su("dos2unix < $path/module.prop").exec().out)
-        }
-
-        if (id.isEmpty()) {
-            val sep = path.lastIndexOf('/')
-            id = path.substring(sep + 1)
-        }
-
-        if (name.isEmpty()) {
-            name = id
-        }
     }
 
-    companion object {
+    override operator fun compareTo(other: Module) = name.compareTo(other.name, true)
-
-        private val PERSIST get() = "${Const.MAGISKTMP}/mirror/persist/magisk"
-
-        suspend fun installed() = withContext(Dispatchers.IO) {
-            SuFile(Const.MAGISK_PATH)
-                .listFiles { _, name -> name != "lost+found" && name != ".core" }
-                .orEmpty()
-                .filter { !it.isFile }
-                .map { Module("${Const.MAGISK_PATH}/${it.name}") }
-                .sortedBy { it.name.toLowerCase() }
-        }
-    }
 }

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

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

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

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

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

@@ -1,11 +1,13 @@
+@file:SuppressLint("InlinedApi")
+
 package com.topjohnwu.magisk.core.model.su
 
+import android.annotation.SuppressLint
 import android.content.pm.PackageManager
 import android.graphics.drawable.Drawable
 import com.topjohnwu.magisk.core.model.su.SuPolicy.Companion.INTERACTIVE
 import com.topjohnwu.magisk.ktx.getLabel
 
-
 data class SuPolicy(
     var uid: Int,
     val packageName: String,
@@ -38,7 +40,7 @@ fun SuPolicy.toMap() = mapOf(
 fun Map<String, String>.toPolicy(pm: PackageManager): SuPolicy {
     val uid = get("uid")?.toIntOrNull() ?: -1
     val packageName = get("package_name").orEmpty()
-    val info = pm.getApplicationInfo(packageName, PackageManager.GET_UNINSTALLED_PACKAGES)
+    val info = pm.getApplicationInfo(packageName, PackageManager.MATCH_UNINSTALLED_PACKAGES)
 
     if (info.uid != uid)
         throw PackageManager.NameNotFoundException()
@@ -59,7 +61,7 @@ fun Map<String, String>.toPolicy(pm: PackageManager): SuPolicy {
 fun Int.toPolicy(pm: PackageManager, policy: Int = INTERACTIVE): SuPolicy {
     val pkg = pm.getPackagesForUid(this)?.firstOrNull()
         ?: throw PackageManager.NameNotFoundException()
-    val info = pm.getApplicationInfo(pkg, PackageManager.GET_UNINSTALLED_PACKAGES)
+    val info = pm.getApplicationInfo(pkg, PackageManager.MATCH_UNINSTALLED_PACKAGES)
     return SuPolicy(
         uid = info.uid,
         packageName = pkg,

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

@@ -7,16 +7,13 @@ import android.os.Bundle
 import android.os.Process
 import android.widget.Toast
 import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.ProviderCallHandler
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.intent
 import com.topjohnwu.magisk.core.model.su.SuPolicy
 import com.topjohnwu.magisk.core.model.su.toLog
 import com.topjohnwu.magisk.core.model.su.toPolicy
-import com.topjohnwu.magisk.core.wrap
+import com.topjohnwu.magisk.di.ServiceLocator
-import com.topjohnwu.magisk.data.repository.LogRepository
-import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.ktx.startActivity
 import com.topjohnwu.magisk.ktx.startActivityWithRoot
 import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
@@ -26,18 +23,13 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
-object SuCallbackHandler : ProviderCallHandler {
+object SuCallbackHandler {
 
     const val REQUEST = "request"
     const val LOG = "log"
     const val NOTIFY = "notify"
     const val TEST = "test"
 
-    override fun call(context: Context, method: String, arg: String?, extras: Bundle?): Bundle? {
-        invoke(context.wrap(), method, extras)
-        return Bundle.EMPTY
-    }
-
     operator fun invoke(context: Context, action: String?, data: Bundle?) {
         data ?: return
 
@@ -111,9 +103,8 @@ object SuCallbackHandler : ProviderCallHandler {
             command = command
         )
 
-        val logRepo = get<LogRepository>()
         GlobalScope.launch {
-            logRepo.insert(log)
+            ServiceLocator.logRepo.insert(log)
         }
     }
 

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

@@ -36,7 +36,7 @@ class SuRequestHandler(
         if (policy.packageName == BuildConfig.APPLICATION_ID)
             return false
 
-        when (Config.suAutoReponse) {
+        when (Config.suAutoResponse) {
             Config.Value.SU_AUTO_DENY -> {
                 respond(SuPolicy.DENY, 0)
                 return false

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

@@ -1,19 +1,16 @@
 package com.topjohnwu.magisk.core.tasks
 
-import android.content.Context
 import android.net.Uri
-import androidx.core.os.postDelayed
+import androidx.core.net.toFile
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.displayName
-import com.topjohnwu.magisk.core.utils.unzip
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
+import com.topjohnwu.magisk.core.utils.unzip
+import com.topjohnwu.magisk.di.AppContext
 import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.superuser.Shell
-import com.topjohnwu.superuser.internal.UiThreadHandler
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.koin.core.KoinComponent
-import org.koin.core.inject
 import timber.log.Timber
 import java.io.File
 import java.io.FileNotFoundException
@@ -23,63 +20,51 @@ open class FlashZip(
     private val mUri: Uri,
     private val console: MutableList<String>,
     private val logs: MutableList<String>
-): KoinComponent {
+) {
 
-    val context: Context by inject()
+    private val installDir = File(AppContext.cacheDir, "flash")
-    private val installFolder = File(context.cacheDir, "flash").apply {
+    private lateinit var zipFile: File
-        if (!exists()) mkdirs()
-    }
-    private val tmpFile: File = File(installFolder, "install.zip")
-
-    @Throws(IOException::class)
-    private fun unzipAndCheck(): Boolean {
-        val parentFile = tmpFile.parentFile ?: return false
-        tmpFile.unzip(parentFile, "META-INF/com/google/android", true)
-
-        val updaterScript = File(parentFile, "updater-script")
-        return Shell
-            .su("grep -q '#MAGISK' $updaterScript")
-            .exec()
-            .isSuccess
-    }
 
     @Throws(IOException::class)
     private fun flash(): Boolean {
-        console.add("- Copying zip to temp directory")
+        installDir.deleteRecursively()
+        installDir.mkdirs()
 
-        runCatching {
+        zipFile = if (mUri.scheme == "file") {
-            mUri.inputStream().writeTo(tmpFile)
+            mUri.toFile()
-        }.getOrElse {
+        } else {
-            when (it) {
+            File(installDir, "install.zip").also {
-                is FileNotFoundException -> console.add("! Invalid Uri")
+                console.add("- Copying zip to temp directory")
-                is IOException -> console.add("! Cannot copy to cache")
+                try {
+                    mUri.inputStream().writeTo(it)
+                } catch (e: IOException) {
+                    when (e) {
+                        is FileNotFoundException -> console.add("! Invalid Uri")
+                        else -> console.add("! Cannot copy to cache")
+                    }
+                    throw e
+                }
             }
-            throw it
         }
 
-        val isMagiskModule = runCatching {
+        val isValid = runCatching {
-            unzipAndCheck()
+            zipFile.unzip(installDir, "META-INF/com/google/android", true)
+            val script = File(installDir, "updater-script")
+            script.readText().contains("#MAGISK")
         }.getOrElse {
             console.add("! Unzip error")
             throw it
         }
 
-        if (!isMagiskModule) {
+        if (!isValid) {
-            console.add("! This zip is not a Magisk Module!")
+            console.add("! This zip is not a Magisk module!")
             return false
         }
 
         console.add("- Installing ${mUri.displayName}")
 
-        val parentFile = tmpFile.parent ?: return false
+        return Shell.su("sh $installDir/update-binary dummy 1 \'$zipFile\'")
-
+            .to(console, logs).exec().isSuccess
-        return Shell
-            .su(
-                "cd $parentFile",
-                "BOOTMODE=true sh update-binary dummy 1 $tmpFile"
-            )
-            .to(console, logs)
-            .exec().isSuccess
     }
 
     open suspend fun exec() = withContext(Dispatchers.IO) {
@@ -94,25 +79,7 @@ open class FlashZip(
             Timber.e(e)
             false
         } finally {
-            Shell.su("cd /", "rm -rf ${tmpFile.parent} ${Const.TMP_FOLDER_PATH}").submit()
+            Shell.su("cd /", "rm -rf $installDir ${Const.TMPDIR}").submit()
         }
     }
-
-    class Uninstall(
-        uri: Uri,
-        console: MutableList<String>,
-        log: MutableList<String>
-    ) : FlashZip(uri, console, log) {
-
-        override suspend fun exec(): Boolean {
-            val success = super.exec()
-            if (success) {
-                UiThreadHandler.handler.postDelayed(3000) {
-                    Shell.su("pm uninstall " + context.packageName).exec()
-                }
-            }
-            return success
-        }
-    }
-
 }

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

@@ -0,0 +1,167 @@
+package com.topjohnwu.magisk.core.tasks
+
+import android.app.Activity
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.widget.Toast
+import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID
+import com.topjohnwu.magisk.DynAPK
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.Provider
+import com.topjohnwu.magisk.core.utils.AXML
+import com.topjohnwu.magisk.core.utils.Keygen
+import com.topjohnwu.magisk.di.ServiceLocator
+import com.topjohnwu.magisk.ktx.writeTo
+import com.topjohnwu.magisk.utils.APKInstall
+import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.signing.JarMap
+import com.topjohnwu.signing.SignApk
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import java.lang.ref.WeakReference
+import java.security.SecureRandom
+
+object HideAPK {
+
+    private const val ALPHA = "abcdefghijklmnopqrstuvwxyz"
+    private const val ALPHADOTS = "$ALPHA....."
+    private const val APP_NAME = "Magisk"
+    private const val ANDROID_MANIFEST = "AndroidManifest.xml"
+
+    // Some arbitrary limit
+    const val MAX_LABEL_LENGTH = 32
+
+    private val svc get() = ServiceLocator.networkService
+    private val Context.APK_URI get() = Provider.APK_URI(packageName)
+    private val Context.PREFS_URI get() = Provider.PREFS_URI(packageName)
+
+    private fun genPackageName(): String {
+        val random = SecureRandom()
+        val len = 5 + random.nextInt(15)
+        val builder = StringBuilder(len)
+        var next: Char
+        var prev = 0.toChar()
+        for (i in 0 until len) {
+            next = if (prev == '.' || i == 0 || i == len - 1) {
+                ALPHA[random.nextInt(ALPHA.length)]
+            } else {
+                ALPHADOTS[random.nextInt(ALPHADOTS.length)]
+            }
+            builder.append(next)
+            prev = next
+        }
+        if (!builder.contains('.')) {
+            // Pick a random index and set it as dot
+            val idx = random.nextInt(len - 2)
+            builder[idx + 1] = '.'
+        }
+        return builder.toString()
+    }
+
+    fun patch(
+        context: Context,
+        apk: File, out: File,
+        pkg: String, label: CharSequence
+    ): Boolean {
+        try {
+            val jar = JarMap.open(apk, true)
+            val je = jar.getJarEntry(ANDROID_MANIFEST)
+            val xml = AXML(jar.getRawData(je))
+
+            if (!xml.findAndPatch(APPLICATION_ID to pkg, APP_NAME to label.toString()))
+                return false
+
+            // Write apk changes
+            jar.getOutputStream(je).write(xml.bytes)
+            val keys = Keygen(context)
+            SignApk.sign(keys.cert, keys.key, jar, FileOutputStream(out))
+        } catch (e: Exception) {
+            Timber.e(e)
+            return false
+        }
+
+        return true
+    }
+
+    private class WaitPackageReceiver(
+        private val pkg: String,
+        activity: Activity
+    ) : BroadcastReceiver() {
+
+        private val activity = WeakReference(activity)
+
+        private fun launchApp(): Unit = activity.get()?.run {
+            val intent = packageManager.getLaunchIntentForPackage(pkg) ?: return
+            Config.suManager = if (pkg == APPLICATION_ID) "" else pkg
+            grantUriPermission(pkg, APK_URI, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            grantUriPermission(pkg, PREFS_URI, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            intent.putExtra(Const.Key.PREV_PKG, packageName)
+            startActivity(intent)
+            finish()
+        } ?: Unit
+
+        override fun onReceive(context: Context, intent: Intent) {
+            when (intent.action ?: return) {
+                Intent.ACTION_PACKAGE_REPLACED, Intent.ACTION_PACKAGE_ADDED -> {
+                    val newPkg = intent.data?.encodedSchemeSpecificPart.orEmpty()
+                    if (newPkg == pkg) {
+                        context.unregisterReceiver(this)
+                        launchApp()
+                    }
+                }
+            }
+        }
+
+    }
+
+    private suspend fun patchAndHide(activity: Activity, label: String): Boolean {
+        val stub = File(activity.cacheDir, "stub.apk")
+        try {
+            svc.fetchFile(Info.remote.stub.link).byteStream().writeTo(stub)
+        } catch (e: IOException) {
+            Timber.e(e)
+            return false
+        }
+
+        // Generate a new random package name and signature
+        val repack = File(activity.cacheDir, "patched.apk")
+        val pkg = genPackageName()
+        Config.keyStoreRaw = ""
+
+        if (!patch(activity, stub, repack, pkg, label))
+            return false
+
+        // Install and auto launch app
+        APKInstall.registerInstallReceiver(activity, WaitPackageReceiver(pkg, activity))
+        if (!Shell.su("adb_pm_install $repack").exec().isSuccess)
+            APKInstall.installHideResult(activity, repack)
+        return true
+    }
+
+    suspend fun hide(activity: Activity, label: String) {
+        val result = withContext(Dispatchers.IO) {
+            patchAndHide(activity, label)
+        }
+        if (!result) {
+            Utils.toast(R.string.failure, Toast.LENGTH_LONG)
+        }
+    }
+
+    fun restore(activity: Activity) {
+        val apk = DynAPK.current(activity)
+        APKInstall.registerInstallReceiver(activity, WaitPackageReceiver(APPLICATION_ID, activity))
+        Shell.su("adb_pm_install $apk").submit {
+            if (!it.isSuccess)
+                APKInstall.installHideResult(activity, apk)
+        }
+    }
+}

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

@@ -1,23 +1,21 @@
 package com.topjohnwu.magisk.core.tasks
 
-import android.content.Context
-import android.content.Intent
 import android.net.Uri
-import android.os.Build
+import android.system.Os
 import android.widget.Toast
 import androidx.annotation.WorkerThread
 import androidx.core.os.postDelayed
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.*
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
-import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.di.ServiceLocator
-import com.topjohnwu.magisk.di.Protected
-import com.topjohnwu.magisk.events.dialog.EnvFixDialog
 import com.topjohnwu.magisk.ktx.reboot
 import com.topjohnwu.magisk.ktx.withStreams
+import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.signing.SignBoot
 import com.topjohnwu.superuser.Shell
@@ -34,161 +32,170 @@ import org.kamranzafar.jtar.TarEntry
 import org.kamranzafar.jtar.TarHeader
 import org.kamranzafar.jtar.TarInputStream
 import org.kamranzafar.jtar.TarOutputStream
-import org.koin.core.KoinComponent
-import org.koin.core.get
-import org.koin.core.inject
 import timber.log.Timber
 import java.io.*
 import java.nio.ByteBuffer
-import java.util.zip.ZipEntry
+import java.security.SecureRandom
-import java.util.zip.ZipInputStream
+import java.util.*
+import java.util.zip.ZipFile
 
-abstract class MagiskInstallImpl : KoinComponent {
+abstract class MagiskInstallImpl protected constructor(
+    protected val console: MutableList<String> = NOPList.getInstance(),
+    private val logs: MutableList<String> = NOPList.getInstance()
+) {
 
-    protected lateinit var installDir: File
+    protected var installDir = File("xxx")
-    private lateinit var srcBoot: String
+    private lateinit var srcBoot: File
-    private lateinit var zipUri: Uri
 
-    protected val console: MutableList<String>
+    private val shell = Shell.getShell()
-    private val logs: MutableList<String>
+    private val service get() = ServiceLocator.networkService
-    private var tarOut: TarOutputStream? = null
+    protected val context get() = ServiceLocator.deContext
-
+    private val useRootDir = shell.isRoot && Info.noDataExec
-    private val service: NetworkService by inject()
-    protected val context: Context by inject()
-
-    protected constructor() {
-        console = NOPList.getInstance()
-        logs = NOPList.getInstance()
-    }
-
-    protected constructor(zip: Uri, out: MutableList<String>, err: MutableList<String>) {
-        console = out
-        logs = err
-        zipUri = zip
-        installDir = File(get<Context>(Protected).filesDir.parent, "install")
-        "rm -rf $installDir".sh()
-        installDir.mkdirs()
-    }
 
     private fun findImage(): Boolean {
-        srcBoot = "find_boot_image; echo \"\$BOOTIMAGE\"".fsh()
+        val bootPath = "find_boot_image; echo \"\$BOOTIMAGE\"".fsh()
-        if (srcBoot.isEmpty()) {
+        if (bootPath.isEmpty()) {
             console.add("! Unable to detect target image")
             return false
         }
-        console.add("- Target image: $srcBoot")
+        srcBoot = SuFile(bootPath)
+        console.add("- Target image: $bootPath")
         return true
     }
 
-    private fun findSecondaryImage(): Boolean {
+    private fun findSecondary(): Boolean {
         val slot = "echo \$SLOT".fsh()
         val target = if (slot == "_a") "_b" else "_a"
         console.add("- Target slot: $target")
-        srcBoot = arrayOf(
+        val bootPath = arrayOf(
             "SLOT=$target",
             "find_boot_image",
             "SLOT=$slot",
             "echo \"\$BOOTIMAGE\"").fsh()
-        if (srcBoot.isEmpty()) {
+        if (bootPath.isEmpty()) {
             console.add("! Unable to detect target image")
             return false
         }
-        console.add("- Target image: $srcBoot")
+        srcBoot = SuFile(bootPath)
+        console.add("- Target image: $bootPath")
         return true
     }
 
-    @Suppress("DEPRECATION")
+    private fun extractFiles(): Boolean {
-    private fun extractZip(): Boolean {
+        console.add("- Device platform: ${Const.CPU_ABI}")
-        val arch = if (Build.VERSION.SDK_INT >= 21) {
+        console.add("- Installing: ${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
-            val abis = listOf(*Build.SUPPORTED_ABIS)
-            if (abis.contains("x86")) "x86" else "arm"
-        } else {
-            if (Build.CPU_ABI == "x86") "x86" else "arm"
-        }
 
-        console.add("- Device platform: " + Build.CPU_ABI)
+        installDir = File(context.filesDir.parent, "install")
+        installDir.deleteRecursively()
+        installDir.mkdirs()
 
         try {
-            ZipInputStream(zipUri.inputStream().buffered()).use { zi ->
+            // Extract binaries
-                lateinit var ze: ZipEntry
+            if (isRunningAsStub) {
-                while (zi.nextEntry?.let { ze = it } != null) {
+                val zf = ZipFile(DynAPK.current(context))
-                    if (ze.isDirectory)
+                zf.entries().asSequence().filter {
-                        continue
+                    !it.isDirectory && it.name.startsWith("lib/${Const.CPU_ABI_32}/")
-                    var name: String? = null
+                }.forEach {
-                    val names = arrayOf("$arch/", "common/", "META-INF/com/google/android/update-binary")
+                    val n = it.name.substring(it.name.lastIndexOf('/') + 1)
-                    for (n in names) {
+                    val name = n.substring(3, n.length - 3)
-                        ze.name.run {
+                    val dest = File(installDir, name)
-                            if (startsWith(n)) {
+                    zf.getInputStream(it).writeTo(dest)
-                                name = substring(lastIndexOf('/') + 1)
+                }
-                            }
+            } else {
-                        }
+                val libs = Const.NATIVE_LIB_DIR.listFiles { _, name ->
-                        name ?: continue
+                    name.startsWith("lib") && name.endsWith(".so")
-                        break
+                } ?: emptyArray()
-                    }
+                for (lib in libs) {
-                    if (name == null && ze.name.startsWith("chromeos/"))
+                    val name = lib.name.substring(3, lib.name.length - 3)
-                        name = ze.name
+                    Os.symlink(lib.path, "$installDir/$name")
-                    name?.also {
-                        val dest = if (installDir is SuFile)
-                            SuFile(installDir, it)
-                        else
-                            File(installDir, it)
-                        dest.parentFile!!.mkdirs()
-                        SuFileOutputStream(dest).use { s -> zi.copyTo(s) }
-                    } ?: continue
                 }
             }
-        } catch (e: IOException) {
+
-            console.add("! Cannot unzip zip")
+            // Extract scripts
+            for (script in listOf("util_functions.sh", "boot_patch.sh", "addon.d.sh")) {
+                val dest = File(installDir, script)
+                context.assets.open(script).writeTo(dest)
+            }
+            // Extract chromeos tools
+            File(installDir, "chromeos").mkdir()
+            for (file in listOf("futility", "kernel_data_key.vbprivk", "kernel.keyblock")) {
+                val name = "chromeos/$file"
+                val dest = File(installDir, name)
+                context.assets.open(name).writeTo(dest)
+            }
+        } catch (e: Exception) {
+            console.add("! Unable to extract files")
             Timber.e(e)
             return false
         }
 
-        val init64 = SuFile.open(installDir, "magiskinit64")
+        if (useRootDir) {
-        if (Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_64_BIT_ABIS.isNotEmpty()) {
+            // Move everything to tmpfs to workaround Samsung bullshit
-            init64.renameTo(SuFile.open(installDir, "magiskinit"))
+            SuFile(Const.TMPDIR).also {
-        } else {
+                arrayOf(
-            init64.delete()
+                    "rm -rf $it",
+                    "mkdir -p $it",
+                    "cp_readlink $installDir $it",
+                    "rm -rf $installDir"
+                ).sh()
+                installDir = it
+            }
         }
-        "cd $installDir; chmod 755 *".sh()
+
         return true
     }
 
-    private fun newEntry(name: String, size: Long): TarEntry {
+    // Optimization for SuFile I/O streams to skip an internal trial and error
+    private fun installDirFile(name: String): File {
+        return if (useRootDir)
+            SuFile(installDir, name)
+        else
+            File(installDir, name)
+    }
+
+    private fun InputStream.cleanPump(out: OutputStream) = withStreams(this, out) { src, _ ->
+        src.copyTo(out)
+    }
+
+    private fun newTarEntry(name: String, size: Long): TarEntry {
         console.add("-- Writing: $name")
         return TarEntry(TarHeader.createHeader(name, size, 0, false, 420 /* 0644 */))
     }
 
     @Throws(IOException::class)
-    private fun handleTar(input: InputStream, output: OutputStream): OutputStream {
+    private fun processTar(input: InputStream, output: OutputStream): OutputStream {
         console.add("- Processing tar file")
         val tarOut = TarOutputStream(output)
         TarInputStream(input).use { tarIn ->
             lateinit var entry: TarEntry
 
-            fun decompressedStream() =
+            fun decompressedStream(): InputStream {
-                if (entry.name.contains(".lz4")) LZ4FrameInputStream(tarIn) else tarIn
+                val src = if (entry.name.endsWith(".lz4")) LZ4FrameInputStream(tarIn) else tarIn
+                return object : FilterInputStream(src) {
+                    override fun available() = 0  /* Workaround bug in LZ4FrameInputStream */
+                    override fun close() { /* Never close src stream */ }
+                }
+            }
 
             while (tarIn.nextEntry?.let { entry = it } != null) {
-                if (entry.name.contains("boot.img") ||
+                if (entry.name.startsWith("boot.img") ||
                     (Config.recovery && entry.name.contains("recovery.img"))) {
                     val name = entry.name.replace(".lz4", "")
                     console.add("-- Extracting: $name")
 
-                    val extract = File(installDir, name)
+                    val extract = installDirFile(name)
-                    FileOutputStream(extract).use { decompressedStream().copyTo(it) }
+                    decompressedStream().cleanPump(SuFileOutputStream.open(extract))
                 } else if (entry.name.contains("vbmeta.img")) {
-                    val rawData = ByteArrayOutputStream().let {
+                    val rawData = decompressedStream().readBytes()
-                        decompressedStream().copyTo(it)
-                        it.toByteArray()
-                    }
                     // Valid vbmeta.img should be at least 256 bytes
                     if (rawData.size < 256)
                         continue
 
-                    // Patch flags to AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED
+                    // 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, 2)
+                    ByteBuffer.wrap(rawData).putInt(120, 3)
-                    tarOut.putNextEntry(newEntry("vbmeta.img", rawData.size.toLong()))
+                    tarOut.putNextEntry(newTarEntry("vbmeta.img", rawData.size.toLong()))
                     tarOut.write(rawData)
                 } else {
                     console.add("-- Copying: ${entry.name}")
@@ -196,36 +203,40 @@ abstract class MagiskInstallImpl : KoinComponent {
                     tarIn.copyTo(tarOut, bufferSize = 1024 * 1024)
                 }
             }
-            val boot = SuFile.open(installDir, "boot.img")
+        }
-            val recovery = SuFile.open(installDir, "recovery.img")
+        val boot = installDirFile("boot.img")
-            if (recovery.exists() && boot.exists()) {
+        val recovery = installDirFile("recovery.img")
-                // Install Magisk to recovery
+        if (Config.recovery && recovery.exists() && boot.exists()) {
-                srcBoot = recovery.path
+            // Install to recovery
-                // Repack boot image to prevent restore
+            srcBoot = recovery
-                arrayOf(
+            // Repack boot image to prevent auto restore
-                    "./magiskboot unpack boot.img",
+            arrayOf(
-                    "./magiskboot repack boot.img",
+                "cd $installDir",
-                    "./magiskboot cleanup",
+                "chmod -R 755 .",
-                    "mv new-boot.img boot.img").sh()
+                "./magiskboot unpack boot.img",
-                SuFileInputStream(boot).use {
+                "./magiskboot repack boot.img",
-                    tarOut.putNextEntry(newEntry("boot.img", boot.length()))
+                "cat new-boot.img > boot.img",
-                    it.copyTo(tarOut)
+                "./magiskboot cleanup",
-                }
+                "rm -f new-boot.img",
-                boot.delete()
+                "cd /").sh()
-            } else {
+            SuFileInputStream.open(boot).use {
-                if (!boot.exists()) {
+                tarOut.putNextEntry(newTarEntry("boot.img", boot.length()))
-                    console.add("! No boot image found")
+                it.copyTo(tarOut)
-                    throw IOException()
-                }
-                srcBoot = boot.path
             }
+            boot.delete()
+        } else {
+            if (!boot.exists()) {
+                console.add("! No boot image found")
+                throw IOException()
+            }
+            srcBoot = boot
         }
         return tarOut
     }
 
     private fun handleFile(uri: Uri): Boolean {
         val outStream: OutputStream
-        val outFile: MediaStoreUtils.UriFile
+        var outFile: MediaStoreUtils.UriFile? = null
 
         // Process input file
         try {
@@ -237,37 +248,52 @@ abstract class MagiskInstallImpl : KoinComponent {
                     return false
                 }
                 src.reset()
+
+                val alpha = "abcdefghijklmnopqrstuvwxyz"
+                val alphaNum = "$alpha${alpha.toUpperCase(Locale.ROOT)}0123456789"
+                val random = SecureRandom()
+                val filename = StringBuilder("magisk_patched-${BuildConfig.VERSION_CODE}_").run {
+                    for (i in 1..5) {
+                        append(alphaNum[random.nextInt(alphaNum.length)])
+                    }
+                    toString()
+                }
+
                 outStream = if (magic.contentEquals("ustar".toByteArray())) {
-                    outFile = MediaStoreUtils.getFile("magisk_patched.tar")
+                    // tar file
-                    handleTar(src, outFile.uri.outputStream())
+                    outFile = MediaStoreUtils.getFile("$filename.tar", true)
+                    processTar(src, outFile!!.uri.outputStream())
                 } else {
-                    // Raw image
+                    // raw image
-                    srcBoot = File(installDir, "boot.img").path
+                    srcBoot = installDirFile("boot.img")
                     console.add("- Copying image to cache")
-                    FileOutputStream(srcBoot).use { src.copyTo(it) }
+                    src.cleanPump(SuFileOutputStream.open(srcBoot))
-                    outFile = MediaStoreUtils.getFile("magisk_patched.img")
+                    outFile = MediaStoreUtils.getFile("$filename.img", true)
-                    outFile.uri.outputStream()
+                    outFile!!.uri.outputStream()
                 }
             }
         } catch (e: IOException) {
             console.add("! Process error")
+            outFile?.delete()
             Timber.e(e)
             return false
         }
 
         // Patch file
-        if (!patchBoot())
+        if (!patchBoot()) {
+            outFile!!.delete()
             return false
+        }
 
         // Output file
         try {
-            val patched = SuFile.open(installDir, "new-boot.img")
+            val newBoot = installDirFile("new-boot.img")
             if (outStream is TarOutputStream) {
-                val name = if (srcBoot.contains("recovery")) "recovery.img" else "boot.img"
+                val name = if (srcBoot.path.contains("recovery")) "recovery.img" else "boot.img"
-                outStream.putNextEntry(newEntry(name, patched.length()))
+                outStream.putNextEntry(newTarEntry(name, newBoot.length()))
             }
-            withStreams(SuFileInputStream(patched), outStream) { src, out -> src.copyTo(out) }
+            SuFileInputStream.open(newBoot).cleanPump(outStream)
-            patched.delete()
+            newBoot.delete()
 
             console.add("")
             console.add("****************************")
@@ -276,126 +302,138 @@ abstract class MagiskInstallImpl : KoinComponent {
             console.add("****************************")
         } catch (e: IOException) {
             console.add("! Failed to output to $outFile")
+            outFile!!.delete()
             Timber.e(e)
             return false
         }
 
+        // Fix up binaries
+        srcBoot.delete()
+        if (shell.isRoot) {
+            "fix_env $installDir".sh()
+        } else {
+            "cp_readlink $installDir".sh()
+        }
+
         return true
     }
 
     private fun patchBoot(): Boolean {
-        var srcNand = ""
-        if ("[ -c $srcBoot ] && nanddump -f boot.img $srcBoot".sh().isSuccess) {
-            srcNand = srcBoot
-            srcBoot = File(installDir, "boot.img").path
-        }
-
         var isSigned = false
-        try {
+        if (srcBoot.let { it !is SuFile || !it.isCharacter }) {
-            SuFileInputStream(srcBoot).use {
+            try {
-                isSigned = SignBoot.verifySignature(it, null)
+                SuFileInputStream.open(srcBoot).use {
-                if (isSigned) {
+                    if (SignBoot.verifySignature(it, null)) {
-                    console.add("- Boot image is signed with AVB 1.0")
+                        isSigned = true
+                        console.add("- Boot image is signed with AVB 1.0")
+                    }
                 }
+            } catch (e: IOException) {
+                console.add("! Unable to check signature")
+                Timber.e(e)
+                return false
             }
-        } catch (e: IOException) {
+        }
-            console.add("! Unable to check signature")
+
+        val newBoot = installDirFile("new-boot.img")
+        if (!useRootDir) {
+            // Create output files before hand
+            newBoot.createNewFile()
+            File(installDir, "stock_boot.img").createNewFile()
+        }
+
+        val cmds = arrayOf(
+            "cd $installDir",
+            "KEEPFORCEENCRYPT=${Config.keepEnc} " +
+            "KEEPVERITY=${Config.keepVerity} " +
+            "RECOVERYMODE=${Config.recovery} " +
+            "sh boot_patch.sh $srcBoot")
+
+        if (!cmds.sh().isSuccess)
             return false
-        }
 
-        if (!("KEEPFORCEENCRYPT=${Config.keepEnc} KEEPVERITY=${Config.keepVerity} " +
+        val job = shell.newJob().add("./magiskboot cleanup", "cd /")
-                "RECOVERYMODE=${Config.recovery} sh update-binary " +
-                "sh boot_patch.sh $srcBoot").sh().isSuccess) {
-            return false
-        }
 
-        if (srcNand.isNotEmpty()) {
-            srcBoot = srcNand
-        }
-
-        val job = Shell.sh(
-            "./magiskboot cleanup",
-            "mv bin/busybox busybox",
-            "rm -rf magisk.apk bin boot.img update-binary",
-            "cd /")
-
-        val patched = File(installDir, "new-boot.img")
         if (isSigned) {
             console.add("- Signing boot image with verity keys")
-            val signed = File(installDir, "signed.img")
+            val signed = File.createTempFile("signed", ".img", context.cacheDir)
             try {
-                withStreams(SuFileInputStream(patched), signed.outputStream().buffered()) {
+                val src = SuFileInputStream.open(newBoot).buffered()
-                    input, out -> SignBoot.doSignature("/boot", input, out, null, null)
+                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.add("mv -f $signed $patched")
         }
         job.exec()
         return true
     }
 
-    private fun flashBoot(): Boolean {
+    private fun flashBoot() = "direct_install $installDir $srcBoot".sh().isSuccess
-        if (!"direct_install $installDir $srcBoot".sh().isSuccess)
-            return false
-        "run_migrations".sh()
-        return true
-    }
 
     private suspend fun postOTA(): Boolean {
-        val bootctl = SuFile("/data/adb/bootctl")
         try {
-            withStreams(service.fetchBootctl().byteStream(), SuFileOutputStream(bootctl)) {
+            val bootctl = File.createTempFile("bootctl", null, context.cacheDir)
-                it, out -> it.copyTo(out)
+            service.fetchBootctl().byteStream().writeTo(bootctl)
-            }
+            "post_ota $bootctl".sh()
         } catch (e: IOException) {
             console.add("! Unable to download bootctl")
             Timber.e(e)
             return false
         }
 
-        "post_ota ${bootctl.parent}".sh()
-
         console.add("***************************************")
         console.add(" Next reboot will boot to second slot!")
         console.add("***************************************")
         return true
     }
 
-    private fun String.sh() = Shell.sh(this).to(console, logs).exec()
+    private fun String.sh() = shell.newJob().add(this).to(console, logs).exec()
-    private fun Array<String>.sh() = Shell.sh(*this).to(console, logs).exec()
+    private fun Array<String>.sh() = shell.newJob().add(*this).to(console, logs).exec()
-    private fun String.fsh() = ShellUtils.fastCmd(this)
+    private fun String.fsh() = ShellUtils.fastCmd(shell, this)
-    private fun Array<String>.fsh() = ShellUtils.fastCmd(*this)
+    private fun Array<String>.fsh() = ShellUtils.fastCmd(shell, *this)
 
-    protected fun doPatchFile(patchFile: Uri) = extractZip() && handleFile(patchFile)
+    protected fun doPatchFile(patchFile: Uri) = extractFiles() && handleFile(patchFile)
 
-    protected fun direct() = findImage() && extractZip() && patchBoot() && flashBoot()
+    protected fun direct() = findImage() && extractFiles() && patchBoot() && flashBoot()
 
     protected suspend fun secondSlot() =
-        findSecondaryImage() && extractZip() && patchBoot() && flashBoot() && postOTA()
+        findSecondary() && extractFiles() && patchBoot() && flashBoot() && postOTA()
 
-    protected fun fixEnv(zip: Uri): Boolean {
+    protected fun fixEnv() = extractFiles() && "fix_env $installDir".sh().isSuccess
-        installDir = SuFile("/data/adb/magisk")
+
-        Shell.su("rm -rf /data/adb/magisk/*").exec()
+    protected fun uninstall() = "run_uninstaller ${AssetHack.apk}".sh().isSuccess
-        zipUri = zip
-        return extractZip() && Shell.su("fix_env").exec().isSuccess
-    }
 
     @WorkerThread
     protected abstract suspend fun operations(): Boolean
 
-    open suspend fun exec() = withContext(Dispatchers.IO) { operations() }
+    open suspend fun exec(): Boolean {
+        synchronized(Companion) {
+            if (haveActiveSession)
+                return false
+            haveActiveSession = true
+        }
+        val result = withContext(Dispatchers.IO) { operations() }
+        synchronized(Companion) {
+            haveActiveSession = false
+        }
+        return result
+    }
+
+    companion object {
+        private var haveActiveSession = false
+    }
 }
 
-sealed class MagiskInstaller(
+abstract class MagiskInstaller(
-    file: Uri,
     console: MutableList<String>,
     logs: MutableList<String>
-) : MagiskInstallImpl(file, console, logs) {
+) : MagiskInstallImpl(console, logs) {
 
     override suspend fun exec(): Boolean {
         val success = super.exec()
@@ -409,46 +447,64 @@ sealed class MagiskInstaller(
     }
 
     class Patch(
-        file: Uri,
         private val uri: Uri,
         console: MutableList<String>,
         logs: MutableList<String>
-    ) : MagiskInstaller(file, console, logs) {
+    ) : MagiskInstaller(console, logs) {
         override suspend fun operations() = doPatchFile(uri)
     }
 
     class SecondSlot(
-        file: Uri,
         console: MutableList<String>,
         logs: MutableList<String>
-    ) : MagiskInstaller(file, console, logs) {
+    ) : MagiskInstaller(console, logs) {
         override suspend fun operations() = secondSlot()
     }
 
     class Direct(
-        file: Uri,
         console: MutableList<String>,
         logs: MutableList<String>
-    ) : MagiskInstaller(file, console, logs) {
+    ) : MagiskInstaller(console, logs) {
         override suspend fun operations() = direct()
     }
 
-}
+    class Emulator(
+        console: MutableList<String>,
+        logs: MutableList<String>
+    ) : MagiskInstaller(console, logs) {
+        override suspend fun operations() = fixEnv()
+    }
 
-class EnvFixTask(
+    class Uninstall(
-    private val zip: Uri
+        console: MutableList<String>,
-) : MagiskInstallImpl() {
+        logs: MutableList<String>
-    override suspend fun operations() = fixEnv(zip)
+    ) : MagiskInstallImpl(console, logs) {
+        override suspend fun operations() = uninstall()
 
-    override suspend fun exec(): Boolean {
+        override suspend fun exec(): Boolean {
-        val success = super.exec()
+            val success = super.exec()
-        LocalBroadcastManager.getInstance(context).sendBroadcast(Intent(EnvFixDialog.DISMISS))
+            if (success) {
-        Utils.toast(
+                UiThreadHandler.handler.postDelayed(3000) {
-            if (success) R.string.reboot_delay_toast else R.string.setup_fail,
+                    Shell.su("pm uninstall ${context.packageName}").exec()
-            Toast.LENGTH_LONG
+                }
-        )
+            }
-        if (success)
+            return success
-            UiThreadHandler.handler.postDelayed(5000) { reboot() }
+        }
-        return success
+    }
+
+    class FixEnv(private val callback: () -> Unit) : MagiskInstallImpl() {
+        override suspend fun operations() = fixEnv()
+
+        override suspend fun exec(): Boolean {
+            val success = super.exec()
+            callback()
+            Utils.toast(
+                if (success) R.string.reboot_delay_toast else R.string.setup_fail,
+                Toast.LENGTH_LONG
+            )
+            if (success)
+                UiThreadHandler.handler.postDelayed(5000) { reboot() }
+            return success
+        }
     }
 }

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

@@ -1,139 +0,0 @@
-package com.topjohnwu.magisk.core.tasks
-
-import android.content.Context
-import android.os.Build.VERSION.SDK_INT
-import android.widget.Toast
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.Const
-import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.isRunningAsStub
-import com.topjohnwu.magisk.core.utils.AXML
-import com.topjohnwu.magisk.core.utils.Keygen
-import com.topjohnwu.magisk.data.repository.NetworkService
-import com.topjohnwu.magisk.ktx.get
-import com.topjohnwu.magisk.ktx.writeTo
-import com.topjohnwu.magisk.utils.Utils
-import com.topjohnwu.magisk.view.Notifications
-import com.topjohnwu.signing.JarMap
-import com.topjohnwu.signing.SignApk
-import com.topjohnwu.superuser.Shell
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.io.File
-import java.io.FileOutputStream
-import java.io.IOException
-import java.security.SecureRandom
-
-object PatchAPK {
-
-    private const val ALPHA = "abcdefghijklmnopqrstuvwxyz"
-    private const val ALPHADOTS = "$ALPHA....."
-
-    private const val APP_ID = "com.topjohnwu.magisk"
-    private const val APP_NAME = "Magisk Manager"
-
-    // Some arbitrary limit
-    const val MAX_LABEL_LENGTH = 32
-
-    private fun genPackageName(): CharSequence {
-        val random = SecureRandom()
-        val len = 5 + random.nextInt(15)
-        val builder = StringBuilder(len)
-        var next: Char
-        var prev = 0.toChar()
-        for (i in 0 until len) {
-            next = if (prev == '.' || i == len - 1) {
-                ALPHA[random.nextInt(ALPHA.length)]
-            } else {
-                ALPHADOTS[random.nextInt(ALPHADOTS.length)]
-            }
-            builder.append(next)
-            prev = next
-        }
-        if (!builder.contains('.')) {
-            // Pick a random index and set it as dot
-            val idx = random.nextInt(len - 1)
-            builder[idx] = '.'
-        }
-        return builder
-    }
-
-    fun patch(
-        context: Context,
-        apk: String, out: String,
-        pkg: CharSequence, label: CharSequence
-    ): Boolean {
-        try {
-            val jar = JarMap.open(apk)
-            val je = jar.getJarEntry(Const.ANDROID_MANIFEST)
-            val xml = AXML(jar.getRawData(je))
-
-            if (!xml.findAndPatch(APP_ID to pkg.toString(), APP_NAME to label.toString()))
-                return false
-
-            // Write apk changes
-            jar.getOutputStream(je).write(xml.bytes)
-            val keys = Keygen(context)
-            SignApk.sign(keys.cert, keys.key, jar, FileOutputStream(out))
-        } catch (e: Exception) {
-            Timber.e(e)
-            return false
-        }
-
-        return true
-    }
-
-    private suspend fun patchAndHide(context: Context, label: String): Boolean {
-        val dlStub = !isRunningAsStub && SDK_INT >= 28 && Const.Version.atLeast_20_2()
-        val src = if (dlStub) {
-            val stub = File(context.cacheDir, "stub.apk")
-            val svc = get<NetworkService>()
-            try {
-                svc.fetchFile(Info.remote.stub.link).byteStream().use {
-                    it.writeTo(stub)
-                }
-            } catch (e: IOException) {
-                Timber.e(e)
-                return false
-            }
-            stub.path
-        } else {
-            context.packageCodePath
-        }
-
-        // Generate a new random package name and signature
-        val repack = File(context.cacheDir, "patched.apk")
-        val pkg = genPackageName()
-        Config.keyStoreRaw = ""
-
-        if (!patch(context, src, repack.path, pkg, label))
-            return false
-
-        // Install the application
-        if (!Shell.su("adb_pm_install $repack").exec().isSuccess)
-            return false
-
-        Config.suManager = pkg.toString()
-        Config.export()
-        Shell.su("pm uninstall $APP_ID").submit()
-
-        return true
-    }
-
-    fun hideManager(context: Context, label: String) {
-        val progress = Notifications.progress(context, context.getString(R.string.hide_manager_title))
-        Notifications.mgr.notify(Const.ID.HIDE_MANAGER_NOTIFICATION_ID, progress.build())
-        GlobalScope.launch {
-            val result = withContext(Dispatchers.IO) {
-                patchAndHide(context, label)
-            }
-            if (!result)
-                Utils.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG)
-            Notifications.mgr.cancel(Const.ID.HIDE_MANAGER_NOTIFICATION_ID)
-        }
-    }
-}

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

@@ -1,119 +1,42 @@
 package com.topjohnwu.magisk.core.tasks
 
-import com.squareup.moshi.JsonClass
+import com.topjohnwu.magisk.core.model.module.OnlineModule
-import com.topjohnwu.magisk.core.Const
-import com.topjohnwu.magisk.core.model.module.Repo
 import com.topjohnwu.magisk.data.database.RepoDao
 import com.topjohnwu.magisk.data.repository.NetworkService
 import com.topjohnwu.magisk.ktx.synchronized
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
-import java.net.HttpURLConnection
-import java.text.SimpleDateFormat
 import java.util.*
-import kotlin.collections.HashSet
 
 class RepoUpdater(
     private val svc: NetworkService,
     private val repoDB: RepoDao
 ) {
 
-    private fun String.trimEtag() = substring(indexOf('\"'), lastIndexOf('\"') + 1)
-
-    private suspend fun forcedReload(cached: MutableSet<String>) = coroutineScope {
-        cached.forEach {
-            launch {
-                val repo = repoDB.getRepo(it)!!
-                try {
-                    repo.update()
-                    repoDB.addRepo(repo)
-                } catch (e: Repo.IllegalRepoException) {
-                    Timber.e(e)
-                }
-            }
-        }
-    }
-
-    private suspend fun loadRepos(
-        repos: List<GithubRepoInfo>,
-        cached: MutableSet<String>
-    ) = coroutineScope {
-        repos.forEach {
-            // Skip submission
-            if (it.id == "submission")
-                return@forEach
-            launch {
-                val repo = repoDB.getRepo(it.id)?.apply { cached.remove(it.id) } ?: Repo(it.id)
-                try {
-                    repo.update(it.pushDate)
-                    repoDB.addRepo(repo)
-                } catch (e: Repo.IllegalRepoException) {
-                    Timber.e(e)
-                }
-            }
-        }
-    }
-
-    private enum class PageResult {
-        SUCCESS,
-        CACHED,
-        ERROR
-    }
-
-    private suspend fun loadPage(
-        cached: MutableSet<String>,
-        page: Int = 1,
-        etag: String = ""
-    ): PageResult = coroutineScope {
-        runCatching {
-            val result = svc.fetchRepos(page, etag)
-            result.run {
-                if (code() == HttpURLConnection.HTTP_NOT_MODIFIED)
-                    return@coroutineScope PageResult.CACHED
-
-                if (!isSuccessful)
-                    return@coroutineScope PageResult.ERROR
-
-                if (page == 1)
-                    repoDB.etagKey = headers()[Const.Key.ETAG_KEY].orEmpty().trimEtag()
-
-                val repoLoad = async { loadRepos(body()!!, cached) }
-                val next = if (headers()[Const.Key.LINK_KEY].orEmpty().contains("next")) {
-                    async { loadPage(cached, page + 1) }
-                } else {
-                    async { PageResult.SUCCESS }
-                }
-                repoLoad.await()
-                return@coroutineScope next.await()
-            }
-        }.getOrElse {
-            Timber.e(it)
-            PageResult.ERROR
-        }
-    }
-
     suspend fun run(forced: Boolean) = withContext(Dispatchers.IO) {
-        val cached = HashSet(repoDB.repoIDList).synchronized()
+        val cachedMap = HashMap<String, Date>().also { map ->
-        when (loadPage(cached, etag = repoDB.etagKey)) {
+            repoDB.getModuleStubs().forEach { map[it.id] = Date(it.last_update) }
-            PageResult.CACHED -> if (forced) forcedReload(cached)
+        }.synchronized()
-            PageResult.SUCCESS -> repoDB.removeRepos(cached)
+        svc.fetchRepoInfo()?.let { info ->
-            PageResult.ERROR -> Unit
+            coroutineScope {
+                info.modules.forEach {
+                    launch {
+                        val lastUpdated = cachedMap.remove(it.id)
+                        if (forced || lastUpdated?.before(Date(it.last_update)) != false) {
+                            try {
+                                val repo = OnlineModule(it).apply { load() }
+                                repoDB.addModule(repo)
+                            } catch (e: OnlineModule.IllegalRepoException) {
+                                Timber.e(e)
+                            }
+                        }
+                    }
+                }
+            }
+            repoDB.removeModules(cachedMap.keys)
         }
     }
 }
-
-private val dateFormat: SimpleDateFormat =
-    SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US).apply {
-        timeZone = TimeZone.getTimeZone("UTC")
-    }
-
-@JsonClass(generateAdapter = true)
-data class GithubRepoInfo(
-    val name: String,
-    val pushed_at: String
-) {
-    val id get() = name
-
-    @Transient
-    val pushDate = dateFormat.parse(pushed_at)!!
-}

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

@@ -6,12 +6,11 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Config
-import org.koin.core.KoinComponent
+import com.topjohnwu.magisk.di.AppContext
-import org.koin.core.get
 
-object BiometricHelper: KoinComponent {
+object BiometricHelper {
 
-    private val mgr by lazy { BiometricManager.from(get()) }
+    private val mgr by lazy { BiometricManager.from(AppContext) }
 
     val isSupported get() = when (mgr.canAuthenticate()) {
         BiometricManager.BIOMETRIC_SUCCESS -> true

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

@@ -7,10 +7,12 @@ import android.util.Base64OutputStream
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.signing.CryptoUtils.readCertificate
 import com.topjohnwu.signing.CryptoUtils.readPrivateKey
+import com.topjohnwu.signing.KeyData
 import org.bouncycastle.asn1.x500.X500Name
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter
 import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder
 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder
+import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.math.BigInteger
 import java.security.KeyPairGenerator
@@ -58,10 +60,10 @@ class Keygen(context: Context) : CertKeyProvider {
 
     class TestProvider : CertKeyProvider {
         override val cert by lazy {
-            readCertificate(javaClass.getResourceAsStream("/keys/testkey.x509.pem"))
+            readCertificate(ByteArrayInputStream(KeyData.testCert()))
         }
         override val key by lazy {
-            readPrivateKey(javaClass.getResourceAsStream("/keys/testkey.pk8"))
+            readPrivateKey(ByteArrayInputStream(KeyData.testKey()))
         }
     }
 

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

@@ -3,20 +3,14 @@
 package com.topjohnwu.magisk.core.utils
 
 import android.annotation.SuppressLint
-import android.content.res.AssetManager
 import android.content.res.Configuration
 import android.content.res.Resources
-import android.util.DisplayMetrics
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.AssetHack
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.ResMgr
-import com.topjohnwu.magisk.core.addAssetPath
-import com.topjohnwu.magisk.ktx.langTagToLocale
-import com.topjohnwu.magisk.ktx.toLangTag
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.util.*
-import kotlin.Comparator
 import kotlin.collections.ArrayList
 
 var currentLocale: Locale = Locale.getDefault()
@@ -30,11 +24,8 @@ suspend fun availableLocales() = cachedLocales ?:
 withContext(Dispatchers.Default) {
     val compareId = R.string.app_changelog
 
-    // Create a completely new resource to prevent cross talk over app's configs
+    // Create a completely new resource to prevent cross talk over active configs
-    val asset = AssetManager::class.java.newInstance().apply { addAssetPath(ResMgr.apk) }
+    val res = AssetHack.newResource()
-    val config = Configuration(ResMgr.resource.configuration)
-    val metrics = DisplayMetrics().apply { setTo(ResMgr.resource.displayMetrics) }
-    val res = Resources(asset, metrics, config)
 
     val locales = ArrayList<String>().apply {
         // Add default locale
@@ -45,19 +36,17 @@ withContext(Dispatchers.Default) {
         add("pt-BR")
 
         // Then add all supported locales
-        addAll(res.assets.locales)
+        addAll(Resources.getSystem().assets.locales)
     }.map {
-        it.langTagToLocale()
+        Locale.forLanguageTag(it)
     }.distinctBy {
-        config.setLocale(it)
+        res.updateLocale(it)
-        res.updateConfiguration(config, metrics)
         res.getString(compareId)
-    }.sortedWith(Comparator { a, b ->
+    }.sortedWith { a, b ->
         a.getDisplayName(a).compareTo(b.getDisplayName(b), true)
-    })
+    }
 
-    config.setLocale(defaultLocale)
+    res.updateLocale(defaultLocale)
-    res.updateConfiguration(config, metrics)
     val defName = res.getString(R.string.system_default)
 
     val names = ArrayList<String>(locales.size + 1)
@@ -68,7 +57,7 @@ withContext(Dispatchers.Default) {
 
     locales.forEach { locale ->
         names.add(locale.getDisplayName(locale))
-        values.add(locale.toLangTag())
+        values.add(locale.toLanguageTag())
     }
 
     (names.toTypedArray() to values.toTypedArray()).also { cachedLocales = it }
@@ -79,12 +68,17 @@ fun Resources.updateConfig(config: Configuration = configuration) {
     updateConfiguration(config, displayMetrics)
 }
 
+fun Resources.updateLocale(locale: Locale) {
+    configuration.setLocale(locale)
+    updateConfiguration(configuration, displayMetrics)
+}
+
 fun refreshLocale() {
     val localeConfig = Config.locale
     currentLocale = when {
         localeConfig.isEmpty() -> defaultLocale
-        else -> localeConfig.langTagToLocale()
+        else -> Locale.forLanguageTag(localeConfig)
     }
     Locale.setDefault(currentLocale)
-    ResMgr.resource.updateConfig()
+    AssetHack.resource.updateConfig()
 }

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

@@ -1,10 +1,7 @@
 package com.topjohnwu.magisk.core.utils
 
-import android.annotation.SuppressLint
-import android.content.ContentResolver
 import android.content.ContentUris
 import android.content.ContentValues
-import android.content.Context
 import android.net.Uri
 import android.os.Build
 import android.os.Environment
@@ -14,7 +11,7 @@ import androidx.annotation.RequiresApi
 import androidx.core.net.toFile
 import androidx.core.net.toUri
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.di.AppContext
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
@@ -25,7 +22,7 @@ import kotlin.experimental.and
 @Suppress("DEPRECATION")
 object MediaStoreUtils {
 
-    private val cr: ContentResolver by lazy { get<Context>().contentResolver }
+    private val cr get() = AppContext.contentResolver
 
     @get:RequiresApi(api = 29)
     private val tableUri
@@ -40,15 +37,17 @@ object MediaStoreUtils {
 
     private val relativePath get() = relativePath(Config.downloadDir)
 
-    @RequiresApi(api = 29)
+    @RequiresApi(api = 30)
     @Throws(IOException::class)
     private fun insertFile(displayName: String): MediaStoreFile {
         val values = ContentValues()
         values.put(MediaStore.MediaColumns.RELATIVE_PATH, relativePath)
         values.put(MediaStore.MediaColumns.DISPLAY_NAME, displayName)
 
-        // before Android 11, MediaStore can not rename new file when file exists,
+        // When a file with the same name exists and was not created by us:
-        // insert will return null. use newFile() instead.
+        // - Before Android 11, insert will return null
+        // - On Android 11+, the system will automatically create a new name
+        // Thus the reason to restrict this method call to API 30+
         val fileUri = cr.insert(tableUri, values) ?: throw IOException("Can't insert $displayName.")
 
         val projection = arrayOf(MediaStore.MediaColumns._ID, MediaStore.MediaColumns.DATA)
@@ -65,14 +64,8 @@ object MediaStoreUtils {
         throw IOException("Can't insert $displayName.")
     }
 
+    @RequiresApi(api = 29)
     private fun queryFile(displayName: String): UriFile? {
-        if (Build.VERSION.SDK_INT < 29) {
-            // Before official general purpose MediaStore API exists, fallback to file based I/O
-            val parent = File(Environment.getExternalStorageDirectory(), relativePath)
-            parent.mkdirs()
-            return LegacyUriFile(File(parent, displayName))
-        }
-
         val projection = arrayOf(MediaStore.MediaColumns._ID, MediaStore.MediaColumns.DATA)
         // Before Android 10, we wrote the DISPLAY_NAME field when insert, so it can be used.
         val selection = "${MediaStore.MediaColumns.DISPLAY_NAME} == ?"
@@ -92,11 +85,17 @@ object MediaStoreUtils {
         return null
     }
 
-    @SuppressLint("NewApi")
     @Throws(IOException::class)
-    fun getFile(displayName: String): UriFile {
+    fun getFile(displayName: String, skipQuery: Boolean = false): UriFile {
-        return queryFile(displayName) ?:
+        if (Build.VERSION.SDK_INT < 30) {
-        /* this code path will never happen pre 29 */ insertFile(displayName)
+            // Fallback to file based I/O pre Android 11
+            val parent = File(Environment.getExternalStorageDirectory(), relativePath)
+            parent.mkdirs()
+            return LegacyUriFile(File(parent, displayName))
+        }
+
+        return if (skipQuery) insertFile(displayName)
+        else queryFile(displayName) ?: insertFile(displayName)
     }
 
     fun Uri.inputStream() = cr.openInputStream(this) ?: throw FileNotFoundException()

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

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

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

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

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

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

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

@@ -20,11 +20,10 @@ abstract class NetworkObserver(
 
     companion object {
         fun observe(context: Context, callback: ConnectionCallback): NetworkObserver {
-            return when (Build.VERSION.SDK_INT) {
+            val observer: NetworkObserver = if (Build.VERSION.SDK_INT >= 23)
-                in 23 until Int.MAX_VALUE -> MarshmallowNetworkObserver(context, callback)
+                MarshmallowNetworkObserver(context, callback)
-                in 21 until 23 -> LollipopNetworkObserver(context, callback)
+            else LollipopNetworkObserver(context, callback)
-                else -> PreLollipopNetworkObserver(context, callback)
+            return observer.apply { getCurrentState() }
-            }.apply { getCurrentState() }
         }
     }
 }

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

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

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

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

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

@@ -2,72 +2,89 @@ package com.topjohnwu.magisk.data.database
 
 import androidx.room.*
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.model.module.Repo
+import com.topjohnwu.magisk.core.model.module.OnlineModule
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
-@Database(version = 6, entities = [Repo::class, RepoEtag::class], exportSchema = false)
+@Database(version = 8, entities = [OnlineModule::class], exportSchema = false)
 abstract class RepoDatabase : RoomDatabase() {
-
     abstract fun repoDao() : RepoDao
-    abstract fun repoByUpdatedDao(): RepoByUpdatedDao
-    abstract fun repoByNameDao(): RepoByNameDao
 }
 
 @Dao
 abstract class RepoDao(private val db: RepoDatabase) {
 
-    val repoIDList get() = getRepoID().map { it.id }
-
-    val repos: List<Repo> get() = when (Config.repoOrder) {
-            Config.Value.ORDER_NAME -> getReposNameOrder()
-            else -> getReposDateOrder()
-        }
-
-    var etagKey: String
-        set(value) = addEtagRaw(RepoEtag(0, value))
-        get() = etagRaw()?.key.orEmpty()
-
     suspend fun clear() = withContext(Dispatchers.IO) { db.clearAllTables() }
 
-    @Query("SELECT * FROM repos ORDER BY last_update DESC")
-    protected abstract fun getReposDateOrder(): List<Repo>
-
-    @Query("SELECT * FROM repos ORDER BY name COLLATE NOCASE")
-    protected abstract fun getReposNameOrder(): List<Repo>
-
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    abstract fun addRepo(repo: Repo)
+    abstract fun addModule(repo: OnlineModule)
-
-    @Query("SELECT * FROM repos WHERE id = :id")
-    abstract fun getRepo(id: String): Repo?
-
-    @Query("SELECT id FROM repos")
-    protected abstract fun getRepoID(): List<RepoID>
 
     @Delete
-    abstract fun removeRepo(repo: Repo)
+    abstract fun removeModule(repo: OnlineModule)
 
-    @Query("DELETE FROM repos WHERE id = :id")
+    @Query("DELETE FROM modules WHERE id = :id")
-    abstract fun removeRepo(id: String)
+    abstract fun removeModule(id: String)
 
-    @Query("DELETE FROM repos WHERE id IN (:idList)")
+    @Query("DELETE FROM modules WHERE id IN (:idList)")
-    abstract fun removeRepos(idList: Collection<String>)
+    abstract fun removeModules(idList: Collection<String>)
 
-    @Query("SELECT * FROM etag")
+    @Query("SELECT * FROM modules WHERE id = :id")
-    protected abstract fun etagRaw(): RepoEtag?
+    abstract fun getModule(id: String): OnlineModule?
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Query("SELECT id, last_update FROM modules")
-    protected abstract fun addEtagRaw(etag: RepoEtag)
+    abstract fun getModuleStubs(): List<ModuleStub>
+
+    fun getModules(offset: Int, limit: Int = LIMIT) = when (Config.repoOrder) {
+        Config.Value.ORDER_NAME -> getNameOrder(offset, limit)
+        else -> getDateOrder(offset, limit)
+    }
+
+    fun searchModules(query: String, offset: Int, limit: Int = LIMIT) = when (Config.repoOrder) {
+        Config.Value.ORDER_NAME -> searchNameOrder(query, offset, limit)
+        else -> searchDateOrder(query, offset, limit)
+    }
+
+    @Query("SELECT * FROM modules WHERE id = :id AND versionCode > :versionCode LIMIT 1")
+    abstract fun getUpdatableModule(id: String, versionCode: Int): OnlineModule?
+
+    @Query("SELECT * FROM modules ORDER BY last_update DESC LIMIT :limit OFFSET :offset")
+    protected abstract fun getDateOrder(offset: Int, limit: Int): List<OnlineModule>
+
+    @Query("SELECT * FROM modules ORDER BY name COLLATE NOCASE LIMIT :limit OFFSET :offset")
+    protected abstract fun getNameOrder(offset: Int, limit: Int): List<OnlineModule>
+
+    @Query(
+        """SELECT * 
+        FROM modules
+        WHERE 
+            (author LIKE '%' || :query || '%') ||
+            (name LIKE '%' || :query || '%') ||
+            (description LIKE '%' || :query || '%')
+        ORDER BY last_update DESC
+        LIMIT :limit 
+        OFFSET :offset"""
+    )
+    protected abstract fun searchDateOrder(query: String, offset: Int, limit: Int): List<OnlineModule>
+
+    @Query(
+        """SELECT * 
+        FROM modules
+        WHERE 
+            (author LIKE '%' || :query || '%') ||
+            (name LIKE '%' || :query || '%') ||
+            (description LIKE '%' || :query || '%')
+        ORDER BY name COLLATE NOCASE
+        LIMIT :limit 
+        OFFSET :offset"""
+    )
+    protected abstract fun searchNameOrder(query: String, offset: Int, limit: Int): List<OnlineModule>
+
+    companion object {
+        const val LIMIT = 10
+    }
 }
 
-data class RepoID(
+data class ModuleStub(
-    @PrimaryKey val id: String
+    @PrimaryKey val id: String,
+    val last_update: Long
 )
-
-@Entity(tableName = "etag")
-data class RepoEtag(
-    @PrimaryKey val id: Int,
-    val key: String
-)
-

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

@@ -2,30 +2,23 @@ package com.topjohnwu.magisk.data.network
 
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.model.BranchInfo
+import com.topjohnwu.magisk.core.model.RepoJson
 import com.topjohnwu.magisk.core.model.UpdateInfo
-import com.topjohnwu.magisk.core.tasks.GithubRepoInfo
 import okhttp3.ResponseBody
-import retrofit2.Response
 import retrofit2.http.*
 
 private const val REVISION = "revision"
-private const val MODULE = "module"
-private const val FILE = "file"
-private const val IF_NONE_MATCH = "If-None-Match"
 private const val BRANCH = "branch"
 private const val REPO = "repo"
+private const val FILE = "file"
 
-const val MAGISK_FILES = "topjohnwu/magisk_files"
+const val MAGISK_FILES = "topjohnwu/magisk-files"
 const val MAGISK_MAIN = "topjohnwu/Magisk"
-private const val MAGISK_MODULES = "Magisk-Modules-Repo"
 
 interface GithubPageServices {
 
-    @GET("stable.json")
+    @GET("{$FILE}")
-    suspend fun fetchStableUpdate(): UpdateInfo
+    suspend fun fetchUpdateJSON(@Path(FILE) file: String): UpdateInfo
-
-    @GET("beta.json")
-    suspend fun fetchBetaUpdate(): UpdateInfo
 }
 
 interface JSDelivrServices {
@@ -38,21 +31,18 @@ interface JSDelivrServices {
     @Streaming
     suspend fun fetchBootctl(@Path(REVISION) revision: String = Const.BOOTCTL_REVISION): ResponseBody
 
-    @GET("$MAGISK_FILES@{$REVISION}/canary.json")
-    suspend fun fetchCanaryUpdate(@Path(REVISION) revision: String): UpdateInfo
-
     @GET("$MAGISK_MAIN@{$REVISION}/scripts/module_installer.sh")
     @Streaming
     suspend fun fetchInstaller(@Path(REVISION) revision: String): ResponseBody
 }
 
-interface GithubRawServices {
+interface RawServices {
 
     @GET
     suspend fun fetchCustomUpdate(@Url url: String): UpdateInfo
 
-    @GET("$MAGISK_MODULES/{$MODULE}/master/{$FILE}")
+    @GET
-    suspend fun fetchModuleFile(@Path(MODULE) id: String, @Path(FILE) file: String): String
+    suspend fun fetchRepoInfo(@Url url: String): RepoJson
 
     @GET
     @Streaming
@@ -65,15 +55,6 @@ interface GithubRawServices {
 
 interface GithubApiServices {
 
-    @GET("users/$MAGISK_MODULES/repos")
-    @Headers("Accept: application/vnd.github.v3+json")
-    suspend fun fetchRepos(
-        @Query("page") page: Int,
-        @Header(IF_NONE_MATCH) etag: String,
-        @Query("sort") sort: String = "pushed",
-        @Query("per_page") count: Int = 100
-    ): Response<List<GithubRepoInfo>>
-
     @GET("repos/{$REPO}/branches/{$BRANCH}")
     @Headers("Accept: application/vnd.github.v3+json")
     suspend fun fetchBranch(

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

@@ -11,16 +11,14 @@ interface PreferenceModel {
 
     val fileName: String
         get() = "${context.packageName}_preferences"
-    val commitPrefs: Boolean
+
-        get() = false
     val prefs: SharedPreferences
         get() = context.getSharedPreferences(fileName, Context.MODE_PRIVATE)
 
     fun preferenceStrInt(
         name: String,
         default: Int,
-        writeDefault: Boolean = false,
+        commit: Boolean = false
-        commit: Boolean = commitPrefs
     ) = object: ReadWriteProperty<PreferenceModel, Int> {
         val base = StringProperty(name, default.toString(), commit)
         override fun getValue(thisRef: PreferenceModel, property: KProperty<*>): Int =
@@ -33,37 +31,37 @@ interface PreferenceModel {
     fun preference(
         name: String,
         default: Boolean,
-        commit: Boolean = commitPrefs
+        commit: Boolean = false
     ) = BooleanProperty(name, default, commit)
 
     fun preference(
         name: String,
         default: Float,
-        commit: Boolean = commitPrefs
+        commit: Boolean = false
     ) = FloatProperty(name, default, commit)
 
     fun preference(
         name: String,
         default: Int,
-        commit: Boolean = commitPrefs
+        commit: Boolean = false
     ) = IntProperty(name, default, commit)
 
     fun preference(
         name: String,
         default: Long,
-        commit: Boolean = commitPrefs
+        commit: Boolean = false
     ) = LongProperty(name, default, commit)
 
     fun preference(
         name: String,
         default: String,
-        commit: Boolean = commitPrefs
+        commit: Boolean = false
     ) = StringProperty(name, default, commit)
 
     fun preference(
         name: String,
         default: Set<String>,
-        commit: Boolean = commitPrefs
+        commit: Boolean = false
     ) = StringSetProperty(name, default, commit)
 
 }

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

@@ -9,8 +9,8 @@ import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
 interface DBConfig {
-    val settingsDao: SettingsDao
+    val settingsDB: SettingsDao
-    val stringDao: StringDao
+    val stringDB: StringDao
 
     fun dbSettings(
         name: String,
@@ -41,7 +41,7 @@ class DBSettingsValue(
     override fun getValue(thisRef: DBConfig, property: KProperty<*>): Int {
         if (value == null)
             value = runBlocking {
-                thisRef.settingsDao.fetch(name, default)
+                thisRef.settingsDB.fetch(name, default)
             }
         return value as Int
     }
@@ -51,7 +51,7 @@ class DBSettingsValue(
             this.value = value
         }
         GlobalScope.launch {
-            thisRef.settingsDao.put(name, value)
+            thisRef.settingsDB.put(name, value)
         }
     }
 }
@@ -82,7 +82,7 @@ class DBStringsValue(
     override fun getValue(thisRef: DBConfig, property: KProperty<*>): String {
         if (value == null)
             value = runBlocking {
-                thisRef.stringDao.fetch(name, default)
+                thisRef.stringDB.fetch(name, default)
             }
         return value!!
     }
@@ -94,21 +94,21 @@ class DBStringsValue(
         if (value.isEmpty()) {
             if (sync) {
                 runBlocking {
-                    thisRef.stringDao.delete(name)
+                    thisRef.stringDB.delete(name)
                 }
             } else {
                 GlobalScope.launch {
-                    thisRef.stringDao.delete(name)
+                    thisRef.stringDB.delete(name)
                 }
             }
         } else {
             if (sync) {
                 runBlocking {
-                    thisRef.stringDao.put(name, value)
+                    thisRef.stringDB.put(name, value)
                 }
             } else {
                 GlobalScope.launch {
-                    thisRef.stringDao.put(name, value)
+                    thisRef.stringDB.put(name, value)
                 }
             }
         }

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

@@ -8,21 +8,18 @@ import com.topjohnwu.magisk.core.Config.Value.DEFAULT_CHANNEL
 import com.topjohnwu.magisk.core.Config.Value.STABLE_CHANNEL
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.model.*
-import com.topjohnwu.magisk.core.model.module.Repo
 import com.topjohnwu.magisk.data.network.*
-import okhttp3.ResponseBody
 import retrofit2.HttpException
 import timber.log.Timber
 import java.io.IOException
 
 class NetworkService(
     private val pages: GithubPageServices,
-    private val raw: GithubRawServices,
+    private val raw: RawServices,
     private val jsd: JSDelivrServices,
     private val api: GithubApiServices
 ) {
-    suspend fun fetchUpdate() = try {
+    suspend fun fetchUpdate() = safe {
         var info = when (Config.updateChannel) {
             DEFAULT_CHANNEL, STABLE_CHANNEL -> fetchStableUpdate()
             BETA_CHANNEL -> fetchBetaUpdate()
@@ -36,54 +33,46 @@ class NetworkService(
             Config.updateChannel = BETA_CHANNEL
             info = fetchBetaUpdate()
         }
-        Info.remote = info
         info
-    } catch (e: IOException) {
-        Timber.e(e)
-        null
-    } catch (e: HttpException) {
-        Timber.e(e)
-        null
     }
 
     // UpdateInfo
-    suspend fun fetchStableUpdate() = pages.fetchStableUpdate()
+    private suspend fun fetchStableUpdate() = pages.fetchUpdateJSON("stable.json")
-    suspend fun fetchBetaUpdate() = pages.fetchBetaUpdate()
+    private suspend fun fetchBetaUpdate() = pages.fetchUpdateJSON("beta.json")
-    suspend fun fetchCustomUpdate(url: String) = raw.fetchCustomUpdate(url)
+    private suspend fun fetchCanaryUpdate() = pages.fetchUpdateJSON("canary.json")
-    suspend fun fetchCanaryUpdate(): UpdateInfo {
+    private suspend fun fetchCustomUpdate(url: String) = raw.fetchCustomUpdate(url)
-        val sha = fetchCanaryVersion()
-        val info = jsd.fetchCanaryUpdate(sha)
 
-        fun genCDNUrl(name: String) = "${Const.Url.JS_DELIVR_URL}${MAGISK_FILES}@${sha}/${name}"
+    private inline fun <T> safe(factory: () -> T): T? {
-        fun ManagerJson.updateCopy() = copy(link = genCDNUrl(link), note = genCDNUrl(note))
+        return try {
-        fun MagiskJson.updateCopy() = copy(link = genCDNUrl(link), note = genCDNUrl(note))
+            factory()
-        fun StubJson.updateCopy() = copy(link = genCDNUrl(link))
+        } catch (e: Exception) {
-        fun UninstallerJson.updateCopy() = copy(link = genCDNUrl(link))
+            Timber.e(e)
-
+            null
-        return info.copy(
+        }
-            app = info.app.updateCopy(),
-            magisk = info.magisk.updateCopy(),
-            stub = info.stub.updateCopy(),
-            uninstaller = info.uninstaller.updateCopy()
-        )
     }
 
-    // Byte streams
+    private inline fun <T> wrap(factory: () -> T): T {
-    suspend fun fetchSafetynet() = jsd.fetchSafetynet()
+        return try {
-    suspend fun fetchBootctl() = jsd.fetchBootctl()
+            factory()
-    suspend fun fetchInstaller(): ResponseBody {
+        } catch (e: HttpException) {
+            throw IOException(e)
+        }
+    }
+
+    // Modules related
+    suspend fun fetchRepoInfo(url: String = Const.Url.OFFICIAL_REPO) = safe {
+        raw.fetchRepoInfo(url)
+    }
+
+    // Fetch files
+    suspend fun fetchSafetynet() = wrap { jsd.fetchSafetynet() }
+    suspend fun fetchBootctl() = wrap { jsd.fetchBootctl() }
+    suspend fun fetchInstaller() = wrap {
         val sha = fetchMainVersion()
-        return jsd.fetchInstaller(sha)
+        jsd.fetchInstaller(sha)
     }
-    suspend fun fetchFile(url: String) = raw.fetchFile(url)
+    suspend fun fetchFile(url: String) = wrap { raw.fetchFile(url) }
+    suspend fun fetchString(url: String) = wrap { raw.fetchString(url) }
 
-    // Strings
-    suspend fun fetchMetadata(repo: Repo) = raw.fetchModuleFile(repo.id, "module.prop")
-    suspend fun fetchReadme(repo: Repo) = raw.fetchModuleFile(repo.id, "README.md")
-    suspend fun fetchString(url: String) = raw.fetchString(url)
-
-    // API calls
-    suspend fun fetchRepos(page: Int, etag: String) = api.fetchRepos(page, etag)
-    private suspend fun fetchCanaryVersion() = api.fetchBranch(MAGISK_FILES, "canary").commit.sha
     private suspend fun fetchMainVersion() = api.fetchBranch(MAGISK_MAIN, "master").commit.sha
 }

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

@@ -28,12 +28,11 @@ import com.google.android.material.card.MaterialCardView
 import com.google.android.material.chip.Chip
 import com.google.android.material.textfield.TextInputLayout
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.di.ServiceLocator
 import com.topjohnwu.magisk.ktx.coroutineScope
-import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.ktx.replaceRandomWithSpecial
 import com.topjohnwu.superuser.internal.UiThreadHandler
 import com.topjohnwu.widget.IndeterminateCheckBox
-import io.noties.markwon.Markwon
 import kotlinx.coroutines.*
 import kotlin.math.roundToInt
 
@@ -60,8 +59,7 @@ fun setInvisibleUnless(view: View, invisibleUnless: Boolean) {
 @BindingAdapter("markdownText")
 fun setMarkdownText(tv: TextView, text: CharSequence) {
     tv.coroutineScope.launch(Dispatchers.IO) {
-        val markwon = get<Markwon>()
+        ServiceLocator.markwon.setMarkdown(tv, text.toString())
-        markwon.setMarkdown(tv, text.toString())
     }
 }
 
@@ -200,12 +198,12 @@ fun RecyclerView.setDividers(dividerVertical: Drawable?, dividerHorizontal: Draw
     }
 }
 
-@BindingAdapter("app:icon")
+@BindingAdapter("icon")
 fun Button.setIconRes(res: Int) {
     (this as MaterialButton).setIconResource(res)
 }
 
-@BindingAdapter("app:icon")
+@BindingAdapter("icon")
 fun Button.setIcon(drawable: Drawable) {
     (this as MaterialButton).icon = drawable
 }

app/src/main/java/com/topjohnwu/magisk/di/ApplicationModule.kt

@@ -1,25 +0,0 @@
-package com.topjohnwu.magisk.di
-
-import android.content.Context
-import android.os.Build
-import androidx.preference.PreferenceManager
-import com.topjohnwu.magisk.core.ResMgr
-import org.koin.core.qualifier.named
-import org.koin.dsl.module
-
-val SUTimeout = named("su_timeout")
-val Protected = named("protected")
-
-val applicationModule = module {
-    factory { ResMgr.resource }
-    factory { get<Context>().packageManager }
-    factory(Protected) { createDEContext(get()) }
-    single(SUTimeout) { get<Context>(Protected).getSharedPreferences("su_timeout", 0) }
-    single { PreferenceManager.getDefaultSharedPreferences(get<Context>(Protected)) }
-}
-
-private fun createDEContext(context: Context): Context {
-    return if (Build.VERSION.SDK_INT >= 24)
-        context.createDeviceProtectedStorageContext()
-    else context
-}

app/src/main/java/com/topjohnwu/magisk/di/DatabaseModule.kt

@@ -1,34 +0,0 @@
-package com.topjohnwu.magisk.di
-
-import android.content.Context
-import androidx.room.Room
-import com.topjohnwu.magisk.core.magiskdb.PolicyDao
-import com.topjohnwu.magisk.core.magiskdb.SettingsDao
-import com.topjohnwu.magisk.core.magiskdb.StringDao
-import com.topjohnwu.magisk.core.tasks.RepoUpdater
-import com.topjohnwu.magisk.data.database.RepoDatabase
-import com.topjohnwu.magisk.data.database.SuLogDatabase
-import org.koin.dsl.module
-
-
-val databaseModule = module {
-    single { PolicyDao(get()) }
-    single { SettingsDao() }
-    single { StringDao() }
-    single { createRepoDatabase(get()) }
-    single { get<RepoDatabase>().repoDao() }
-    single { get<RepoDatabase>().repoByNameDao() }
-    single { get<RepoDatabase>().repoByUpdatedDao() }
-    single { createSuLogDatabase(get(Protected)).suLogDao() }
-    single { RepoUpdater(get(), get()) }
-}
-
-fun createRepoDatabase(context: Context) =
-    Room.databaseBuilder(context, RepoDatabase::class.java, "repo.db")
-        .fallbackToDestructiveMigration()
-        .build()
-
-fun createSuLogDatabase(context: Context) =
-    Room.databaseBuilder(context, SuLogDatabase::class.java, "sulogs.db")
-        .fallbackToDestructiveMigration()
-        .build()

app/src/main/java/com/topjohnwu/magisk/di/Modules.kt

@@ -1,9 +0,0 @@
-package com.topjohnwu.magisk.di
-
-val koinModules = listOf(
-    applicationModule,
-    networkingModule,
-    databaseModule,
-    repositoryModule,
-    viewModelModules
-)

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

@@ -1,49 +1,31 @@
 package com.topjohnwu.magisk.di
 
 import android.content.Context
-import android.os.Build
 import com.squareup.moshi.Moshi
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.ProviderInstaller
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.data.network.GithubApiServices
-import com.topjohnwu.magisk.data.network.GithubPageServices
-import com.topjohnwu.magisk.data.network.GithubRawServices
-import com.topjohnwu.magisk.data.network.JSDelivrServices
 import com.topjohnwu.magisk.ktx.precomputedText
-import com.topjohnwu.magisk.net.Networking
-import com.topjohnwu.magisk.net.NoSSLv3SocketFactory
 import com.topjohnwu.magisk.utils.MarkwonImagePlugin
 import io.noties.markwon.Markwon
 import io.noties.markwon.html.HtmlPlugin
 import okhttp3.Dns
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.dnsoverhttps.DnsOverHttps
-import org.koin.dsl.module
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.converter.scalars.ScalarsConverterFactory
 import java.net.InetAddress
 import java.net.UnknownHostException
 
-val networkingModule = module {
-    single { createOkHttpClient(get()) }
-    single { createRetrofit(get()) }
-    single { createApiService<GithubRawServices>(get(), Const.Url.GITHUB_RAW_URL) }
-    single { createApiService<GithubApiServices>(get(), Const.Url.GITHUB_API_URL) }
-    single { createApiService<GithubPageServices>(get(), Const.Url.GITHUB_PAGE_URL) }
-    single { createApiService<JSDelivrServices>(get(), Const.Url.JS_DELIVR_URL) }
-    single { createMarkwon(get(), get()) }
-}
-
 private class DnsResolver(client: OkHttpClient) : Dns {
 
-    private var dohError = false
-    private val poisonedHosts = listOf("raw.githubusercontent.com")
     private val doh by lazy {
         DnsOverHttps.Builder().client(client)
-            .url(HttpUrl.get("https://cloudflare-dns.com/dns-query"))
+            .url("https://cloudflare-dns.com/dns-query".toHttpUrl())
             .bootstrapDnsHosts(listOf(
                 InetAddress.getByName("162.159.36.1"),
                 InetAddress.getByName("162.159.46.1"),
@@ -60,16 +42,12 @@ private class DnsResolver(client: OkHttpClient) : Dns {
     }
 
     override fun lookup(hostname: String): List<InetAddress> {
-        return if (!dohError && Config.doh && poisonedHosts.contains(hostname)) {
+        if (Config.doh) {
             try {
-                doh.lookup(hostname)
+                return doh.lookup(hostname)
-            } catch (e: UnknownHostException) {
+            } catch (e: UnknownHostException) {}
-                dohError = true
-                Dns.SYSTEM.lookup(hostname)
-            }
-        } else {
-            Dns.SYSTEM.lookup(hostname)
         }
+        return Dns.SYSTEM.lookup(hostname)
     }
 }
 
@@ -77,15 +55,14 @@ private class DnsResolver(client: OkHttpClient) : Dns {
 fun createOkHttpClient(context: Context): OkHttpClient {
     val builder = OkHttpClient.Builder()
 
-//    val httpLoggingInterceptor = HttpLoggingInterceptor().apply {
+    if (BuildConfig.DEBUG) {
-//        level = HttpLoggingInterceptor.Level.HEADERS
+        builder.addInterceptor(HttpLoggingInterceptor().apply {
-//    }
+            level = HttpLoggingInterceptor.Level.BASIC
-//    builder.addInterceptor(httpLoggingInterceptor)
+        })
+    }
 
-    if (!Networking.init(context)) {
+    if (!ProviderInstaller.install(context)) {
         Info.hasGMS = false
-        if (Build.VERSION.SDK_INT < 21)
-            builder.sslSocketFactory(NoSSLv3SocketFactory())
     }
     builder.dns(DnsResolver(builder.build()))
 

app/src/main/java/com/topjohnwu/magisk/di/RepositoryModule.kt

@@ -1,11 +0,0 @@
-package com.topjohnwu.magisk.di
-
-import com.topjohnwu.magisk.data.repository.LogRepository
-import com.topjohnwu.magisk.data.repository.NetworkService
-import org.koin.dsl.module
-
-
-val repositoryModule = module {
-    single { LogRepository(get()) }
-    single { NetworkService(get(), get(), get(), get()) }
-}

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

@@ -0,0 +1,88 @@
+package com.topjohnwu.magisk.di
+
+import android.annotation.SuppressLint
+import android.content.Context
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStoreOwner
+import androidx.room.Room
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.magiskdb.PolicyDao
+import com.topjohnwu.magisk.core.magiskdb.SettingsDao
+import com.topjohnwu.magisk.core.magiskdb.StringDao
+import com.topjohnwu.magisk.core.tasks.RepoUpdater
+import com.topjohnwu.magisk.data.database.RepoDatabase
+import com.topjohnwu.magisk.data.database.SuLogDatabase
+import com.topjohnwu.magisk.data.repository.LogRepository
+import com.topjohnwu.magisk.data.repository.NetworkService
+import com.topjohnwu.magisk.ktx.deviceProtectedContext
+import com.topjohnwu.magisk.ui.home.HomeViewModel
+import com.topjohnwu.magisk.ui.install.InstallViewModel
+import com.topjohnwu.magisk.ui.log.LogViewModel
+import com.topjohnwu.magisk.ui.module.ModuleViewModel
+import com.topjohnwu.magisk.ui.settings.SettingsViewModel
+import com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
+import com.topjohnwu.magisk.ui.surequest.SuRequestViewModel
+
+val AppContext: Context inline get() = ServiceLocator.context
+
+@SuppressLint("StaticFieldLeak")
+object ServiceLocator {
+
+    lateinit var context: Context
+    val deContext by lazy { context.deviceProtectedContext }
+    val timeoutPrefs by lazy { deContext.getSharedPreferences("su_timeout", 0) }
+
+    // Database
+    val policyDB = PolicyDao()
+    val settingsDB = SettingsDao()
+    val stringDB = StringDao()
+    val repoDB by lazy { createRepoDatabase(context).repoDao() }
+    val sulogDB by lazy { createSuLogDatabase(deContext).suLogDao() }
+    val repoUpdater by lazy { RepoUpdater(networkService, repoDB) }
+    val logRepo by lazy { LogRepository(sulogDB) }
+
+    // Networking
+    val okhttp by lazy { createOkHttpClient(context) }
+    val retrofit by lazy { createRetrofit(okhttp) }
+    val markwon by lazy { createMarkwon(context, okhttp) }
+    val networkService by lazy {
+        NetworkService(
+            createApiService(retrofit, Const.Url.GITHUB_PAGE_URL),
+            createApiService(retrofit, Const.Url.GITHUB_RAW_URL),
+            createApiService(retrofit, Const.Url.JS_DELIVR_URL),
+            createApiService(retrofit, Const.Url.GITHUB_API_URL)
+        )
+    }
+
+    object VMFactory : ViewModelProvider.Factory {
+        @Suppress("UNCHECKED_CAST")
+        override fun <T : ViewModel?> create(clz: Class<T>): T {
+            return when (clz) {
+                HomeViewModel::class.java -> HomeViewModel(networkService)
+                LogViewModel::class.java -> LogViewModel(logRepo)
+                ModuleViewModel::class.java -> ModuleViewModel(repoDB, repoUpdater)
+                SettingsViewModel::class.java -> SettingsViewModel(repoDB)
+                SuperuserViewModel::class.java -> SuperuserViewModel(policyDB)
+                InstallViewModel::class.java -> InstallViewModel(networkService)
+                SuRequestViewModel::class.java -> SuRequestViewModel(policyDB, timeoutPrefs)
+                else -> clz.newInstance()
+            } as T
+        }
+    }
+}
+
+inline fun <reified VM : ViewModel> ViewModelStoreOwner.viewModel() =
+    lazy(LazyThreadSafetyMode.NONE) {
+        ViewModelProvider(this, ServiceLocator.VMFactory).get(VM::class.java)
+    }
+
+private fun createRepoDatabase(context: Context) =
+    Room.databaseBuilder(context, RepoDatabase::class.java, "repo.db")
+        .fallbackToDestructiveMigration()
+        .build()
+
+private fun createSuLogDatabase(context: Context) =
+    Room.databaseBuilder(context, SuLogDatabase::class.java, "sulogs.db")
+        .fallbackToDestructiveMigration()
+        .build()

app/src/main/java/com/topjohnwu/magisk/di/ViewModelsModule.kt

@@ -1,34 +0,0 @@
-package com.topjohnwu.magisk.di
-
-import com.topjohnwu.magisk.ui.MainViewModel
-import com.topjohnwu.magisk.ui.flash.FlashFragmentArgs
-import com.topjohnwu.magisk.ui.flash.FlashViewModel
-import com.topjohnwu.magisk.ui.hide.HideViewModel
-import com.topjohnwu.magisk.ui.home.HomeViewModel
-import com.topjohnwu.magisk.ui.install.InstallViewModel
-import com.topjohnwu.magisk.ui.log.LogViewModel
-import com.topjohnwu.magisk.ui.module.ModuleViewModel
-import com.topjohnwu.magisk.ui.safetynet.SafetynetViewModel
-import com.topjohnwu.magisk.ui.settings.SettingsViewModel
-import com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
-import com.topjohnwu.magisk.ui.surequest.SuRequestViewModel
-import com.topjohnwu.magisk.ui.theme.ThemeViewModel
-import org.koin.androidx.viewmodel.dsl.viewModel
-import org.koin.dsl.module
-
-val viewModelModules = module {
-    viewModel { HideViewModel() }
-    viewModel { HomeViewModel(get()) }
-    viewModel { LogViewModel(get()) }
-    viewModel { ModuleViewModel(get(), get(), get()) }
-    viewModel { SafetynetViewModel() }
-    viewModel { SettingsViewModel(get()) }
-    viewModel { SuperuserViewModel(get(), get()) }
-    viewModel { ThemeViewModel() }
-    viewModel { InstallViewModel(get()) }
-    viewModel { MainViewModel() }
-
-    // Legacy
-    viewModel { (args: FlashFragmentArgs) -> FlashViewModel(args, get()) }
-    viewModel { SuRequestViewModel(get(), get(), get(SUTimeout), get()) }
-}

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

@@ -1,8 +1,11 @@
 package com.topjohnwu.magisk.events
 
+import android.os.Build
+import android.os.PowerManager
 import android.view.ContextThemeWrapper
 import android.view.MenuItem
 import android.widget.PopupMenu
+import androidx.core.content.getSystemService
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.base.BaseActivity
 import com.topjohnwu.superuser.Shell
@@ -13,6 +16,7 @@ object RebootEvent {
     private fun reboot(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_reboot_normal -> systemReboot()
+            R.id.action_reboot_userspace -> systemReboot("userspace")
             R.id.action_reboot_bootloader -> systemReboot("bootloader")
             R.id.action_reboot_download -> systemReboot("download")
             R.id.action_reboot_edl -> systemReboot("edl")
@@ -26,6 +30,9 @@ object RebootEvent {
         val themeWrapper = ContextThemeWrapper(activity, R.style.Foundation_PopupMenu)
         val menu = PopupMenu(themeWrapper, activity.findViewById(R.id.action_reboot))
         activity.menuInflater.inflate(R.menu.menu_reboot, menu.menu)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
+            activity.getSystemService<PowerManager>()?.isRebootingUserspaceSupported == true)
+            menu.menu.findItem(R.id.action_reboot_userspace).isVisible = true
         menu.setOnMenuItemClickListener(::reboot)
         return menu
     }

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

@@ -6,40 +6,38 @@ import com.google.android.material.snackbar.Snackbar
 import com.topjohnwu.magisk.arch.ActivityExecutor
 import com.topjohnwu.magisk.arch.BaseUIActivity
 import com.topjohnwu.magisk.arch.ViewEvent
-import com.topjohnwu.magisk.utils.TransitiveText
+import com.topjohnwu.magisk.utils.TextHolder
+import com.topjohnwu.magisk.utils.asText
 
-class SnackbarEvent private constructor(
+class SnackbarEvent constructor(
-    private val msg: TransitiveText,
+    private val msg: TextHolder,
-    private val length: Int,
+    private val length: Int = Snackbar.LENGTH_SHORT,
-    private val builder: Snackbar.() -> Unit
+    private val builder: Snackbar.() -> Unit = {}
 ) : ViewEvent(), ActivityExecutor {
 
     constructor(
         @StringRes res: Int,
         length: Int = Snackbar.LENGTH_SHORT,
         builder: Snackbar.() -> Unit = {}
-    ) : this(TransitiveText.Res(res), length, builder)
+    ) : this(res.asText(), length, builder)
 
     constructor(
-        message: String,
+        msg: String,
         length: Int = Snackbar.LENGTH_SHORT,
         builder: Snackbar.() -> Unit = {}
-    ) : this(TransitiveText.String(message), length, builder)
+    ) : this(msg.asText(), length, builder)
 
 
     private fun snackbar(
         view: View,
         message: String,
-        length: Int = Snackbar.LENGTH_SHORT,
+        length: Int,
-        builder: Snackbar.() -> Unit = {}
+        builder: Snackbar.() -> Unit
     ) = Snackbar.make(view, message, length).apply(builder).show()
 
     override fun invoke(activity: BaseUIActivity<*, *>) {
-        if (activity is BaseUIActivity<*, *>) {
+        snackbar(activity.snackbarView,
-            snackbar(activity.snackbarView,
+            msg.getText(activity.resources).toString(),
-                msg.getText(activity.resources).toString(),
+            length, builder)
-                length, builder)
-        }
     }
-
 }

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

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
+import android.view.View
 import android.widget.Toast
 import androidx.navigation.NavDirections
 import com.topjohnwu.magisk.MainDirections
@@ -12,21 +13,23 @@ import com.topjohnwu.magisk.arch.*
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.base.ActivityResultCallback
 import com.topjohnwu.magisk.core.base.BaseActivity
-import com.topjohnwu.magisk.core.model.module.Repo
+import com.topjohnwu.magisk.core.model.module.OnlineModule
+import com.topjohnwu.magisk.events.dialog.MarkDownDialog
 import com.topjohnwu.magisk.utils.Utils
-import com.topjohnwu.magisk.view.MarkDownWindow
+import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.magisk.view.Shortcuts
-import kotlinx.coroutines.launch
 
 class ViewActionEvent(val action: BaseActivity.() -> Unit) : ViewEvent(), ActivityExecutor {
     override fun invoke(activity: BaseUIActivity<*, *>) = action(activity)
 }
 
-class OpenChangelogEvent(val item: Repo) : ViewEventWithScope(), ContextExecutor {
+class OpenReadmeEvent(private val item: OnlineModule) : MarkDownDialog() {
-    override fun invoke(context: Context) {
+    override suspend fun getMarkdownText() = item.notes()
-        scope.launch {
+    override fun build(dialog: MagiskDialog) {
-            MarkDownWindow.show(context, null, item::readme)
+        super.build(dialog)
-        }
+        dialog.applyButton(MagiskDialog.ButtonType.NEGATIVE) {
+            titleRes = android.R.string.cancel
+        }.cancellable(true)
     }
 }
 
@@ -58,9 +61,11 @@ class DieEvent : ViewEvent(), ActivityExecutor {
     }
 }
 
-class ShowUIEvent : ViewEvent(), ActivityExecutor {
+class ShowUIEvent(private val delegate: View.AccessibilityDelegate?)
+    : ViewEvent(), ActivityExecutor {
     override fun invoke(activity: BaseUIActivity<*, *>) {
         activity.setContentView()
+        activity.setAccessibilityDelegate(delegate)
     }
 }
 
@@ -75,7 +80,7 @@ class MagiskInstallFileEvent(private val callback: ActivityResultCallback)
     override fun invoke(activity: BaseUIActivity<*, *>) {
         val intent = Intent(Intent.ACTION_GET_CONTENT).setType("*/*")
         try {
-            activity.startActivityForResult(intent, Const.ID.SELECT_FILE, callback)
+            activity.startActivityForResult(intent, callback)
             Utils.toast(R.string.patch_file_msg, Toast.LENGTH_LONG)
         } catch (e: ActivityNotFoundException) {
             Utils.toast(R.string.app_not_found, Toast.LENGTH_SHORT)
@@ -104,10 +109,10 @@ class SelectModuleEvent : ViewEvent(), FragmentExecutor {
         val intent = Intent(Intent.ACTION_GET_CONTENT).setType("application/zip")
         try {
             fragment.apply {
-                activity.startActivityForResult(intent, Const.ID.FETCH_ZIP) { code, intent ->
+                activity.startActivityForResult(intent) { code, intent ->
                     if (code == Activity.RESULT_OK && intent != null) {
                         intent.data?.also {
-                            MainDirections.actionFlashFragment(it, Const.Value.FLASH_ZIP).navigate()
+                            MainDirections.actionFlashFragment(Const.Value.FLASH_ZIP, it).navigate()
                         }
                     }
                 }

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

@@ -10,7 +10,9 @@ abstract class DialogEvent : ViewEvent(), ActivityExecutor {
     protected lateinit var dialog: MagiskDialog
 
     override fun invoke(activity: BaseUIActivity<*, *>) {
-        dialog = MagiskDialog(activity).apply(this::build).reveal()
+        dialog = MagiskDialog(activity)
+            .apply { setOwnerActivity(activity) }
+            .apply(this::build).reveal()
     }
 
     abstract fun build(dialog: MagiskDialog)

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

@@ -1,15 +1,11 @@
 package com.topjohnwu.magisk.events.dialog
 
-import android.content.BroadcastReceiver
+import androidx.lifecycle.lifecycleScope
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.download.Action.EnvFix
+import com.topjohnwu.magisk.core.base.BaseActivity
-import com.topjohnwu.magisk.core.download.DownloadService
+import com.topjohnwu.magisk.core.tasks.MagiskInstaller
-import com.topjohnwu.magisk.core.download.Subject.Magisk
 import com.topjohnwu.magisk.view.MagiskDialog
+import kotlinx.coroutines.launch
 
 class EnvFixDialog : DialogEvent() {
 
@@ -24,20 +20,17 @@ class EnvFixDialog : DialogEvent() {
                     .applyMessage(R.string.setup_msg)
                     .resetButtons()
                     .cancellable(false)
-                val lbm = LocalBroadcastManager.getInstance(dialog.context)
+                (dialog.ownerActivity as BaseActivity).lifecycleScope.launch {
-                lbm.registerReceiver(object : BroadcastReceiver() {
+                    MagiskInstaller.FixEnv {
-                    override fun onReceive(context: Context, intent: Intent?) {
                         dialog.dismiss()
-                        lbm.unregisterReceiver(this)
+                    }.exec()
-                    }
+                }
-                }, IntentFilter(DISMISS))
-                DownloadService.start(dialog.context, Magisk(EnvFix))
             }
         }
         .applyButton(MagiskDialog.ButtonType.NEGATIVE) {
             titleRes = android.R.string.cancel
         }
-        .let { Unit }
+        .let { }
 
     companion object {
         const val DISMISS = "com.topjohnwu.magisk.ENV_DONE"

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

@@ -2,40 +2,37 @@ package com.topjohnwu.magisk.events.dialog
 
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.download.Action
 import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.core.download.Subject
-import com.topjohnwu.magisk.ktx.res
+import com.topjohnwu.magisk.di.AppContext
+import com.topjohnwu.magisk.di.ServiceLocator
 import com.topjohnwu.magisk.view.MagiskDialog
-import com.topjohnwu.magisk.view.MarkDownWindow
+import java.io.File
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 
-class ManagerInstallDialog : DialogEvent() {
+class ManagerInstallDialog : MarkDownDialog() {
+
+    private val svc get() = ServiceLocator.networkService
+
+    override suspend fun getMarkdownText(): String {
+        val text = svc.fetchString(Info.remote.magisk.note)
+        // Cache the changelog
+        AppContext.cacheDir.listFiles { _, name -> name.endsWith(".md") }.orEmpty().forEach {
+            it.delete()
+        }
+        File(AppContext.cacheDir, "${Info.remote.magisk.versionCode}.md").writeText(text)
+        return text
+    }
 
     override fun build(dialog: MagiskDialog) {
+        super.build(dialog)
         with(dialog) {
-            val subject = Subject.Manager(Action.APK.Upgrade)
-
-            applyTitle(R.string.repo_install_title.res(R.string.app_name.res()))
-            applyMessage(R.string.repo_install_msg.res(subject.title))
-
             setCancelable(true)
-
             applyButton(MagiskDialog.ButtonType.POSITIVE) {
                 titleRes = R.string.install
-                onClick { DownloadService.start(context, subject) }
+                onClick { DownloadService.start(context, Subject.Manager()) }
             }
-
-            if (Info.remote.app.note.isEmpty()) return
             applyButton(MagiskDialog.ButtonType.NEGATIVE) {
-                titleRes = R.string.app_changelog
+                titleRes = android.R.string.cancel
-                onClick {
-                    GlobalScope.launch(Dispatchers.Main.immediate) {
-                        MarkDownWindow.show(context, null, Info.remote.app.note)
-                    }
-                }
             }
         }
     }

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

@@ -0,0 +1,41 @@
+package com.topjohnwu.magisk.events.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.di.ServiceLocator
+import com.topjohnwu.magisk.view.MagiskDialog
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import kotlin.coroutines.cancellation.CancellationException
+
+abstract class MarkDownDialog : DialogEvent() {
+
+    abstract suspend fun getMarkdownText(): String
+
+    @CallSuper
+    override fun build(dialog: MagiskDialog) {
+        with(dialog) {
+            val view = LayoutInflater.from(context).inflate(R.layout.markdown_window_md2, null)
+            applyView(view)
+            (ownerActivity as BaseActivity).lifecycleScope.launch {
+                val tv = view.findViewById<TextView>(R.id.md_txt)
+                withContext(Dispatchers.IO) {
+                    try {
+                        ServiceLocator.markwon.setMarkdown(tv, getMarkdownText())
+                    } catch (e: Exception) {
+                        if (e is CancellationException)
+                            throw e
+                        Timber.e(e)
+                        tv.post { tv.setText(R.string.download_file_error) }
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -5,16 +5,16 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.download.Action
 import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.core.download.Subject
-import com.topjohnwu.magisk.core.model.module.Repo
+import com.topjohnwu.magisk.core.model.module.OnlineModule
 import com.topjohnwu.magisk.view.MagiskDialog
 
-class ModuleInstallDialog(private val item: Repo) : DialogEvent() {
+class ModuleInstallDialog(private val item: OnlineModule) : DialogEvent() {
 
     override fun build(dialog: MagiskDialog) {
         with(dialog) {
 
             fun download(install: Boolean) {
-                val config = if (install) Action.Flash.Primary else Action.Download
+                val config = if (install) Action.Flash else Action.Download
                 val subject = Subject.Module(item, config)
                 DownloadService.start(context, subject)
             }

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

@@ -3,10 +3,8 @@ package com.topjohnwu.magisk.events.dialog
 import android.app.ProgressDialog
 import android.widget.Toast
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.arch.BaseUIActivity
-import com.topjohnwu.magisk.core.download.Action
+import com.topjohnwu.magisk.ui.flash.FlashFragment
-import com.topjohnwu.magisk.core.download.DownloadService
-import com.topjohnwu.magisk.core.download.Subject
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.superuser.Shell
@@ -20,12 +18,10 @@ class UninstallDialog : DialogEvent() {
                 titleRes = R.string.restore_img
                 onClick { restore() }
             }
-        if (Info.remote.uninstaller.link.isNotEmpty()) {
+            .applyButton(MagiskDialog.ButtonType.NEGATIVE) {
-            dialog.applyButton(MagiskDialog.ButtonType.NEGATIVE) {
                 titleRes = R.string.complete_uninstall
                 onClick { completeUninstall() }
             }
-        }
     }
 
     @Suppress("DEPRECATION")
@@ -46,7 +42,8 @@ class UninstallDialog : DialogEvent() {
     }
 
     private fun completeUninstall() {
-        DownloadService.start(dialog.context, Subject.Magisk(Action.Uninstall))
+        (dialog.ownerActivity as? BaseUIActivity<*, *>)
+                ?.navigation?.navigate(FlashFragment.uninstall())
     }
 
 }

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

@@ -0,0 +1,193 @@
+@file:Suppress("unused")
+
+package com.topjohnwu.magisk.ktx
+
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.view.View
+import android.widget.EdgeEffect
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.topjohnwu.magisk.R
+
+fun RecyclerView.addInvalidateItemDecorationsObserver() {
+
+    adapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
+        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+            invalidateItemDecorations()
+        }
+
+        override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
+            invalidateItemDecorations()
+        }
+
+        override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
+            invalidateItemDecorations()
+        }
+    })
+}
+
+fun RecyclerView.addVerticalPadding(paddingTop: Int = 0, paddingBottom: Int = 0) {
+    addItemDecoration(VerticalPaddingDecoration(paddingTop, paddingBottom))
+}
+
+private class VerticalPaddingDecoration(private val paddingTop: Int = 0, private val paddingBottom: Int = 0) : RecyclerView.ItemDecoration() {
+
+    private var allowTop: Boolean = true
+    private var allowBottom: Boolean = true
+
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+        val adapter = parent.adapter ?: return
+        val position = parent.getChildAdapterPosition(view)
+        val count = adapter.itemCount
+        if (position == 0 && allowTop) {
+            outRect.top = paddingTop
+        } else if (position == count - 1 && allowBottom) {
+            outRect.bottom = paddingBottom
+        }
+    }
+}
+
+fun RecyclerView.addSimpleItemDecoration(
+    left: Int = 0,
+    top: Int = 0,
+    right: Int = 0,
+    bottom: Int = 0,
+) {
+    addItemDecoration(SimpleItemDecoration(left, top, right, bottom))
+}
+
+private class SimpleItemDecoration(
+    private val left: Int = 0,
+    private val top: Int = 0,
+    private val right: Int = 0,
+    private val bottom: Int = 0
+) : RecyclerView.ItemDecoration() {
+
+    private var allowLeft: Boolean = true
+    private var allowTop: Boolean = true
+    private var allowRight: Boolean = true
+    private var allowBottom: Boolean = true
+
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+        if (parent.adapter == null) {
+            return
+        }
+        if (allowLeft) {
+            outRect.left = left
+        }
+        if (allowTop) {
+            outRect.top = top
+        }
+        if (allowRight) {
+            outRect.right = right
+        }
+        if (allowBottom) {
+            outRect.top = bottom
+        }
+    }
+}
+
+fun RecyclerView.fixEdgeEffect(overScrollIfContentScrolls: Boolean = true, alwaysClipToPadding: Boolean = true) {
+    if (overScrollIfContentScrolls) {
+        val listener = OverScrollIfContentScrollsListener()
+        addOnLayoutChangeListener(listener)
+        setTag(R.id.tag_rikka_recyclerView_OverScrollIfContentScrollsListener, listener)
+    } else {
+        val listener = getTag(R.id.tag_rikka_recyclerView_OverScrollIfContentScrollsListener) as? OverScrollIfContentScrollsListener
+        if (listener != null) {
+            removeOnLayoutChangeListener(listener)
+            setTag(R.id.tag_rikka_recyclerView_OverScrollIfContentScrollsListener, null)
+        }
+    }
+
+    edgeEffectFactory = if (alwaysClipToPadding && !clipToPadding) {
+        AlwaysClipToPaddingEdgeEffectFactory()
+    } else {
+        RecyclerView.EdgeEffectFactory()
+    }
+}
+
+private class OverScrollIfContentScrollsListener : View.OnLayoutChangeListener {
+    private var show = true
+    override fun onLayoutChange(v: View, left: Int, top: Int, right: Int, bottom: Int, oldLeft: Int, oldTop: Int, oldRight: Int, oldBottom: Int) {
+        if (shouldDrawOverScroll(v as RecyclerView) != show) {
+            show = !show
+            if (show) {
+                v.setOverScrollMode(View.OVER_SCROLL_IF_CONTENT_SCROLLS)
+            } else {
+                v.setOverScrollMode(View.OVER_SCROLL_NEVER)
+            }
+        }
+    }
+
+    fun shouldDrawOverScroll(recyclerView: RecyclerView): Boolean {
+        if (recyclerView.layoutManager == null || recyclerView.adapter == null || recyclerView.adapter!!.itemCount == 0) {
+            return false
+        }
+        if (recyclerView.layoutManager is LinearLayoutManager) {
+            val itemCount = recyclerView.layoutManager!!.itemCount
+            val firstPosition: Int = (recyclerView.layoutManager as LinearLayoutManager?)!!.findFirstCompletelyVisibleItemPosition()
+            val lastPosition: Int = (recyclerView.layoutManager as LinearLayoutManager?)!!.findLastCompletelyVisibleItemPosition()
+            return firstPosition != 0 || lastPosition != itemCount - 1
+        }
+        return true
+    }
+}
+
+private class AlwaysClipToPaddingEdgeEffectFactory : RecyclerView.EdgeEffectFactory() {
+
+    override fun createEdgeEffect(view: RecyclerView, direction: Int): EdgeEffect {
+
+        return object : EdgeEffect(view.context) {
+            private var ensureSize = false
+
+            private fun ensureSize() {
+                if (ensureSize) return
+                ensureSize = true
+
+                when (direction) {
+                    DIRECTION_LEFT -> {
+                        setSize(view.measuredHeight - view.paddingTop - view.paddingBottom,
+                            view.measuredWidth - view.paddingLeft - view.paddingRight)
+                    }
+                    DIRECTION_TOP -> {
+                        setSize(view.measuredWidth - view.paddingLeft - view.paddingRight,
+                            view.measuredHeight - view.paddingTop - view.paddingBottom)
+                    }
+                    DIRECTION_RIGHT -> {
+                        setSize(view.measuredHeight - view.paddingTop - view.paddingBottom,
+                            view.measuredWidth - view.paddingLeft - view.paddingRight)
+                    }
+                    DIRECTION_BOTTOM -> {
+                        setSize(view.measuredWidth - view.paddingLeft - view.paddingRight,
+                            view.measuredHeight - view.paddingTop - view.paddingBottom)
+                    }
+                }
+            }
+
+            override fun draw(c: Canvas): Boolean {
+                ensureSize()
+
+                val restore = c.save()
+                when (direction) {
+                    DIRECTION_LEFT -> {
+                        c.translate(view.paddingBottom.toFloat(), 0f)
+                    }
+                    DIRECTION_TOP -> {
+                        c.translate(view.paddingLeft.toFloat(), view.paddingTop.toFloat())
+                    }
+                    DIRECTION_RIGHT -> {
+                        c.translate(-view.paddingTop.toFloat(), 0f)
+                    }
+                    DIRECTION_BOTTOM -> {
+                        c.translate(view.paddingRight.toFloat(), view.paddingBottom.toFloat())
+                    }
+                }
+                val res = super.draw(c)
+                c.restoreToCount(restore)
+                return res
+            }
+        }
+    }
+}

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

@@ -1,15 +1,17 @@
 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.ComponentInfo
-import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.pm.PackageManager.*
+import android.content.pm.ServiceInfo
+import android.content.pm.ServiceInfo.FLAG_ISOLATED_PROCESS
+import android.content.pm.ServiceInfo.FLAG_USE_APP_ZYGOTE
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.database.Cursor
@@ -19,7 +21,6 @@ import android.graphics.drawable.AdaptiveIconDrawable
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.LayerDrawable
 import android.net.Uri
-import android.os.Build
 import android.os.Build.VERSION.SDK_INT
 import android.text.PrecomputedText
 import android.view.View
@@ -39,11 +40,13 @@ import androidx.core.widget.TextViewCompat
 import androidx.databinding.BindingAdapter
 import androidx.fragment.app.Fragment
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
+import androidx.lifecycle.lifecycleScope
 import androidx.transition.AutoTransition
 import androidx.transition.TransitionManager
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.AssetHack
 import com.topjohnwu.magisk.core.Const
-import com.topjohnwu.magisk.core.ResMgr
+import com.topjohnwu.magisk.core.base.BaseActivity
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.utils.DynamicClassLoader
 import com.topjohnwu.magisk.utils.Utils
@@ -55,32 +58,10 @@ import kotlinx.coroutines.launch
 import java.io.File
 import java.lang.reflect.Array as JArray
 
-val packageName: String get() = get<Context>().packageName
+val ServiceInfo.isIsolated get() = (flags and FLAG_ISOLATED_PROCESS) != 0
 
-val PackageInfo.processes
+@get:SuppressLint("InlinedApi")
-    get() = activities?.processNames.orEmpty() +
+val ServiceInfo.useAppZygote get() = (flags and FLAG_USE_APP_ZYGOTE) != 0
-            services?.processNames.orEmpty() +
-            receivers?.processNames.orEmpty() +
-            providers?.processNames.orEmpty()
-
-val Array<out ComponentInfo>.processNames get() = mapNotNull { it.processName }
-
-val ApplicationInfo.packageInfo: PackageInfo get() {
-    val pm = get<PackageManager>()
-
-    return try {
-        val request = GET_ACTIVITIES or GET_SERVICES or GET_RECEIVERS or GET_PROVIDERS
-        pm.getPackageInfo(packageName, request)
-    } catch (e: Exception) {
-        // Exceed binder data transfer limit, fetch each component type separately
-        pm.getPackageInfo(packageName, 0).apply {
-            runCatching { activities = pm.getPackageInfo(packageName, GET_ACTIVITIES).activities }
-            runCatching { services = pm.getPackageInfo(packageName, GET_SERVICES).services }
-            runCatching { receivers = pm.getPackageInfo(packageName, GET_RECEIVERS).receivers }
-            runCatching { providers = pm.getPackageInfo(packageName, GET_PROVIDERS).providers }
-        }
-    }
-}
 
 fun Context.rawResource(id: Int) = resources.openRawResource(id)
 
@@ -101,6 +82,11 @@ fun Context.getBitmap(id: Int): Bitmap {
     return bitmap
 }
 
+val Context.deviceProtectedContext: Context get() =
+    if (SDK_INT >= 24) {
+        createDeviceProtectedStorageContext()
+    } else { this }
+
 fun Intent.startActivity(context: Context) = context.startActivity(this)
 
 fun Intent.startActivityWithRoot() {
@@ -245,15 +231,13 @@ fun Context.colorStateListCompat(@ColorRes id: Int) = try {
     null
 }
 
-fun Context.drawableCompat(@DrawableRes id: Int) = ContextCompat.getDrawable(this, id)
+fun Context.drawableCompat(@DrawableRes id: Int) = AppCompatResources.getDrawable(this, id)
 /**
  * Pass [start] and [end] dimensions, function will return left and right
  * with respect to RTL layout direction
  */
 fun Context.startEndToLeftRight(start: Int, end: Int): Pair<Int, Int> {
-    if (SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 &&
+    if (resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
-        resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL
-    ) {
         return end to start
     }
     return start to end
@@ -261,8 +245,7 @@ fun Context.startEndToLeftRight(start: Int, end: Int): Pair<Int, Int> {
 
 fun Context.openUrl(url: String) = Utils.openLink(this, url.toUri())
 
-@Suppress("FunctionName")
+inline fun <reified T> T.createClassLoader(apk: File) =
-inline fun <reified T> T.DynamicClassLoader(apk: File) =
     DynamicClassLoader(apk, T::class.java.classLoader)
 
 fun Context.unwrap(): Context {
@@ -313,8 +296,21 @@ fun ViewGroup.startAnimations() {
     )
 }
 
+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
+    }
+}
+
 var View.coroutineScope: CoroutineScope
-    get() = getTag(R.id.coroutineScope) as? CoroutineScope ?: GlobalScope
+    get() = getTag(R.id.coroutineScope) as? CoroutineScope
+        ?: (activity as? BaseActivity)?.lifecycleScope
+        ?: GlobalScope
     set(value) = setTag(R.id.coroutineScope, value)
 
 @set:BindingAdapter("precomputedText")
@@ -323,16 +319,6 @@ var TextView.precomputedText: CharSequence
     set(value) {
         val callback = tag as? Runnable
 
-        // Don't even bother pre 21
-        if (SDK_INT < 21) {
-            post {
-                text = value
-                isGone = false
-                callback?.run()
-            }
-            return
-        }
-
         coroutineScope.launch(Dispatchers.IO) {
             if (SDK_INT >= 29) {
                 // Internally PrecomputedTextCompat will use platform API on API 29+
@@ -364,6 +350,16 @@ var TextView.precomputedText: CharSequence
     }
 
 fun Int.dpInPx(): Int {
-    val scale = ResMgr.resource.displayMetrics.density
+    val scale = AssetHack.resource.displayMetrics.density
     return (this * scale + 0.5).toInt()
 }
+
+@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
+}

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

@@ -1,19 +1,17 @@
 package com.topjohnwu.magisk.ktx
 
-import android.os.Build
 import androidx.collection.SparseArrayCompat
 import timber.log.Timber
 import java.io.File
 import java.io.InputStream
 import java.io.OutputStream
 import java.lang.reflect.Field
-import java.lang.reflect.Method
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 
-fun ZipInputStream.forEach(callback: (ZipEntry) -> Unit) {
+inline fun ZipInputStream.forEach(callback: (ZipEntry) -> Unit) {
     var entry: ZipEntry? = nextEntry
     while (entry != null) {
         callback(entry)
@@ -49,93 +47,8 @@ fun <T> MutableList<T>.synchronized() = Collections.synchronizedList(this)
 fun <T> MutableSet<T>.synchronized() = Collections.synchronizedSet(this)
 fun <K, V> MutableMap<K, V>.synchronized() = Collections.synchronizedMap(this)
 
-fun String.langTagToLocale(): Locale {
-    if (Build.VERSION.SDK_INT >= 21) {
-        return Locale.forLanguageTag(this)
-    } else {
-        val tok = split("-".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-        if (tok.isEmpty()) {
-            return Locale("")
-        }
-        val language = when (tok[0]) {
-            "und" -> "" // Undefined
-            "fil" -> "tl" // Filipino
-            else -> tok[0]
-        }
-        if (language.length != 2 && language.length != 3)
-            return Locale("")
-        if (tok.size == 1)
-            return Locale(language)
-        val country = tok[1]
-
-        return if (country.length != 2 && country.length != 3) Locale(language)
-        else Locale(language, country)
-    }
-}
-
-fun Locale.toLangTag(): String {
-    if (Build.VERSION.SDK_INT >= 21) {
-        return toLanguageTag()
-    } else {
-        var language = language
-        var country = country
-        var variant = variant
-        when {
-            language.isEmpty() || !language.matches("\\p{Alpha}{2,8}".toRegex()) ->
-                language = "und"       // Follow the Locale#toLanguageTag() implementation
-            language == "iw" -> language = "he"        // correct deprecated "Hebrew"
-            language == "in" -> language = "id"        // correct deprecated "Indonesian"
-            language == "ji" -> language = "yi"        // correct deprecated "Yiddish"
-        }
-        // ensure valid country code, if not well formed, it's omitted
-
-        // variant subtags that begin with a letter must be at least 5 characters long
-        // ensure valid country code, if not well formed, it's omitted
-        if (!country.matches("\\p{Alpha}{2}|\\p{Digit}{3}".toRegex())) {
-            country = ""
-        }
-
-        // variant subtags that begin with a letter must be at least 5 characters long
-        if (!variant.matches("\\p{Alnum}{5,8}|\\p{Digit}\\p{Alnum}{3}".toRegex())) {
-            variant = ""
-        }
-        val tag = StringBuilder(language)
-        if (country.isNotEmpty())
-            tag.append('-').append(country)
-        if (variant.isNotEmpty())
-            tag.append('-').append(variant)
-        return tag.toString()
-    }
-}
-
 fun SimpleDateFormat.parseOrNull(date: String) =
     runCatching { parse(date) }.onFailure { Timber.e(it) }.getOrNull()
 
-// Reflection hacks
+fun Class<*>.reflectField(name: String): Field =
-
+    getDeclaredField(name).apply { isAccessible = true }
-private val loadClass = ClassLoader::class.java.getMethod("loadClass", String::class.java)
-private val getDeclaredMethod = Class::class.java.getMethod("getDeclaredMethod",
-    String::class.java, arrayOf<Class<*>>()::class.java)
-private val getDeclaredField = Class::class.java.getMethod("getDeclaredField", String::class.java)
-
-fun ClassLoader.forceLoadClass(name: String) =
-    runCatching { loadClass.invoke(this, name) }.getOrNull() as Class<*>?
-
-fun Class<*>.forceGetDeclaredMethod(name: String, vararg types: Class<*>) =
-    (runCatching { getDeclaredMethod.invoke(this, name, types) }.getOrNull() as Method?)?.also {
-        it.isAccessible = true
-    }
-
-fun Class<*>.forceGetDeclaredField(name: String) =
-    (runCatching { getDeclaredField.invoke(this, name) }.getOrNull() as Field?)?.also {
-        it.isAccessible = true
-    }
-
-inline fun <reified T> T.forceGetClass(name: String) =
-    T::class.java.classLoader?.forceLoadClass(name)
-
-fun Class<*>.forceGetField(name: String): Field? =
-    forceGetDeclaredField(name) ?: superclass?.forceGetField(name)
-
-fun Class<*>.forceGetMethod(name: String, vararg types: Class<*>): Method? =
-    forceGetDeclaredMethod(name, *types) ?: superclass?.forceGetMethod(name, *types)

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

@@ -1,17 +0,0 @@
-package com.topjohnwu.magisk.ktx
-
-import org.koin.core.context.KoinContextHandler
-import org.koin.core.parameter.ParametersDefinition
-import org.koin.core.qualifier.Qualifier
-
-fun getKoin() = KoinContextHandler.get()
-
-inline fun <reified T> inject(
-    qualifier: Qualifier? = null,
-    noinline parameters: ParametersDefinition? = null
-) = lazy { get<T>(qualifier, parameters) }
-
-inline fun <reified T> get(
-    qualifier: Qualifier? = null,
-    noinline parameters: ParametersDefinition? = null
-): T = getKoin().get(qualifier, parameters)