Release Magisk v25.1

Co-authored-by: John Wu <topjohnwu@gmail.com>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,19 +1,18 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
+title: ""
+labels: ""
+assignees: ""
 ---
 
 <!--
 
 ## READ BEFORE OPENING ISSUES
 
-All bug reports require you to **USE CANARY BUILDS**. Please include the version name and version code in the bug report.
+All bug reports require you to **USE DEBUG 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 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 MAGISK**.
 
 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.
 
@@ -31,7 +30,7 @@ Without following the rules above, your issue will be closed without explanation
 
 -->
 
-Device: 
+Device:
 Android version:
-Magisk version name: 
-Magisk version code: 
+Magisk version name:
+Magisk version code:

.gitmodules

@@ -25,9 +25,6 @@
 [submodule "pcre"]
 	path = native/jni/external/pcre
 	url = https://android.googlesource.com/platform/external/pcre
-[submodule "xhook"]
-	path = native/jni/external/xhook
-	url = https://github.com/iqiyi/xHook.git
 [submodule "libcxx"]
 	path = native/jni/external/libcxx
 	url = https://github.com/topjohnwu/libcxx.git

README.MD

@@ -18,9 +18,10 @@ Some highlight features:
 
 [Github](https://github.com/topjohnwu/Magisk/) is the only source where you can get official Magisk information and downloads.
 
-[![](https://img.shields.io/badge/Magisk-v23.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v23.0)
-[![](https://img.shields.io/badge/Magisk%20Beta-v24.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v24.0)
-[![](https://img.shields.io/badge/Magisk-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk-files/canary/app-debug.apk)
+[![](https://img.shields.io/badge/Magisk-v24.3-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v24.3)
+[![](https://img.shields.io/badge/Magisk%20Beta-v25.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v25.0)
+[![](https://img.shields.io/badge/Magisk-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk-files/canary/app-release.apk)
+[![](https://img.shields.io/badge/Magisk-Debug-red)](https://raw.githubusercontent.com/topjohnwu/magisk-files/canary/app-debug.apk)
 
 ## Useful Links
 
@@ -30,7 +31,7 @@ Some highlight features:
 
 ## Bug Reports
 
-**Only bug reports from Canary builds will be accepted.**
+**Only bug reports from Debug builds will be accepted.**
 
 For installation issues, upload both boot image and install logs.<br>
 For Magisk issues, upload boot logcat or dmesg.<br>
@@ -52,7 +53,13 @@ For Magisk app crashes, record and upload the logcat when the crash occurs.
   For each action, use `-h` to access help (e.g. `./build.py all -h`)
 - To start development, open the project with Android Studio. The IDE can be used for both app (Kotlin/Java) and native (C++/C) sources.
 - Optionally, set custom configs with `config.prop`. A sample `config.prop.sample` is provided.
-- To sign APKs and zips with your own private keys, set signing configs in `config.prop`. For more info, check [Google's Documentation](https://developer.android.com/studio/publish/app-signing.html#generate-key).
+
+## Signing and Distribution
+
+- The certificate of the key used to sign the final Magisk APK product is also directly embedded into some executables. In release builds, Magisk's root daemon will enforce this certificate check and reject and forcefully uninstall any non-matching Magisk apps to protect users from malicious and unverified Magisk APKs.
+- To do any development on Magisk itself, switch to an **official debug build and reinstall Magisk** to bypass the signature check.
+- To distribute your own Magisk builds signed with your own keys, set your signing configs in `config.prop`.
+- Check [Google's Documentation](https://developer.android.com/studio/publish/app-signing.html#generate-key) for more details on generating your own key.
 
 ## Translation Contributions
 

app/build.gradle.kts

@@ -19,6 +19,8 @@ kapt {
 }
 
 android {
+    namespace = "com.topjohnwu.magisk"
+
     defaultConfig {
         applicationId = "com.topjohnwu.magisk"
         vectorDrawables.useSupportLibrary = true
@@ -54,11 +56,6 @@ android {
             keepDebugSymbols += "**/*.so"
         }
     }
-
-    kotlinOptions {
-        jvmTarget = "11"
-        freeCompilerArgs = listOf("-Xjvm-default=enable")
-    }
 }
 
 setupApp()
@@ -74,22 +71,17 @@ dependencies {
     implementation("com.github.topjohnwu:jtar:1.0.0")
     implementation("com.github.topjohnwu:indeterminate-checkbox:1.0.7")
     implementation("com.github.topjohnwu:lz4-java:1.7.1")
-    implementation("com.jakewharton.timber:timber:4.7.1")
-    implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
+    implementation("com.jakewharton.timber:timber:5.0.1")
+    implementation("org.bouncycastle:bcpkix-jdk18on:1.71")
     implementation("dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0")
-    implementation("dev.rikka.rikkax.insets:insets:1.1.1")
+    implementation("dev.rikka.rikkax.insets:insets:1.2.0")
     implementation("dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1")
     implementation("io.noties.markwon:core:4.6.2")
 
-    val vBAdapt = "4.0.0"
-    val bindingAdapter = "me.tatarka.bindingcollectionadapter2:bindingcollectionadapter"
-    implementation("${bindingAdapter}:${vBAdapt}")
-    implementation("${bindingAdapter}-recyclerview:${vBAdapt}")
-
-    val vLibsu = "3.2.1"
+    val vLibsu = "5.0.2"
     implementation("com.github.topjohnwu.libsu:core:${vLibsu}")
-    implementation("com.github.topjohnwu.libsu:io:${vLibsu}")
     implementation("com.github.topjohnwu.libsu:service:${vLibsu}")
+    implementation("com.github.topjohnwu.libsu:nio:${vLibsu}")
 
     val vRetrofit = "2.9.0"
     implementation("com.squareup.retrofit2:retrofit:${vRetrofit}")
@@ -105,24 +97,24 @@ dependencies {
     implementation("com.squareup.moshi:moshi:${vMoshi}")
     kapt("com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}")
 
-    val vRoom = "2.4.1"
+    val vRoom = "2.5.0-alpha02"
     implementation("androidx.room:room-runtime:${vRoom}")
     implementation("androidx.room:room-ktx:${vRoom}")
     kapt("androidx.room:room-compiler:${vRoom}")
 
-    val vNav = "2.5.0-alpha01"
+    val vNav = "2.5.0-rc01"
     implementation("androidx.navigation:navigation-fragment-ktx:${vNav}")
     implementation("androidx.navigation:navigation-ui-ktx:${vNav}")
 
     implementation("androidx.biometric:biometric:1.1.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    implementation("androidx.appcompat:appcompat:1.4.1")
+    implementation("androidx.appcompat:appcompat:1.4.2")
     implementation("androidx.preference:preference:1.2.0")
     implementation("androidx.recyclerview:recyclerview:1.2.1")
     implementation("androidx.fragment:fragment-ktx:1.4.1")
     implementation("androidx.transition:transition:1.4.1")
-    implementation("androidx.core:core-ktx:1.7.0")
-    implementation("androidx.core:core-splashscreen:1.0.0-beta01")
-    implementation("com.google.android.material:material:1.5.0")
+    implementation("androidx.core:core-ktx:1.8.0")
+    implementation("androidx.core:core-splashscreen:1.0.0-rc01")
+    implementation("com.google.android.material:material:1.6.1")
 }

app/proguard-rules.pro

@@ -1,21 +1,3 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/topjohnwu/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
 # Parcelable
 -keepclassmembers class * implements android.os.Parcelable {
     public static final ** CREATOR;
@@ -26,6 +8,9 @@
 	public static void check*(...);
 	public static void throw*(...);
 }
+-assumenosideeffects class java.util.Objects {
+    public static ** requireNonNull(...);
+}
 
 # Stub
 -keep class com.topjohnwu.magisk.core.App { <init>(java.lang.Object); }
@@ -34,6 +19,11 @@
   boolean mActivityHandlesUiMode;
 }
 
+# main
+-keep,allowoptimization public class com.topjohnwu.magisk.signing.SignBoot {
+    public static void main(java.lang.String[]);
+}
+
 # Strip Timber verbose and debug logging
 -assumenosideeffects class timber.log.Timber$Tree {
   public void v(**);

app/shared/build.gradle.kts

@@ -5,9 +5,7 @@ plugins {
 setupCommon()
 
 android {
-    defaultConfig {
-        consumerProguardFiles("proguard-rules.pro")
-    }
+    namespace = "com.topjohnwu.shared"
 }
 
 dependencies {

app/shared/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

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

@@ -1,72 +0,0 @@
-package com.topjohnwu.magisk;
-
-import static android.os.Build.VERSION.SDK_INT;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import io.michaelrocks.paranoid.Obfuscate;
-
-@Obfuscate
-public class DynAPK {
-    private static File dynDir;
-    private static Method addAssetPath;
-
-    private static File getDynDir(Context c) {
-        if (dynDir == null) {
-            if (SDK_INT >= 24) {
-                // Use protected context to allow directBootAware
-                c = c.createDeviceProtectedStorageContext();
-            }
-            dynDir = new File(c.getFilesDir().getParent(), "dyn");
-            dynDir.mkdir();
-        }
-        return dynDir;
-    }
-
-    public static File current(Context c) {
-        return new File(getDynDir(c), "current.apk");
-    }
-
-    public static File update(Context c) {
-        return new File(getDynDir(c), "update.apk");
-    }
-
-    public static void addAssetPath(AssetManager asset, String path) {
-        try {
-            if (addAssetPath == null)
-                addAssetPath = AssetManager.class.getMethod("addAssetPath", String.class);
-            addAssetPath.invoke(asset, path);
-        } catch (Exception ignored) {}
-    }
-
-    public static class Data {
-        // Indices of the object array
-        private static final int STUB_VERSION = 0;
-        private static final int CLASS_COMPONENT_MAP = 1;
-        private static final int ROOT_SERVICE = 2;
-        private static final int ARR_SIZE = 3;
-
-        private final Object[] arr;
-
-        public Data() { arr = new Object[ARR_SIZE]; }
-        public Data(Object o) { arr = (Object[]) o; }
-        public Object getObject() { return arr; }
-
-        public int getVersion() { return (int) arr[STUB_VERSION]; }
-        public void setVersion(int version) { arr[STUB_VERSION] = version; }
-        public Map<String, String> getClassToComponent() {
-            // noinspection unchecked
-            return (Map<String, String>) arr[CLASS_COMPONENT_MAP];
-        }
-        public void setClassToComponent(Map<String, String> map) {
-            arr[CLASS_COMPONENT_MAP] = map;
-        }
-        public Class<?> getRootService() { return (Class<?>) arr[ROOT_SERVICE]; }
-        public void setRootService(Class<?> service) { arr[ROOT_SERVICE] = service; }
-    }
-}

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

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

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

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

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

@@ -5,18 +5,17 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.Enumeration;
 
-import dalvik.system.DexClassLoader;
+import dalvik.system.BaseDexClassLoader;
 
-public class DynamicClassLoader extends DexClassLoader {
-
-    private static final ClassLoader base = Object.class.getClassLoader();
+public class DynamicClassLoader extends BaseDexClassLoader {
 
     public DynamicClassLoader(File apk) {
-        super(apk.getPath(), apk.getParent(), null, base);
+        this(apk, getSystemClassLoader());
     }
 
     public DynamicClassLoader(File apk, ClassLoader parent) {
-        super(apk.getPath(), apk.getParent(), null, parent);
+        // Set optimizedDirectory to null to bypass DexFile's security checks
+        super(apk.getPath(), null, null, parent);
     }
 
     @Override
@@ -28,7 +27,7 @@ public class DynamicClassLoader extends DexClassLoader {
 
         try {
             // Then check boot classpath
-            return base.loadClass(name);
+            return getSystemClassLoader().loadClass(name);
         } catch (ClassNotFoundException ignored) {
             try {
                 // Next try current dex
@@ -46,7 +45,7 @@ public class DynamicClassLoader extends DexClassLoader {
 
     @Override
     public URL getResource(String name) {
-        URL resource = base.getResource(name);
+        URL resource = getSystemClassLoader().getResource(name);
         if (resource != null)
             return resource;
         resource = findResource(name);
@@ -58,7 +57,7 @@ public class DynamicClassLoader extends DexClassLoader {
 
     @Override
     public Enumeration<URL> getResources(String name) throws IOException {
-        return new CompoundEnumeration<>(base.getResources(name),
+        return new CompoundEnumeration<>(getSystemClassLoader().getResources(name),
                 findResources(name), getParent().getResources(name));
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.topjohnwu.magisk">
-
-    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".core.App"
@@ -29,8 +26,8 @@
         <activity
             android:name=".ui.surequest.SuRequestActivity"
             android:directBootAware="true"
-            android:excludeFromRecents="true"
             android:exported="false"
+            android:taskAffinity=""
             tools:ignore="AppLinkUrlError">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -40,11 +37,11 @@
 
         <receiver
             android:name=".core.Receiver"
-            android:directBootAware="true"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
                 <action android:name="android.intent.action.UID_REMOVED" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />

app/src/main/aidl/com/topjohnwu/magisk/core/utils/IRootUtils.aidl

@@ -0,0 +1,9 @@
+// IRootUtils.aidl
+package com.topjohnwu.magisk.core.utils;
+
+// Declare any non-default types here with import statements
+
+interface IRootUtils {
+    android.app.ActivityManager.RunningAppProcessInfo getAppProcess(int pid);
+    IBinder getFileSystem();
+}

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

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

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

@@ -20,11 +20,12 @@ abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHo
     protected abstract val layoutRes: Int
 
     private val navigation get() = activity?.navigation
+    open val snackbarView: View? get() = null
     open val snackbarAnchorView: View? get() = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        startObserveEvents()
+        startObserveLiveData()
     }
 
     override fun onCreateView(
@@ -36,9 +37,14 @@ abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHo
             it.setVariable(BR.viewModel, viewModel)
             it.lifecycleOwner = viewLifecycleOwner
         }
+        savedInstanceState?.let { viewModel.onRestoreState(it) }
         return binding.root
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        viewModel.onSaveState(outState)
+    }
+
     override fun onStart() {
         super.onStart()
         activity?.supportActionBar?.subtitle = null
@@ -70,7 +76,10 @@ abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHo
 
     override fun onResume() {
         super.onResume()
-        viewModel.requestRefresh()
+        viewModel.let {
+            if (it is AsyncLoadViewModel)
+                it.startLoading()
+        }
     }
 
     protected open fun onPreBind(binding: Binding) {
@@ -78,7 +87,7 @@ abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHo
     }
 
     fun NavDirections.navigate() {
-        navigation?.navigate(this)
+        navigation?.currentDestination?.getAction(actionId)?.let { navigation!!.navigate(this) }
     }
 
 }

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

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

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

@@ -1,84 +1,39 @@
 package com.topjohnwu.magisk.arch
 
-import android.Manifest
-import androidx.annotation.CallSuper
-import androidx.databinding.Bindable
-import androidx.databinding.Observable
+import android.Manifest.permission.REQUEST_INSTALL_PACKAGES
+import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+import android.annotation.SuppressLint
+import android.os.Bundle
 import androidx.databinding.PropertyChangeRegistry
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.NavDirections
-import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.databinding.ObservableHost
-import com.topjohnwu.magisk.databinding.set
 import com.topjohnwu.magisk.events.BackPressEvent
 import com.topjohnwu.magisk.events.NavigationEvent
 import com.topjohnwu.magisk.events.PermissionEvent
 import com.topjohnwu.magisk.events.SnackbarEvent
-import kotlinx.coroutines.Job
 
-abstract class BaseViewModel(
-    initialState: State = State.LOADING
-) : ViewModel(), ObservableHost {
+abstract class BaseViewModel : ViewModel(), ObservableHost {
 
     override var callbacks: PropertyChangeRegistry? = null
 
-    enum class State {
-        LOADED, LOADING, LOADING_FAILED
-    }
-
-    @get:Bindable
-    val loading get() = state == State.LOADING
-    @get:Bindable
-    val loaded get() = state == State.LOADED
-    @get:Bindable
-    val loadFailed get() = state == State.LOADING_FAILED
-
-    val isConnected get() = Info.isConnected
+    private val _viewEvents = MutableLiveData<ViewEvent>()
     val viewEvents: LiveData<ViewEvent> get() = _viewEvents
 
-    var state= initialState
-        set(value) = set(value, field, { field = it }, BR.loading, BR.loaded, BR.loadFailed)
-
-    private val _viewEvents = MutableLiveData<ViewEvent>()
-    private var runningJob: Job? = null
-    private val refreshCallback = object : Observable.OnPropertyChangedCallback() {
-        override fun onPropertyChanged(sender: Observable?, propertyId: Int) {
-            requestRefresh()
-        }
-    }
-
-    init {
-        isConnected.addOnPropertyChangedCallback(refreshCallback)
-    }
-
-    /** This should probably never be called manually, it's called manually via delegate. */
-    @Synchronized
-    fun requestRefresh() {
-        if (runningJob?.isActive == true) {
-            return
-        }
-        runningJob = refresh()
-    }
-
-    protected open fun refresh(): Job? = null
-
-    @CallSuper
-    override fun onCleared() {
-        isConnected.removeOnPropertyChangedCallback(refreshCallback)
-        super.onCleared()
-    }
+    open fun onSaveState(state: Bundle) {}
+    open fun onRestoreState(state: Bundle) {}
+    open fun onNetworkChanged(network: Boolean) {}
 
     fun withPermission(permission: String, callback: (Boolean) -> Unit) {
         PermissionEvent(permission, callback).publish()
     }
 
     inline fun withExternalRW(crossinline callback: () -> Unit) {
-        withPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) {
+        withPermission(WRITE_EXTERNAL_STORAGE) {
             if (!it) {
                 SnackbarEvent(R.string.external_rw_permission_denied).publish()
             } else {
@@ -87,6 +42,17 @@ abstract class BaseViewModel(
         }
     }
 
+    @SuppressLint("InlinedApi")
+    inline fun withInstallPermission(crossinline callback: () -> Unit) {
+        withPermission(REQUEST_INSTALL_PACKAGES) {
+            if (!it) {
+                SnackbarEvent(R.string.install_unknown_denied).publish()
+            } else {
+                callback()
+            }
+        }
+    }
+
     fun back() = BackPressEvent().publish()
 
     fun <Event : ViewEvent> Event.publish() {

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

@@ -10,9 +10,11 @@ import androidx.core.content.res.use
 import androidx.core.view.WindowCompat
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
+import com.google.android.material.snackbar.Snackbar
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.base.BaseActivity
+import com.topjohnwu.magisk.widget.Pre23CardViewBackgroundColorFixLayoutInflaterListener
 import rikka.insets.WindowInsetsHelper
 import rikka.layoutinflater.view.LayoutInflaterFactory
 
@@ -25,17 +27,21 @@ abstract class UIActivity<Binding : ViewDataBinding> : BaseActivity(), ViewModel
     open val snackbarAnchorView: View? get() = null
 
     init {
-        val theme = Config.darkTheme
-        AppCompatDelegate.setDefaultNightMode(theme)
+        AppCompatDelegate.setDefaultNightMode(Config.darkTheme)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         layoutInflater.factory2 = LayoutInflaterFactory(delegate)
             .addOnViewCreatedListener(WindowInsetsHelper.LISTENER)
+            .apply {
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                    this.addOnViewCreatedListener(Pre23CardViewBackgroundColorFixLayoutInflaterListener.getInstance())
+                }
+            }
 
         super.onCreate(savedInstanceState)
 
-        startObserveEvents()
+        startObserveLiveData()
 
         // We need to set the window background explicitly since for whatever reason it's not
         // propagated upstream
@@ -74,9 +80,19 @@ abstract class UIActivity<Binding : ViewDataBinding> : BaseActivity(), ViewModel
         binding.root.rootView.accessibilityDelegate = delegate
     }
 
+    fun showSnackbar(
+        message: CharSequence,
+        length: Int = Snackbar.LENGTH_SHORT,
+        builder: Snackbar.() -> Unit = {}
+    ) = Snackbar.make(snackbarView, message, length)
+        .setAnchorView(snackbarAnchorView).apply(builder).show()
+
     override fun onResume() {
         super.onResume()
-        viewModel.requestRefresh()
+        viewModel.let {
+            if (it is AsyncLoadViewModel)
+                it.startLoading()
+        }
     }
 
     override fun onEventDispatched(event: ViewEvent) = when (event) {

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

@@ -1,15 +1,24 @@
 package com.topjohnwu.magisk.arch
 
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStoreOwner
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.ui.home.HomeViewModel
+import com.topjohnwu.magisk.ui.install.InstallViewModel
+import com.topjohnwu.magisk.ui.log.LogViewModel
+import com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
+import com.topjohnwu.magisk.ui.surequest.SuRequestViewModel
 
-interface ViewModelHolder : LifecycleOwner {
+interface ViewModelHolder : LifecycleOwner, ViewModelStoreOwner {
 
     val viewModel: BaseViewModel
 
-    fun startObserveEvents() {
-        viewModel.viewEvents.observe(this) {
-            onEventDispatched(it)
-        }
+    fun startObserveLiveData() {
+        viewModel.viewEvents.observe(this, this::onEventDispatched)
+        Info.isConnected.observe(this, viewModel::onNetworkChanged)
     }
 
     /**
@@ -17,3 +26,23 @@ interface ViewModelHolder : LifecycleOwner {
      */
     fun onEventDispatched(event: ViewEvent) {}
 }
+
+object VMFactory : ViewModelProvider.Factory {
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return when (modelClass) {
+            HomeViewModel::class.java -> HomeViewModel(ServiceLocator.networkService)
+            LogViewModel::class.java -> LogViewModel(ServiceLocator.logRepo)
+            SuperuserViewModel::class.java -> SuperuserViewModel(ServiceLocator.policyDB)
+            InstallViewModel::class.java -> InstallViewModel(ServiceLocator.networkService)
+            SuRequestViewModel::class.java ->
+                SuRequestViewModel(ServiceLocator.policyDB, ServiceLocator.timeoutPrefs)
+            else -> modelClass.newInstance()
+        } as T
+    }
+}
+
+inline fun <reified VM : ViewModel> ViewModelHolder.viewModel() =
+    lazy(LazyThreadSafetyMode.NONE) {
+        ViewModelProvider(this, VMFactory)[VM::class.java]
+    }

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

@@ -1,29 +1,30 @@
 package com.topjohnwu.magisk.core
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Application
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Bundle
-import com.topjohnwu.magisk.DynAPK
+import com.topjohnwu.magisk.StubApk
+import com.topjohnwu.magisk.core.di.ServiceLocator
 import com.topjohnwu.magisk.core.utils.*
-import com.topjohnwu.magisk.di.ServiceLocator
+import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.internal.UiThreadHandler
 import com.topjohnwu.superuser.ipc.RootService
 import kotlinx.coroutines.Dispatchers
 import timber.log.Timber
+import java.lang.ref.WeakReference
 import kotlin.system.exitProcess
 
 open class App() : Application() {
 
     constructor(o: Any) : this() {
-        val data = DynAPK.Data(o)
+        val data = StubApk.Data(o)
         // Add the root service name mapping
-        data.classToComponent[RootRegistry::class.java.name] = data.rootService.name
+        data.classToComponent[RootUtils::class.java.name] = data.rootService.name
         // Send back the actual root service class
-        data.rootService = RootRegistry::class.java
+        data.rootService = RootUtils::class.java
         Info.stub = data
     }
 
@@ -37,43 +38,38 @@ open class App() : Application() {
     }
 
     override fun attachBaseContext(context: Context) {
-        Shell.setDefaultBuilder(Shell.Builder.create()
-            .setFlags(Shell.FLAG_MOUNT_MASTER)
-            .setInitializers(ShellInit::class.java)
-            .setTimeout(2))
-        Shell.EXECUTOR = DispatcherExecutor(Dispatchers.IO)
-
         // Get the actual ContextImpl
         val app: Application
         val base: Context
         if (context is Application) {
             app = context
             base = context.baseContext
+            AppApkPath = StubApk.current(base).path
         } else {
             app = this
             base = context
+            AppApkPath = base.packageResourcePath
         }
         super.attachBaseContext(base)
         ServiceLocator.context = base
+        app.registerActivityLifecycleCallbacks(ActivityTracker)
+
+        Shell.setDefaultBuilder(Shell.Builder.create()
+            .setFlags(Shell.FLAG_MOUNT_MASTER)
+            .setInitializers(ShellInit::class.java)
+            .setContext(base)
+            .setTimeout(2))
+        Shell.EXECUTOR = DispatcherExecutor(Dispatchers.IO)
+        RootUtils.bindTask = RootService.bindOrTask(
+            intent<RootUtils>(),
+            UiThreadHandler.executor,
+            RootUtils.Connection
+        )
+        // Pre-heat the shell ASAP
+        Shell.getShell(null) {}
 
         refreshLocale()
-        AppApkPath = if (isRunningAsStub) {
-            DynAPK.current(base).path
-        } else {
-            base.packageResourcePath
-        }
-
-        base.resources.patch()
-        app.registerActivityLifecycleCallbacks(ActivityTracker)
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-        RootRegistry.bindTask = RootService.createBindTask(
-            intent<RootRegistry>(),
-            UiThreadHandler.executor,
-            RootRegistry.Connection
-        )
+        resources.patch()
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
@@ -85,20 +81,21 @@ open class App() : Application() {
     }
 }
 
-@SuppressLint("StaticFieldLeak")
 object ActivityTracker : Application.ActivityLifecycleCallbacks {
 
-    @Volatile
-    var foreground: Activity? = null
+    val foreground: Activity? get() = ref.get()
 
-    val hasForeground get() = foreground != null
+    @Volatile
+    private var ref = WeakReference<Activity>(null)
 
     override fun onActivityResumed(activity: Activity) {
-        foreground = activity
+        if (activity is SuRequestActivity) return
+        ref = WeakReference(activity)
     }
 
     override fun onActivityPaused(activity: Activity) {
-        foreground = null
+        if (activity is SuRequestActivity) return
+        ref.clear()
     }
 
     override fun onActivityCreated(activity: Activity, bundle: Bundle?) {}

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

@@ -6,21 +6,23 @@ import android.util.Xml
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.edit
 import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.repository.BoolDBPropertyNoWrite
+import com.topjohnwu.magisk.core.repository.DBConfig
+import com.topjohnwu.magisk.core.repository.PreferenceConfig
 import com.topjohnwu.magisk.core.utils.refreshLocale
-import com.topjohnwu.magisk.data.preference.PreferenceModel
-import com.topjohnwu.magisk.data.repository.DBBoolSettingsNoWrite
-import com.topjohnwu.magisk.data.repository.DBConfig
-import com.topjohnwu.magisk.di.ServiceLocator
 import com.topjohnwu.magisk.ui.theme.Theme
+import kotlinx.coroutines.GlobalScope
 import org.xmlpull.v1.XmlPullParser
 import java.io.File
 import java.io.InputStream
 
-object Config : PreferenceModel, DBConfig {
+object Config : PreferenceConfig, DBConfig {
 
     override val stringDB get() = ServiceLocator.stringDB
     override val settingsDB get() = ServiceLocator.settingsDB
     override val context get() = ServiceLocator.deContext
+    override val coroutineScope get() = GlobalScope
 
     @get:SuppressLint("ApplySharedPref")
     val prefsFile: File get() {
@@ -70,6 +72,7 @@ object Config : PreferenceModel, DBConfig {
         const val BETA_CHANNEL = 1
         const val CUSTOM_CHANNEL = 2
         const val CANARY_CHANNEL = 3
+        const val DEBUG_CHANNEL = 4
 
         // root access mode
         const val ROOT_ACCESS_DISABLED = 0
@@ -106,6 +109,8 @@ object Config : PreferenceModel, DBConfig {
 
     private val defaultChannel =
         if (BuildConfig.DEBUG)
+            Value.DEBUG_CHANNEL
+        else if (Const.APP_IS_CANARY)
             Value.CANARY_CHANNEL
         else
             Value.DEFAULT_CHANNEL
@@ -149,7 +154,7 @@ object Config : PreferenceModel, DBConfig {
     var suMultiuserMode by dbSettings(Key.SU_MULTIUSER_MODE, Value.MULTIUSER_MODE_OWNER_ONLY)
     var suBiometric by dbSettings(Key.SU_BIOMETRIC, false)
     var zygisk by dbSettings(Key.ZYGISK, false)
-    var denyList by DBBoolSettingsNoWrite(Key.DENYLIST, false)
+    var denyList by BoolDBPropertyNoWrite(Key.DENYLIST, false)
     var suManager by dbStrings(Key.SU_MANAGER, "", true)
     var keyStoreRaw by dbStrings(Key.KEYSTORE, "", true)
 
@@ -158,7 +163,7 @@ object Config : PreferenceModel, DBConfig {
     fun load(pkg: String?) {
         // Only try to load prefs when fresh install and a previous package name is set
         if (pkg != null && prefs.all.isEmpty()) runCatching {
-            context.contentResolver.openInputStream(Provider.PREFS_URI(pkg))?.use {
+            context.contentResolver.openInputStream(Provider.preferencesUri(pkg))?.use {
                 prefs.edit { parsePrefs(it) }
             }
         }
@@ -169,10 +174,11 @@ object Config : PreferenceModel, DBConfig {
                 suBiometric = true
             remove(SU_FINGERPRINT)
             prefs.getString(Key.UPDATE_CHANNEL, null).also {
-                if (it == null)
+                if (it == null ||
+                    it.toInt() > Value.DEBUG_CHANNEL ||
+                    it.toInt() < Value.DEFAULT_CHANNEL) {
                     putString(Key.UPDATE_CHANNEL, defaultChannel.toString())
-                else if (it.toInt() > Value.CANARY_CHANNEL)
-                    putString(Key.UPDATE_CHANNEL, Value.CANARY_CHANNEL.toString())
+                }
             }
         }
     }

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

@@ -25,11 +25,11 @@ object Const {
     val APP_IS_CANARY get() = Version.isCanary(BuildConfig.VERSION_CODE)
 
     object Version {
-        const val MIN_VERSION = "v21.0"
-        const val MIN_VERCODE = 21000
+        const val MIN_VERSION = "v22.0"
+        const val MIN_VERCODE = 22000
 
-        fun atLeast_21_2() = Info.env.versionCode >= 21200 || isCanary()
         fun atLeast_24_0() = Info.env.versionCode >= 24000 || isCanary()
+        fun atLeast_25_0() = Info.env.versionCode >= 25000 || isCanary()
         fun isCanary() = isCanary(Info.env.versionCode)
 
         fun isCanary(ver: Int) = ver > 0 && ver % 100 != 0
@@ -37,8 +37,6 @@ object Const {
 
     object ID {
         const val JOB_SERVICE_ID = 7
-        const val UPDATE_NOTIFICATION_CHANNEL = "update"
-        const val PROGRESS_NOTIFICATION_CHANNEL = "progress"
     }
 
     object Url {

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

@@ -2,7 +2,6 @@
 
 package com.topjohnwu.magisk.core
 
-import android.app.Activity
 import android.content.ComponentName
 import android.content.Context
 import android.content.ContextWrapper
@@ -11,47 +10,51 @@ import android.content.res.AssetManager
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.util.DisplayMetrics
-import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.StubApk
+import com.topjohnwu.magisk.core.di.AppContext
 import com.topjohnwu.magisk.core.utils.syncLocale
-import com.topjohnwu.magisk.di.AppContext
+import com.topjohnwu.magisk.ktx.unwrap
 
 lateinit var AppApkPath: String
 
-fun AssetManager.addAssetPath(path: String) = DynAPK.addAssetPath(this, path)
-
-fun Context.wrap(): Context = if (this is PatchedContext) this else PatchedContext(this)
-
-private class PatchedContext(base: Context) : ContextWrapper(base) {
-    init { base.resources.patch() }
-    override fun getClassLoader() = javaClass.classLoader!!
-    override fun createConfigurationContext(config: Configuration) =
-        super.createConfigurationContext(config).wrap()
-}
+fun Resources.addAssetPath(path: String) = StubApk.addAssetPath(this, path)
 
 fun Resources.patch(): Resources {
-    syncLocale()
     if (isRunningAsStub)
-        assets.addAssetPath(AppApkPath)
+        addAssetPath(AppApkPath)
+    syncLocale()
     return this
 }
 
+fun Context.patch(): Context {
+    unwrap().resources.patch()
+    return this
+}
+
+// Wrapping is only necessary for ContextThemeWrapper to support configuration overrides
+fun Context.wrap(): Context {
+    patch()
+    return object : ContextWrapper(this) {
+        override fun createConfigurationContext(config: Configuration): Context {
+            return super.createConfigurationContext(config).wrap()
+        }
+    }
+}
+
 fun createNewResources(): Resources {
     val asset = AssetManager::class.java.newInstance()
-    asset.addAssetPath(AppApkPath)
     val config = Configuration(AppContext.resources.configuration)
     val metrics = DisplayMetrics()
     metrics.setTo(AppContext.resources.displayMetrics)
-    return Resources(asset, metrics, config)
+    val res = Resources(asset, metrics, config)
+    res.addAssetPath(AppApkPath)
+    return res
 }
 
 fun Class<*>.cmp(pkg: String) =
     ComponentName(pkg, Info.stub?.classToComponent?.get(name) ?: name)
 
-inline fun <reified T> Activity.redirect() = Intent(intent)
-    .setComponent(T::class.java.cmp(packageName))
-    .setFlags(0)
-
 inline fun <reified T> Context.intent() = Intent().setComponent(T::class.java.cmp(packageName))
 
 // Keep a reference to these resources to prevent it from

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

@@ -1,22 +1,21 @@
 package com.topjohnwu.magisk.core
 
 import android.os.Build
-import androidx.databinding.ObservableBoolean
-import com.topjohnwu.magisk.DynAPK
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.topjohnwu.magisk.StubApk
+import com.topjohnwu.magisk.core.di.AppContext
 import com.topjohnwu.magisk.core.model.UpdateInfo
+import com.topjohnwu.magisk.core.repository.NetworkService
 import com.topjohnwu.magisk.core.utils.net.NetworkObserver
-import com.topjohnwu.magisk.data.repository.NetworkService
-import com.topjohnwu.magisk.di.AppContext
 import com.topjohnwu.magisk.ktx.getProperty
-import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils.fastCmd
-import com.topjohnwu.superuser.internal.UiThreadHandler
 
 val isRunningAsStub get() = Info.stub != null
 
 object Info {
 
-    var stub: DynAPK.Data? = null
+    var stub: StubApk.Data? = null
 
     val EMPTY_REMOTE = UpdateInfo()
     var remote = EMPTY_REMOTE
@@ -36,6 +35,7 @@ object Info {
     @JvmField var vbmeta = false
     var crypto = ""
     var noDataExec = false
+    var isRooted = false
 
     @JvmField var hasGMS = true
     val isSamsung = Build.MANUFACTURER.equals("samsung", ignoreCase = true)
@@ -43,26 +43,31 @@ object Info {
         getProperty("ro.kernel.qemu", "0") == "1" ||
             getProperty("ro.boot.qemu", "0") == "1"
 
-    val isConnected by lazy {
-        ObservableBoolean(false).also { field ->
+    val isConnected: LiveData<Boolean> by lazy {
+        MutableLiveData(false).also { field ->
             NetworkObserver.observe(AppContext) {
-                UiThreadHandler.run { field.set(it) }
+                remote = EMPTY_REMOTE
+                field.postValue(it)
             }
         }
     }
 
-    private fun loadState() = Env(
-        fastCmd("magisk -v").split(":".toRegex())[0],
-        runCatching { fastCmd("magisk -V").toInt() }.getOrDefault(-1)
-    )
+    private fun loadState(): Env {
+        val v = fastCmd("magisk -v").split(":".toRegex())
+        return Env(
+            v[0], v.size >= 3 && v[2] == "D",
+            runCatching { fastCmd("magisk -V").toInt() }.getOrDefault(-1)
+        )
+    }
 
     class Env(
         val versionString: String = "",
+        val isDebug: Boolean = false,
         code: Int = -1
     ) {
         val versionCode = when {
             code < Const.Version.MIN_VERCODE -> -1
-            else -> if (Shell.rootAccess()) code else -1
+            else -> if (isRooted) code else -1
         }
         val isUnsupported = code > 0 && code < Const.Version.MIN_VERCODE
         val isActive = versionCode >= 0

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

@@ -7,7 +7,7 @@ import android.content.Context
 import androidx.core.content.getSystemService
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.core.base.BaseJobService
-import com.topjohnwu.magisk.di.ServiceLocator
+import com.topjohnwu.magisk.core.di.ServiceLocator
 import com.topjohnwu.magisk.view.Notifications
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -23,16 +23,20 @@ class JobService : BaseJobService() {
     override fun onStartJob(params: JobParameters): Boolean {
         val coroutineScope = CoroutineScope(Dispatchers.IO + job)
         coroutineScope.launch {
-            svc.fetchUpdate()?.run {
-                Info.remote = this
-                if (Info.env.isActive && BuildConfig.VERSION_CODE < magisk.versionCode)
-                    Notifications.managerUpdate(this@JobService)
-            }
+            doWork()
             jobFinished(params, false)
         }
         return false
     }
 
+    private suspend fun doWork() {
+        svc.fetchUpdate()?.let {
+            Info.remote = it
+            if (Info.env.isActive && BuildConfig.VERSION_CODE < it.magisk.versionCode)
+                Notifications.updateAvailable(this)
+        }
+    }
+
     override fun onStopJob(params: JobParameters): Boolean {
         job.cancel()
         return false

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

@@ -1,22 +1,13 @@
 package com.topjohnwu.magisk.core
 
-import android.content.ContentProvider
-import android.content.ContentValues
-import android.content.Context
-import android.content.pm.ProviderInfo
-import android.database.Cursor
 import android.net.Uri
 import android.os.Bundle
 import android.os.ParcelFileDescriptor
 import android.os.ParcelFileDescriptor.MODE_READ_ONLY
+import com.topjohnwu.magisk.core.base.BaseProvider
 import com.topjohnwu.magisk.core.su.SuCallbackHandler
-import java.io.File
 
-class Provider : ContentProvider() {
-
-    override fun attachInfo(context: Context, info: ProviderInfo) {
-        super.attachInfo(context.wrap(), info)
-    }
+class Provider : BaseProvider() {
 
     override fun call(method: String, arg: String?, extras: Bundle?): Bundle? {
         SuCallbackHandler.run(context!!, method, extras)
@@ -25,24 +16,13 @@ class Provider : ContentProvider() {
 
     override fun openFile(uri: Uri, mode: String): ParcelFileDescriptor? {
         return when (uri.encodedPath ?: return null) {
-            "/apk_file" -> ParcelFileDescriptor.open(File(context!!.packageCodePath), MODE_READ_ONLY)
             "/prefs_file" -> ParcelFileDescriptor.open(Config.prefsFile, MODE_READ_ONLY)
             else -> super.openFile(uri, mode)
         }
     }
 
     companion object {
-        fun APK_URI(pkg: String) =
-            Uri.Builder().scheme("content").authority("$pkg.provider").path("apk_file").build()
-
-        fun PREFS_URI(pkg: String) =
+        fun preferencesUri(pkg: String): Uri =
             Uri.Builder().scheme("content").authority("$pkg.provider").path("prefs_file").build()
     }
-
-    override fun onCreate() = true
-    override fun getType(uri: Uri): String? = null
-    override fun insert(uri: Uri, values: ContentValues?): Uri? = null
-    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?) = 0
-    override fun update(uri: Uri, values: ContentValues?, selection: String?, selectionArgs: Array<out String>?) = 0
-    override fun query(uri: Uri, projection: Array<out String>?, selection: String?, selectionArgs: Array<out String>?, sortOrder: String?): Cursor? = null
 }

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

@@ -1,10 +1,11 @@
 package com.topjohnwu.magisk.core
 
 import android.annotation.SuppressLint
-import android.content.ContextWrapper
+import android.content.Context
 import android.content.Intent
 import com.topjohnwu.magisk.core.base.BaseReceiver
-import com.topjohnwu.magisk.di.ServiceLocator
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.GlobalScope
@@ -25,8 +26,9 @@ open class Receiver : BaseReceiver() {
         return if (uid == -1) null else uid
     }
 
-    override fun onReceive(context: ContextWrapper, intent: Intent?) {
+    override fun onReceive(context: Context, intent: Intent?) {
         intent ?: return
+        super.onReceive(context, intent)
 
         fun rmPolicy(uid: Int) = GlobalScope.launch {
             policyDB.delete(uid)
@@ -42,9 +44,16 @@ open class Receiver : BaseReceiver() {
                 getUid(intent)?.let { rmPolicy(it) }
             }
             Intent.ACTION_PACKAGE_FULLY_REMOVED -> {
-                getPkg(intent)?.let { Shell.su("magisk --denylist rm $it").submit() }
+                getPkg(intent)?.let { Shell.cmd("magisk --denylist rm $it").submit() }
             }
             Intent.ACTION_LOCALE_CHANGED -> Shortcuts.setupDynamic(context)
+            Intent.ACTION_MY_PACKAGE_REPLACED -> {
+                @Suppress("DEPRECATION")
+                val installer = context.packageManager.getInstallerPackageName(context.packageName)
+                if (installer == context.packageName) {
+                    Notifications.updateDone(context)
+                }
+            }
         }
     }
 }

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

@@ -1,19 +1,32 @@
 package com.topjohnwu.magisk.core.base
 
+import android.Manifest.permission.REQUEST_INSTALL_PACKAGES
 import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+import android.app.Activity
+import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
-import android.content.res.Configuration
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
+import android.os.Parcelable
+import android.widget.Toast
+import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.contract.ActivityResultContracts.GetContent
 import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
 import androidx.appcompat.app.AppCompatActivity
+import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.isRunningAsStub
-import com.topjohnwu.magisk.core.utils.currentLocale
+import com.topjohnwu.magisk.core.utils.RequestInstall
 import com.topjohnwu.magisk.core.wrap
 import com.topjohnwu.magisk.ktx.reflectField
+import com.topjohnwu.magisk.utils.Utils
+
+interface ContentResultCallback: ActivityResultCallback<Uri>, Parcelable {
+    fun onActivityLaunch() {}
+    // Make the result type explicitly non-null
+    override fun onActivityResult(result: Uri)
+}
 
 abstract class BaseActivity : AppCompatActivity() {
 
@@ -22,17 +35,27 @@ abstract class BaseActivity : AppCompatActivity() {
         permissionCallback?.invoke(it)
         permissionCallback = null
     }
+    private val requestInstall = registerForActivityResult(RequestInstall()) {
+        permissionCallback?.invoke(it)
+        permissionCallback = null
+    }
 
-    private var contentCallback: ((Uri) -> Unit)? = null
+    private var contentCallback: ContentResultCallback? = null
     private val getContent = registerForActivityResult(GetContent()) {
-        if (it != null) contentCallback?.invoke(it)
+        if (it != null) contentCallback?.onActivityResult(it)
         contentCallback = null
     }
 
-    override fun applyOverrideConfiguration(config: Configuration?) {
-        // Force applying our preferred local
-        config?.setLocale(currentLocale)
-        super.applyOverrideConfiguration(config)
+    private val mReferrerField by lazy(LazyThreadSafetyMode.NONE) {
+        Activity::class.java.reflectField("mReferrer")
+    }
+
+    val realCallingPackage: String? get() {
+        callingPackage?.let { return it }
+        if (Build.VERSION.SDK_INT >= 22) {
+            mReferrerField.get(this)?.let { return it as String }
+        }
+        return null
     }
 
     override fun attachBaseContext(base: Context) {
@@ -47,9 +70,17 @@ abstract class BaseActivity : AppCompatActivity() {
             clz.reflectField("mActivityHandlesUiModeChecked").set(delegate, true)
             clz.reflectField("mActivityHandlesUiMode").set(delegate, false)
         }
+        contentCallback = savedInstanceState?.getParcelable(CONTENT_CALLBACK_KEY)
         super.onCreate(savedInstanceState)
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        contentCallback?.let {
+            outState.putParcelable(CONTENT_CALLBACK_KEY, it)
+        }
+    }
+
     fun withPermission(permission: String, callback: (Boolean) -> Unit) {
         if (permission == WRITE_EXTERNAL_STORAGE && Build.VERSION.SDK_INT >= 30) {
             // We do not need external rw on 30+
@@ -57,12 +88,21 @@ abstract class BaseActivity : AppCompatActivity() {
             return
         }
         permissionCallback = callback
-        requestPermission.launch(permission)
+        if (permission == REQUEST_INSTALL_PACKAGES) {
+            requestInstall.launch(Unit)
+        } else {
+            requestPermission.launch(permission)
+        }
     }
 
-    fun getContent(type: String, callback: (Uri) -> Unit) {
+    fun getContent(type: String, callback: ContentResultCallback) {
         contentCallback = callback
-        getContent.launch(type)
+        try {
+            getContent.launch(type)
+            callback.onActivityLaunch()
+        } catch (e: ActivityNotFoundException) {
+            Utils.toast(R.string.app_not_found, Toast.LENGTH_SHORT)
+        }
     }
 
     override fun recreate() {
@@ -74,4 +114,8 @@ abstract class BaseActivity : AppCompatActivity() {
         startActivity(Intent(intent).setFlags(0))
         finish()
     }
+
+    companion object {
+        private const val CONTENT_CALLBACK_KEY = "content_callback"
+    }
 }

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

@@ -2,10 +2,10 @@ package com.topjohnwu.magisk.core.base
 
 import android.app.job.JobService
 import android.content.Context
-import com.topjohnwu.magisk.core.wrap
+import com.topjohnwu.magisk.core.patch
 
 abstract class BaseJobService : JobService() {
     override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base.wrap())
+        super.attachBaseContext(base.patch())
     }
 }

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

@@ -0,0 +1,21 @@
+package com.topjohnwu.magisk.core.base
+
+import android.content.ContentProvider
+import android.content.ContentValues
+import android.content.Context
+import android.content.pm.ProviderInfo
+import android.database.Cursor
+import android.net.Uri
+import com.topjohnwu.magisk.core.patch
+
+open class BaseProvider : ContentProvider() {
+    override fun attachInfo(context: Context, info: ProviderInfo) {
+        super.attachInfo(context.patch(), info)
+    }
+    override fun onCreate() = true
+    override fun getType(uri: Uri): String? = null
+    override fun insert(uri: Uri, values: ContentValues?): Uri? = null
+    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?) = 0
+    override fun update(uri: Uri, values: ContentValues?, selection: String?, selectionArgs: Array<out String>?) = 0
+    override fun query(uri: Uri, projection: Array<out String>?, selection: String?, selectionArgs: Array<out String>?, sortOrder: String?): Cursor? = null
+}

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

@@ -2,15 +2,13 @@ package com.topjohnwu.magisk.core.base
 
 import android.content.BroadcastReceiver
 import android.content.Context
-import android.content.ContextWrapper
 import android.content.Intent
-import com.topjohnwu.magisk.core.wrap
+import androidx.annotation.CallSuper
+import com.topjohnwu.magisk.core.patch
 
 abstract class BaseReceiver : BroadcastReceiver() {
-
-    final override fun onReceive(context: Context, intent: Intent?) {
-        onReceive(context.wrap() as ContextWrapper, intent)
+    @CallSuper
+    override fun onReceive(context: Context, intent: Intent?) {
+        context.patch()
     }
-
-    abstract fun onReceive(context: ContextWrapper, intent: Intent?)
 }

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

@@ -2,10 +2,13 @@ package com.topjohnwu.magisk.core.base
 
 import android.app.Service
 import android.content.Context
-import com.topjohnwu.magisk.core.wrap
+import android.content.Intent
+import android.os.IBinder
+import com.topjohnwu.magisk.core.patch
 
-abstract class BaseService : Service() {
+open class BaseService : Service() {
     override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base.wrap())
+        super.attachBaseContext(base.patch())
     }
+    override fun onBind(intent: Intent?): IBinder? = null
 }