Magisk v22.1 release notes

* This becomes meanless after 9c0e189.

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/workflows/build.yml

@@ -43,12 +43,8 @@ jobs:
       - name: Set up GitHub env (Windows)
         if: runner.os == 'Windows'
         run: |
-          $oldAndroidPath = $env:ANDROID_SDK_ROOT
-          $sdk_root = "C:\Android"
-          New-Item -Path $sdk_root -ItemType SymbolicLink -Value $oldAndroidPath
           $ndk_ver = Select-String -Path "gradle.properties" -Pattern "^magisk.fullNdkVersion=" | % { $_ -replace ".*=" }
-          echo "ANDROID_SDK_ROOT=$sdk_root" >> $env:GITHUB_ENV
-          echo "ANDROID_HOME=$sdk_root" >> $env:GITHUB_ENV
+          echo "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
 

.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

@@ -28,6 +28,9 @@
 [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 "termux-elf-cleaner"]
 	path = tools/termux-elf-cleaner
 	url = https://github.com/termux/termux-elf-cleaner.git

README.MD

@@ -1,7 +1,6 @@
 ![](docs/images/logo.png)
 
-![ZIP Downloads](https://img.shields.io/badge/dynamic/json?color=blue&label=ZIP%20Downloads&query=magisk&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk_files%2Fcount%2Fcount.json&cacheSeconds=1800)
-![APK Downloads](https://img.shields.io/badge/dynamic/json?color=green&label=APK%20Downloads&query=manager&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk_files%2Fcount%2Fcount.json&cacheSeconds=1800)
+[![Downloads](https://img.shields.io/badge/dynamic/json?color=green&label=Downloads&query=totalString&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk-files%2Fcount%2Fcount.json&cacheSeconds=1800)](https://raw.githubusercontent.com/topjohnwu/magisk-files/count/count.json)
 
 ## Introduction
 
@@ -15,11 +14,11 @@ Here are some feature highlights:
 
 ## Downloads
 
-[![](https://img.shields.io/badge/Magisk%20Manager-v8.0.6-green)](https://github.com/topjohnwu/Magisk/releases/download/manager-v8.0.6/MagiskManager-v8.0.6.apk)
-[![](https://img.shields.io/badge/Magisk%20Manager-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk_files/canary/app-debug.apk)
-<br>
-[![](https://img.shields.io/badge/Magisk-v21.3-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v21.3)
-[![](https://img.shields.io/badge/Magisk%20Beta-v21.3-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v21.3)
+Please note that the only source of official Magisk information and downloads is [Github](https://github.com/topjohnwu/Magisk/). Beware of any other websites.
+
+[![](https://img.shields.io/badge/Magisk-v22.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v22.0)
+[![](https://img.shields.io/badge/Magisk%20Beta-v22.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v22.0)
+[![](https://img.shields.io/badge/Magisk-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk-files/canary/app-debug.apk)
 
 ## Useful Links
 
@@ -34,17 +33,14 @@ Here are some feature highlights:
 - 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
 
@@ -60,13 +56,13 @@ For Magisk Manager crashes, record and upload the logcat when the crash occurs.
 - Run `./build.py ndk` to let the script download and install NDK for you
 - To start building, run `build.py` to see your options. \
 For each action, use `-h` to access help (e.g. `./build.py all -h`)
-- To start development, open the project in Android Studio. Both app (Kotlin/Java) and native (C++/C) source code can be properly developed using the IDE, but *always* use `build.py` for building.
+- To start development, open the project with Android Studio. The IDE can be used for both app (Kotlin/Java) and native (C++/C) sources.
 - Optionally, set custom configs with `config.prop`. A sample `config.prop.sample` is provided.
 - To sign APKs and zips with your own private keys, set signing configs in `config.prop`. For more info, check [Google's Documentation](https://developer.android.com/studio/publish/app-signing.html#generate-key).
 
 ## Translation Contributions
 
-Default string resources for Magisk Manager and its stub APK are located here:
+Default string resources for the Magisk app and its stub APK are located here:
 
 - `app/src/main/res/values/strings.xml`
 - `stub/src/main/res/values/strings.xml`

app/.gitignore

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

app/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.apache.tools.ant.filters.FixCrLfFilter
 import java.io.PrintStream
 
 plugins {
@@ -22,8 +23,9 @@ android {
         applicationId = "com.topjohnwu.magisk"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
-        versionName = Config.appVersion
-        versionCode = Config.appVersionCode
+        versionName = Config.version
+        versionCode = Config.versionCode
+        ndk.abiFilters("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
 
         javaCompileOptions.annotationProcessorOptions.arguments(
             mapOf("room.incremental" to "true")
@@ -51,13 +53,14 @@ android {
     }
 
     packagingOptions {
-        exclude("/META-INF/**")
+        exclude("/META-INF/*")
         exclude("/org/bouncycastle/**")
         exclude("/kotlin/**")
         exclude("/kotlinx/**")
         exclude("/okhttp3/**")
         exclude("/*.txt")
         exclude("/*.bin")
+        doNotStrip("**/*.so")
     }
 
     kotlinOptions {
@@ -65,10 +68,83 @@ android {
     }
 }
 
-tasks["preBuild"]?.dependsOn(tasks.register("copyUtils", Copy::class) {
-    from(rootProject.file("scripts/util_functions.sh"))
-    into("src/main/res/raw")
-})
+val syncLibs by tasks.registering(Sync::class) {
+    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 createStubLibs by tasks.registering {
+    dependsOn(syncLibs)
+    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()
+    }
+}
+
+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")
@@ -125,13 +201,13 @@ dependencies {
     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.1"
     implementation("com.github.topjohnwu.libsu:core:${vLibsu}")
     implementation("com.github.topjohnwu.libsu:io:${vLibsu}")
 
@@ -158,7 +234,7 @@ dependencies {
     implementation("com.squareup.moshi:moshi:${vMoshi}")
     kapt("com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}")
 
-    val vRoom = "2.3.0-alpha04"
+    val vRoom = "2.3.0-beta03"
     implementation("androidx.room:room-runtime:${vRoom}")
     implementation("androidx.room:room-ktx:${vRoom}")
     kapt("androidx.room:room-compiler:${vRoom}")
@@ -167,17 +243,16 @@ 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.4")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
     implementation("androidx.browser:browser:1.3.0")
     implementation("androidx.preference:preference:1.1.1")
     implementation("androidx.recyclerview:recyclerview:1.1.0")
-    implementation("androidx.fragment:fragment-ktx:1.2.5")
-    implementation("androidx.work:work-runtime-ktx:2.4.0")
-    implementation("androidx.transition:transition:1.3.1")
+    implementation("androidx.fragment:fragment-ktx:1.3.1")
+    implementation("androidx.work:work-runtime-ktx:2.5.0")
+    implementation("androidx.transition:transition:1.4.0")
     implementation("androidx.multidex:multidex:2.0.1")
     implementation("androidx.core:core-ktx:1.3.2")
-    implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.0.0")
-    implementation("com.google.android.material:material:1.2.1")
+    implementation("com.google.android.material:material:1.3.0")
 }

app/proguard-rules.pro

@@ -18,16 +18,10 @@
 
 # Kotlin
 -assumenosideeffects class kotlin.jvm.internal.Intrinsics {
-	public static void checkExpressionValueIsNotNull(...);
-	public static void checkNotNullExpressionValue(...);
-	public static void checkReturnedValueIsNotNull(...);
-	public static void checkFieldIsNotNull(...);
-	public static void checkParameterIsNotNull(...);
+	public static void check*(...);
+	public static void throw*(...);
 }
 
-# Stubs
--keep class a.* { *; }
-
 # Snet
 -keepclassmembers class com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper { *; }
 -keep,allowobfuscation interface com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper$Callback
@@ -35,14 +29,17 @@
   void onResponse(org.json.JSONObject);
 }
 
+# Stub
+-keep class com.topjohnwu.magisk.core.App { <init>(java.lang.Object); }
+
 # 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

app/shared/src/main/AndroidManifest.xml

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

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) {
-        Intent install = new Intent(Intent.ACTION_INSTALL_PACKAGE);
-        install.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        install.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            install.setData(FileProvider.getUriForFile(c, c.getPackageName() + ".provider", apk));
-        } else {
-            apk.setReadable(true, false);
-            install.setData(Uri.fromFile(apk));
-        }
-        return install;
+    public static void registerInstallReceiver(Context c, BroadcastReceiver r) {
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
+        filter.addDataScheme("package");
+        c.getApplicationContext().registerReceiver(r, filter);
+    }
+
+    public static void installHideResult(Activity c, File apk) {
+        Intent intent = installIntent(c, apk);
+        intent.putExtra(Intent.EXTRA_RETURN_RESULT, true);
+        c.startActivityForResult(intent, 0); // Ignore result, use install receiver
     }
 }

app/src/main/AndroidManifest.xml

@@ -3,21 +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.FOREGROUND_SERVICE" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="29" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
 
     <application
+        android:name=".core.App"
+        android:extractNativeLibs="true"
         android:icon="@drawable/ic_launcher"
-        android:name="a.e"
-        android:allowBackup="false"
+        android:multiArch="true"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
 
         <!-- Splash -->
         <activity
-            android:name="a.c"
+            android:name=".core.SplashActivity"
+            android:exported="true"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -30,48 +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"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
         <!-- Receiver -->
         <receiver
-            android:name="a.h"
-            android:directBootAware="true">
+            android:name=".core.Receiver"
+            android:directBootAware="true"
+            android:exported="false">
             <intent-filter>
-                <action android:name="android.intent.action.REBOOT" />
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
+                <action android:name="android.intent.action.UID_REMOVED" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <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="a.p"
+            android:name=".core.Provider"
             android:authorities="${applicationId}.provider"
             android:directBootAware="true"
             android:exported="false"
-            android:grantUriPermissions="true">
-        </provider>
+            android:grantUriPermissions="true" />
 
         <!-- Hardcode GMS version -->
         <meta-data
@@ -82,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,32 +0,0 @@
-@file:JvmName("a")
-package a
-
-import com.topjohnwu.magisk.core.App
-import com.topjohnwu.magisk.core.Provider
-import com.topjohnwu.magisk.core.Receiver
-import com.topjohnwu.magisk.core.SplashActivity
-import com.topjohnwu.magisk.core.download.DownloadService
-import com.topjohnwu.magisk.ui.MainActivity
-import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
-import com.topjohnwu.signing.SignBoot
-
-fun main(args: Array<String>) {
-    SignBoot.main(args)
-}
-
-class b : MainActivity()
-
-class c : SplashActivity()
-
-class e : App {
-    constructor() : super()
-    constructor(o: Any) : super(o)
-}
-
-class h : Receiver()
-
-class j : DownloadService()
-
-class m : SuRequestActivity()
-
-class p : Provider()

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

@@ -10,7 +10,6 @@ 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
@@ -28,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<*, *>
@@ -36,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 {
@@ -58,14 +57,6 @@ abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
             .use { it.getDrawable(0) }
             .also { window.setBackgroundDrawable(it) }
 
-        directionsDispatcher.observe(this) {
-            it?.navigate()
-            // we don't want the directions to be re-dispatched, so we preemptively set them to null
-            if (it != null) {
-                directionsDispatcher.value = null
-            }
-        }
-
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             window?.decorView?.let {
                 it.systemUiVisibility = (it.systemUiVisibility
@@ -127,14 +118,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/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

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

@@ -1,7 +1,6 @@
 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
@@ -107,7 +106,7 @@ abstract class BaseViewModel(
         _viewEvents.postValue(this)
     }
 
-    fun NavDirections.publish() {
+    fun NavDirections.navigate() {
         _viewEvents.postValue(NavigationEvent(this))
     }
 

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

@@ -10,8 +10,9 @@ import androidx.multidex.MultiDex
 import androidx.work.WorkManager
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.DynAPK
+import com.topjohnwu.magisk.core.utils.AppShellInit
+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.ktx.unwrap
@@ -19,6 +20,7 @@ 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() {
@@ -31,7 +33,7 @@ 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()
 
@@ -61,12 +63,18 @@ open class App() : Application() {
         val wrapped = impl.wrap()
         super.attachBaseContext(wrapped)
 
+        val info = base.applicationInfo
+        val libDir = runCatching {
+            info.javaClass.getDeclaredField("secondaryNativeLibraryDir").get(info) as String?
+        }.getOrNull() ?: info.nativeLibraryDir
+        Const.NATIVE_LIB_DIR = File(libDir)
+
         // Normal startup
         startKoin {
             androidContext(wrapped)
             modules(koinModules)
         }
-        ResMgr.init(impl)
+        AssetHack.init(impl)
         app.registerActivityLifecycleCallbacks(ForegroundTracker)
         WorkManager.initialize(impl.wrapJob(), androidx.work.Configuration.Builder().build())
     }

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

@@ -1,41 +1,52 @@
 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
+    val CPU_ABI_32: String
+
+    init {
+        if (Build.VERSION.SDK_INT >= 21) {
+            CPU_ABI = Build.SUPPORTED_ABIS[0]
+            CPU_ABI_32 = Build.SUPPORTED_32_BIT_ABIS.firstOrNull() ?: CPU_ABI
+        } else {
+            CPU_ABI = Build.CPU_ABI
+            CPU_ABI_32 = 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_REVISION = "18ab78817087c337ae0edd1ecac38aec49217880"
-    const val BOOTCTL_REVISION = "18ab78817087c337ae0edd1ecac38aec49217880"
+    const val SNET_REVISION = "22.0"
+    const val BOOTCTL_REVISION = "22.0"
 
     // Misc
     val USER_ID = Process.myUid() / 100000
 
     object Version {
-        const val MIN_VERSION = "v19.0"
-        const val MIN_VERCODE = 19000
+        const val MIN_VERSION = "v20.4"
+        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 UPDATE_NOTIFICATION_CHANNEL = "update"
         const val PROGRESS_NOTIFICATION_CHANNEL = "progress"
@@ -46,9 +57,13 @@ object Const {
         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 GITHUB_OLD_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"
     }

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 =
-    if (global) GlobalResContext(this) else ResContext(this)
+fun Context.wrap(inject: Boolean = false): Context =
+    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 {
-        return this
-    }
+    override fun getApplicationContext() = this
 
     @SuppressLint("NewApi")
     override fun getSystemService(name: String): Any? {
-        return if (!isRunningAsStub) super.getSystemService(name) else
-            when (name) {
-                Context.JOB_SCHEDULER_SERVICE ->
-                    JobSchedulerWrapper(super.getSystemService(name) as JobScheduler)
-                else -> super.getSystemService(name)
+        return super.getSystemService(name).let {
+            when {
+                !isRunningAsStub -> it
+                name == JOB_SCHEDULER_SERVICE -> JobSchedulerWrapper(it as JobScheduler)
+                else -> it
             }
+        }
     }
 }
 
-fun Class<*>.cmp(pkg: String): ComponentName {
-    val name = ClassMap[this].name
-    return ComponentName(pkg, Info.stub?.classToComponent?.get(name) ?: name)
-}
+fun Class<*>.cmp(pkg: String) =
+    ComponentName(pkg, Info.stub?.classToComponent?.get(name) ?: name)
 
 inline fun <reified T> Activity.redirect() = Intent(intent)
     .setComponent(T::class.java.cmp(packageName))
@@ -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) {
-    open val mRes: Resources get() = ResMgr.resource
-
-    override fun getResources(): Resources {
-        return mRes
-    }
-
-    override fun getClassLoader(): ClassLoader {
-        return javaClass.classLoader!!
-    }
-
+private open class InjectedContext(base: Context) : ContextWrapper(base) {
+    open val res: Resources get() = AssetHack.resource
+    override fun getAssets(): AssetManager = res.assets
+    override fun getResources() = res
+    override fun getClassLoader() = 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) {
-    override val mRes by lazy { base.resources.patch() }
-
+private class ReInjectedContext(base: Context) : InjectedContext(base) {
+    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): Int {
-        return base.schedule(job.patch())
-    }
-
-    override fun enqueue(job: JobInfo, work: JobWorkItem): Int {
-        return base.enqueue(job.patch(), work)
-    }
-
-    override fun cancel(jobId: Int) {
-        base.cancel(jobId)
-    }
-
-    override fun cancelAll() {
-        base.cancelAll()
-    }
-
-    override fun getAllPendingJobs(): List<JobInfo> {
-        return base.allPendingJobs
-    }
-
-    override fun getPendingJob(jobId: Int): JobInfo? {
-        return base.getPendingJob(jobId)
-    }
-
+    override fun schedule(job: JobInfo) = base.schedule(job.patch())
+    override fun enqueue(job: JobInfo, work: JobWorkItem) = base.enqueue(job.patch(), work)
+    override fun cancel(jobId: Int) = base.cancel(jobId)
+    override fun cancelAll() = base.cancelAll()
+    override fun getAllPendingJobs(): List<JobInfo> = base.allPendingJobs
+    override fun getPendingJob(jobId: Int) = base.getPendingJob(jobId)
     private fun JobInfo.patch(): JobInfo {
-        // We need to swap out the service of JobInfo
-        val name = service.className
-        val component = ComponentName(
-            service.packageName,
-            Info.stubChk.classToComponent[name] ?: name
-        )
+        // Swap out the service of JobInfo
+        val component = service.run {
+            ComponentName(packageName,
+                Info.stub?.classToComponent?.get(className) ?: className)
+        }
+        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,
-        Receiver::class.java to a.h::class.java,
-        DownloadService::class.java to a.j::class.java,
-        SuRequestActivity::class.java to a.m::class.java
-    )
-
-    operator fun get(c: Class<*>) = map.getOrElse(c) { c }
-}
-
 // Keep a reference to these resources to prevent it from
 // being removed when running "remove unused resources"
 val shouldKeepResources = listOf(

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

@@ -1,41 +1,45 @@
 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.data.repository.NetworkService
 import com.topjohnwu.magisk.ktx.get
-import com.topjohnwu.magisk.utils.CachedValue
+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 var isSAR = false
-    @JvmStatic var isAB = false
+    @JvmStatic val env by lazy { loadState() }
+    @JvmField var isSAR = 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
-    @JvmStatic var hasGMS = true
-    @JvmStatic var isPixel = false
-    @JvmStatic val cryptoText get() = crypto.capitalize(Locale.US)
+    @JvmField var ramdisk = false
+    @JvmField var hasGMS = true
+    @JvmField val isPixel = Build.BRAND == "google"
+    @JvmField val isEmulator = getProperty("ro.kernel.qemu", "0") == "1"
+    var crypto = ""
+    var noDataExec = false
 
     val isConnected by lazy {
         ObservableBoolean(false).also { field ->
@@ -47,14 +51,12 @@ object Info {
 
     val isNewReboot by lazy {
         try {
-            FileInputStream("/proc/sys/kernel/random/boot_id").bufferedReader().use {
-                val id = it.readLine()
-                if (id != Config.bootId) {
-                    Config.bootId = id
-                    true
-                } else {
-                    false
-                }
+            val id = File("/proc/sys/kernel/random/boot_id").readText()
+            if (id != Config.bootId) {
+                Config.bootId = id
+                true
+            } else {
+                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) {
-            in Int.MIN_VALUE..Const.Version.MIN_VERCODE -> -1
+        val magiskVersionCode = when {
+            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/Receiver.kt

@@ -1,10 +1,10 @@
 package com.topjohnwu.magisk.core
 
+import android.annotation.SuppressLint
 import android.content.ContextWrapper
 import android.content.Intent
 import com.topjohnwu.magisk.core.base.BaseReceiver
 import com.topjohnwu.magisk.core.magiskdb.PolicyDao
-import com.topjohnwu.magisk.core.su.SuCallbackHandler
 import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.GlobalScope
@@ -15,30 +15,33 @@ open class Receiver : BaseReceiver() {
 
     private val policyDB: PolicyDao by inject()
 
-    private fun getPkg(intent: Intent): String {
-        return intent.data?.encodedSchemeSpecificPart.orEmpty()
+    @SuppressLint("InlinedApi")
+    private fun getPkg(intent: Intent): String? {
+        val pkg = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME)
+        return pkg ?: intent.data?.schemeSpecificPart
+    }
+
+    private fun getUid(intent: Intent): Int? {
+        val uid = intent.getIntExtra(Intent.EXTRA_UID, -1)
+        return if (uid == -1) null else uid
     }
 
     override fun onReceive(context: ContextWrapper, intent: Intent?) {
         intent ?: return
 
-        fun rmPolicy(pkg: String) = GlobalScope.launch {
-            policyDB.delete(pkg)
+        fun rmPolicy(uid: Int) = GlobalScope.launch {
+            policyDB.delete(uid)
         }
 
         when (intent.action ?: return) {
-            Intent.ACTION_REBOOT -> {
-                SuCallbackHandler(context, intent.getStringExtra("action"), intent.extras)
-            }
             Intent.ACTION_PACKAGE_REPLACED -> {
                 // This will only work pre-O
                 if (Config.suReAuth)
-                    rmPolicy(getPkg(intent))
+                    getUid(intent)?.let { rmPolicy(it) }
             }
-            Intent.ACTION_PACKAGE_FULLY_REMOVED -> {
-                val pkg = getPkg(intent)
-                rmPolicy(pkg)
-                Shell.su("magiskhide --rm $pkg").submit()
+            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,32 +1,30 @@
 package com.topjohnwu.magisk.core
 
-import android.app.Activity
-import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.base.BaseActivity
+import com.topjohnwu.magisk.core.tasks.HideAPK
 import com.topjohnwu.magisk.data.repository.NetworkService
 import com.topjohnwu.magisk.ktx.get
 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 kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import java.util.concurrent.CountDownLatch
 
-open class SplashActivity : Activity() {
+open class SplashActivity : BaseActivity() {
 
-    override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base.wrap())
-    }
+    private val latch = CountDownLatch(1)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         setTheme(R.style.SplashTheme)
         super.onCreate(savedInstanceState)
-        GlobalScope.launch(Dispatchers.IO) {
-            initAndStart()
-        }
+        // Pre-initialize root shell
+        Shell.getShell(null) { initAndStart() }
     }
 
     private fun handleRepackage(pkg: String?) {
@@ -40,13 +38,26 @@ open class SplashActivity : Activity() {
             if (Config.suManager.isNotEmpty())
                 Config.suManager = ""
             pkg ?: return
-            Shell.su("(pm uninstall $pkg)& >/dev/null 2>&1").exec()
+            if (!Shell.su("(pm uninstall $pkg)& >/dev/null 2>&1").exec().isSuccess)
+                uninstallApp(pkg)
         }
     }
 
     private fun initAndStart() {
-        // Pre-initialize root shell
-        Shell.getShell()
+        if (isRunningAsStub && !Shell.rootAccess()) {
+            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
+        }
 
         val prevPkg = intent.getStringExtra(Const.Key.PREV_PKG)
 
@@ -60,11 +71,21 @@ open class SplashActivity : Activity() {
         get<NetworkService>()
 
         DONE = true
-
-        redirect<MainActivity>().also { startActivity(it) }
+        startActivity(redirect<MainActivity>())
         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,13 +1,11 @@
 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.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
@@ -18,20 +16,15 @@ class UpdateCheckService(context: Context, workerParams: WorkerParameters)
     private val svc: NetworkService by inject()
 
     override suspend fun doWork(): Result {
-        // Make sure shell initializer was ran
-        withContext(Dispatchers.IO) {
-            Shell.getShell()
-        }
-        return svc.fetchUpdate()?.let {
-            if (BuildConfig.VERSION_CODE < it.app.versionCode)
+        return svc.fetchUpdate()?.run {
+            if (Info.env.isActive && BuildConfig.VERSION_CODE < magisk.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

@@ -14,7 +14,6 @@ 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.set
@@ -26,6 +25,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,7 +40,7 @@ abstract class BaseActivity : AppCompatActivity() {
     }
 
     override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base.wrap(false))
+        super.attachBaseContext(base.wrap(true))
     }
 
     fun withPermission(permission: String, builder: PermissionRequestBuilder.() -> Unit) {
@@ -49,10 +55,7 @@ abstract class BaseActivity : AppCompatActivity() {
         if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
             request.onSuccess()
         } else {
-            var requestCode: Int
-            do {
-                requestCode = Random.nextInt(Const.ID.MAX_ACTIVITY_RESULT + 1, 1 shl 15)
-            } while (resultCallbacks.containsKey(requestCode))
+            val requestCode = newRequestCode
             resultCallbacks[requestCode] = { result, _ ->
                 if (result > 0)
                     request.onSuccess()
@@ -92,7 +95,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/download/Action.kt

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

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

@@ -8,11 +8,8 @@ import androidx.lifecycle.MutableLiveData
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.ForegroundTracker
 import com.topjohnwu.magisk.core.base.BaseService
-import com.topjohnwu.magisk.core.utils.MediaStoreUtils.checkSum
-import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
 import com.topjohnwu.magisk.core.utils.ProgressInputStream
 import com.topjohnwu.magisk.data.repository.NetworkService
-import com.topjohnwu.magisk.ktx.withStreams
 import com.topjohnwu.magisk.view.Notifications
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -69,18 +66,11 @@ abstract class BaseDownloader : BaseService(), KoinComponent {
     // -- Download logic
 
     private suspend fun Subject.startDownload() {
-        val skip = this is Subject.Magisk && file.checkSum("MD5", magisk.md5)
-        if (!skip) {
-            val stream = service.fetchFile(url).toProgressStream(this)
-            when (this) {
-                is Subject.Module ->  // Download and process on-the-fly
-                    stream.toModule(file, service.fetchInstaller().byteStream())
-                else -> {
-                    withStreams(stream, file.outputStream()) { it, out -> it.copyTo(out) }
-                    if (this is Subject.Manager)
-                        handleAPK(this)
-                }
-            }
+        val stream = service.fetchFile(url).toProgressStream(this)
+        when (this) {
+            is Subject.Module ->  // Download and process on-the-fly
+                stream.toModule(file, service.fetchInstaller().byteStream())
+            is Subject.Manager -> handleAPK(this, stream)
         }
         val newId = notifyFinish(this)
         if (ForegroundTracker.hasForeground)
@@ -187,7 +177,7 @@ abstract class BaseDownloader : BaseService(), KoinComponent {
     companion object : KoinComponent {
         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.core.download.Action.Flash.Secondary
-import com.topjohnwu.magisk.core.download.Subject.*
+import com.topjohnwu.magisk.arch.BaseUIActivity
+import com.topjohnwu.magisk.core.ForegroundTracker
+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,22 +45,13 @@ 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())
     }
 

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

@@ -2,19 +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.Info
 import com.topjohnwu.magisk.core.isRunningAsStub
 import com.topjohnwu.magisk.core.tasks.HideAPK
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
 import com.topjohnwu.magisk.ktx.relaunchApp
+import com.topjohnwu.magisk.ktx.withStreams
 import com.topjohnwu.magisk.ktx.writeTo
 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")
-    HideAPK.patch(this, apk.path, patched.path, packageName, applicationInfo.nonLocalizedLabel)
+    HideAPK.patch(this, apk, patched, packageName, applicationInfo.nonLocalizedLabel)
     apk.delete()
     patched.renameTo(apk)
 }
@@ -22,30 +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("")
     }
 }
 
-suspend fun BaseDownloader.handleAPK(subject: Subject.Manager) {
-    val apk = subject.file.toFile()
-    val id = subject.notifyID()
+private class DupOutputStream(
+    private val o1: OutputStream,
+    private val o2: OutputStream
+) : OutputStream() {
+    override fun write(b: Int) {
+        o1.write(b)
+        o2.write(b)
+    }
+    override fun write(b: ByteArray?, off: Int, len: Int) {
+        o1.write(b, off, len)
+        o2.write(b, off, len)
+    }
+    override fun close() {
+        o1.close()
+        o2.close()
+    }
+}
+
+suspend fun 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
-        apk.copyTo(DynAPK.update(this), overwrite = true)
-        apk.delete()
-        if (Info.stubChk.version < subject.stub.versionCode) {
-            notifyHide(id)
+        val apk = subject.file.toFile()
+        val id = subject.notifyID()
+        write(DynAPK.update(this).outputStream())
+        if (Info.stub!!.version < subject.stub.versionCode) {
             // 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) {
-        notifyHide(id)
-        patch(apk)
+    } else {
+        write(subject.file.outputStream())
     }
 }

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
-        while (entry != null) {
+        zin.forEach { entry ->
             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

@@ -6,7 +6,6 @@ import android.os.Parcelable
 import androidx.core.net.toUri
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.model.MagiskJson
-import com.topjohnwu.magisk.core.model.ManagerJson
 import com.topjohnwu.magisk.core.model.StubJson
 import com.topjohnwu.magisk.core.model.module.OnlineModule
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
@@ -40,70 +39,26 @@ sealed class Subject : Parcelable {
 
     @Parcelize
     class Manager(
-        private val app: ManagerJson = Info.remote.app,
+        private val json: MagiskJson = Info.remote.magisk,
         val stub: StubJson = Info.remote.stub
     ) : Subject() {
         override val action get() = Action.Download
-        override val title: String get() = "MagiskManager-${app.version}(${app.versionCode})"
-        override val url: String get() = app.link
+        override val title: String get() = "Magisk-${json.version}(${json.versionCode})"
+        override val url: String get() = json.link
 
         @IgnoredOnParcel
         override val file by lazy {
             cachedFile("manager.apk")
         }
 
+        val externalFile get() = MediaStoreUtils.getFile("$title.apk").uri
     }
-
-    abstract class Magisk : Subject() {
-
-        val magisk: MagiskJson = Info.remote.magisk
-
-        @Parcelize
-        private class Internal(
-            override val action: Action
-        ) : Magisk() {
-            override val url: String get() = magisk.link
-            override val title: String get() = "Magisk-${magisk.version}(${magisk.versionCode})"
-
-            @IgnoredOnParcel
-            override val file by lazy {
-                cachedFile("magisk.zip")
-            }
-        }
-
-        @Parcelize
-        private class Uninstall : Magisk() {
-            override val action get() = Action.Uninstall
-            override val url: String get() = Info.remote.uninstaller.link
-            override val title: String get() = "uninstall.zip"
-
-            @IgnoredOnParcel
-            override val file by lazy {
-                cachedFile(title)
-            }
-
-        }
-
-        @Parcelize
-        private class Download : Magisk() {
-            override val action get() = Action.Download
-            override val url: String get() = magisk.link
-            override val title: String get() = "Magisk-${magisk.version}(${magisk.versionCode}).zip"
-
-            @IgnoredOnParcel
-            override val file by lazy {
-                MediaStoreUtils.getFile(title).uri
-            }
-        }
-
-        companion object {
-            operator fun invoke(config: Action) = when (config) {
-                Action.Download -> Download()
-                Action.Uninstall -> Uninstall()
-                Action.EnvFix, is Action.Flash, is Action.Patch -> Internal(config)
-            }
-        }
-
-    }
-
+}
+
+sealed class Action : Parcelable {
+    @Parcelize
+    object Flash : Action()
+
+    @Parcelize
+    object Download : Action()
 }

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

@@ -31,12 +31,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)

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

@@ -6,29 +6,13 @@ import kotlinx.parcelize.Parcelize
 
 @JsonClass(generateAdapter = true)
 data class UpdateInfo(
-    val app: ManagerJson = ManagerJson(),
-    val uninstaller: UninstallerJson = UninstallerJson(),
     val magisk: MagiskJson = MagiskJson(),
     val stub: StubJson = StubJson()
 )
 
-@JsonClass(generateAdapter = true)
-data class UninstallerJson(
-    val link: String = ""
-)
-
-@JsonClass(generateAdapter = true)
-data class MagiskJson(
-    val version: String = "",
-    val versionCode: Int = -1,
-    val link: String = "",
-    val note: String = "",
-    val md5: String = ""
-)
-
 @Parcelize
 @JsonClass(generateAdapter = true)
-data class ManagerJson(
+data class MagiskJson(
     val version: String = "",
     val versionCode: Int = -1,
     val link: String = "",

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/tasks/FlashZip.kt

@@ -2,14 +2,13 @@ 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.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
@@ -25,61 +24,50 @@ open class FlashZip(
     private val logs: MutableList<String>
 ): KoinComponent {
 
-    val context: Context by inject()
-    private val installFolder = File(context.cacheDir, "flash").apply {
-        if (!exists()) mkdirs()
-    }
-    private val tmpFile: File = File(installFolder, "install.zip")
-
-    @Throws(IOException::class)
-    private fun unzipAndCheck(): Boolean {
-        val parentFile = tmpFile.parentFile ?: return false
-        tmpFile.unzip(parentFile, "META-INF/com/google/android", true)
-
-        val updaterScript = File(parentFile, "updater-script")
-        return Shell
-            .su("grep -q '#MAGISK' $updaterScript")
-            .exec()
-            .isSuccess
-    }
+    private val context: Context by inject()
+    private val installDir = File(context.cacheDir, "flash")
+    private lateinit var zipFile: File
 
     @Throws(IOException::class)
     private fun flash(): Boolean {
-        console.add("- Copying zip to temp directory")
+        installDir.deleteRecursively()
+        installDir.mkdirs()
 
-        runCatching {
-            mUri.inputStream().writeTo(tmpFile)
-        }.getOrElse {
-            when (it) {
-                is FileNotFoundException -> console.add("! Invalid Uri")
-                is IOException -> console.add("! Cannot copy to cache")
+        zipFile = if (mUri.scheme == "file") {
+            mUri.toFile()
+        } else {
+            File(installDir, "install.zip").also {
+                console.add("- Copying zip to temp directory")
+                try {
+                    mUri.inputStream().writeTo(it)
+                } catch (e: IOException) {
+                    when (e) {
+                        is FileNotFoundException -> console.add("! Invalid Uri")
+                        else -> console.add("! Cannot copy to cache")
+                    }
+                    throw e
+                }
             }
-            throw it
         }
 
-        val isMagiskModule = runCatching {
-            unzipAndCheck()
+        val isValid = runCatching {
+            zipFile.unzip(installDir, "META-INF/com/google/android", true)
+            val script = File(installDir, "updater-script")
+            script.readText().contains("#MAGISK")
         }.getOrElse {
             console.add("! Unzip error")
             throw it
         }
 
-        if (!isMagiskModule) {
-            console.add("! This zip is not a Magisk Module!")
+        if (!isValid) {
+            console.add("! This zip is not a Magisk module!")
             return false
         }
 
         console.add("- Installing ${mUri.displayName}")
 
-        val parentFile = tmpFile.parent ?: return false
-
-        return Shell
-            .su(
-                "cd $parentFile",
-                "BOOTMODE=true sh update-binary dummy 1 $tmpFile"
-            )
-            .to(console, logs)
-            .exec().isSuccess
+        return Shell.su("sh $installDir/update-binary dummy 1 \'$zipFile\'")
+            .to(console, logs).exec().isSuccess
     }
 
     open suspend fun exec() = withContext(Dispatchers.IO) {
@@ -94,25 +82,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

@@ -1,38 +1,41 @@
 package com.topjohnwu.magisk.core.tasks
 
-import android.app.ProgressDialog
+import android.app.Activity
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.os.Build.VERSION.SDK_INT
 import android.widget.Toast
 import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID
 import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.*
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.Provider
 import com.topjohnwu.magisk.core.utils.AXML
 import com.topjohnwu.magisk.core.utils.Keygen
 import com.topjohnwu.magisk.data.repository.NetworkService
 import com.topjohnwu.magisk.ktx.inject
 import com.topjohnwu.magisk.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.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.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 Manager"
+    private const val APP_NAME = "Magisk"
     private const val ANDROID_MANIFEST = "AndroidManifest.xml"
 
     // Some arbitrary limit
@@ -49,7 +52,7 @@ object HideAPK {
         var next: Char
         var prev = 0.toChar()
         for (i in 0 until len) {
-            next = if (prev == '.' || prev == 0.toChar() || i == len - 1) {
+            next = if (prev == '.' || i == 0 || i == len - 1) {
                 ALPHA[random.nextInt(ALPHA.length)]
             } else {
                 ALPHADOTS[random.nextInt(ALPHADOTS.length)]
@@ -59,19 +62,19 @@ object HideAPK {
         }
         if (!builder.contains('.')) {
             // Pick a random index and set it as dot
-            val idx = random.nextInt(len - 1)
-            builder[idx] = '.'
+            val idx = random.nextInt(len - 2)
+            builder[idx + 1] = '.'
         }
         return builder.toString()
     }
 
     fun patch(
         context: Context,
-        apk: String, out: String,
+        apk: File, out: File,
         pkg: String, label: CharSequence
     ): Boolean {
         try {
-            val jar = JarMap.open(apk)
+            val jar = JarMap.open(apk, true)
             val je = jar.getJarEntry(ANDROID_MANIFEST)
             val xml = AXML(jar.getRawData(je))
 
@@ -90,103 +93,76 @@ object HideAPK {
         return true
     }
 
-    private suspend fun patchAndHide(context: Context, label: String): Boolean {
-        val dlStub = !isRunningAsStub && SDK_INT >= 28 && Const.Version.atLeast_20_2()
-        val src = if (dlStub) {
-            val stub = File(context.cacheDir, "stub.apk")
-            try {
-                svc.fetchFile(Info.remote.stub.link).byteStream().use {
-                    it.writeTo(stub)
-                }
-            } catch (e: IOException) {
-                Timber.e(e)
-                return false
-            }
-            stub.path
-        } else {
-            context.packageCodePath
-        }
+    private class WaitPackageReceiver(
+        private val pkg: String,
+        activity: Activity
+    ) : BroadcastReceiver() {
 
-        // Generate a new random package name and signature
-        val repack = File(context.cacheDir, "patched.apk")
-        val pkg = genPackageName()
-        Config.keyStoreRaw = ""
+        private val activity = WeakReference(activity)
 
-        if (!patch(context, src, repack.path, pkg, label))
-            return false
-
-        // Install the application
-        if (!Shell.su("adb_pm_install $repack").exec().isSuccess)
-            return false
-
-        context.apply {
-            val intent = packageManager.getLaunchIntentForPackage(pkg) ?: return false
-            Config.suManager = pkg
+        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
 
-        return true
-    }
-
-    @Suppress("DEPRECATION")
-    fun hide(context: Context, label: String) {
-        val dialog = ProgressDialog.show(context, context.getString(R.string.hide_manager_title), "", true)
-        GlobalScope.launch {
-            val result = withContext(Dispatchers.IO) {
-                patchAndHide(context, label)
-            }
-            if (!result) {
-                Utils.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG)
-                dialog.dismiss()
-            }
-        }
-    }
-
-    private suspend fun downloadAndRestore(context: Context): Boolean {
-        val apk = if (isRunningAsStub) {
-            DynAPK.current(context)
-        } else {
-            File(context.cacheDir, "manager.apk").also { apk ->
-                try {
-                    svc.fetchFile(Info.remote.app.link).byteStream().use {
-                        it.writeTo(apk)
+        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()
                     }
-                } catch (e: IOException) {
-                    Timber.e(e)
-                    return false
                 }
             }
         }
 
-        if (!Shell.su("adb_pm_install $apk").exec().isSuccess)
-            return false
+    }
 
-        context.apply {
-            val intent = packageManager.getLaunchIntentForPackage(APPLICATION_ID) ?: return false
-            Config.suManager = ""
-            grantUriPermission(APPLICATION_ID, APK_URI, Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            grantUriPermission(APPLICATION_ID, PREFS_URI, Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            intent.putExtra(Const.Key.PREV_PKG, packageName)
-            startActivity(intent)
+    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
     }
 
-    @Suppress("DEPRECATION")
-    fun restore(context: Context) {
-        val dialog = ProgressDialog.show(context, context.getString(R.string.restore_img_msg), "", true)
-        GlobalScope.launch {
-            val result = withContext(Dispatchers.IO) {
-                downloadAndRestore(context)
-            }
-            if (!result) {
-                Utils.toast(R.string.restore_manager_fail_toast, Toast.LENGTH_LONG)
-                dialog.dismiss()
-            }
+    suspend fun 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,25 +1,23 @@
 package com.topjohnwu.magisk.core.tasks
 
 import android.content.Context
-import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.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.Info
+import com.topjohnwu.magisk.core.*
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
 import com.topjohnwu.magisk.data.repository.NetworkService
 import com.topjohnwu.magisk.di.Protected
-import com.topjohnwu.magisk.events.dialog.EnvFixDialog
 import com.topjohnwu.magisk.ktx.reboot
+import com.topjohnwu.magisk.ktx.symlink
 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
@@ -37,156 +35,162 @@ import org.kamranzafar.jtar.TarHeader
 import org.kamranzafar.jtar.TarInputStream
 import org.kamranzafar.jtar.TarOutputStream
 import org.koin.core.KoinComponent
-import org.koin.core.get
 import org.koin.core.inject
 import timber.log.Timber
 import java.io.*
 import java.nio.ByteBuffer
 import java.security.SecureRandom
 import java.util.*
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
+import java.util.zip.ZipFile
 
-abstract class MagiskInstallImpl : KoinComponent {
+abstract class MagiskInstallImpl protected constructor(
+    protected val console: MutableList<String> = NOPList.getInstance(),
+    private val logs: MutableList<String> = NOPList.getInstance()
+) : KoinComponent {
 
-    protected lateinit var installDir: File
-    private lateinit var srcBoot: String
-    private lateinit var zipUri: Uri
-
-    protected val console: MutableList<String>
-    private val logs: MutableList<String>
-    private var tarOut: TarOutputStream? = null
+    protected var installDir = File("xxx")
+    private lateinit var srcBoot: File
 
+    private val shell = Shell.getShell()
     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()
-    }
+    protected val context: Context by inject(Protected)
+    private val useRootDir = shell.isRoot && Info.noDataExec
 
     private fun findImage(): Boolean {
-        srcBoot = "find_boot_image; echo \"\$BOOTIMAGE\"".fsh()
-        if (srcBoot.isEmpty()) {
+        val bootPath = "find_boot_image; echo \"\$BOOTIMAGE\"".fsh()
+        if (bootPath.isEmpty()) {
             console.add("! Unable to detect target image")
             return false
         }
-        console.add("- Target image: $srcBoot")
+        srcBoot = SuFile(bootPath)
+        console.add("- Target image: $bootPath")
         return true
     }
 
-    private fun findSecondaryImage(): Boolean {
+    private fun findSecondary(): Boolean {
         val slot = "echo \$SLOT".fsh()
         val target = if (slot == "_a") "_b" else "_a"
         console.add("- Target slot: $target")
-        srcBoot = arrayOf(
+        val bootPath = arrayOf(
             "SLOT=$target",
             "find_boot_image",
             "SLOT=$slot",
             "echo \"\$BOOTIMAGE\"").fsh()
-        if (srcBoot.isEmpty()) {
+        if (bootPath.isEmpty()) {
             console.add("! Unable to detect target image")
             return false
         }
-        console.add("- Target image: $srcBoot")
+        srcBoot = SuFile(bootPath)
+        console.add("- Target image: $bootPath")
         return true
     }
 
-    @Suppress("DEPRECATION")
-    private fun extractZip(): Boolean {
-        val arch = if (Build.VERSION.SDK_INT >= 21) {
-            val abis = listOf(*Build.SUPPORTED_ABIS)
-            if (abis.contains("x86")) "x86" else "arm"
-        } else {
-            if (Build.CPU_ABI == "x86") "x86" else "arm"
-        }
+    private fun extractFiles(): Boolean {
+        console.add("- Device platform: ${Const.CPU_ABI}")
+        console.add("- Installing: ${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
 
-        console.add("- Device platform: " + Build.CPU_ABI)
-        console.add("- Magisk Manager: ${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
-        console.add("- Install target: ${Info.remote.magisk.version} (${Info.remote.magisk.versionCode})")
+        installDir = File(context.filesDir.parent, "install")
+        installDir.deleteRecursively()
+        installDir.mkdirs()
 
         try {
-            ZipInputStream(zipUri.inputStream().buffered()).use { zi ->
-                lateinit var ze: ZipEntry
-                while (zi.nextEntry?.let { ze = it } != null) {
-                    if (ze.isDirectory)
-                        continue
-                    var name: String? = null
-                    val names = arrayOf("$arch/", "common/", "META-INF/com/google/android/update-binary")
-                    for (n in names) {
-                        ze.name.run {
-                            if (startsWith(n)) {
-                                name = substring(lastIndexOf('/') + 1)
-                            }
-                        }
-                        name ?: continue
-                        break
-                    }
-                    if (name == null && ze.name.startsWith("chromeos/"))
-                        name = ze.name
-                    name?.also {
-                        val dest = if (installDir is SuFile)
-                            SuFile(installDir, it)
-                        else
-                            File(installDir, it)
-                        dest.parentFile!!.mkdirs()
-                        SuFileOutputStream(dest).use { s -> zi.copyTo(s) }
-                    } ?: continue
+            // Extract binaries
+            if (isRunningAsStub) {
+                val zf = ZipFile(DynAPK.current(context))
+                zf.entries().asSequence().filter {
+                    !it.isDirectory && it.name.startsWith("lib/${Const.CPU_ABI_32}/")
+                }.forEach {
+                    val n = it.name.substring(it.name.lastIndexOf('/') + 1)
+                    val name = n.substring(3, n.length - 3)
+                    val dest = File(installDir, name)
+                    zf.getInputStream(it).writeTo(dest)
+                }
+            } else {
+                val libs = Const.NATIVE_LIB_DIR.listFiles { _, name ->
+                    name.startsWith("lib") && name.endsWith(".so")
+                } ?: emptyArray()
+                for (lib in libs) {
+                    val name = lib.name.substring(3, lib.name.length - 3)
+                    symlink(lib.path, "$installDir/$name")
                 }
             }
-        } catch (e: IOException) {
-            console.add("! Cannot unzip zip")
+
+            // Extract scripts
+            for (script in listOf("util_functions.sh", "boot_patch.sh", "addon.d.sh")) {
+                val dest = File(installDir, script)
+                context.assets.open(script).writeTo(dest)
+            }
+            // Extract chromeos tools
+            File(installDir, "chromeos").mkdir()
+            for (file in listOf("futility", "kernel_data_key.vbprivk", "kernel.keyblock")) {
+                val name = "chromeos/$file"
+                val dest = File(installDir, name)
+                context.assets.open(name).writeTo(dest)
+            }
+        } catch (e: Exception) {
+            console.add("! Unable to extract files")
             Timber.e(e)
             return false
         }
 
-        val init64 = SuFile.open(installDir, "magiskinit64")
-        if (Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_64_BIT_ABIS.isNotEmpty()) {
-            init64.renameTo(SuFile.open(installDir, "magiskinit"))
-        } else {
-            init64.delete()
+        if (useRootDir) {
+            // Move everything to tmpfs to workaround Samsung bullshit
+            SuFile(Const.TMPDIR).also {
+                arrayOf(
+                    "rm -rf $it",
+                    "mkdir -p $it",
+                    "cp_readlink $installDir $it",
+                    "rm -rf $installDir"
+                ).sh()
+                installDir = it
+            }
         }
-        "cd $installDir; chmod 755 *".sh()
+
         return true
     }
 
-    private fun newEntry(name: String, size: Long): TarEntry {
+    // Optimization for SuFile I/O streams to skip an internal trial and error
+    private fun installDirFile(name: String): File {
+        return if (useRootDir)
+            SuFile(installDir, name)
+        else
+            File(installDir, name)
+    }
+
+    private fun InputStream.cleanPump(out: OutputStream) = withStreams(this, out) { src, _ ->
+        src.copyTo(out)
+    }
+
+    private fun newTarEntry(name: String, size: Long): TarEntry {
         console.add("-- Writing: $name")
         return TarEntry(TarHeader.createHeader(name, size, 0, false, 420 /* 0644 */))
     }
 
     @Throws(IOException::class)
-    private fun handleTar(input: InputStream, output: OutputStream): OutputStream {
+    private fun processTar(input: InputStream, output: OutputStream): OutputStream {
         console.add("- Processing tar file")
         val tarOut = TarOutputStream(output)
         TarInputStream(input).use { tarIn ->
             lateinit var entry: TarEntry
 
-            fun decompressedStream() =
-                if (entry.name.contains(".lz4")) LZ4FrameInputStream(tarIn) else tarIn
+            fun decompressedStream(): InputStream {
+                val src = if (entry.name.endsWith(".lz4")) LZ4FrameInputStream(tarIn) else tarIn
+                return object : FilterInputStream(src) {
+                    override fun available() = 0  /* Workaround bug in LZ4FrameInputStream */
+                    override fun close() { /* Never close src stream */ }
+                }
+            }
 
             while (tarIn.nextEntry?.let { entry = it } != null) {
-                if (entry.name.contains("boot.img") ||
+                if (entry.name.startsWith("boot.img") ||
                     (Config.recovery && entry.name.contains("recovery.img"))) {
                     val name = entry.name.replace(".lz4", "")
                     console.add("-- Extracting: $name")
 
-                    val extract = File(installDir, name)
-                    FileOutputStream(extract).use { decompressedStream().copyTo(it) }
+                    val extract = installDirFile(name)
+                    decompressedStream().cleanPump(SuFileOutputStream.open(extract))
                 } else if (entry.name.contains("vbmeta.img")) {
-                    val rawData = ByteArrayOutputStream().let {
-                        decompressedStream().copyTo(it)
-                        it.toByteArray()
-                    }
+                    val rawData = decompressedStream().readBytes()
                     // Valid vbmeta.img should be at least 256 bytes
                     if (rawData.size < 256)
                         continue
@@ -195,7 +199,7 @@ abstract class MagiskInstallImpl : KoinComponent {
                     // AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED
                     console.add("-- Patching: vbmeta.img")
                     ByteBuffer.wrap(rawData).putInt(120, 3)
-                    tarOut.putNextEntry(newEntry("vbmeta.img", rawData.size.toLong()))
+                    tarOut.putNextEntry(newTarEntry("vbmeta.img", rawData.size.toLong()))
                     tarOut.write(rawData)
                 } else {
                     console.add("-- Copying: ${entry.name}")
@@ -203,29 +207,32 @@ abstract class MagiskInstallImpl : KoinComponent {
                     tarIn.copyTo(tarOut, bufferSize = 1024 * 1024)
                 }
             }
-            val boot = SuFile.open(installDir, "boot.img")
-            val recovery = SuFile.open(installDir, "recovery.img")
-            if (Config.recovery && recovery.exists() && boot.exists()) {
-                // Install Magisk to recovery
-                srcBoot = recovery.path
-                // Repack boot image to prevent restore
-                arrayOf(
-                    "./magiskboot unpack boot.img",
-                    "./magiskboot repack boot.img",
-                    "./magiskboot cleanup",
-                    "mv new-boot.img boot.img").sh()
-                SuFileInputStream(boot).use {
-                    tarOut.putNextEntry(newEntry("boot.img", boot.length()))
-                    it.copyTo(tarOut)
-                }
-                boot.delete()
-            } else {
-                if (!boot.exists()) {
-                    console.add("! No boot image found")
-                    throw IOException()
-                }
-                srcBoot = boot.path
+        }
+        val boot = installDirFile("boot.img")
+        val recovery = installDirFile("recovery.img")
+        if (Config.recovery && recovery.exists() && boot.exists()) {
+            // Install to recovery
+            srcBoot = recovery
+            // Repack boot image to prevent auto restore
+            arrayOf(
+                "cd $installDir",
+                "./magiskboot unpack boot.img",
+                "./magiskboot repack boot.img",
+                "cat new-boot.img > boot.img",
+                "./magiskboot cleanup",
+                "rm -f new-boot.img",
+                "cd /").sh()
+            SuFileInputStream.open(boot).use {
+                tarOut.putNextEntry(newTarEntry("boot.img", boot.length()))
+                it.copyTo(tarOut)
             }
+            boot.delete()
+        } else {
+            if (!boot.exists()) {
+                console.add("! No boot image found")
+                throw IOException()
+            }
+            srcBoot = boot
         }
         return tarOut
     }
@@ -248,20 +255,22 @@ abstract class MagiskInstallImpl : KoinComponent {
                 val alpha = "abcdefghijklmnopqrstuvwxyz"
                 val alphaNum = "$alpha${alpha.toUpperCase(Locale.ROOT)}0123456789"
                 val random = SecureRandom()
-                val suffix = StringBuilder()
-                for (i in 1..5) {
-                    suffix.append(alphaNum[random.nextInt(alphaNum.length)])
+                val filename = StringBuilder("magisk_patched-${BuildConfig.VERSION_CODE}_").run {
+                    for (i in 1..5) {
+                        append(alphaNum[random.nextInt(alphaNum.length)])
+                    }
+                    toString()
                 }
 
-                val filename = "magisk_patched_$suffix"
                 outStream = if (magic.contentEquals("ustar".toByteArray())) {
+                    // tar file
                     outFile = MediaStoreUtils.getFile("$filename.tar", true)
-                    handleTar(src, outFile!!.uri.outputStream())
+                    processTar(src, outFile!!.uri.outputStream())
                 } else {
-                    // Raw image
-                    srcBoot = File(installDir, "boot.img").path
+                    // raw image
+                    srcBoot = installDirFile("boot.img")
                     console.add("- Copying image to cache")
-                    FileOutputStream(srcBoot).use { src.copyTo(it) }
+                    src.cleanPump(SuFileOutputStream.open(srcBoot))
                     outFile = MediaStoreUtils.getFile("$filename.img", true)
                     outFile!!.uri.outputStream()
                 }
@@ -281,13 +290,13 @@ abstract class MagiskInstallImpl : KoinComponent {
 
         // Output file
         try {
-            val patched = SuFile.open(installDir, "new-boot.img")
+            val newBoot = installDirFile("new-boot.img")
             if (outStream is TarOutputStream) {
-                val name = if (srcBoot.contains("recovery")) "recovery.img" else "boot.img"
-                outStream.putNextEntry(newEntry(name, patched.length()))
+                val name = if (srcBoot.path.contains("recovery")) "recovery.img" else "boot.img"
+                outStream.putNextEntry(newTarEntry(name, newBoot.length()))
             }
-            withStreams(SuFileInputStream(patched), outStream) { src, out -> src.copyTo(out) }
-            patched.delete()
+            SuFileInputStream.open(newBoot).cleanPump(outStream)
+            newBoot.delete()
 
             console.add("")
             console.add("****************************")
@@ -301,131 +310,133 @@ abstract class MagiskInstallImpl : KoinComponent {
             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: Boolean
-        try {
-            SuFileInputStream(srcBoot).use {
-                isSigned = SignBoot.verifySignature(it, null)
-                if (isSigned) {
-                    console.add("- Boot image is signed with AVB 1.0")
+        var isSigned = false
+        if (srcBoot.let { it !is SuFile || !it.isCharacter }) {
+            try {
+                SuFileInputStream.open(srcBoot).use {
+                    if (SignBoot.verifySignature(it, null)) {
+                        isSigned = true
+                        console.add("- Boot image is signed with AVB 1.0")
+                    }
                 }
+            } catch (e: IOException) {
+                console.add("! Unable to check signature")
+                Timber.e(e)
+                return false
             }
-        } catch (e: IOException) {
-            console.add("! Unable to check signature")
+        }
+
+        val newBoot = installDirFile("new-boot.img")
+        if (!useRootDir) {
+            // Create output files before hand
+            newBoot.createNewFile()
+            File(installDir, "stock_boot.img").createNewFile()
+        }
+
+        val cmds = arrayOf(
+            "cd $installDir",
+            "KEEPFORCEENCRYPT=${Config.keepEnc} " +
+            "KEEPVERITY=${Config.keepVerity} " +
+            "RECOVERYMODE=${Config.recovery} " +
+            "sh boot_patch.sh $srcBoot")
+
+        if (!cmds.sh().isSuccess)
             return false
-        }
 
-        if (!("KEEPFORCEENCRYPT=${Config.keepEnc} KEEPVERITY=${Config.keepVerity} " +
-                "RECOVERYMODE=${Config.recovery} sh update-binary " +
-                "sh boot_patch.sh $srcBoot").sh().isSuccess) {
-            return false
-        }
+        val job = shell.newJob().add("./magiskboot cleanup", "cd /")
 
-        if (srcNand.isNotEmpty()) {
-            srcBoot = srcNand
-        }
-
-        val job = Shell.sh(
-            "./magiskboot cleanup",
-            "mv bin/busybox busybox",
-            "rm -rf magisk.apk bin boot.img update-binary",
-            "cd /")
-
-        val patched = File(installDir, "new-boot.img")
         if (isSigned) {
             console.add("- Signing boot image with verity keys")
-            val signed = File(installDir, "signed.img")
+            val signed = File.createTempFile("signed", ".img", context.cacheDir)
             try {
-                withStreams(SuFileInputStream(patched), signed.outputStream().buffered()) {
-                    input, out -> SignBoot.doSignature(null, null, input, out, "/boot")
+                val src = SuFileInputStream.open(newBoot).buffered()
+                val out = signed.outputStream().buffered()
+                withStreams(src, out) { _, _ ->
+                    SignBoot.doSignature(null, null, src, out, "/boot")
                 }
             } catch (e: IOException) {
                 console.add("! Unable to sign image")
                 Timber.e(e)
                 return false
             }
-
-            job.add("mv -f $signed $patched")
+            job.add("cat $signed > $newBoot", "rm -f $signed")
         }
         job.exec()
         return true
     }
 
-    private fun copySepolicyRules(): Boolean {
-        if (Info.remote.magisk.versionCode >= 21100) {
-            // Copy existing rules for migration
-            "copy_sepolicy_rules".sh()
-        }
-        return true
-    }
-
-    private fun flashBoot(): Boolean {
-        if (!"direct_install $installDir $srcBoot".sh().isSuccess)
-            return false
-        "run_migrations".sh()
-        return true
-    }
+    private fun flashBoot() = "direct_install $installDir $srcBoot".sh().isSuccess
 
     private suspend fun postOTA(): Boolean {
-        val bootctl = SuFile("/data/adb/bootctl")
         try {
-            withStreams(service.fetchBootctl().byteStream(), SuFileOutputStream(bootctl)) {
-                it, out -> it.copyTo(out)
-            }
+            val bootctl = File.createTempFile("bootctl", null, context.cacheDir)
+            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 Array<String>.sh() = Shell.sh(*this).to(console, logs).exec()
-    private fun String.fsh() = ShellUtils.fastCmd(this)
-    private fun Array<String>.fsh() = ShellUtils.fastCmd(*this)
+    private fun String.sh() = shell.newJob().add(this).to(console, logs).exec()
+    private fun Array<String>.sh() = shell.newJob().add(*this).to(console, logs).exec()
+    private fun String.fsh() = ShellUtils.fastCmd(shell, this)
+    private fun Array<String>.fsh() = ShellUtils.fastCmd(shell, *this)
 
-    protected fun doPatchFile(patchFile: Uri) = extractZip() && handleFile(patchFile)
+    protected fun doPatchFile(patchFile: Uri) = extractFiles() && handleFile(patchFile)
 
-    protected fun direct() = findImage() && extractZip() && patchBoot() &&
-        copySepolicyRules() && flashBoot()
+    protected fun direct() = findImage() && extractFiles() && patchBoot() && flashBoot()
 
-    protected suspend fun secondSlot() = findSecondaryImage() && extractZip() &&
-        patchBoot() && copySepolicyRules() && flashBoot() && postOTA()
+    protected suspend fun secondSlot() =
+        findSecondary() && extractFiles() && patchBoot() && flashBoot() && postOTA()
 
-    protected fun fixEnv(zip: Uri): Boolean {
-        installDir = SuFile("/data/adb/magisk")
-        Shell.su("rm -rf /data/adb/magisk/*").exec()
-        zipUri = zip
-        return extractZip() && Shell.su("fix_env").exec().isSuccess
-    }
+    protected fun fixEnv() = extractFiles() && "fix_env $installDir".sh().isSuccess
+
+    protected fun uninstall() = "run_uninstaller ${AssetHack.apk}".sh().isSuccess
 
     @WorkerThread
     protected abstract suspend fun operations(): Boolean
 
-    open suspend fun exec() = withContext(Dispatchers.IO) { operations() }
+    open suspend fun exec(): Boolean {
+        synchronized(Companion) {
+            if (haveActiveSession)
+                return false
+            haveActiveSession = true
+        }
+        val result = withContext(Dispatchers.IO) { operations() }
+        synchronized(Companion) {
+            haveActiveSession = false
+        }
+        return result
+    }
+
+    companion object {
+        private var haveActiveSession = false
+    }
 }
 
-sealed class MagiskInstaller(
-    file: Uri,
+abstract class MagiskInstaller(
     console: MutableList<String>,
     logs: MutableList<String>
-) : MagiskInstallImpl(file, console, logs) {
+) : MagiskInstallImpl(console, logs) {
 
     override suspend fun exec(): Boolean {
         val success = super.exec()
@@ -439,46 +450,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(
-    private val zip: Uri
-) : MagiskInstallImpl() {
-    override suspend fun operations() = fixEnv(zip)
+    class Uninstall(
+        console: MutableList<String>,
+        logs: MutableList<String>
+    ) : MagiskInstallImpl(console, logs) {
+        override suspend fun operations() = uninstall()
 
-    override suspend fun exec(): Boolean {
-        val success = super.exec()
-        LocalBroadcastManager.getInstance(context).sendBroadcast(Intent(EnvFixDialog.DISMISS))
-        Utils.toast(
-            if (success) R.string.reboot_delay_toast else R.string.setup_fail,
-            Toast.LENGTH_LONG
-        )
-        if (success)
-            UiThreadHandler.handler.postDelayed(5000) { reboot() }
-        return success
+        override suspend fun exec(): Boolean {
+            val success = super.exec()
+            if (success) {
+                UiThreadHandler.handler.postDelayed(3000) {
+                    Shell.su("pm uninstall ${context.packageName}").exec()
+                }
+            }
+            return success
+        }
+    }
+
+    class FixEnv(private val callback: () -> Unit) : MagiskInstallImpl() {
+        override suspend fun operations() = fixEnv()
+
+        override suspend fun exec(): Boolean {
+            val success = super.exec()
+            callback()
+            Utils.toast(
+                if (success) R.string.reboot_delay_toast else R.string.setup_fail,
+                Toast.LENGTH_LONG
+            )
+            if (success)
+                UiThreadHandler.handler.postDelayed(5000) { reboot() }
+            return success
+        }
     }
 }

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

@@ -3,20 +3,16 @@
 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 +26,8 @@ suspend fun availableLocales() = cachedLocales ?:
 withContext(Dispatchers.Default) {
     val compareId = R.string.app_changelog
 
-    // Create a completely new resource to prevent cross talk over app's configs
-    val asset = AssetManager::class.java.newInstance().apply { addAssetPath(ResMgr.apk) }
-    val config = Configuration(ResMgr.resource.configuration)
-    val metrics = DisplayMetrics().apply { setTo(ResMgr.resource.displayMetrics) }
-    val res = Resources(asset, metrics, config)
+    // Create a completely new resource to prevent cross talk over active configs
+    val res = AssetHack.newResource()
 
     val locales = ArrayList<String>().apply {
         // Add default locale
@@ -45,19 +38,17 @@ withContext(Dispatchers.Default) {
         add("pt-BR")
 
         // Then add all supported locales
-        addAll(res.assets.locales)
+        addAll(Resources.getSystem().assets.locales)
     }.map {
         it.langTagToLocale()
     }.distinctBy {
-        config.setLocale(it)
-        res.updateConfiguration(config, metrics)
+        res.updateLocale(it)
         res.getString(compareId)
-    }.sortedWith(Comparator { a, b ->
+    }.sortedWith { a, b ->
         a.getDisplayName(a).compareTo(b.getDisplayName(b), true)
-    })
+    }
 
-    config.setLocale(defaultLocale)
-    res.updateConfiguration(config, metrics)
+    res.updateLocale(defaultLocale)
     val defName = res.getString(R.string.system_default)
 
     val names = ArrayList<String>(locales.size + 1)
@@ -79,6 +70,11 @@ 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 {
@@ -86,5 +82,5 @@ fun refreshLocale() {
         else -> localeConfig.langTagToLocale()
     }
     Locale.setDefault(currentLocale)
-    ResMgr.resource.updateConfig()
+    AssetHack.resource.updateConfig()
 }

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/data/network/NetworkServices.kt

@@ -10,17 +10,15 @@ import retrofit2.http.*
 private const val REVISION = "revision"
 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"
 
 interface GithubPageServices {
 
-    @GET("stable.json")
-    suspend fun fetchStableUpdate(): UpdateInfo
-
-    @GET("beta.json")
-    suspend fun fetchBetaUpdate(): UpdateInfo
+    @GET("{$FILE}")
+    suspend fun fetchUpdateJSON(@Path(FILE) file: String): UpdateInfo
 }
 
 interface JSDelivrServices {
@@ -33,9 +31,6 @@ 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

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

@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk.data.repository
 
+import android.os.Build
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Config.Value.BETA_CHANNEL
 import com.topjohnwu.magisk.core.Config.Value.CANARY_CHANNEL
@@ -8,7 +9,6 @@ import com.topjohnwu.magisk.core.Config.Value.DEFAULT_CHANNEL
 import com.topjohnwu.magisk.core.Config.Value.STABLE_CHANNEL
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.model.*
 import com.topjohnwu.magisk.data.network.*
 import retrofit2.HttpException
 import timber.log.Timber
@@ -21,6 +21,10 @@ class NetworkService(
     private val api: GithubApiServices
 ) {
     suspend fun fetchUpdate() = safe {
+        // Pre SDK 21 no longer receives any major updates
+        if (Build.VERSION.SDK_INT < 21)
+            return fetchStableUpdate()
+
         var info = when (Config.updateChannel) {
             DEFAULT_CHANNEL, STABLE_CHANNEL -> fetchStableUpdate()
             BETA_CHANNEL -> fetchBetaUpdate()
@@ -34,31 +38,14 @@ class NetworkService(
             Config.updateChannel = BETA_CHANNEL
             info = fetchBetaUpdate()
         }
-        Info.remote = info
         info
     }
 
     // UpdateInfo
-    private suspend fun fetchStableUpdate() = pages.fetchStableUpdate()
-    private suspend fun fetchBetaUpdate() = pages.fetchBetaUpdate()
+    private suspend fun fetchStableUpdate() = pages.fetchUpdateJSON("stable.json")
+    private suspend fun fetchBetaUpdate() = pages.fetchUpdateJSON("beta.json")
+    private suspend fun fetchCanaryUpdate() = pages.fetchUpdateJSON("canary.json")
     private suspend fun fetchCustomUpdate(url: String) = raw.fetchCustomUpdate(url)
-    private suspend fun fetchCanaryUpdate(): UpdateInfo {
-        val sha = fetchCanaryVersion()
-        val info = jsd.fetchCanaryUpdate(sha)
-
-        fun genCDNUrl(name: String) = "${Const.Url.JS_DELIVR_URL}${MAGISK_FILES}@${sha}/${name}"
-        fun ManagerJson.updateCopy() = copy(link = genCDNUrl(link), note = genCDNUrl(note))
-        fun MagiskJson.updateCopy() = copy(link = genCDNUrl(link), note = genCDNUrl(note))
-        fun StubJson.updateCopy() = copy(link = genCDNUrl(link))
-        fun UninstallerJson.updateCopy() = copy(link = genCDNUrl(link))
-
-        return info.copy(
-            app = info.app.updateCopy(),
-            magisk = info.magisk.updateCopy(),
-            stub = info.stub.updateCopy(),
-            uninstaller = info.uninstaller.updateCopy()
-        )
-    }
 
     private inline fun <T> safe(factory: () -> T): T? {
         return try {
@@ -92,6 +79,5 @@ class NetworkService(
     suspend fun fetchFile(url: String) = wrap { raw.fetchFile(url) }
     suspend fun fetchString(url: String) = wrap { raw.fetchString(url) }
 
-    private suspend fun fetchCanaryVersion() = api.fetchBranch(MAGISK_FILES, "canary").commit.sha
     private suspend fun fetchMainVersion() = api.fetchBranch(MAGISK_MAIN, "master").commit.sha
 }

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

@@ -1,9 +1,9 @@
 package com.topjohnwu.magisk.di
 
 import android.content.Context
-import android.os.Build
 import androidx.preference.PreferenceManager
-import com.topjohnwu.magisk.core.ResMgr
+import com.topjohnwu.magisk.core.AssetHack
+import com.topjohnwu.magisk.ktx.deviceProtectedContext
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
@@ -11,15 +11,9 @@ val SUTimeout = named("su_timeout")
 val Protected = named("protected")
 
 val applicationModule = module {
-    factory { ResMgr.resource }
+    factory { AssetHack.resource }
     factory { get<Context>().packageManager }
-    factory(Protected) { createDEContext(get()) }
+    factory(Protected) { get<Context>().deviceProtectedContext }
     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
+    single { PreferenceManager.getDefaultSharedPreferences(get(Protected)) }
 }

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

@@ -34,7 +34,10 @@ val networkingModule = module {
     single { createRetrofit(get()) }
     single { createApiService<RawServices>(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<GithubPageServices>(get(),
+        if (Build.VERSION.SDK_INT < 21) Const.Url.GITHUB_OLD_PAGE_URL
+        else Const.Url.GITHUB_PAGE_URL
+    ) }
     single { createApiService<JSDelivrServices>(get(), Const.Url.JS_DELIVR_URL) }
     single { createMarkwon(get(), get()) }
 }

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

@@ -23,12 +23,10 @@ val viewModelModules = module {
     viewModel { ModuleViewModel(get(), get()) }
     viewModel { SafetynetViewModel() }
     viewModel { SettingsViewModel(get()) }
-    viewModel { SuperuserViewModel(get(), get()) }
+    viewModel { SuperuserViewModel(get()) }
     viewModel { ThemeViewModel() }
     viewModel { InstallViewModel(get()) }
     viewModel { MainViewModel() }
-
-    // Legacy
     viewModel { (args: FlashFragmentArgs) -> FlashViewModel(args) }
     viewModel { SuRequestViewModel(get(), get(), get(SUTimeout), get()) }
 }

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

@@ -29,10 +29,10 @@ object RebootEvent {
     fun inflateMenu(activity: BaseActivity): PopupMenu {
         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.getItem(R.id.action_reboot_userspace).isVisible = true
-        activity.menuInflater.inflate(R.menu.menu_reboot, menu.menu)
+            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,32 +6,33 @@ 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(
-    private val msg: TransitiveText,
-    private val length: Int,
-    private val builder: Snackbar.() -> Unit
+class SnackbarEvent constructor(
+    private val msg: TextHolder,
+    private val length: Int = Snackbar.LENGTH_SHORT,
+    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,
-        builder: Snackbar.() -> Unit = {}
+        length: Int,
+        builder: Snackbar.() -> Unit
     ) = Snackbar.make(view, message, length).apply(builder).show()
 
     override fun invoke(activity: BaseUIActivity<*, *>) {
@@ -39,5 +40,4 @@ class SnackbarEvent private constructor(
             msg.getText(activity.resources).toString(),
             length, builder)
     }
-
 }

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

@@ -14,20 +14,22 @@ 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.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 OpenReadmeEvent(val item: OnlineModule) : ViewEventWithScope(), ContextExecutor {
-    override fun invoke(context: Context) {
-        scope.launch {
-            MarkDownWindow.show(context, null, item::notes)
-        }
+class OpenReadmeEvent(private val item: OnlineModule) : MarkDownDialog() {
+    override suspend fun getMarkdownText() = item.notes()
+    override fun build(dialog: MagiskDialog) {
+        super.build(dialog)
+        dialog.applyButton(MagiskDialog.ButtonType.NEGATIVE) {
+            titleRes = android.R.string.cancel
+        }.cancellable(true)
     }
 }
 
@@ -78,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)
@@ -107,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 android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import androidx.lifecycle.lifecycleScope
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.download.Action.EnvFix
-import com.topjohnwu.magisk.core.download.DownloadService
-import com.topjohnwu.magisk.core.download.Subject.Magisk
+import com.topjohnwu.magisk.core.base.BaseActivity
+import com.topjohnwu.magisk.core.tasks.MagiskInstaller
 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)
-                lbm.registerReceiver(object : BroadcastReceiver() {
-                    override fun onReceive(context: Context, intent: Intent?) {
+                (dialog.ownerActivity as BaseActivity).lifecycleScope.launch {
+                    MagiskInstaller.FixEnv {
                         dialog.dismiss()
-                        lbm.unregisterReceiver(this)
-                    }
-                }, IntentFilter(DISMISS))
-                DownloadService.start(dialog.context, Magisk(EnvFix))
+                    }.exec()
+                }
             }
         }
         .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

@@ -1,40 +1,41 @@
 package com.topjohnwu.magisk.events.dialog
 
+import android.content.Context
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.core.download.Subject
-import com.topjohnwu.magisk.ktx.res
+import com.topjohnwu.magisk.data.repository.NetworkService
 import com.topjohnwu.magisk.view.MagiskDialog
-import com.topjohnwu.magisk.view.MarkDownWindow
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import org.koin.core.get
+import org.koin.core.inject
+import java.io.File
 
-class ManagerInstallDialog : DialogEvent() {
+class ManagerInstallDialog : MarkDownDialog() {
+
+    private val svc: NetworkService by inject()
+
+    override suspend fun getMarkdownText(): String {
+        val text = svc.fetchString(Info.remote.magisk.note)
+        // Cache the changelog
+        val context = get<Context>()
+        context.cacheDir.listFiles { _, name -> name.endsWith(".md") }.orEmpty().forEach {
+            it.delete()
+        }
+        File(context.cacheDir, "${Info.remote.magisk.versionCode}.md").writeText(text)
+        return text
+    }
 
     override fun build(dialog: MagiskDialog) {
+        super.build(dialog)
         with(dialog) {
-            val subject = Subject.Manager()
-
-            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
-                onClick {
-                    GlobalScope.launch(Dispatchers.Main.immediate) {
-                        MarkDownWindow.show(context, null, Info.remote.app.note)
-                    }
-                }
+                titleRes = android.R.string.cancel
             }
         }
     }

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

@@ -0,0 +1,45 @@
+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.view.MagiskDialog
+import io.noties.markwon.Markwon
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.koin.core.KoinComponent
+import org.koin.core.inject
+import timber.log.Timber
+import kotlin.coroutines.cancellation.CancellationException
+
+abstract class MarkDownDialog : DialogEvent(), KoinComponent {
+
+    private val markwon: Markwon by inject()
+
+    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 {
+                        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

@@ -14,7 +14,7 @@ class ModuleInstallDialog(private val item: OnlineModule) : DialogEvent() {
         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,7 @@ 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.core.download.Action
-import com.topjohnwu.magisk.core.download.DownloadService
-import com.topjohnwu.magisk.core.download.Subject
+import com.topjohnwu.magisk.ui.flash.FlashFragment
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.superuser.Shell
@@ -20,12 +17,10 @@ class UninstallDialog : DialogEvent() {
                 titleRes = R.string.restore_img
                 onClick { restore() }
             }
-        if (Info.remote.uninstaller.link.isNotEmpty()) {
-            dialog.applyButton(MagiskDialog.ButtonType.NEGATIVE) {
+            .applyButton(MagiskDialog.ButtonType.NEGATIVE) {
                 titleRes = R.string.complete_uninstall
                 onClick { completeUninstall() }
             }
-        }
     }
 
     @Suppress("DEPRECATION")
@@ -46,7 +41,7 @@ class UninstallDialog : DialogEvent() {
     }
 
     private fun completeUninstall() {
-        DownloadService.start(dialog.context, Subject.Magisk(Action.Uninstall))
+        FlashFragment.uninstall()
     }
 
 }

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

@@ -21,8 +21,8 @@ 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.system.Os
 import android.text.PrecomputedText
 import android.view.View
 import android.view.ViewGroup
@@ -41,11 +41,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,10 +57,26 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import java.io.File
+import java.lang.reflect.Method
 import java.lang.reflect.Array as JArray
 
 val packageName: String get() = get<Context>().packageName
 
+private lateinit var osSymlink: Method
+private lateinit var os: Any
+
+fun symlink(oldPath: String, newPath: String) {
+    if (SDK_INT >= 21) {
+        Os.symlink(oldPath, newPath)
+    } else {
+        if (!::osSymlink.isInitialized) {
+            os = Class.forName("libcore.io.Libcore").getField("os").get(null)!!
+            osSymlink = os.javaClass.getMethod("symlink", String::class.java, String::class.java)
+        }
+        osSymlink.invoke(os, oldPath, newPath)
+    }
+}
+
 val ServiceInfo.isIsolated get() = (flags and FLAG_ISOLATED_PROCESS) != 0
 
 @get:SuppressLint("InlinedApi")
@@ -83,6 +101,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() {
@@ -227,15 +250,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 &&
-        resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL
-    ) {
+    if (resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
         return end to start
     }
     return start to end
@@ -295,8 +316,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")
@@ -346,6 +380,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

@@ -6,14 +6,12 @@ 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)
@@ -53,7 +51,7 @@ fun String.langTagToLocale(): Locale {
     if (Build.VERSION.SDK_INT >= 21) {
         return Locale.forLanguageTag(this)
     } else {
-        val tok = split("-".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+        val tok = split("[-_]".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
         if (tok.isEmpty()) {
             return Locale("")
         }
@@ -110,32 +108,3 @@ fun Locale.toLangTag(): String {
 
 fun SimpleDateFormat.parseOrNull(date: String) =
     runCatching { parse(date) }.onFailure { Timber.e(it) }.getOrNull()
-
-// Reflection hacks
-
-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/ui/MainActivity.kt

@@ -1,6 +1,7 @@
 package com.topjohnwu.magisk.ui
 
 import android.content.Intent
+import android.content.pm.ApplicationInfo
 import android.os.Build
 import android.os.Bundle
 import android.view.MenuItem
@@ -10,9 +11,7 @@ import android.view.WindowManager
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.view.forEach
-import androidx.core.view.updateLayoutParams
 import androidx.navigation.NavDirections
-import com.google.android.material.card.MaterialCardView
 import com.topjohnwu.magisk.MainDirections
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.BaseUIActivity
@@ -22,13 +21,12 @@ import com.topjohnwu.magisk.core.*
 import com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
 import com.topjohnwu.magisk.ktx.startAnimations
 import com.topjohnwu.magisk.ui.home.HomeFragmentDirections
-import com.topjohnwu.magisk.utils.HideBottomViewOnScrollBehavior
-import com.topjohnwu.magisk.utils.HideTopViewOnScrollBehavior
 import com.topjohnwu.magisk.utils.HideableBehavior
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.magisk.view.Shortcuts
 import org.koin.androidx.viewmodel.ext.android.viewModel
+import java.io.File
 
 class MainViewModel : BaseViewModel()
 
@@ -36,7 +34,7 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
 
     override val layoutRes = R.layout.activity_main_md2
     override val viewModel by viewModel<MainViewModel>()
-    override val navHost: Int = R.id.main_nav_host
+    override val navHostId: Int = R.id.main_nav_host
 
     private var isRootFragment = true
 
@@ -77,12 +75,6 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
 
         setSupportActionBar(binding.mainToolbar)
 
-        binding.mainToolbarWrapper.updateLayoutParams<CoordinatorLayout.LayoutParams> {
-            behavior = HideTopViewOnScrollBehavior<MaterialCardView>()
-        }
-        binding.mainBottomBar.updateLayoutParams<CoordinatorLayout.LayoutParams> {
-            behavior = HideBottomViewOnScrollBehavior<MaterialCardView>()
-        }
         binding.mainNavigation.setOnNavigationItemSelectedListener {
             getScreen(it.itemId)?.navigate()
             true
@@ -91,7 +83,7 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
             (currentFragment as? ReselectionTarget)?.onReselected()
         }
 
-        val section = if (intent.action == ACTION_APPLICATION_PREFERENCES) Const.Nav.SETTINGS
+        val section = if (intent.action == Intent.ACTION_APPLICATION_PREFERENCES) Const.Nav.SETTINGS
         else intent.getStringExtra(Const.Key.OPEN_SECTION)
         getScreen(section)?.navigate()
 
@@ -174,9 +166,9 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
 
     private fun getScreen(name: String?): NavDirections? {
         return when (name) {
-            Const.Nav.SUPERUSER -> HomeFragmentDirections.actionSuperuserFragment()
-            Const.Nav.HIDE -> HomeFragmentDirections.actionHideFragment()
-            Const.Nav.MODULES -> HomeFragmentDirections.actionModuleFragment()
+            Const.Nav.SUPERUSER -> MainDirections.actionSuperuserFragment()
+            Const.Nav.HIDE -> MainDirections.actionHideFragment()
+            Const.Nav.MODULES -> MainDirections.actionModuleFragment()
             Const.Nav.SETTINGS -> HomeFragmentDirections.actionHomeFragmentToSettingsFragment()
             else -> null
         }
@@ -198,7 +190,37 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
                 .applyTitle(R.string.unsupport_magisk_title)
                 .applyMessage(R.string.unsupport_magisk_msg, Const.Version.MIN_VERSION)
                 .applyButton(MagiskDialog.ButtonType.POSITIVE) { titleRes = android.R.string.ok }
-                .cancellable(true)
+                .cancellable(false)
+                .reveal()
+        }
+
+        if (!Info.isEmulator && Info.env.isActive && System.getenv("PATH")
+                ?.split(':')
+                ?.filterNot { File("$it/magisk").exists() }
+                ?.any { File("$it/su").exists() } == true) {
+            MagiskDialog(this)
+                .applyTitle(R.string.unsupport_general_title)
+                .applyMessage(R.string.unsupport_other_su_msg)
+                .applyButton(MagiskDialog.ButtonType.POSITIVE) { titleRes = android.R.string.ok }
+                .cancellable(false)
+                .reveal()
+        }
+
+        if (applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM != 0) {
+            MagiskDialog(this)
+                .applyTitle(R.string.unsupport_general_title)
+                .applyMessage(R.string.unsupport_system_app_msg)
+                .applyButton(MagiskDialog.ButtonType.POSITIVE) { titleRes = android.R.string.ok }
+                .cancellable(false)
+                .reveal()
+        }
+
+        if (applicationInfo.flags and ApplicationInfo.FLAG_EXTERNAL_STORAGE != 0) {
+            MagiskDialog(this)
+                .applyTitle(R.string.unsupport_general_title)
+                .applyMessage(R.string.unsupport_external_storage_msg)
+                .applyButton(MagiskDialog.ButtonType.POSITIVE) { titleRes = android.R.string.ok }
+                .cancellable(false)
                 .reveal()
         }
     }
@@ -222,11 +244,4 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
                 .reveal()
         }
     }
-
-    companion object {
-        private val ACTION_APPLICATION_PREFERENCES get() =
-            if (Build.VERSION.SDK_INT >= 24) Intent.ACTION_APPLICATION_PREFERENCES
-            else "???"
-    }
-
 }

app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashFragment.kt

@@ -7,8 +7,8 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.*
 import androidx.navigation.NavDeepLinkBuilder
+import com.topjohnwu.magisk.MainDirections
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.arch.BaseUIActivity
 import com.topjohnwu.magisk.arch.BaseUIFragment
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.cmp
@@ -16,14 +16,12 @@ import com.topjohnwu.magisk.databinding.FragmentFlashMd2Binding
 import com.topjohnwu.magisk.ui.MainActivity
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
-import com.topjohnwu.magisk.MainDirections.Companion.actionFlashFragment as toFlash
-import com.topjohnwu.magisk.ui.flash.FlashFragmentArgs as args
 
 class FlashFragment : BaseUIFragment<FlashViewModel, FragmentFlashMd2Binding>() {
 
     override val layoutRes = R.layout.fragment_flash_md2
     override val viewModel by viewModel<FlashViewModel> {
-        parametersOf(args.fromBundle(requireArguments()))
+        parametersOf(FlashFragmentArgs.fromBundle(requireArguments()))
     }
 
     private var defaultOrientation = -1
@@ -51,6 +49,7 @@ class FlashFragment : BaseUIFragment<FlashViewModel, FragmentFlashMd2Binding>()
 
         defaultOrientation = activity.requestedOrientation
         activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR
+        viewModel.startFlashing()
     }
 
     @SuppressLint("WrongConstant")
@@ -78,7 +77,7 @@ class FlashFragment : BaseUIFragment<FlashViewModel, FragmentFlashMd2Binding>()
 
     companion object {
 
-        private fun createIntent(context: Context, args: args) =
+        private fun createIntent(context: Context, args: FlashFragmentArgs) =
             NavDeepLinkBuilder(context)
                 .setGraph(R.navigation.main)
                 .setComponentName(MainActivity::class.java.cmp(context.packageName))
@@ -91,61 +90,36 @@ class FlashFragment : BaseUIFragment<FlashViewModel, FragmentFlashMd2Binding>()
 
         /* Flashing is understood as installing / flashing magisk itself */
 
-        fun flashIntent(context: Context, file: Uri, isSecondSlot: Boolean, id: Int = -1) = args(
-            installer = file,
-            action = flashType(isSecondSlot),
-            dismissId = id
-        ).let { createIntent(context, it) }
-
-        fun flash(file: Uri, isSecondSlot: Boolean, id: Int) = toFlash(
-            installer = file,
-            action = flashType(isSecondSlot),
-            dismissId = id
-        ).let { BaseUIActivity.postDirections(it) }
+        fun flash(isSecondSlot: Boolean) = MainDirections.actionFlashFragment(
+            action = flashType(isSecondSlot)
+        )
 
         /* Patching is understood as injecting img files with magisk */
 
-        fun patchIntent(context: Context, file: Uri, uri: Uri, id: Int = -1) = args(
-            installer = file,
+        fun patch(uri: Uri) = MainDirections.actionFlashFragment(
             action = Const.Value.PATCH_FILE,
-            additionalData = uri,
-            dismissId = id
-        ).let { createIntent(context, it) }
-
-        fun patch(file: Uri, uri: Uri, id: Int) = toFlash(
-            installer = file,
-            action = Const.Value.PATCH_FILE,
-            additionalData = uri,
-            dismissId = id
-        ).let { BaseUIActivity.postDirections(it) }
+            additionalData = uri
+        )
 
         /* Uninstalling is understood as removing magisk entirely */
 
-        fun uninstallIntent(context: Context, file: Uri, id: Int = -1) = args(
-            installer = file,
-            action = Const.Value.UNINSTALL,
-            dismissId = id
-        ).let { createIntent(context, it) }
-
-        fun uninstall(file: Uri, id: Int) = toFlash(
-            installer = file,
-            action = Const.Value.UNINSTALL,
-            dismissId = id
-        ).let { BaseUIActivity.postDirections(it) }
+        fun uninstall() = MainDirections.actionFlashFragment(
+            action = Const.Value.UNINSTALL
+        )
 
         /* Installing is understood as flashing modules / zips */
 
-        fun installIntent(context: Context, file: Uri, id: Int = -1) = args(
-            installer = file,
+        fun installIntent(context: Context, file: Uri, id: Int = -1) = FlashFragmentArgs(
             action = Const.Value.FLASH_ZIP,
+            additionalData = file,
             dismissId = id
         ).let { createIntent(context, it) }
 
-        fun install(file: Uri, id: Int) = toFlash(
-            installer = file,
+        fun install(file: Uri, id: Int) = MainDirections.actionFlashFragment(
             action = Const.Value.FLASH_ZIP,
+            additionalData = file,
             dismissId = id
-        ).let { BaseUIActivity.postDirections(it) }
+        )
     }
 
 }

app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt

@@ -1,6 +1,5 @@
 package com.topjohnwu.magisk.ui.flash
 
-import android.net.Uri
 import android.view.MenuItem
 import androidx.databinding.Bindable
 import androidx.lifecycle.LiveData
@@ -12,6 +11,7 @@ import com.topjohnwu.magisk.arch.BaseViewModel
 import com.topjohnwu.magisk.arch.diffListOf
 import com.topjohnwu.magisk.arch.itemBindingOf
 import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.tasks.FlashZip
 import com.topjohnwu.magisk.core.tasks.MagiskInstaller
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
@@ -26,9 +26,7 @@ import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-class FlashViewModel(
-    args: FlashFragmentArgs
-) : BaseViewModel() {
+class FlashViewModel(private val args: FlashFragmentArgs) : BaseViewModel() {
 
     @get:Bindable
     var showReboot = Shell.rootAccess()
@@ -50,34 +48,33 @@ class FlashViewModel(
         }
     }
 
-    init {
-        args.dismissId.takeIf { it != -1 }?.also {
-            Notifications.mgr.cancel(it)
-        }
-        val (installer, action, uri) = args
-        startFlashing(installer, uri, action)
-    }
+    fun startFlashing() {
+        val (action, uri, id) = args
+        if (id != -1)
+            Notifications.mgr.cancel(id)
 
-    private fun startFlashing(installer: Uri, uri: Uri?, action: String) {
         viewModelScope.launch {
             val result = when (action) {
                 Const.Value.FLASH_ZIP -> {
-                    FlashZip(installer, outItems, logItems).exec()
+                    FlashZip(uri!!, outItems, logItems).exec()
                 }
                 Const.Value.UNINSTALL -> {
                     showReboot = false
-                    FlashZip.Uninstall(installer, outItems, logItems).exec()
+                    MagiskInstaller.Uninstall(outItems, logItems).exec()
                 }
                 Const.Value.FLASH_MAGISK -> {
-                    MagiskInstaller.Direct(installer, outItems, logItems).exec()
+                    if (Info.isEmulator)
+                        MagiskInstaller.Emulator(outItems, logItems).exec()
+                    else
+                        MagiskInstaller.Direct(outItems, logItems).exec()
                 }
                 Const.Value.FLASH_INACTIVE_SLOT -> {
-                    MagiskInstaller.SecondSlot(installer, outItems, logItems).exec()
+                    MagiskInstaller.SecondSlot(outItems, logItems).exec()
                 }
                 Const.Value.PATCH_FILE -> {
                     uri ?: return@launch
                     showReboot = false
-                    MagiskInstaller.Patch(installer, uri, outItems, logItems).exec()
+                    MagiskInstaller.Patch(uri, outItems, logItems).exec()
                 }
                 else -> {
                     back()

app/src/main/java/com/topjohnwu/magisk/ui/hide/HideInfo.kt

@@ -7,6 +7,7 @@ import android.content.pm.PackageManager
 import android.content.pm.PackageManager.*
 import android.content.pm.ServiceInfo
 import android.graphics.drawable.Drawable
+import android.os.Build.VERSION.SDK_INT
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.ktx.getLabel
 import com.topjohnwu.magisk.ktx.isIsolated
@@ -59,7 +60,7 @@ class HideAppInfo(info: ApplicationInfo, pm: PackageManager, hideList: List<Cmdl
 
         val hidden = hideList.filter { it.packageName == packageName || it.packageName == ISOLATED_MAGIC }
         fun createProcess(name: String, pkg: String = packageName): HideProcessInfo {
-            return HideProcessInfo(name, pkg, hidden.any { it.process == name })
+            return HideProcessInfo(name, pkg, hidden.any { it.process == name && it.packageName == pkg })
         }
 
         var haveAppZygote = false
@@ -71,7 +72,8 @@ class HideAppInfo(info: ApplicationInfo, pm: PackageManager, hideList: List<Cmdl
                     // Using app zygote, don't need to track the process
                     null
                 } else {
-                    createProcess("${it.processName}:${it.name}", ISOLATED_MAGIC)
+                    val proc = if (SDK_INT >= 29) "${it.processName}:${it.name}" else it.processName
+                    createProcess(proc, ISOLATED_MAGIC)
                 }
             } else {
                 createProcess(it.processName)
@@ -84,7 +86,7 @@ class HideAppInfo(info: ApplicationInfo, pm: PackageManager, hideList: List<Cmdl
             receivers?.processes().orEmpty() +
             providers?.processes().orEmpty() +
             listOf(if (haveAppZygote) createProcess("${processName}_zygote") else null)
-        }.filterNotNull().distinctBy { it.name }.sortedBy { it.name }
+        }.filterNotNull().distinct().sortedBy { it.name }
     }
 
     companion object {
@@ -100,6 +102,6 @@ data class HideProcessInfo(
     val packageName: String,
     var isHidden: Boolean
 ) {
-    val isIsolated get() = name == ISOLATED_MAGIC
+    val isIsolated get() = packageName == ISOLATED_MAGIC
     val isAppZygote get() = name.endsWith("_zygote")
 }

app/src/main/java/com/topjohnwu/magisk/ui/hide/HideRvItems.kt

@@ -93,13 +93,15 @@ class HideProcessRvItem(
 
     override val layoutRes get() = R.layout.item_hide_process_md2
 
+    val displayName = if (process.isIsolated) "(isolated) ${process.name}" else process.name
+
     @get:Bindable
     var isHidden
         get() = process.isHidden
         set(value) = set(value, process.isHidden, { process.isHidden = it }, BR.hidden) {
             val arg = if (it) "add" else "rm"
             val (name, pkg) = process
-            Shell.su("magiskhide --$arg $pkg $name").submit()
+            Shell.su("magiskhide $arg $pkg \'$name\'").submit()
         }
 
     fun toggle() {
@@ -109,7 +111,10 @@ class HideProcessRvItem(
     val defaultSelection get() =
         process.isIsolated || process.isAppZygote || process.name == process.packageName
 
-    override fun contentSameAs(other: HideProcessRvItem) = process == other.process
-    override fun itemSameAs(other: HideProcessRvItem) = process.name == other.process.name
+    override fun contentSameAs(other: HideProcessRvItem) =
+        process.isHidden == other.process.isHidden
+
+    override fun itemSameAs(other: HideProcessRvItem) =
+        process.name == other.process.name && process.packageName == other.process.packageName
 
 }

app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt

@@ -62,12 +62,13 @@ class HideViewModel : BaseViewModel(), Queryable {
         state = State.LOADING
         val (apps, diff) = withContext(Dispatchers.Default) {
             val pm = get<PackageManager>()
-            val hideList = Shell.su("magiskhide --ls").exec().out.map { CmdlineHiddenItem(it) }
+            val hideList = Shell.su("magiskhide ls").exec().out.map { CmdlineHiddenItem(it) }
             val apps = pm.getInstalledApplications(MATCH_UNINSTALLED_PACKAGES)
                 .asSequence()
-                .filter { it.enabled && !blacklist.contains(it.packageName) }
+                .filterNot { blacklist.contains(it.packageName) }
                 .map { HideAppInfo(it, pm, hideList) }
                 .filter { it.processes.isNotEmpty() }
+                .filter { info -> info.enabled || info.processes.any { it.isHidden } }
                 .map { HideRvItem(it) }
                 .toList()
                 .sorted()

app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt

@@ -2,6 +2,8 @@ package com.topjohnwu.magisk.ui.home
 
 import android.os.Bundle
 import android.view.*
+import android.widget.ImageView
+import android.widget.TextView
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.BaseUIFragment
 import com.topjohnwu.magisk.core.download.BaseDownloader
@@ -22,20 +24,32 @@ class HomeFragment : BaseUIFragment<HomeViewModel, FragmentHomeMd2Binding>() {
         BaseDownloader.observeProgress(this, viewModel::onProgressUpdate)
     }
 
+    private fun checkTitle(text: TextView, icon: ImageView) {
+        text.post {
+            if (text.layout.getEllipsisCount(0) != 0) {
+                with (icon) {
+                    layoutParams.width = 0
+                    layoutParams.height = 0
+                    requestLayout()
+                }
+            }
+        }
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         super.onCreateView(inflater, container, savedInstanceState)
 
-        // Set barrier reference IDs in code, since resource IDs will be stripped in release mode
-        binding.homeMagiskWrapper.homeMagiskTitleBarrier.referencedIds =
-            intArrayOf(R.id.home_magisk_button, R.id.home_magisk_title, R.id.home_magisk_icon)
-        binding.homeMagiskWrapper.homeMagiskBarrier.referencedIds =
-            intArrayOf(R.id.home_magisk_latest_version, R.id.home_magisk_installed_version)
-        binding.homeManagerWrapper.homeManagerTitleBarrier.referencedIds =
-            intArrayOf(R.id.home_manager_button, R.id.home_manager_title, R.id.home_manager_icon)
+        // If titles are squished, hide icons
+        with(binding.homeMagiskWrapper) {
+            checkTitle(homeMagiskTitle, homeMagiskIcon)
+        }
+        with(binding.homeManagerWrapper) {
+            checkTitle(homeManagerTitle, homeManagerIcon)
+        }
 
         return binding.root
     }
@@ -46,11 +60,14 @@ class HomeFragment : BaseUIFragment<HomeViewModel, FragmentHomeMd2Binding>() {
             menu.removeItem(R.id.action_reboot)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-        R.id.action_settings -> HomeFragmentDirections.actionHomeFragmentToSettingsFragment()
-            .navigate()
-        R.id.action_reboot -> RebootEvent.inflateMenu(activity).show()
-        else -> null
-    }?.let { true } ?: super.onOptionsItemSelected(item)
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.action_settings ->
+                HomeFragmentDirections.actionHomeFragmentToSettingsFragment().navigate()
+            R.id.action_reboot -> RebootEvent.inflateMenu(activity).show()
+            else -> return super.onOptionsItemSelected(item)
+        }
+        return true
+    }
 
 }

app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt

@@ -9,8 +9,6 @@ import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.download.Subject
 import com.topjohnwu.magisk.core.download.Subject.Manager
-import com.topjohnwu.magisk.core.model.MagiskJson
-import com.topjohnwu.magisk.core.model.ManagerJson
 import com.topjohnwu.magisk.data.repository.NetworkService
 import com.topjohnwu.magisk.events.OpenInappLinkEvent
 import com.topjohnwu.magisk.events.SnackbarEvent
@@ -18,8 +16,7 @@ import com.topjohnwu.magisk.events.dialog.EnvFixDialog
 import com.topjohnwu.magisk.events.dialog.ManagerInstallDialog
 import com.topjohnwu.magisk.events.dialog.UninstallDialog
 import com.topjohnwu.magisk.ktx.await
-import com.topjohnwu.magisk.ktx.packageName
-import com.topjohnwu.magisk.ktx.res
+import com.topjohnwu.magisk.utils.asText
 import com.topjohnwu.magisk.utils.set
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.launch
@@ -34,41 +31,46 @@ class HomeViewModel(
     private val svc: NetworkService
 ) : BaseViewModel() {
 
+    val magiskTitleBarrierIds =
+        intArrayOf(R.id.home_magisk_icon, R.id.home_magisk_title, R.id.home_magisk_button)
+    val magiskDetailBarrierIds =
+        intArrayOf(R.id.home_magisk_installed_version, R.id.home_device_details_ramdisk)
+    val appTitleBarrierIds =
+        intArrayOf(R.id.home_manager_icon, R.id.home_manager_title, R.id.home_manager_button)
+
     @get:Bindable
     var isNoticeVisible = Config.safetyNotice
         set(value) = set(value, field, { field = it }, BR.noticeVisible)
 
-    @get:Bindable
-    var stateMagisk = MagiskState.LOADING
-        set(value) = set(value, field, { field = it }, BR.stateMagisk, BR.showUninstall)
+    val stateMagisk = when {
+        !Info.env.isActive -> MagiskState.NOT_INSTALLED
+        Info.env.magiskVersionCode < BuildConfig.VERSION_CODE -> MagiskState.OBSOLETE
+        else -> MagiskState.UP_TO_DATE
+    }
 
     @get:Bindable
     var stateManager = MagiskState.LOADING
         set(value) = set(value, field, { field = it }, BR.stateManager)
 
-    @get:Bindable
-    var magiskRemoteVersion = R.string.loading.res()
-        set(value) = set(value, field, { field = it }, BR.magiskRemoteVersion)
-
-    val magiskInstalledVersion get() =
-        "${Info.env.magiskVersionString} (${Info.env.magiskVersionCode})"
+    val magiskInstalledVersion get() = Info.env.run {
+        if (isActive)
+            "$magiskVersionString ($magiskVersionCode)".asText()
+        else
+            R.string.not_available.asText()
+    }
 
     @get:Bindable
-    var managerRemoteVersion = R.string.loading.res()
+    var managerRemoteVersion = R.string.loading.asText()
         set(value) = set(value, field, { field = it }, BR.managerRemoteVersion)
 
     val managerInstalledVersion = Info.stub?.let {
         "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE}) (${it.version})"
     } ?: "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
-    val statePackageName = packageName
 
     @get:Bindable
     var stateManagerProgress = 0
         set(value) = set(value, field, { field = it }, BR.stateManagerProgress)
 
-    @get:Bindable
-    val showUninstall get() = Info.env.isActive && state != State.LOADING
-
     @get:Bindable
     val showSafetyNet get() = Info.hasGMS && isConnected.get()
 
@@ -80,30 +82,25 @@ class HomeViewModel(
 
     override fun refresh() = viewModelScope.launch {
         state = State.LOADING
-        svc.fetchUpdate()?.apply {
+        notifyPropertyChanged(BR.showSafetyNet)
+        Info.getRemote(svc)?.apply {
             state = State.LOADED
-            stateMagisk = when {
-                !Info.env.isActive -> MagiskState.NOT_INSTALLED
-                magisk.isObsolete -> MagiskState.OBSOLETE
-                else -> MagiskState.UP_TO_DATE
-            }
 
             stateManager = when {
-                app.isObsolete -> MagiskState.OBSOLETE
+                BuildConfig.VERSION_CODE < magisk.versionCode -> MagiskState.OBSOLETE
                 else -> MagiskState.UP_TO_DATE
             }
 
-            magiskRemoteVersion =
-                "${magisk.version} (${magisk.versionCode})"
             managerRemoteVersion =
-                "${app.version} (${app.versionCode}) (${stub.versionCode})"
+                "${magisk.version} (${magisk.versionCode}) (${stub.versionCode})".asText()
 
             launch {
                 ensureEnv()
             }
-        } ?: apply { state = State.LOADING_FAILED }
-        notifyPropertyChanged(BR.showUninstall)
-        notifyPropertyChanged(BR.showSafetyNet)
+        } ?: {
+            state = State.LOADING_FAILED
+            managerRemoteVersion = R.string.not_available.asText()
+        }()
     }
 
     val showTest = false
@@ -115,9 +112,8 @@ class HomeViewModel(
     }.publish()
 
     fun onProgressUpdate(progress: Float, subject: Subject) {
-        when (subject) {
-            is Manager -> stateManagerProgress = progress.times(100f).roundToInt()
-        }
+        if (subject is Manager)
+            stateManagerProgress = progress.times(100f).roundToInt()
     }
 
     fun onLinkPressed(link: String) = OpenInappLinkEvent(link).publish()
@@ -125,21 +121,17 @@ class HomeViewModel(
     fun onDeletePressed() = UninstallDialog().publish()
 
     fun onManagerPressed() = when (state) {
-        State.LOADED -> ManagerInstallDialog().publish()
+        State.LOADED -> withExternalRW { ManagerInstallDialog().publish() }
         State.LOADING -> SnackbarEvent(R.string.loading).publish()
         else -> SnackbarEvent(R.string.no_connection).publish()
     }
 
-    fun onMagiskPressed() = when (state) {
-        State.LOADED -> withExternalRW {
-            HomeFragmentDirections.actionHomeFragmentToInstallFragment().publish()
-        }
-        State.LOADING -> SnackbarEvent(R.string.loading).publish()
-        else -> SnackbarEvent(R.string.no_connection).publish()
+    fun onMagiskPressed() = withExternalRW {
+        HomeFragmentDirections.actionHomeFragmentToInstallFragment().navigate()
     }
 
     fun onSafetyNetPressed() =
-        HomeFragmentDirections.actionHomeFragmentToSafetynetFragment().publish()
+        HomeFragmentDirections.actionHomeFragmentToSafetynetFragment().navigate()
 
     fun hideNotice() {
         Config.safetyNotice = false
@@ -160,9 +152,4 @@ class HomeViewModel(
         }
     }
 
-    private val MagiskJson.isObsolete
-        get() = Info.env.isActive && Info.env.magiskVersionCode < versionCode
-    private val ManagerJson.isObsolete
-        get() = BuildConfig.VERSION_CODE < versionCode
-
 }

app/src/main/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt

@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.BaseUIFragment
-import com.topjohnwu.magisk.core.download.BaseDownloader
 import com.topjohnwu.magisk.databinding.FragmentInstallMd2Binding
 import com.topjohnwu.magisk.ktx.coroutineScope
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -23,7 +22,6 @@ class InstallFragment : BaseUIFragment<InstallViewModel, FragmentInstallMd2Bindi
 
         // Allow markwon to run in viewmodel scope
         binding.releaseNotes.coroutineScope = viewModel.viewModelScope
-        BaseDownloader.observeProgress(this, viewModel::onProgressUpdate)
     }
 
     override fun onCreateView(

app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt

@@ -1,33 +1,35 @@
 package com.topjohnwu.magisk.ui.install
 
 import android.app.Activity
+import android.content.Context
 import android.net.Uri
 import androidx.databinding.Bindable
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.core.Const
 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.data.repository.NetworkService
 import com.topjohnwu.magisk.events.MagiskInstallFileEvent
 import com.topjohnwu.magisk.events.dialog.SecondSlotWarningDialog
+import com.topjohnwu.magisk.ui.flash.FlashFragment
 import com.topjohnwu.magisk.utils.set
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.launch
 import org.koin.core.get
 import timber.log.Timber
+import java.io.File
 import java.io.IOException
-import kotlin.math.roundToInt
 
 class InstallViewModel(
     svc: NetworkService
-) : BaseViewModel(State.LOADED) {
+) : BaseViewModel() {
 
     val isRooted = Shell.rootAccess()
-    val skipOptions = Info.ramdisk && !Info.isFDE && Info.isSAR
+    val skipOptions = Info.isEmulator || (Info.ramdisk && !Info.isFDE && Info.isSAR)
+    val noSecondSlot = !isRooted || Info.isPixel || Info.isVirtualAB || !Info.isAB || Info.isEmulator
 
     @get:Bindable
     var step = if (skipOptions) 1 else 0
@@ -52,10 +54,6 @@ class InstallViewModel(
             }
         }
 
-    @get:Bindable
-    var progress = 0
-        set(value) = set(value, field, { field = it }, BR.progress)
-
     @get:Bindable
     var data: Uri? = null
         set(value) = set(value, field, { field = it }, BR.data)
@@ -67,41 +65,35 @@ class InstallViewModel(
     init {
         viewModelScope.launch {
             try {
-                notes = svc.fetchString(Info.remote.magisk.note)
+                val context = get<Context>()
+                File(context.cacheDir, "${BuildConfig.VERSION_CODE}.md").run {
+                    notes = when {
+                        exists() -> readText()
+                        Const.Url.CHANGELOG_URL.isEmpty() -> ""
+                        else -> {
+                            val text = svc.fetchString(Const.Url.CHANGELOG_URL)
+                            writeText(text)
+                            text
+                        }
+                    }
+                }
             } catch (e: IOException) {
                 Timber.e(e)
             }
         }
     }
 
-    fun onProgressUpdate(progress: Float, subject: Subject) {
-        if (subject !is Subject.Magisk) {
-            return
-        }
-        this.progress = progress.times(100).roundToInt()
-        if (this.progress >= 100) {
-            state = State.LOADED
-        } else if (this.progress < -150) {
-            state = State.LOADING_FAILED
-        }
-    }
-
     fun step(nextStep: Int) {
         step = nextStep
     }
 
     fun install() {
-        DownloadService.start(get(), Subject.Magisk(resolveAction()))
+        when (method) {
+            R.id.method_patch -> FlashFragment.patch(data!!).navigate()
+            R.id.method_direct -> FlashFragment.flash(false).navigate()
+            R.id.method_inactive_slot -> FlashFragment.flash(true).navigate()
+            else -> error("Unknown value")
+        }
         state = State.LOADING
     }
-
-    // ---
-
-    private fun resolveAction() = when (method) {
-        R.id.method_download -> Action.Download
-        R.id.method_patch -> Action.Patch(data!!)
-        R.id.method_direct -> Action.Flash.Primary
-        R.id.method_inactive_slot -> Action.Flash.Secondary
-        else -> error("Unknown value")
-    }
 }

app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt

@@ -313,10 +313,8 @@ class ModuleViewModel(
 
     fun infoPressed(item: ModuleItem) {
         item.repo?.also {
-            if (isConnected.get())
-                OpenReadmeEvent(it).publish()
-            else
-                SnackbarEvent(R.string.no_connection).publish()
+            if (isConnected.get()) OpenReadmeEvent(it).publish()
+            else SnackbarEvent(R.string.no_connection).publish()
         } ?: return
     }
 }

app/src/main/java/com/topjohnwu/magisk/ui/settings/BaseSettingsItem.kt

@@ -9,8 +9,8 @@ import androidx.databinding.Bindable
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.ObservableItem
-import com.topjohnwu.magisk.utils.TransitiveText
-import com.topjohnwu.magisk.utils.asTransitive
+import com.topjohnwu.magisk.utils.TextHolder
+import com.topjohnwu.magisk.utils.asText
 import com.topjohnwu.magisk.utils.set
 import com.topjohnwu.magisk.view.MagiskDialog
 import org.koin.core.KoinComponent
@@ -21,9 +21,9 @@ sealed class BaseSettingsItem : ObservableItem<BaseSettingsItem>() {
     override val layoutRes get() = R.layout.item_settings
 
     open val icon: Int get() = 0
-    open val title: TransitiveText get() = TransitiveText.EMPTY
+    open val title: TextHolder get() = TextHolder.EMPTY
     @get:Bindable
-    open val description: TransitiveText get() = TransitiveText.EMPTY
+    open val description: TextHolder get() = TextHolder.EMPTY
 
     // ---
 
@@ -151,8 +151,8 @@ sealed class BaseSettingsItem : ObservableItem<BaseSettingsItem>() {
         open val entries get() = resources.getArrayOrEmpty(entryRes)
         open val entryValues get() = resources.getArrayOrEmpty(entryValRes)
 
-        override val description: TransitiveText
-            get() = entries.getOrNull(value)?.asTransitive() ?: TransitiveText.EMPTY
+        override val description: TextHolder
+            get() = entries.getOrNull(value)?.asText() ?: TextHolder.EMPTY
 
         private fun Resources.getArrayOrEmpty(id: Int): Array<String> =
             runCatching { getStringArray(id) }.getOrDefault(emptyArray())

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt

@@ -20,9 +20,9 @@ import com.topjohnwu.magisk.databinding.DialogSettingsAppNameBinding
 import com.topjohnwu.magisk.databinding.DialogSettingsDownloadPathBinding
 import com.topjohnwu.magisk.databinding.DialogSettingsUpdateChannelBinding
 import com.topjohnwu.magisk.ktx.get
-import com.topjohnwu.magisk.utils.TransitiveText
+import com.topjohnwu.magisk.utils.TextHolder
 import com.topjohnwu.magisk.utils.Utils
-import com.topjohnwu.magisk.utils.asTransitive
+import com.topjohnwu.magisk.utils.asText
 import com.topjohnwu.magisk.utils.set
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.CoroutineScope
@@ -31,7 +31,7 @@ import kotlinx.coroutines.launch
 // --- Customization
 
 object Customization : BaseSettingsItem.Section() {
-    override val title = R.string.settings_customization.asTransitive()
+    override val title = R.string.settings_customization.asText()
 }
 
 object Language : BaseSettingsItem.Selector() {
@@ -40,7 +40,7 @@ object Language : BaseSettingsItem.Selector() {
             Config.locale = entryValues[it]
         }
 
-    override val title = R.string.language.asTransitive()
+    override val title = R.string.language.asText()
     override var entries = emptyArray<String>()
     override var entryValues = emptyArray<String>()
 
@@ -58,18 +58,18 @@ object Language : BaseSettingsItem.Selector() {
 
 object Theme : BaseSettingsItem.Blank() {
     override val icon = R.drawable.ic_paint
-    override val title = R.string.section_theme.asTransitive()
+    override val title = R.string.section_theme.asText()
 }
 
-// --- Manager
+// --- App
 
-object Manager : BaseSettingsItem.Section() {
-    override val title = R.string.manager.asTransitive()
+object AppSettings : BaseSettingsItem.Section() {
+    override val title = R.string.home_app_title.asText()
 }
 
 object ClearRepoCache : BaseSettingsItem.Blank() {
-    override val title = R.string.settings_clear_cache_title.asTransitive()
-    override val description = R.string.settings_clear_cache_summary.asTransitive()
+    override val title = R.string.settings_clear_cache_title.asText()
+    override val description = R.string.settings_clear_cache_summary.asText()
 
     override fun refresh() {
         isEnabled = Info.env.isActive
@@ -77,8 +77,8 @@ object ClearRepoCache : BaseSettingsItem.Blank() {
 }
 
 object Hide : BaseSettingsItem.Input() {
-    override val title = R.string.settings_hide_manager_title.asTransitive()
-    override val description = R.string.settings_hide_manager_summary.asTransitive()
+    override val title = R.string.settings_hide_app_title.asText()
+    override val description = R.string.settings_hide_app_summary.asText()
 
     override var value = ""
         set(value) = setV(value, field, { field = it })
@@ -87,7 +87,7 @@ object Hide : BaseSettingsItem.Input() {
         get() = if (isError) null else result
 
     @get:Bindable
-    var result = "Manager"
+    var result = "Settings"
         set(value) = set(value, field, { field = it }, BR.result, BR.error)
 
     val maxLength
@@ -106,24 +106,21 @@ object Hide : BaseSettingsItem.Input() {
 }
 
 object Restore : BaseSettingsItem.Blank() {
-    override val title = R.string.settings_restore_manager_title.asTransitive()
-    override val description = R.string.settings_restore_manager_summary.asTransitive()
-    override fun refresh() {
-        isEnabled = Info.remote.app.versionCode > 0
-    }
+    override val title = R.string.settings_restore_app_title.asText()
+    override val description = R.string.settings_restore_app_summary.asText()
 }
 
 object AddShortcut : BaseSettingsItem.Blank() {
-    override val title = R.string.add_shortcut_title.asTransitive()
-    override val description = R.string.setting_add_shortcut_summary.asTransitive()
+    override val title = R.string.add_shortcut_title.asText()
+    override val description = R.string.setting_add_shortcut_summary.asText()
 }
 
 object DownloadPath : BaseSettingsItem.Input() {
     override var value = Config.downloadDir
         set(value) = setV(value, field, { field = it }) { Config.downloadDir = it }
 
-    override val title = R.string.settings_download_path_title.asTransitive()
-    override val description get() = path.asTransitive()
+    override val title = R.string.settings_download_path_title.asText()
+    override val description get() = path.asText()
 
     override val inputResult: String get() = result
 
@@ -141,22 +138,29 @@ object DownloadPath : BaseSettingsItem.Input() {
 
 object UpdateChannel : BaseSettingsItem.Selector() {
     override var value = Config.updateChannel
-        set(value) = setV(value, field, { field = it }) { Config.updateChannel = it }
+        set(value) = setV(value, field, { field = it }) {
+            Config.updateChannel = it
+            Info.remote = Info.EMPTY_REMOTE
+        }
 
-    override val title = R.string.settings_update_channel_title.asTransitive()
+    override val title = R.string.settings_update_channel_title.asText()
     override val entries: Array<String> = resources.getStringArray(R.array.update_channel).let {
-        if (BuildConfig.DEBUG) it.toMutableList().apply { add("Canary") }.toTypedArray() else it
+        if (BuildConfig.VERSION_CODE % 100 == 0)
+            it.toMutableList().apply { removeAt(Config.Value.CANARY_CHANNEL) }.toTypedArray()
+        else it
     }
     override val description
-        get() = entries.getOrNull(value)?.asTransitive()
-            ?: TransitiveText.String(if (value == -1) entries[0] else "Canary")
+        get() = entries.getOrNull(value)?.asText() ?: TextHolder.String(entries[0])
 }
 
 object UpdateChannelUrl : BaseSettingsItem.Input() {
-    override val title = R.string.settings_update_custom.asTransitive()
+    override val title = R.string.settings_update_custom.asText()
     override var value = Config.customChannelUrl
-        set(value) = setV(value, field, { field = it }) { Config.customChannelUrl = it }
-    override val description get() = value.asTransitive()
+        set(value) = setV(value, field, { field = it }) {
+            Config.customChannelUrl = it
+            Info.remote = Info.EMPTY_REMOTE
+        }
+    override val description get() = value.asText()
 
     override val inputResult get() = result
 
@@ -173,8 +177,8 @@ object UpdateChannelUrl : BaseSettingsItem.Input() {
 }
 
 object UpdateChecker : BaseSettingsItem.Toggle() {
-    override val title = R.string.settings_check_update_title.asTransitive()
-    override val description = R.string.settings_check_update_summary.asTransitive()
+    override val title = R.string.settings_check_update_title.asText()
+    override val description = R.string.settings_check_update_summary.asText()
     override var value = Config.checkUpdate
         set(value) = setV(value, field, { field = it }) {
             Config.checkUpdate = it
@@ -183,8 +187,8 @@ object UpdateChecker : BaseSettingsItem.Toggle() {
 }
 
 object DoHToggle : BaseSettingsItem.Toggle() {
-    override val title = R.string.settings_doh_title.asTransitive()
-    override val description = R.string.settings_doh_description.asTransitive()
+    override val title = R.string.settings_doh_title.asText()
+    override val description = R.string.settings_doh_description.asText()
     override var value = Config.doh
         set(value) = setV(value, field, { field = it }) {
             Config.doh = it
@@ -193,35 +197,35 @@ object DoHToggle : BaseSettingsItem.Toggle() {
 
 // check whether is module already installed beforehand?
 object SystemlessHosts : BaseSettingsItem.Blank() {
-    override val title = R.string.settings_hosts_title.asTransitive()
-    override val description = R.string.settings_hosts_summary.asTransitive()
+    override val title = R.string.settings_hosts_title.asText()
+    override val description = R.string.settings_hosts_summary.asText()
 }
 
 object Tapjack : BaseSettingsItem.Toggle() {
-    override val title = R.string.settings_su_tapjack_title.asTransitive()
-    override var description = R.string.settings_su_tapjack_summary.asTransitive()
+    override val title = R.string.settings_su_tapjack_title.asText()
+    override var description = R.string.settings_su_tapjack_summary.asText()
     override var value = Config.suTapjack
         set(value) = setV(value, field, { field = it }) { Config.suTapjack = it }
 }
 
 object Biometrics : BaseSettingsItem.Toggle() {
-    override val title = R.string.settings_su_biometric_title.asTransitive()
+    override val title = R.string.settings_su_biometric_title.asText()
     override var value = Config.suBiometric
         set(value) = setV(value, field, { field = it }) { Config.suBiometric = it }
-    override var description = R.string.settings_su_biometric_summary.asTransitive()
+    override var description = R.string.settings_su_biometric_summary.asText()
 
     override fun refresh() {
         isEnabled = BiometricHelper.isSupported
         if (!isEnabled) {
             value = false
-            description = R.string.no_biometric.asTransitive()
+            description = R.string.no_biometric.asText()
         }
     }
 }
 
 object Reauthenticate : BaseSettingsItem.Toggle() {
-    override val title = R.string.settings_su_reauth_title.asTransitive()
-    override val description = R.string.settings_su_reauth_summary.asTransitive()
+    override val title = R.string.settings_su_reauth_title.asText()
+    override val description = R.string.settings_su_reauth_summary.asText()
     override var value = Config.suReAuth
         set(value) = setV(value, field, { field = it }) { Config.suReAuth = it }
 
@@ -233,16 +237,16 @@ object Reauthenticate : BaseSettingsItem.Toggle() {
 // --- Magisk
 
 object Magisk : BaseSettingsItem.Section() {
-    override val title = R.string.magisk.asTransitive()
+    override val title = R.string.magisk.asText()
 }
 
 object MagiskHide : BaseSettingsItem.Toggle() {
-    override val title = R.string.magiskhide.asTransitive()
-    override val description = R.string.settings_magiskhide_summary.asTransitive()
+    override val title = R.string.magiskhide.asText()
+    override val description = R.string.settings_magiskhide_summary.asText()
     override var value = Config.magiskHide
         set(value) = setV(value, field, { field = it }) {
             val cmd = if (it) "enable" else "disable"
-            Shell.su("magiskhide --$cmd").submit { cb ->
+            Shell.su("magiskhide $cmd").submit { cb ->
                 if (cb.isSuccess) Config.magiskHide = it
                 else field = !it
             }
@@ -252,11 +256,11 @@ object MagiskHide : BaseSettingsItem.Toggle() {
 // --- Superuser
 
 object Superuser : BaseSettingsItem.Section() {
-    override val title = R.string.superuser.asTransitive()
+    override val title = R.string.superuser.asText()
 }
 
 object AccessMode : BaseSettingsItem.Selector() {
-    override val title = R.string.superuser_access.asTransitive()
+    override val title = R.string.superuser_access.asText()
     override val entryRes = R.array.su_access
 
     override var value = Config.rootMode
@@ -266,7 +270,7 @@ object AccessMode : BaseSettingsItem.Selector() {
 }
 
 object MultiuserMode : BaseSettingsItem.Selector() {
-    override val title = R.string.multiuser_mode.asTransitive()
+    override val title = R.string.multiuser_mode.asText()
     override val entryRes = R.array.multiuser_mode
 
     override var value = Config.suMultiuserMode
@@ -275,7 +279,7 @@ object MultiuserMode : BaseSettingsItem.Selector() {
         }
 
     override val description
-        get() = resources.getStringArray(R.array.multiuser_summary)[value].asTransitive()
+        get() = resources.getStringArray(R.array.multiuser_summary)[value].asText()
 
     override fun refresh() {
         isEnabled = Const.USER_ID == 0
@@ -283,7 +287,7 @@ object MultiuserMode : BaseSettingsItem.Selector() {
 }
 
 object MountNamespaceMode : BaseSettingsItem.Selector() {
-    override val title = R.string.mount_namespace_mode.asTransitive()
+    override val title = R.string.mount_namespace_mode.asText()
     override val entryRes = R.array.namespace
 
     override var value = Config.suMntNamespaceMode
@@ -292,11 +296,11 @@ object MountNamespaceMode : BaseSettingsItem.Selector() {
         }
 
     override val description
-        get() = resources.getStringArray(R.array.namespace_summary)[value].asTransitive()
+        get() = resources.getStringArray(R.array.namespace_summary)[value].asText()
 }
 
 object AutomaticResponse : BaseSettingsItem.Selector() {
-    override val title = R.string.auto_response.asTransitive()
+    override val title = R.string.auto_response.asText()
     override val entryRes = R.array.auto_response
 
     override var value = Config.suAutoResponse
@@ -306,7 +310,7 @@ object AutomaticResponse : BaseSettingsItem.Selector() {
 }
 
 object RequestTimeout : BaseSettingsItem.Selector() {
-    override val title = R.string.request_timeout.asTransitive()
+    override val title = R.string.request_timeout.asText()
     override val entryRes = R.array.request_timeout
     override val entryValRes = R.array.request_timeout_value
 
@@ -320,7 +324,7 @@ object RequestTimeout : BaseSettingsItem.Selector() {
 }
 
 object SUNotification : BaseSettingsItem.Selector() {
-    override val title = R.string.superuser_notification.asTransitive()
+    override val title = R.string.superuser_notification.asText()
     override val entryRes = R.array.su_notification
 
     override var value = Config.suNotification

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt

@@ -21,6 +21,7 @@ import com.topjohnwu.magisk.data.database.RepoDao
 import com.topjohnwu.magisk.events.AddHomeIconEvent
 import com.topjohnwu.magisk.events.RecreateEvent
 import com.topjohnwu.magisk.events.dialog.BiometricEvent
+import com.topjohnwu.magisk.ktx.activity
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.launch
@@ -54,13 +55,17 @@ class SettingsViewModel(
 
         // Manager
         list.addAll(listOf(
-            Manager,
+            AppSettings,
             UpdateChannel, UpdateChannelUrl, DoHToggle, UpdateChecker, DownloadPath
         ))
         if (Info.env.isActive) {
             list.add(ClearRepoCache)
-            if (Const.USER_ID == 0 && Info.isConnected.get())
-                list.add(if (hidden) Restore else Hide)
+            if (Build.VERSION.SDK_INT >= 21 && Const.USER_ID == 0) {
+                if (hidden)
+                    list.add(Restore)
+                else if (Info.isConnected.get())
+                    list.add(Hide)
+            }
         }
 
         // Magisk
@@ -98,19 +103,21 @@ class SettingsViewModel(
     override fun onItemPressed(view: View, item: BaseSettingsItem, callback: () -> Unit) = when (item) {
         is DownloadPath -> withExternalRW(callback)
         is Biometrics -> authenticate(callback)
-        is Theme -> SettingsFragmentDirections.actionSettingsFragmentToThemeFragment().publish()
+        is Theme -> SettingsFragmentDirections.actionSettingsFragmentToThemeFragment().navigate()
         is ClearRepoCache -> clearRepoCache()
         is SystemlessHosts -> createHosts()
-        is Restore -> HideAPK.restore(view.context)
+        is Restore -> HideAPK.restore(view.activity)
         is AddShortcut -> AddHomeIconEvent().publish()
         else -> callback()
     }
 
-    override fun onItemChanged(view: View, item: BaseSettingsItem) = when (item) {
-        is Language -> RecreateEvent().publish()
-        is UpdateChannel -> openUrlIfNecessary(view)
-        is Hide -> HideAPK.hide(view.context, item.value)
-        else -> Unit
+    override fun onItemChanged(view: View, item: BaseSettingsItem) {
+        when (item) {
+            is Language -> RecreateEvent().publish()
+            is UpdateChannel -> openUrlIfNecessary(view)
+            is Hide -> viewModelScope.launch { HideAPK.hide(view.activity, item.value) }
+            else -> Unit
+        }
     }
 
     private fun openUrlIfNecessary(view: View) {

app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt

@@ -1,6 +1,5 @@
 package com.topjohnwu.magisk.ui.superuser
 
-import android.content.res.Resources
 import androidx.databinding.ObservableArrayList
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
@@ -19,6 +18,7 @@ import com.topjohnwu.magisk.events.SnackbarEvent
 import com.topjohnwu.magisk.events.dialog.BiometricEvent
 import com.topjohnwu.magisk.events.dialog.SuperuserRevokeDialog
 import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.magisk.utils.asText
 import com.topjohnwu.magisk.view.TappableHeadlineItem
 import com.topjohnwu.magisk.view.TextItem
 import kotlinx.coroutines.Dispatchers
@@ -27,8 +27,7 @@ import kotlinx.coroutines.withContext
 import me.tatarka.bindingcollectionadapter2.collections.MergeObservableList
 
 class SuperuserViewModel(
-    private val db: PolicyDao,
-    private val resources: Resources
+    private val db: PolicyDao
 ) : BaseViewModel(), TappableHeadlineItem.Listener {
 
     private val itemNoData = TextItem(R.string.superuser_policy_none)
@@ -55,6 +54,7 @@ class SuperuserViewModel(
         }
         state = State.LOADING
         val (policies, diff) = withContext(Dispatchers.Default) {
+            db.deleteOutdated()
             val policies = db.fetchAll {
                 PolicyRvItem(it, it.icon, this@SuperuserViewModel)
             }.sortedWith(compareBy(
@@ -79,7 +79,7 @@ class SuperuserViewModel(
     }
 
     private fun hidePressed() =
-        SuperuserFragmentDirections.actionSuperuserFragmentToHideFragment().publish()
+        SuperuserFragmentDirections.actionSuperuserFragmentToHideFragment().navigate()
 
     fun deletePressed(item: PolicyRvItem) {
         fun updateState() = viewModelScope.launch {
@@ -106,7 +106,7 @@ class SuperuserViewModel(
 
     fun updatePolicy(policy: SuPolicy, isLogging: Boolean) = viewModelScope.launch {
         db.update(policy)
-        val str = when {
+        val res = when {
             isLogging -> when {
                 policy.logging -> R.string.su_snack_log_on
                 else -> R.string.su_snack_log_off
@@ -116,7 +116,7 @@ class SuperuserViewModel(
                 else -> R.string.su_snack_notif_off
             }
         }
-        SnackbarEvent(resources.getString(str, policy.appName)).publish()
+        SnackbarEvent(res.asText(policy.appName)).publish()
     }
 
     fun togglePolicy(item: PolicyRvItem, enable: Boolean) {
@@ -130,7 +130,7 @@ class SuperuserViewModel(
                 db.update(app)
                 val res = if (app.policy == SuPolicy.ALLOW) R.string.su_snack_grant
                 else R.string.su_snack_deny
-                SnackbarEvent(resources.getString(res).format(item.item.appName)).publish()
+                SnackbarEvent(res.asText(item.item.appName)).publish()
             }
         }
 

app/src/main/java/com/topjohnwu/magisk/utils/HideBottomViewOnScrollBehavior.kt

@@ -1,5 +1,7 @@
 package com.topjohnwu.magisk.utils
 
+import android.content.Context
+import android.util.AttributeSet
 import android.view.View
 import android.view.ViewGroup
 import androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -13,8 +15,8 @@ import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Info
 import kotlin.math.roundToInt
 
-class HideBottomViewOnScrollBehavior<V : View> : HideBottomViewOnScrollBehavior<V>(),
-    HideableBehavior<V> {
+class HideBottomViewOnScrollBehavior<V : View>(context: Context, attrs: AttributeSet) :
+    HideBottomViewOnScrollBehavior<V>(), HideableBehavior<V> {
 
     private var lockState: Boolean = false
     private var isLaidOut = false
@@ -122,4 +124,4 @@ class HideBottomViewOnScrollBehavior<V : View> : HideBottomViewOnScrollBehavior<
         .setInterpolator(FastOutSlowInInterpolator())
         .start()
 
-}
+}

app/src/main/java/com/topjohnwu/magisk/utils/HideTopViewOnScrollBehavior.kt

@@ -1,6 +1,8 @@
 package com.topjohnwu.magisk.utils
 
 import android.animation.TimeInterpolator
+import android.content.Context
+import android.util.AttributeSet
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewPropertyAnimator
@@ -8,9 +10,8 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.ViewCompat
 import com.google.android.material.animation.AnimationUtils
 
-class HideTopViewOnScrollBehavior<V : View> :
-    CoordinatorLayout.Behavior<V>(),
-    HideableBehavior<V> {
+class HideTopViewOnScrollBehavior<V : View>(context: Context, attrs: AttributeSet) :
+    CoordinatorLayout.Behavior<V>(), HideableBehavior<V> {
 
     companion object {
         private const val STATE_SCROLLED_DOWN = 1
@@ -139,4 +140,4 @@ class HideTopViewOnScrollBehavior<V : View> :
         .setDuration(duration)
         .withEndAction { currentAnimator = null }
         .let { currentAnimator = it }
-}
+}

app/src/main/java/com/topjohnwu/magisk/utils/MarkwonImagePlugin.kt

@@ -15,7 +15,7 @@ import android.widget.TextView
 import androidx.annotation.WorkerThread
 import com.caverock.androidsvg.SVG
 import com.caverock.androidsvg.SVGParseException
-import com.topjohnwu.magisk.core.ResMgr
+import com.topjohnwu.magisk.core.AssetHack
 import com.topjohnwu.superuser.internal.WaitRunnable
 import io.noties.markwon.AbstractMarkwonPlugin
 import io.noties.markwon.MarkwonSpansFactory
@@ -216,7 +216,7 @@ class MarkwonImagePlugin(okHttp: OkHttpClient) : AbstractMarkwonPlugin() {
                 return PictureDrawable(picture)
             }
 
-            val density: Float = ResMgr.resource.displayMetrics.density
+            val density: Float = AssetHack.resource.displayMetrics.density
 
             val width = (w * density + .5f).toInt()
             val height = (h * density + .5f).toInt()
@@ -226,7 +226,7 @@ class MarkwonImagePlugin(okHttp: OkHttpClient) : AbstractMarkwonPlugin() {
             canvas.scale(density, density)
             svg.renderToCanvas(canvas)
 
-            return BitmapDrawable(ResMgr.resource, bitmap)
+            return BitmapDrawable(AssetHack.resource, bitmap)
         }
 
     }

app/src/main/java/com/topjohnwu/magisk/utils/TextHolder.kt

@@ -0,0 +1,47 @@
+package com.topjohnwu.magisk.utils
+
+import android.content.res.Resources
+import android.widget.TextView
+import androidx.databinding.BindingAdapter
+
+sealed class TextHolder {
+
+    abstract val isEmpty: Boolean
+    abstract fun getText(resources: Resources): CharSequence
+
+    // ---
+
+    class String(
+        private val value: CharSequence
+    ) : TextHolder() {
+
+        override val isEmpty get() = value.isEmpty()
+        override fun getText(resources: Resources) = value
+
+    }
+
+    class Resource(
+        private val value: Int,
+        private vararg val params: Any
+    ) : TextHolder() {
+
+        override val isEmpty get() = value == 0
+        override fun getText(resources: Resources) = resources.getString(value, *params)
+
+    }
+
+    // ---
+
+    companion object {
+        val EMPTY = String("")
+    }
+}
+
+fun Int.asText(vararg params: Any): TextHolder = TextHolder.Resource(this, *params)
+fun CharSequence.asText(): TextHolder = TextHolder.String(this)
+
+
+@BindingAdapter("android:text")
+fun TextView.setText(text: TextHolder) {
+    this.text = text.getText(context.resources)
+}

app/src/main/java/com/topjohnwu/magisk/utils/TransitiveText.kt

@@ -1,55 +0,0 @@
-package com.topjohnwu.magisk.utils
-
-import android.content.res.Resources
-import android.widget.TextView
-import androidx.databinding.BindingAdapter
-import androidx.databinding.InverseBindingAdapter
-import com.topjohnwu.magisk.ktx.get
-
-sealed class TransitiveText {
-
-    abstract val isEmpty: Boolean
-    abstract fun getText(resources: Resources): CharSequence
-
-    // ---
-
-    class String(
-        private val value: CharSequence
-    ) : TransitiveText() {
-
-        override val isEmpty = value.isEmpty()
-        override fun getText(resources: Resources) = value
-
-    }
-
-    class Res(
-        private val value: Int,
-        private vararg val params: Any
-    ) : TransitiveText() {
-
-        override val isEmpty = value == 0
-        override fun getText(resources: Resources) =
-            resources.getString(value, *params)
-
-    }
-
-    // ---
-
-    companion object {
-        val EMPTY = String("")
-    }
-
-}
-
-
-fun Int.asTransitive(vararg params: Any) = TransitiveText.Res(this, *params)
-fun CharSequence.asTransitive() = TransitiveText.String(this)
-
-
-@BindingAdapter("android:text")
-fun TextView.setText(text: TransitiveText) {
-    this.text = text.getText(get())
-}
-
-@InverseBindingAdapter(attribute = "android:text", event = "android:textAttrChanged")
-fun TextView.getTransitiveText() = text.asTransitive()

app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt

@@ -47,7 +47,8 @@ class MagiskDialog(
         super.onCreate(savedInstanceState)
         super.setContentView(binding.root)
 
-        val surfaceColor = MaterialColors.getColor(context, R.attr.colorSurfaceSurfaceVariant, javaClass.canonicalName)
+        val default = MaterialColors.getColor(context, R.attr.colorSurface, javaClass.canonicalName)
+        val surfaceColor = MaterialColors.getColor(context, R.attr.colorSurfaceSurfaceVariant, default)
         val materialShapeDrawable = MaterialShapeDrawable(context, null, R.attr.alertDialogStyle, R.style.MaterialAlertDialog_MaterialComponents)
         materialShapeDrawable.initializeElevationOverlay(context)
         materialShapeDrawable.fillColor = ColorStateList.valueOf(surfaceColor)

app/src/main/java/com/topjohnwu/magisk/view/MarkDownWindow.kt

@@ -1,54 +0,0 @@
-package com.topjohnwu.magisk.view
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.widget.TextView
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.data.repository.NetworkService
-import com.topjohnwu.magisk.ktx.coroutineScope
-import io.noties.markwon.Markwon
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import org.koin.core.KoinComponent
-import org.koin.core.inject
-import timber.log.Timber
-import kotlin.coroutines.coroutineContext
-
-object MarkDownWindow : KoinComponent {
-
-    private val svc: NetworkService by inject()
-    private val markwon: Markwon by inject()
-
-    suspend fun show(activity: Context, title: String?, url: String) {
-        show(activity, title) {
-            svc.fetchString(url)
-        }
-    }
-
-    suspend fun show(activity: Context, title: String?, input: suspend () -> String) {
-        val view = LayoutInflater.from(activity).inflate(R.layout.markdown_window_md2, null)
-
-        MagiskDialog(activity)
-            .applyTitle(title ?: "")
-            .applyView(view)
-            .applyButton(MagiskDialog.ButtonType.NEGATIVE) {
-                titleRes = android.R.string.cancel
-            }
-            .reveal()
-
-        val tv = view.findViewById<TextView>(R.id.md_txt)
-        tv.coroutineScope = CoroutineScope(coroutineContext)
-        withContext(Dispatchers.IO) {
-            try {
-                markwon.setMarkdown(tv, input())
-            } 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/view/Notifications.kt

@@ -3,24 +3,20 @@ package com.topjohnwu.magisk.view
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.app.PendingIntent
 import android.content.Context
 import android.os.Build.VERSION.SDK_INT
-import androidx.core.app.TaskStackBuilder
 import androidx.core.content.getSystemService
 import androidx.core.graphics.drawable.toIcon
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Const.ID.PROGRESS_NOTIFICATION_CHANNEL
 import com.topjohnwu.magisk.core.Const.ID.UPDATE_NOTIFICATION_CHANNEL
-import com.topjohnwu.magisk.core.SplashActivity
-import com.topjohnwu.magisk.core.cmp
 import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.core.download.Subject
-import com.topjohnwu.magisk.core.intent
 import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.ktx.getBitmap
 
+@Suppress("DEPRECATION")
 object Notifications {
 
     val mgr by lazy { get<Context>().getSystemService<NotificationManager>()!! }
@@ -49,29 +45,11 @@ object Notifications {
         }
     }
 
-    fun magiskUpdate(context: Context) {
-        val intent = context.intent<SplashActivity>()
-                .putExtra(Const.Key.OPEN_SECTION, "magisk")
-        val stackBuilder = TaskStackBuilder.create(context)
-        stackBuilder.addParentStack(SplashActivity::class.java.cmp(context.packageName))
-        stackBuilder.addNextIntent(intent)
-        val pendingIntent = stackBuilder.getPendingIntent(
-            Const.ID.MAGISK_UPDATE_NOTIFICATION_ID, PendingIntent.FLAG_UPDATE_CURRENT)
-
-        val builder = updateBuilder(context)
-            .setContentTitle(context.getString(R.string.magisk_update_title))
-            .setContentText(context.getString(R.string.manager_download_install))
-            .setAutoCancel(true)
-            .setContentIntent(pendingIntent)
-
-        mgr.notify(Const.ID.MAGISK_UPDATE_NOTIFICATION_ID, builder.build())
-    }
-
     fun managerUpdate(context: Context) {
         val intent = DownloadService.pendingIntent(context, Subject.Manager())
 
         val builder = updateBuilder(context)
-            .setContentTitle(context.getString(R.string.manager_update_title))
+            .setContentTitle(context.getString(R.string.magisk_update_title))
             .setContentText(context.getString(R.string.manager_download_install))
             .setAutoCancel(true)
             .setContentIntent(intent)

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

@@ -1,6 +1,5 @@
 package com.topjohnwu.magisk.view
 
-import android.annotation.TargetApi
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ShortcutInfo
@@ -8,6 +7,8 @@ import android.content.pm.ShortcutManager
 import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.core.content.getSystemService
+import androidx.core.content.pm.ShortcutInfoCompat
+import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Const
@@ -24,16 +25,14 @@ object Shortcuts {
         }
     }
 
-    @TargetApi(26)
     fun addHomeIcon(context: Context) {
-        val manager = context.getSystemService<ShortcutManager>() ?: return
         val intent = context.packageManager.getLaunchIntentForPackage(context.packageName) ?: return
-        val info = ShortcutInfo.Builder(context, Const.Nav.HOME)
-            .setShortLabel(context.getString(R.string.app_name))
+        val info = ShortcutInfoCompat.Builder(context, Const.Nav.HOME)
+            .setShortLabel(context.getString(R.string.magisk))
             .setIntent(intent)
-            .setIcon(context.getIcon(R.drawable.ic_launcher))
+            .setIcon(context.getIconCompat(R.drawable.ic_launcher))
             .build()
-        manager.requestPinShortcut(info, null)
+        ShortcutManagerCompat.requestPinShortcut(context, info, null)
     }
 
     private fun Context.getIconCompat(id: Int): IconCompat {

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

@@ -19,18 +19,10 @@ public abstract class JarMap implements Closeable {
 
     LinkedHashMap<String, JarEntry> entryMap;
 
-    public static JarMap open(String file) throws IOException {
-        return new FileMap(new File(file), true, ZipFile.OPEN_READ);
-    }
-
     public static JarMap open(File file, boolean verify) throws IOException {
         return new FileMap(file, verify, ZipFile.OPEN_READ);
     }
 
-    public static JarMap open(String file, boolean verify) throws IOException {
-        return new FileMap(new File(file), verify, ZipFile.OPEN_READ);
-    }
-
     public static JarMap open(InputStream is, boolean verify) throws IOException {
         return new StreamMap(is, verify);
     }

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

@@ -10,7 +10,6 @@ import org.bouncycastle.cms.CMSSignedData;
 import org.bouncycastle.cms.CMSSignedDataGenerator;
 import org.bouncycastle.cms.CMSTypedData;
 import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.operator.ContentSigner;
 import org.bouncycastle.operator.OperatorCreationException;
 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
@@ -31,7 +30,6 @@ import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.PrivateKey;
 import java.security.PublicKey;
-import java.security.Security;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;

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

@@ -1,5 +1,6 @@
 package com.topjohnwu.signing;
 
+import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -32,6 +33,7 @@ import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
 
+@Keep
 public class SignBoot {
 
     private static final int BOOT_IMAGE_HEADER_V1_RECOVERY_DTBO_SIZE_OFFSET = 1632;
@@ -88,6 +90,21 @@ public class SignBoot {
         }
     }
 
+    private static int fullRead(InputStream in, byte[] b) throws IOException {
+        return fullRead(in, b, 0, b.length);
+    }
+
+    private static int fullRead(InputStream in, byte[] b, int off, int len) throws IOException {
+        int n = 0;
+        while (n < len) {
+            int count = in.read(b, off + n, len - n);
+            if (count <= 0)
+                break;
+            n += count;
+        }
+        return n;
+    }
+
     public static boolean doSignature(
             @Nullable X509Certificate cert, @Nullable PrivateKey key,
             @NonNull InputStream imgIn, @NonNull OutputStream imgOut, @NonNull String target
@@ -96,7 +113,7 @@ public class SignBoot {
             PushBackRWStream in = new PushBackRWStream(imgIn, imgOut);
             byte[] hdr = new byte[BOOT_IMAGE_HEADER_SIZE_MAXIMUM];
             // First read the header
-            in.read(hdr);
+            fullRead(in, hdr);
             int signableSize = getSignableImageSize(hdr);
             // Unread header
             in.unread(hdr);
@@ -126,7 +143,7 @@ public class SignBoot {
         try {
             // Read the header for size
             byte[] hdr = new byte[BOOT_IMAGE_HEADER_SIZE_MAXIMUM];
-            if (imgIn.read(hdr) != hdr.length) {
+            if (fullRead(imgIn, hdr) != hdr.length) {
                 System.err.println("Unable to read image header");
                 return false;
             }
@@ -135,7 +152,7 @@ public class SignBoot {
             // Read the rest of the image
             byte[] rawImg = Arrays.copyOf(hdr, signableSize);
             int remain = signableSize - hdr.length;
-            if (imgIn.read(rawImg, hdr.length, remain) != remain) {
+            if (fullRead(imgIn, rawImg, hdr.length, remain) != remain) {
                 System.err.println("Unable to read image");
                 return false;
             }
@@ -179,6 +196,9 @@ public class SignBoot {
         int secondSize = image.getInt();
         image.getLong(); // second_addr + tags_addr
         int pageSize = image.getInt();
+        if (pageSize >= 0x02000000) {
+            throw new IllegalArgumentException("Invalid image header: PXA header detected");
+        }
         int length = pageSize // include the page aligned image header
                 + ((kernelSize + pageSize - 1) / pageSize) * pageSize
                 + ((ramdskSize + pageSize - 1) / pageSize) * pageSize
@@ -197,8 +217,7 @@ public class SignBoot {
                 image.getLong(); // dtb address
             }
             if (image.position() != headerSize) {
-                throw new IllegalArgumentException(
-                        "Invalid image header: invalid header length");
+                throw new IllegalArgumentException("Invalid image header: invalid header length");
             }
         } else {
             // headerVersion is 0 or actually dt/extra size in this case

app/src/main/res/drawable/bg_line_bottom_rounded.xml

@@ -3,9 +3,9 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="?colorSecondary" />
+            <solid android:color="@android:color/black" />
             <corners android:bottomLeftRadius="2dp" android:bottomRightRadius="2dp" />
         </shape>
     </item>
 
-</selector>
+</selector>

app/src/main/res/drawable/bg_line_top_rounded.xml

@@ -3,9 +3,9 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="?colorSecondary" />
+            <solid android:color="@android:color/black" />
             <corners android:topLeftRadius="2dp" android:topRightRadius="2dp" />
         </shape>
     </item>
 
-</selector>
+</selector>

app/src/main/res/layout/activity_main_md2.xml

@@ -35,6 +35,7 @@
             style="@style/WidgetFoundation.Appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:layout_behavior="com.topjohnwu.magisk.utils.HideTopViewOnScrollBehavior"
             app:fitsSystemWindowsInsets="top">
 
             <com.google.android.material.appbar.MaterialToolbar
@@ -76,6 +77,7 @@
             android:layout_marginBottom="@dimen/l1"
             android:fitsSystemWindows="false"
             app:layout_fitsSystemWindowsInsets="bottom"
+            app:layout_behavior="com.topjohnwu.magisk.utils.HideBottomViewOnScrollBehavior"
             tools:layout_marginBottom="64dp">
 
             <com.google.android.material.bottomnavigation.BottomNavigationView

app/src/main/res/layout/fragment_home_md2.xml

@@ -108,7 +108,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/home_magisk_wrapper" />
 
             <Space
-                gone="@{!viewModel.showSafetyNet &amp;&amp; !viewModel.showUninstall}"
+                gone="@{!viewModel.showSafetyNet &amp;&amp; !Info.env.isActive}"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/l1" />
 
@@ -128,7 +128,7 @@
 
             <Button
                 style="@style/WidgetFoundation.Button.Outlined.Error"
-                gone="@{!viewModel.showUninstall}"
+                goneUnless="@{Info.env.isActive}"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/l1"

app/src/main/res/layout/fragment_install_md2.xml

@@ -25,306 +25,218 @@
         app:fitsSystemWindowsInsets="top|bottom"
         tools:paddingTop="24dp">
 
-        <FrameLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:orientation="vertical"
+            android:paddingTop="@dimen/l_50">
 
-            <LinearLayout
-                goneUnless="@{viewModel.loaded &amp;&amp; viewModel.progress &lt;= 0}"
+            <com.google.android.material.card.MaterialCardView
+                style="@style/WidgetFoundation.Card"
+                gone="@{viewModel.skipOptions}"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="false"
-                android:orientation="vertical"
-                android:paddingTop="@dimen/l_50">
-
-                <com.google.android.material.card.MaterialCardView
-                    style="@style/WidgetFoundation.Card"
-                    gone="@{viewModel.skipOptions}"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/l1"
-                    android:layout_marginEnd="@dimen/l1"
-                    android:focusable="false">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <ImageView
-                                style="@style/WidgetFoundation.Icon"
-                                isSelected="@{viewModel.step > 0}"
-                                android:layout_marginStart="@dimen/l_25"
-                                app:srcCompat="@drawable/ic_check_circle_md2" />
-
-                            <TextView
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_marginStart="@dimen/l1"
-                                android:layout_weight="1"
-                                android:gravity="center_vertical"
-                                android:text="@string/install_options_title"
-                                android:textAppearance="@style/AppearanceFoundation.Body"
-                                android:textStyle="bold" />
-
-                            <Button
-                                style="@style/WidgetFoundation.Button.Text"
-                                gone="@{viewModel.step != 0}"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:onClick="@{() -> viewModel.step(1)}"
-                                android:text="@string/install_next" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            gone="@{viewModel.step != 0}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/l1"
-                            android:layout_marginTop="@dimen/l_50"
-                            android:layout_marginEnd="@dimen/l1"
-                            android:layout_marginBottom="@dimen/l_50"
-                            android:orientation="vertical"
-                            android:paddingStart="3dp"
-                            android:paddingEnd="3dp"
-                            tools:layout_gravity="center">
-
-                            <CheckBox
-                                style="@style/WidgetFoundation.Checkbox"
-                                gone="@{Info.isSAR}"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:checked="@={Config.keepVerity}"
-                                android:text="@string/keep_dm_verity"
-                                tools:checked="true" />
-
-                            <CheckBox
-                                style="@style/WidgetFoundation.Checkbox"
-                                goneUnless="@{Info.isFDE}"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:checked="@={Config.keepEnc}"
-                                android:text="@string/keep_force_encryption"
-                                app:tint="?colorPrimary" />
-
-                            <CheckBox
-                                style="@style/WidgetFoundation.Checkbox"
-                                gone="@{Info.ramdisk}"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:checked="@={Config.recovery}"
-                                android:text="@string/recovery_mode"
-                                app:tint="?colorPrimary" />
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                </com.google.android.material.card.MaterialCardView>
-
-                <com.google.android.material.card.MaterialCardView
-                    style="@style/WidgetFoundation.Card"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/l1"
-                    android:layout_marginTop="@dimen/l1"
-                    android:layout_marginEnd="@dimen/l1"
-                    android:focusable="false">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <ImageView
-                                style="@style/WidgetFoundation.Icon"
-                                isSelected="@{viewModel.step > 1}"
-                                android:layout_marginStart="@dimen/l_25"
-                                app:srcCompat="@drawable/ic_check_circle_md2" />
-
-                            <TextView
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_marginStart="@dimen/l1"
-                                android:layout_weight="1"
-                                android:gravity="center_vertical"
-                                android:text="@string/install_method_title"
-                                android:textAppearance="@style/AppearanceFoundation.Body"
-                                android:textStyle="bold" />
-
-                            <Button
-                                style="@style/WidgetFoundation.Button.Text"
-                                gone="@{viewModel.step != 1}"
-                                isEnabled="@{viewModel.method == @id/method_patch ? viewModel.data != null : viewModel.method != -1}"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:onClick="@{() -> viewModel.install()}"
-                                android:text="@string/install_start"
-                                app:icon="@drawable/ic_forth_md2"
-                                app:iconGravity="textEnd" />
-
-                        </LinearLayout>
-
-                        <RadioGroup
-                            gone="@{viewModel.step != 1}"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/l1"
-                            android:layout_marginTop="@dimen/l_50"
-                            android:layout_marginEnd="@dimen/l1"
-                            android:layout_marginBottom="@dimen/l_50"
-                            android:checkedButton="@={viewModel.method}"
-                            android:paddingStart="3dp"
-                            android:paddingEnd="3dp">
-
-                            <RadioButton
-                                android:id="@+id/method_download"
-                                style="@style/WidgetFoundation.RadioButton"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="@string/download_zip_only"
-                                tools:checked="true" />
-
-                            <RadioButton
-                                android:id="@+id/method_patch"
-                                style="@style/WidgetFoundation.RadioButton"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="@string/select_patch_file" />
-
-                            <RadioButton
-                                android:id="@+id/method_direct"
-                                style="@style/WidgetFoundation.RadioButton"
-                                gone="@{!viewModel.rooted}"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="@string/direct_install" />
-
-                            <RadioButton
-                                android:id="@+id/method_inactive_slot"
-                                style="@style/WidgetFoundation.RadioButton"
-                                gone="@{!viewModel.isRooted || Info.isPixel || !Info.isAB}"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="@string/install_inactive_slot" />
-
-                        </RadioGroup>
-
-                    </LinearLayout>
-
-                </com.google.android.material.card.MaterialCardView>
-
-                <com.google.android.material.card.MaterialCardView
-                    style="@style/WidgetFoundation.Card"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/l1"
-                    android:layout_marginStart="@dimen/l1"
-                    android:layout_marginEnd="@dimen/l1"
-                    android:focusable="false">
-
-                    <TextView
-                        android:id="@+id/release_notes"
-                        markdownText="@{viewModel.notes}"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="15dp"
-                        android:textAppearance="@style/AppearanceFoundation.Caption"
-                        android:visibility="gone"
-                        tools:maxLines="5"
-                        tools:text="@tools:sample/lorem/random"
-                        tools:visibility="visible" />
-
-                </com.google.android.material.card.MaterialCardView>
-
-            </LinearLayout>
-
-            <LinearLayout
-                goneUnless="@{viewModel.loading}"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
+                android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/l1"
                 android:layout_marginEnd="@dimen/l1"
-                android:gravity="center"
-                android:orientation="vertical">
+                android:focusable="false">
 
-                <TextView
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/loading"
-                    android:textAppearance="@style/AppearanceFoundation.Title" />
+                    android:orientation="vertical">
 
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/l1">
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
 
-                    <ProgressBar
-                        style="@style/WidgetFoundation.ProgressBar"
-                        invisible="@{viewModel.progress &lt;= 0}"
-                        android:layout_width="100dp"
-                        android:layout_gravity="center"
-                        android:progress="@{viewModel.progress}" />
+                        <ImageView
+                            style="@style/WidgetFoundation.Icon"
+                            isSelected="@{viewModel.step > 0}"
+                            android:layout_marginStart="@dimen/l_25"
+                            app:srcCompat="@drawable/ic_check_circle_md2" />
 
-                    <ProgressBar
-                        style="@style/WidgetFoundation.ProgressBar.Indeterminate"
-                        invisibleUnless="@{viewModel.progress &lt;= 0}"
-                        android:layout_width="100dp"
-                        android:layout_gravity="center" />
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginStart="@dimen/l1"
+                            android:layout_weight="1"
+                            android:gravity="center_vertical"
+                            android:text="@string/install_options_title"
+                            android:textAppearance="@style/AppearanceFoundation.Body"
+                            android:textStyle="bold" />
 
-                </FrameLayout>
+                        <Button
+                            style="@style/WidgetFoundation.Button.Text"
+                            gone="@{viewModel.step != 0}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:onClick="@{() -> viewModel.step(1)}"
+                            android:text="@string/install_next" />
 
+                    </LinearLayout>
 
-            </LinearLayout>
+                    <LinearLayout
+                        gone="@{viewModel.step != 0}"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/l1"
+                        android:layout_marginTop="@dimen/l_50"
+                        android:layout_marginEnd="@dimen/l1"
+                        android:layout_marginBottom="@dimen/l_50"
+                        android:orientation="vertical"
+                        android:paddingStart="3dp"
+                        android:paddingEnd="3dp"
+                        tools:layout_gravity="center">
 
-            <LinearLayout
-                goneUnless="@{viewModel.loaded &amp;&amp; viewModel.progress >= 100}"
+                        <CheckBox
+                            style="@style/WidgetFoundation.Checkbox"
+                            gone="@{Info.isSAR}"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:checked="@={Config.keepVerity}"
+                            android:text="@string/keep_dm_verity"
+                            tools:checked="true" />
+
+                        <CheckBox
+                            style="@style/WidgetFoundation.Checkbox"
+                            goneUnless="@{Info.isFDE}"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:checked="@={Config.keepEnc}"
+                            android:text="@string/keep_force_encryption"
+                            app:tint="?colorPrimary" />
+
+                        <CheckBox
+                            style="@style/WidgetFoundation.Checkbox"
+                            gone="@{Info.ramdisk}"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:checked="@={Config.recovery}"
+                            android:text="@string/recovery_mode"
+                            app:tint="?colorPrimary" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                style="@style/WidgetFoundation.Card"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:orientation="vertical">
+                android:layout_marginStart="@dimen/l1"
+                android:layout_marginTop="@dimen/l1"
+                android:layout_marginEnd="@dimen/l1"
+                android:focusable="false">
 
-                <TextView
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/download_complete"
-                    android:textAppearance="@style/AppearanceFoundation.Title" />
+                    android:orientation="vertical">
 
-            </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
 
-            <LinearLayout
-                goneUnless="@{viewModel.loadFailed}"
+                        <ImageView
+                            style="@style/WidgetFoundation.Icon"
+                            isSelected="@{viewModel.step > 1}"
+                            android:layout_marginStart="@dimen/l_25"
+                            app:srcCompat="@drawable/ic_check_circle_md2" />
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginStart="@dimen/l1"
+                            android:layout_weight="1"
+                            android:gravity="center_vertical"
+                            android:text="@string/install_method_title"
+                            android:textAppearance="@style/AppearanceFoundation.Body"
+                            android:textStyle="bold" />
+
+                        <Button
+                            style="@style/WidgetFoundation.Button.Text"
+                            gone="@{viewModel.step != 1}"
+                            isEnabled="@{viewModel.method == @id/method_patch ? viewModel.data != null : viewModel.method != -1}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:onClick="@{() -> viewModel.install()}"
+                            android:text="@string/install_start"
+                            app:icon="@drawable/ic_forth_md2"
+                            app:iconGravity="textEnd" />
+
+                    </LinearLayout>
+
+                    <RadioGroup
+                        gone="@{viewModel.step != 1}"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/l1"
+                        android:layout_marginTop="@dimen/l_50"
+                        android:layout_marginEnd="@dimen/l1"
+                        android:layout_marginBottom="@dimen/l_50"
+                        android:checkedButton="@={viewModel.method}"
+                        android:paddingStart="3dp"
+                        android:paddingEnd="3dp">
+
+                        <RadioButton
+                            android:id="@+id/method_patch"
+                            style="@style/WidgetFoundation.RadioButton"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/select_patch_file" />
+
+                        <RadioButton
+                            android:id="@+id/method_direct"
+                            style="@style/WidgetFoundation.RadioButton"
+                            gone="@{!viewModel.rooted}"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/direct_install" />
+
+                        <RadioButton
+                            android:id="@+id/method_inactive_slot"
+                            style="@style/WidgetFoundation.RadioButton"
+                            gone="@{viewModel.noSecondSlot}"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/install_inactive_slot" />
+
+                    </RadioGroup>
+
+                </LinearLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                style="@style/WidgetFoundation.Card"
+                gone="@{viewModel.notes.empty}"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:orientation="vertical">
+                android:layout_marginTop="@dimen/l1"
+                android:layout_marginStart="@dimen/l1"
+                android:layout_marginEnd="@dimen/l1"
+                android:focusable="false">
 
                 <TextView
+                    android:id="@+id/release_notes"
+                    markdownText="@{viewModel.notes}"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/download_file_error"
-                    android:textAppearance="@style/AppearanceFoundation.Title" />
+                    android:layout_margin="15dp"
+                    android:textAppearance="@style/AppearanceFoundation.Caption"
+                    android:visibility="gone"
+                    tools:maxLines="5"
+                    tools:text="@tools:sample/lorem/random"
+                    tools:visibility="visible" />
 
-            </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
 
-        </FrameLayout>
+        </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 

app/src/main/res/layout/include_home_magisk.xml

@@ -46,46 +46,52 @@
                 android:text="@string/magisk"
                 android:textAppearance="@style/AppearanceFoundation.Title"
                 android:textColor="?colorPrimary"
+                android:maxLines="1"
+                android:ellipsize="end"
                 app:layout_constraintBottom_toBottomOf="@+id/home_magisk_icon"
                 app:layout_constraintEnd_toStartOf="@+id/home_magisk_button"
                 app:layout_constraintStart_toEndOf="@+id/home_magisk_icon"
                 app:layout_constraintTop_toTopOf="@+id/home_magisk_icon" />
 
-            <Button
+            <FrameLayout
                 android:id="@+id/home_magisk_button"
-                style="@style/WidgetFoundation.Button"
-                invisible="@{viewModel.stateMagisk != MagiskState.OBSOLETE}"
-                android:enabled="@{viewModel.stateManager != MagiskState.OBSOLETE}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="@{() -> viewModel.onMagiskPressed()}"
-                android:text="@string/update"
-                android:textAllCaps="false"
-                app:icon="@drawable/ic_update_md2"
-                app:layout_constraintBottom_toBottomOf="@+id/home_magisk_title"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/home_magisk_title"/>
+                app:layout_constraintBottom_toBottomOf="@+id/home_magisk_title"
+                app:layout_constraintTop_toTopOf="@+id/home_magisk_title">
 
-            <Button
-                style="@style/WidgetFoundation.Button.Text"
-                invisible="@{viewModel.stateMagisk == MagiskState.OBSOLETE}"
-                android:enabled="@{viewModel.stateManager != MagiskState.OBSOLETE}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="@{() -> viewModel.onMagiskPressed()}"
-                android:text="@string/install"
-                android:textAllCaps="false"
-                app:icon="@drawable/ic_install"
-                app:layout_constraintBottom_toBottomOf="@+id/home_magisk_title"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/home_magisk_title"/>
+                <Button
+                    style="@style/WidgetFoundation.Button"
+                    gone="@{viewModel.stateMagisk != MagiskState.OBSOLETE}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:onClick="@{() -> viewModel.onMagiskPressed()}"
+                    android:text="@string/update"
+                    android:textAllCaps="false"
+                    android:layout_gravity="end"
+                    app:icon="@drawable/ic_update_md2" />
+
+                <Button
+                    style="@style/WidgetFoundation.Button.Text"
+                    gone="@{viewModel.stateMagisk == MagiskState.OBSOLETE}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:onClick="@{() -> viewModel.onMagiskPressed()}"
+                    android:text="@string/install"
+                    android:textAllCaps="false"
+                    app:icon="@drawable/ic_install"/>
+
+            </FrameLayout>
 
             <androidx.constraintlayout.widget.Barrier
                 android:id="@+id/home_magisk_title_barrier"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:barrierDirection="bottom"
-                tools:constraint_referenced_ids="home_magisk_button,home_magisk_title,home_magisk_icon" />
+                app:referencedIds="@{viewModel.magiskTitleBarrierIds}"
+                tools:constraint_referenced_ids="home_magisk_icon,home_magisk_title,home_magisk_button" />
 
             <HorizontalScrollView
                 android:layout_width="match_parent"
@@ -105,41 +111,24 @@
                         android:layout_height="wrap_content">
 
                         <LinearLayout
-                            android:id="@+id/home_magisk_latest_version"
+                            android:id="@+id/home_magisk_installed_version"
                             style="@style/W.Home.Item.Top"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent">
 
-                            <TextView
-                                style="@style/W.Home.ItemContent"
-                                android:text="@string/home_latest_version" />
-
-                            <TextView
-                                style="@style/W.Home.ItemContent.Right"
-                                android:text="@{viewModel.loadFailed ? @string/not_available : viewModel.magiskRemoteVersion }"
-                                tools:text="20.1 (12345)" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/home_magisk_installed_version"
-                            style="@style/W.Home.Item"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/home_magisk_latest_version">
-
                             <TextView
                                 style="@style/W.Home.ItemContent"
                                 android:text="@string/home_installed_version" />
 
                             <TextView
                                 style="@style/W.Home.ItemContent.Right"
-                                android:text="@{Info.env.isActive ? viewModel.magiskInstalledVersion : @string/not_available}"
-                                tools:text="20.1 (12345)" />
+                                android:text="@{viewModel.magiskInstalledVersion}"
+                                tools:text="22.0 (22000)" />
 
                         </LinearLayout>
 
                         <LinearLayout
-                            android:id="@+id/home_device_details_recovery"
+                            android:id="@+id/home_device_details_ramdisk"
                             style="@style/W.Home.Item.Bottom"
                             app:layout_constraintStart_toStartOf="@+id/home_magisk_installed_version"
                             app:layout_constraintTop_toBottomOf="@+id/home_magisk_installed_version">
@@ -160,7 +149,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             app:barrierDirection="end"
-                            tools:constraint_referenced_ids="home_magisk_latest_version,home_magisk_installed_version"/>
+                            app:referencedIds="@{viewModel.magiskDetailBarrierIds}"
+                            tools:constraint_referenced_ids="home_magisk_installed_version,home_device_details_ramdisk"/>
 
                         <LinearLayout
                             android:id="@+id/home_device_details_ab"
@@ -181,7 +171,7 @@
 
                         <LinearLayout
                             android:id="@+id/home_device_details_sar"
-                            style="@style/W.Home.Item"
+                            style="@style/W.Home.Item.Bottom"
                             app:layout_constraintStart_toStartOf="@+id/home_device_details_ab"
                             app:layout_constraintTop_toBottomOf="@+id/home_device_details_ab">
 
@@ -196,23 +186,6 @@
 
                         </LinearLayout>
 
-                        <LinearLayout
-                            android:id="@+id/home_device_details_crypto"
-                            style="@style/W.Home.Item.Bottom"
-                            app:layout_constraintStart_toStartOf="@+id/home_device_details_sar"
-                            app:layout_constraintTop_toBottomOf="@+id/home_device_details_sar">
-
-                            <TextView
-                                style="@style/W.Home.ItemContent"
-                                android:text="Crypto" />
-
-                            <TextView
-                                style="@style/W.Home.ItemContent.Right"
-                                android:text="@{Info.cryptoText}"
-                                tools:text="N/A" />
-
-                        </LinearLayout>
-
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
                 </LinearLayout>

app/src/main/res/layout/include_home_manager.xml

@@ -43,48 +43,56 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/l1"
-                android:text="@string/manager"
+                android:text="@string/home_app_title"
                 android:textAppearance="@style/AppearanceFoundation.Title"
                 android:textColor="?colorPrimary"
+                android:maxLines="1"
+                android:ellipsize="end"
                 app:layout_constraintBottom_toBottomOf="@+id/home_manager_icon"
                 app:layout_constraintEnd_toStartOf="@+id/home_manager_button"
                 app:layout_constraintStart_toEndOf="@+id/home_manager_icon"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:text="@string/manager" />
+                tools:text="@string/home_app_title" />
 
-            <Button
+            <FrameLayout
                 android:id="@+id/home_manager_button"
-                style="@style/WidgetFoundation.Button"
-                invisible="@{viewModel.stateManager != MagiskState.OBSOLETE}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="@{() -> viewModel.onManagerPressed()}"
-                android:text="@string/update"
-                android:textAllCaps="false"
-                app:icon="@drawable/ic_update_md2"
-                app:layout_constraintBottom_toBottomOf="@+id/home_manager_title"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/home_manager_title"/>
+                app:layout_constraintBottom_toBottomOf="@+id/home_manager_title"
+                app:layout_constraintTop_toTopOf="@+id/home_manager_title">
 
-            <Button
-                style="@style/WidgetFoundation.Button.Text"
-                invisible="@{viewModel.stateManager == MagiskState.OBSOLETE}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="@{() -> viewModel.onManagerPressed()}"
-                android:text="@string/install"
-                android:textAllCaps="false"
-                app:icon="@drawable/ic_install"
-                app:layout_constraintBottom_toBottomOf="@+id/home_manager_title"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/home_manager_title"/>
+                <Button
+                    style="@style/WidgetFoundation.Button"
+                    gone="@{viewModel.stateManager != MagiskState.OBSOLETE}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:onClick="@{() -> viewModel.onManagerPressed()}"
+                    android:text="@string/update"
+                    android:textAllCaps="false"
+                    android:layout_gravity="end"
+                    app:icon="@drawable/ic_update_md2" />
+
+                <Button
+                    style="@style/WidgetFoundation.Button.Text"
+                    gone="@{viewModel.stateManager != MagiskState.UP_TO_DATE}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:onClick="@{() -> viewModel.onManagerPressed()}"
+                    android:text="@string/install"
+                    android:textAllCaps="false"
+                    app:icon="@drawable/ic_install"/>
+
+            </FrameLayout>
 
             <androidx.constraintlayout.widget.Barrier
                 android:id="@+id/home_manager_title_barrier"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:barrierDirection="bottom"
-                tools:constraint_referenced_ids="home_manager_button,home_manager_title,home_manager_icon" />
+                app:referencedIds="@{viewModel.appTitleBarrierIds}"
+                tools:constraint_referenced_ids="home_manager_icon,home_manager_title,home_manager_button" />
 
             <HorizontalScrollView
                 android:layout_width="match_parent"
@@ -115,8 +123,8 @@
 
                             <TextView
                                 style="@style/W.Home.ItemContent.Right"
-                                android:text="@{viewModel.loadFailed ? @string/not_available : viewModel.managerRemoteVersion}"
-                                tools:text="8.0.0 (123) (10)" />
+                                android:text="@{viewModel.managerRemoteVersion}"
+                                tools:text="22.0 (22000) (16)" />
 
                         </LinearLayout>
 
@@ -133,7 +141,7 @@
                             <TextView
                                 style="@style/W.Home.ItemContent.Right"
                                 android:text="@{viewModel.managerInstalledVersion}"
-                                tools:text="8.0.0 (123) (10)" />
+                                tools:text="22.0 (22000) (16)" />
 
                         </LinearLayout>
 
@@ -150,7 +158,7 @@
                             <TextView
                                 android:id="@+id/home_manager_extra_connection_value"
                                 style="@style/W.Home.ItemContent.Right"
-                                android:text="@{viewModel.statePackageName}"
+                                android:text="@{context.packageName}"
                                 tools:text="com.topjohnwu.magisk" />
 
                         </LinearLayout>

app/src/main/res/layout/item_hide_md2.xml

@@ -64,7 +64,7 @@
                     app:layout_constraintStart_toEndOf="@+id/hide_icon"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed"
-                    tools:text="@string/app_name" />
+                    tools:text="@string/magisk" />
 
                 <TextView
                     android:id="@+id/hide_package"

app/src/main/res/layout/item_hide_process_md2.xml

@@ -30,7 +30,7 @@
             android:layout_marginBottom="@dimen/l_75"
             android:singleLine="true"
             android:ellipsize="middle"
-            android:text="@{item.process.name}"
+            android:text="@{item.displayName}"
             android:textAppearance="@style/AppearanceFoundation.Caption.Variant"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/hide_process_checkbox"

app/src/main/res/layout/item_log_access_md2.xml

@@ -58,7 +58,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:text="@string/app_name" />
+                tools:text="@string/magisk" />
 
             <TextView
                 android:id="@+id/log_date"

app/src/main/res/layout/item_log_track_md2.xml

@@ -29,14 +29,15 @@
         tools:layout_gravity="center"
         tools:minHeight="?listPreferredItemHeightSmall">
 
-        <View
+        <ImageView
             android:id="@+id/track_top"
             invisible="@{isTop}"
             android:layout_width="2dp"
             android:layout_height="0dp"
             android:layout_marginBottom="2dp"
             android:alpha=".3"
-            android:background="@drawable/bg_line_bottom_rounded"
+            app:tint="?colorSecondary"
+            app:srcCompat="@drawable/bg_line_bottom_rounded"
             app:layout_constraintBottom_toTopOf="@+id/track_bullet"
             app:layout_constraintEnd_toEndOf="@+id/track_bullet"
             app:layout_constraintStart_toStartOf="@+id/track_bullet"
@@ -54,14 +55,15 @@
             app:tint="@color/color_primary_error_transient"
             tools:srcCompat="@drawable/ic_check_md2" />
 
-        <View
+        <ImageView
             android:id="@+id/track_bottom"
             invisible="@{isBottom}"
             android:layout_width="2dp"
             android:layout_height="0dp"
             android:layout_marginTop="2dp"
             android:alpha=".3"
-            android:background="@drawable/bg_line_top_rounded"
+            app:tint="?colorSecondary"
+            app:srcCompat="@drawable/bg_line_top_rounded"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/track_bullet"
             app:layout_constraintStart_toStartOf="@+id/track_bullet"

app/src/main/res/layout/item_policy_md2.xml

@@ -61,7 +61,7 @@
                         app:layout_constraintEnd_toStartOf="@+id/policy_indicator"
                         app:layout_constraintStart_toEndOf="@+id/policy_app_icon"
                         app:layout_constraintTop_toTopOf="@+id/policy_app_icon"
-                        tools:text="@string/app_name" />
+                        tools:text="@string/magisk" />
 
                     <TextView
                         android:id="@+id/policy_package_name"

app/src/main/res/navigation/main.xml

@@ -49,10 +49,6 @@
         android:label="FlashFragment"
         tools:layout="@layout/fragment_flash_md2">
 
-        <argument
-            android:name="installer"
-            app:argType="android.net.Uri" />
-
         <argument
             android:name="action"
             app:argType="string" />
@@ -149,8 +145,7 @@
         app:exitAnim="@anim/fragment_exit"
         app:popEnterAnim="@anim/fragment_enter_pop"
         app:popExitAnim="@anim/fragment_exit_pop"
-        app:popUpTo="@id/superuserFragment"
-        app:popUpToInclusive="true" />
+        app:popUpTo="@id/homeFragment" />
 
     <action
         android:id="@+id/action_logFragment"
@@ -159,8 +154,7 @@
         app:exitAnim="@anim/fragment_exit"
         app:popEnterAnim="@anim/fragment_enter_pop"
         app:popExitAnim="@anim/fragment_exit_pop"
-        app:popUpTo="@id/logFragment"
-        app:popUpToInclusive="true" />
+        app:popUpTo="@id/homeFragment" />
 
     <action
         android:id="@+id/action_moduleFragment"
@@ -169,8 +163,7 @@
         app:exitAnim="@anim/fragment_exit"
         app:popEnterAnim="@anim/fragment_enter_pop"
         app:popExitAnim="@anim/fragment_exit_pop"
-        app:popUpTo="@id/modulesFragment"
-        app:popUpToInclusive="true" />
+        app:popUpTo="@id/homeFragment" />
 
     <action
         android:id="@+id/action_flashFragment"
@@ -179,8 +172,7 @@
         app:exitAnim="@anim/fragment_exit"
         app:popEnterAnim="@anim/fragment_enter_pop"
         app:popExitAnim="@anim/fragment_exit_pop"
-        app:popUpTo="@id/installFragment"
-        app:popUpToInclusive="true" />
+        app:popUpTo="@id/homeFragment" />
 
     <action
         android:id="@+id/action_hideFragment"
@@ -188,8 +180,6 @@
         app:enterAnim="@anim/fragment_enter"
         app:exitAnim="@anim/fragment_exit"
         app:popEnterAnim="@anim/fragment_enter_pop"
-        app:popExitAnim="@anim/fragment_exit_pop"
-        app:popUpTo="@id/superuserFragment"
-        app:popUpToInclusive="false" />
+        app:popExitAnim="@anim/fragment_exit_pop" />
 
 </navigation>

app/src/main/res/raw/.gitignore

@@ -1 +0,0 @@
-/util_functions.sh

app/src/main/res/raw/manager.sh

@@ -1,5 +1,5 @@
 ##################################
-# Magisk Manager internal scripts
+# Magisk app internal scripts
 ##################################
 
 run_delay() {
@@ -7,27 +7,41 @@ run_delay() {
 }
 
 env_check() {
-  for file in busybox magisk magiskboot magiskinit util_functions.sh boot_patch.sh; do
+  for file in busybox magiskboot magiskinit util_functions.sh boot_patch.sh; do
     [ -f $MAGISKBIN/$file ] || return 1
   done
   return 0
 }
 
-fix_env() {
-  cd $MAGISKBIN
-  PATH=/system/bin /system/bin/sh update-binary -x
-  ./busybox rm -f update-binary magisk.apk
-  ./busybox chmod -R 755 .
-  ./magiskinit -x magisk magisk
+cp_readlink() {
+  if [ -z $2 ]; then
+    cd $1
+  else
+    cp -af $1/. $2
+    cd $2
+  fi
+  for file in *; do
+    if [ -L $file ]; then
+      local full=$(readlink -f $file)
+      rm $file
+      cp -af $full $file
+    fi
+  done
+  chmod -R 755 .
   cd /
 }
 
-direct_install() {
-  rm -rf $MAGISKBIN/* 2>/dev/null
+fix_env() {
+  # Cleanup and make dirs
+  rm -rf $MAGISKBIN/*
   mkdir -p $MAGISKBIN 2>/dev/null
   chmod 700 $NVBASE
-  cp -af $1/. $MAGISKBIN
-  rm -f $MAGISKBIN/new-boot.img
+  cp_readlink $1 $MAGISKBIN
+  rm -rf $1
+  chown -R 0:0 $MAGISKBIN
+}
+
+direct_install() {
   echo "- Flashing new boot image"
   flash_image $1/new-boot.img $2
   case $? in
@@ -40,10 +54,22 @@ direct_install() {
       return 2
       ;;
   esac
-  rm -rf $1
+
+  rm -f $1/new-boot.img
+  fix_env $1
+  run_migrations
+  copy_sepolicy_rules
+
   return 0
 }
 
+run_uninstaller() {
+  rm -rf /dev/tmp
+  mkdir -p /dev/tmp/install
+  unzip -o "$1" "assets/*" "lib/*" -d /dev/tmp/install
+  INSTALLER=/dev/tmp/install sh /dev/tmp/install/assets/uninstaller.sh dummy 1 "$1"
+}
+
 restore_imgs() {
   [ -z $SHA1 ] && return 1
   local BACKUPDIR=/data/magisk_backup_$SHA1
@@ -63,15 +89,17 @@ restore_imgs() {
 }
 
 post_ota() {
-  cd $1
+  cd /data/adb
+  cp -f $1 bootctl
+  rm -f $1
   chmod 755 bootctl
   ./bootctl hal-info || return
   [ $(./bootctl get-current-slot) -eq 0 ] && SLOT_NUM=1 || SLOT_NUM=0
   ./bootctl set-active-boot-slot $SLOT_NUM
   cat << EOF > post-fs-data.d/post_ota.sh
-${1}/bootctl mark-boot-successful
-rm -f ${1}/bootctl
-rm -f ${1}/post-fs-data.d/post_ota.sh
+/data/adb/bootctl mark-boot-successful
+rm -f /data/adb/bootctl
+rm -f /data/adb/post-fs-data.d/post_ota.sh
 EOF
   chmod 755 post-fs-data.d/post_ota.sh
   cd /
@@ -87,8 +115,8 @@ id=hosts
 name=Systemless Hosts
 version=1.0
 versionCode=1
-author=Magisk Manager
-description=Magisk Manager built-in systemless hosts module
+author=Magisk
+description=Magisk app built-in systemless hosts module
 EOF
   magisk --clone /system/etc/hosts hosts/system/etc/hosts
   touch hosts/update
@@ -172,8 +200,7 @@ grep_prop() { return; }
 # Initialize
 #############
 
-mm_init() {
-  export BOOTMODE=true
+app_init() {
   mount_partitions
   get_flags
   run_migrations
@@ -183,3 +210,5 @@ mm_init() {
   # Make sure RECOVERYMODE has value
   [ -z $RECOVERYMODE ] && RECOVERYMODE=false
 }
+
+export BOOTMODE=true

app/src/main/res/values-ar/strings.xml

@@ -14,20 +14,15 @@
     <!--Home-->
     <string name="no_connection">لا يوجد إتصال</string>
     <string name="app_changelog">تفاصيل التحديث</string>
-    <string name="manager">المدير</string>
     <string name="loading">جارٍ التحميل...</string>
     <string name="update">تحديث</string>
     <string name="not_available">غير/متوفر</string>
     <string name="hide">إخفاء</string>
-    <string name="status">الحالة</string>
     <string name="home_package">الحزمة</string>
 
-    <string name="home_notice_content">تأكد دوما أنك تستعمل إصدار ماجسيك رسمي، التطبيقات المثبتة من الجهات الخارجية ستسبب لك أضراراً</string>
     <string name="home_support_title">تبرع لنا</string>
     <string name="home_item_source">الكود المصدري للتطبيق</string>
     <string name="home_support_content">مـاجـيسك هي، وستظل دوماً، مجانيةً و مفتوحة المصدر، اظهر اهتمامك لنا لكي نبقيها هكذا بدعم مالي صغير</string>
-    <string name="home_status_normal"> الوضـع الطبيعي</string>
-    <string name="home_status_stub"> وضـع STUB</string>
     <string name="home_installed_version">تم التثبيت</string>
     <string name="home_latest_version">آخر إصدار</string>
     <string name="invalid_update_channel">مصدر التحديث غير صالح</string>
@@ -43,7 +38,6 @@
     <string name="install_next">التالي</string>
     <string name="install_start">هيا، بنا</string>
     <string name="manager_download_install">اضغط للتنزيل و التثبيت</string>
-    <string name="download_zip_only">تحميل Zip فقط</string>
     <string name="direct_install">تثبيت مباشر (موصى بها)</string>
     <string name="install_inactive_slot">التثبيت على المنطقة الغير نشطة (بعد OTA)</string>
     <string name="install_inactive_slot_msg">سيُجبر جهازك للاقلاع على المنطقة الغير النشطة بعد إعادة التشغيل!\n استخدم هذا الخيار فقط بعد الانتهاء من OTA. استمرار؟</string>
@@ -133,10 +127,6 @@
     <string name="settings_download_path_message">ستحمل الملفات إلى %1$s</string>
     <string name="settings_clear_cache_title">حذف الذاكرة المؤقتة للإضافات</string>
     <string name="settings_clear_cache_summary">حذف المعلومات المخزنة محليا، هذا سيجبر التطبيق على التحديث الإضافات عبر الانترنت</string>
-    <string name="settings_hide_manager_title">إخفاء مـاجـيسك Manager</string>
-    <string name="settings_hide_manager_summary">تغيير اسم حزمة التطبيق لتجنب الكشف</string>
-    <string name="settings_restore_manager_title">استعادة مـاجـيسك Manager</string>
-    <string name="settings_restore_manager_summary">استعادة مـاجـيسك Manager مع اسم الحزمة الأصلي</string>
     <string name="language">اللغة</string>
     <string name="system_default">(الأفتراضي)</string>
     <string name="settings_check_update_title">تحقق من التحديثات</string>
@@ -195,10 +185,7 @@
     <string name="progress_channel">إشعارات التقدم</string>
     <string name="download_complete">اكتمل التنزيل</string>
     <string name="download_file_error">فشل تنزيل الملف</string>
-    <string name="download_open_parent">أظهر المجلد الرئيسي</string>
-    <string name="download_open_self">أظهر الملف</string>
     <string name="magisk_update_title">تحديث مـاجـيسك متوفر!</string>
-    <string name="manager_update_title">تحديث مـاجـيسك Manager متوفر!</string>
 
     <!--Toasts, Dialogs-->
     <string name="yes">نعم</string>
@@ -212,8 +199,6 @@
     <string name="flashing">يتم الحرق...</string>
     <string name="done">تم!</string>
     <string name="failure">فشل!</string>
-    <string name="hide_manager_title">جار إخفاء مـاجـيسك Manager…</string>
-    <string name="hide_manager_fail_toast">فشل إخفاء مـاجـيسك Manager…</string>
     <string name="open_link_failed_toast">لم يُعثر على تطبيق لفتح الرابط …</string>
     <string name="complete_uninstall">إلغاء التثبيت بالكامل</string>
     <string name="restore_img">استعادة الصور</string>
@@ -221,13 +206,10 @@
     <string name="restore_done">تم الأستعادة</string>
     <string name="restore_fail">النسخة الاحتياطية الأصلية غير موجودة!</string>
     <string name="proprietary_title">تنزيل شفرة الملكية</string>
-    <string name="proprietary_notice">مـاجـيسك برنامج FOSS(السرعة والأمان)،ولا يحتوي على شفرة SafetyNet الخاصة بكوكل.\n\nهل تسمح لـمـاجـيسك بتحميل ملحق GoogleApiClient لفحص SafetyNet?</string>
     <string name="setup_fail">فشل التضبيط</string>
     <string name="env_fix_title"> الإعداد الأضافي مطلوب</string>
-    <string name="env_fix_msg">يحتاج جهازك إلى إعداد إضافي ليتسنى لـمـاجـيسك العمل بشكل صحيح. سيتم تنزيل ملف مضغوط لتثبيت مـاجـيسك هل تريد المتابعة؟</string>
     <string name="setup_msg">جار تضبيت البيئة</string>
     <string name="authenticate">تصديق</string>
     <string name="unsupport_magisk_title">إصدار مـاجـيسك غير مدعوم</string>
-    <string name="unsupport_magisk_msg">إصدار الملف أصغر من %1$s.مـاجـيسك لا يدعمها..\n\nسيتصرف التطبيق كأنك لا تملك روت بجهازك.فضلاًً حدث المعجبين باسرع وقت.</string>
 
 </resources>

app/src/main/res/values-az/strings.xml

@@ -43,10 +43,7 @@
     <string name="progress_channel">Nəticə Bildirişləri</string>
     <string name="download_complete">Yükləmə bitdi</string>
     <string name="download_file_error">Faylı yükləmək alınmadı</string>
-    <string name="download_open_parent">Valideyn qovluğunda göstər</string>
-    <string name="download_open_self">Faylı göstər</string>
     <string name="magisk_update_title">Magisk Yeniləməsi Var!</string>
-    <string name="manager_update_title">Magisk Manager Yeniləməsi Var!</string>
 
     <!--Toasts, Dialogs-->
     <string name="repo_install_title">%1$s faylını yüklə</string>
@@ -57,10 +54,7 @@
     <string name="repo_cache_cleared">Repo keşi silindi</string>
     <string name="manager_download_install">Yükləyib quraşdırmaq üçün toxun.</string>
     <string name="flashing">Qurulur</string>
-    <string name="hide_manager_title">Magisk Manager gizlədilir…</string>
-    <string name="hide_manager_fail_toast">Magisk Manager\'i gizlətmək alınmadı.</string>
     <string name="open_link_failed_toast">Keçid açmağa heçbir tətbiq tapılmadı.</string>
-    <string name="download_zip_only">Yalnız Zip yüklə</string>
     <string name="direct_install">Birdəfəlik Yüklə (Tövsiyə olunur)</string>
     <string name="select_patch_file">Fayl Seç və Yamaqla</string>
     <string name="install_inactive_slot">Fəal olmayan slota quraşdır (OTA\'dan sonra)</string>
@@ -71,20 +65,14 @@
     <string name="restore_done">Geri qaytarma bitdi!</string>
     <string name="restore_fail">Stock nüsxə mövcud deyil!</string>
     <string name="proprietary_title">Özəl kodu yükləyin</string>
-    <string name="proprietary_notice">Magisk Manager açıq lisenziyalıdır və Google\'ın özəl SafetyNet API kodunu ehtiva etmir.\n\Magisk Managerə SafetyNet yoxlamaları üçün tərkibində GoogleApiClient olan əlavəni yükləməyə icazə verirsiniz?</string>
     <string name="setup_fail">Quraşdırma alınmadı.</string>
     <string name="env_fix_title">Əlavə Quraşdırma Lazımdır</string>
-    <string name="env_fix_msg">Cihazınızın Magisk\'in düzgün işləməsi üçün əlavə quraşdırmaya ehtiyacı var . Bu Magisk zip faylını endirəcək, davam etmək istəyirsiniz?</string>
     <string name="setup_title">Əlavə quraşdırma</string>
     <string name="setup_msg">Quraşdırma yerinə yetirilir…</string>
 
     <!--Settings Activity -->
     <string name="settings_clear_cache_title">Repo Keşini Təmizlə</string>
     <string name="settings_clear_cache_summary">Onlayn repolar üçün keşlənmiş məlumatı silin. Bu tətbiqi onlayn şəkildə yenilənməyə məcbur edir.</string>
-    <string name="settings_hide_manager_title">Magisk Manager\'i Gizlə</string>
-    <string name="settings_hide_manager_summary">Magisk Manager\'i təsadüfi adla yenidən sıxışdır.</string>
-    <string name="settings_restore_manager_title">Magisk Manager\'i Geri Qaytar</string>
-    <string name="settings_restore_manager_summary">Magisk Manager\'i orjinal sıxışdırma ilə geri qaytar</string>
     <string name="language">Dil</string>
     <string name="system_default">(Sistem Dili)</string>
     <string name="settings_check_update_title">Yeniləmələri Yoxla</string>