Release Magisk v24.3

Fix #5542

README.MD

@@ -12,19 +12,19 @@ Some highlight features:
 - **MagiskSU**: Provide root access for applications
 - **Magisk Modules**: Modify read-only partitions by installing modules
 - **MagiskBoot**: The most complete tool for unpacking and repacking Android boot images
+- **Zygisk**: Run code in every Android applications' processes
 
 ## Downloads
 
 [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-v23.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v23.0)
+[![](https://img.shields.io/badge/Magisk-v24.1-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v24.1)
+[![](https://img.shields.io/badge/Magisk%20Beta-v24.2-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v24.2)
 [![](https://img.shields.io/badge/Magisk-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk-files/canary/app-debug.apk)
 
 ## Useful Links
 
 - [Installation Instruction](https://topjohnwu.github.io/Magisk/install.html)
-- [Frequently Asked Questions](https://topjohnwu.github.io/Magisk/faq.html)
 - [Magisk Documentation](https://topjohnwu.github.io/Magisk/)
 - [Magisk Troubleshoot Wiki](https://www.didgeridoohan.com/magisk/HomePage) (by [@Didgeridoohan](https://github.com/Didgeridoohan))
 
@@ -41,15 +41,15 @@ For Magisk app crashes, record and upload the logcat when the crash occurs.
 - Magisk builds on any OS Android Studio supports. Install Android Studio and do the initial setups.
 - Clone sources: `git clone --recurse-submodules https://github.com/topjohnwu/Magisk.git`
 - Install Python 3.6+ \
-(Windows only: select **'Add Python to PATH'** in installer, and run `pip install colorama` after install)
+  (Windows only: select **'Add Python to PATH'** in installer, and run `pip install colorama` after install)
 - Configure to use the JDK bundled in Android Studio:
-	- macOS: `export JAVA_HOME="/Applications/Android Studio.app/Contents/jre/Contents/Home"`
-	- Linux: `export PATH="/path/to/androidstudio/jre/bin:$PATH"`
-	- Windows: Add `C:\Path\To\Android Studio\jre\bin` to environment variable `PATH`
+  - macOS: `export JAVA_HOME="/Applications/Android Studio.app/Contents/jre/Contents/Home"`
+  - Linux: `export PATH="/path/to/androidstudio/jre/bin:$PATH"`
+  - Windows: Add `C:\Path\To\Android Studio\jre\bin` to environment variable `PATH`
 - Set environment variable `ANDROID_SDK_ROOT` to the Android SDK folder (can be found in Android Studio settings)
 - Run `./build.py ndk` to let the script download and install NDK for you
 - To start building, run `build.py` to see your options. \
-For each action, use `-h` to access help (e.g. `./build.py all -h`)
+  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).

app/build.gradle.kts

@@ -57,6 +57,7 @@ android {
 
     kotlinOptions {
         jvmTarget = "11"
+        freeCompilerArgs = listOf("-Xjvm-default=enable")
     }
 }
 
@@ -85,7 +86,7 @@ dependencies {
     implementation("${bindingAdapter}:${vBAdapt}")
     implementation("${bindingAdapter}-recyclerview:${vBAdapt}")
 
-    val vLibsu = "3.2.1"
+    val vLibsu = "4.0.2"
     implementation("com.github.topjohnwu.libsu:core:${vLibsu}")
     implementation("com.github.topjohnwu.libsu:io:${vLibsu}")
     implementation("com.github.topjohnwu.libsu:service:${vLibsu}")
@@ -109,19 +110,19 @@ dependencies {
     implementation("androidx.room:room-ktx:${vRoom}")
     kapt("androidx.room:room-compiler:${vRoom}")
 
-    val vNav = "2.4.0-rc01"
+    val vNav = "2.5.0-alpha01"
     implementation("androidx.navigation:navigation-fragment-ktx:${vNav}")
     implementation("androidx.navigation:navigation-ui-ktx:${vNav}")
 
     implementation("androidx.biometric:biometric:1.1.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.2")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
     implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("androidx.preference:preference:1.1.1")
+    implementation("androidx.preference:preference:1.2.0")
     implementation("androidx.recyclerview:recyclerview:1.2.1")
-    implementation("androidx.fragment:fragment-ktx:1.4.0")
+    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.4.0")
+    implementation("com.google.android.material:material:1.5.0")
 }

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

@@ -2,7 +2,10 @@ package com.topjohnwu.magisk;
 
 import static android.os.Build.VERSION.SDK_INT;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.res.AssetManager;
 
 import java.io.File;
@@ -12,28 +15,39 @@ import java.util.Map;
 import io.michaelrocks.paranoid.Obfuscate;
 
 @Obfuscate
-public class DynAPK {
+public class StubApk {
     private static File dynDir;
     private static Method addAssetPath;
 
-    private static File getDynDir(Context c) {
+    private static File getDynDir(ApplicationInfo info) {
         if (dynDir == null) {
+            final String dataDir;
             if (SDK_INT >= 24) {
-                // Use protected context to allow directBootAware
-                c = c.createDeviceProtectedStorageContext();
+                // Use device protected path to allow directBootAware
+                dataDir = info.deviceProtectedDataDir;
+            } else {
+                dataDir = info.dataDir;
             }
-            dynDir = new File(c.getFilesDir().getParent(), "dyn");
-            dynDir.mkdir();
+            dynDir = new File(dataDir, "dyn");
+            dynDir.mkdirs();
         }
         return dynDir;
     }
 
     public static File current(Context c) {
-        return new File(getDynDir(c), "current.apk");
+        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), "update.apk");
+        return new File(getDynDir(c.getApplicationInfo()), "update.apk");
+    }
+
+    public static File update(ApplicationInfo info) {
+        return new File(getDynDir(info), "update.apk");
     }
 
     public static void addAssetPath(AssetManager asset, String path) {
@@ -44,6 +58,14 @@ public class DynAPK {
         } 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;

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/src/main/AndroidManifest.xml

@@ -31,6 +31,7 @@
             android:directBootAware="true"
             android:excludeFromRecents="true"
             android:exported="false"
+            android:taskAffinity=""
             tools:ignore="AppLinkUrlError">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -45,6 +46,7 @@
             <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/java/com/topjohnwu/magisk/arch/BaseFragment.kt

@@ -15,11 +15,11 @@ import com.topjohnwu.magisk.ktx.startAnimations
 
 abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHolder {
 
-    val activity get() = requireActivity() as NavigationActivity<*>
+    val activity get() = getActivity() as? NavigationActivity<*>
     protected lateinit var binding: Binding
     protected abstract val layoutRes: Int
 
-    private val navigation get() = activity.navigation
+    private val navigation get() = activity?.navigation
     open val snackbarAnchorView: View? get() = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -41,12 +41,12 @@ abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHo
 
     override fun onStart() {
         super.onStart()
-        activity.supportActionBar?.subtitle = null
+        activity?.supportActionBar?.subtitle = null
     }
 
     override fun onEventDispatched(event: ViewEvent) = when(event) {
         is ContextExecutor -> event(requireContext())
-        is ActivityExecutor -> event(activity)
+        is ActivityExecutor -> activity?.let { event(it) } ?: Unit
         is FragmentExecutor -> event(this)
         else -> Unit
     }

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

@@ -1,23 +1,27 @@
 package com.topjohnwu.magisk.arch
 
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
+import android.Manifest.permission.REQUEST_INSTALL_PACKAGES
+import android.annotation.SuppressLint
 import android.os.Bundle
-import androidx.activity.result.contract.ActivityResultContract
+import android.widget.Toast
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.databinding.ViewDataBinding
+import androidx.lifecycle.lifecycleScope
 import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.*
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.JobService
+import com.topjohnwu.magisk.core.isRunningAsStub
 import com.topjohnwu.magisk.core.tasks.HideAPK
 import com.topjohnwu.magisk.di.ServiceLocator
 import com.topjohnwu.magisk.ui.theme.Theme
+import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
-import java.util.concurrent.CountDownLatch
+import kotlinx.coroutines.launch
 
 abstract class BaseMainActivity<Binding : ViewDataBinding> : NavigationActivity<Binding>() {
 
@@ -25,9 +29,6 @@ abstract class BaseMainActivity<Binding : ViewDataBinding> : NavigationActivity<
         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)
 
@@ -67,18 +68,28 @@ abstract class BaseMainActivity<Binding : ViewDataBinding> : NavigationActivity<
 
     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) }
+    @SuppressLint("InlinedApi")
+    private fun showInvalidStateMessage(): Unit = runOnUiThread {
+        MagiskDialog(this).apply {
+            setTitle(R.string.unsupport_nonroot_stub_title)
+            setMessage(R.string.unsupport_nonroot_stub_msg)
+            setButton(MagiskDialog.ButtonType.POSITIVE) {
+                text = R.string.install
+                onClick {
+                    withPermission(REQUEST_INSTALL_PACKAGES) {
+                        if (!it) {
+                            Utils.toast(R.string.install_unknown_denied, Toast.LENGTH_SHORT)
+                            showInvalidStateMessage()
+                        } else {
+                            lifecycleScope.launch {
+                                HideAPK.restore(this@BaseMainActivity)
+                            }
+                        }
+                    }
                 }
-                setCancelable(false)
-                show()
             }
+            setCancelable(false)
+            show()
         }
     }
 
@@ -100,30 +111,17 @@ abstract class BaseMainActivity<Binding : ViewDataBinding> : NavigationActivity<
             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()
+                Shell.cmd("(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()
+            if (!Shell.cmd("(pm uninstall $pkg)& >/dev/null 2>&1").exec().isSuccess) {
+                // Uninstall through Android API
+                uninstallAndWait(pkg)
             }
         }
     }
 
-    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,6 +1,8 @@
 package com.topjohnwu.magisk.arch
 
-import android.Manifest
+import android.Manifest.permission.REQUEST_INSTALL_PACKAGES
+import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+import android.annotation.SuppressLint
 import androidx.annotation.CallSuper
 import androidx.databinding.Bindable
 import androidx.databinding.Observable
@@ -78,7 +80,7 @@ abstract class BaseViewModel(
     }
 
     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 +89,17 @@ abstract class BaseViewModel(
         }
     }
 
+    @SuppressLint("InlinedApi")
+    inline fun withInstallPermission(crossinline callback: () -> Unit) {
+        withPermission(REQUEST_INSTALL_PACKAGES) {
+            if (!it) {
+                SnackbarEvent(R.string.install_unknown_denied).publish()
+            } else {
+                callback()
+            }
+        }
+    }
+
     fun back() = BackPressEvent().publish()
 
     fun <Event : ViewEvent> Event.publish() {

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

@@ -10,6 +10,7 @@ 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
@@ -74,6 +75,13 @@ 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()

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

@@ -6,9 +6,10 @@ 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.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
@@ -19,7 +20,7 @@ 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
         // Send back the actual root service class
@@ -58,18 +59,18 @@ open class App() : Application() {
 
         refreshLocale()
         AppApkPath = if (isRunningAsStub) {
-            DynAPK.current(base).path
+            StubApk.current(base).path
         } else {
             base.packageResourcePath
         }
 
         base.resources.patch()
-        app.registerActivityLifecycleCallbacks(ForegroundTracker)
+        app.registerActivityLifecycleCallbacks(ActivityTracker)
     }
 
     override fun onCreate() {
         super.onCreate()
-        RootRegistry.bindTask = RootService.createBindTask(
+        RootRegistry.bindTask = RootService.bindOrTask(
             intent<RootRegistry>(),
             UiThreadHandler.executor,
             RootRegistry.Connection
@@ -86,18 +87,18 @@ open class App() : Application() {
 }
 
 @SuppressLint("StaticFieldLeak")
-object ForegroundTracker : Application.ActivityLifecycleCallbacks {
+object ActivityTracker : Application.ActivityLifecycleCallbacks {
 
     @Volatile
     var foreground: Activity? = null
 
-    val hasForeground get() = foreground != null
-
     override fun onActivityResumed(activity: Activity) {
+        if (activity is SuRequestActivity) return
         foreground = activity
     }
 
     override fun onActivityPaused(activity: Activity) {
+        if (activity is SuRequestActivity) return
         foreground = null
     }
 

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

@@ -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

@@ -11,14 +11,14 @@ 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.utils.syncLocale
 import com.topjohnwu.magisk.di.AppContext
 
 lateinit var AppApkPath: String
 
-fun AssetManager.addAssetPath(path: String) = DynAPK.addAssetPath(this, path)
+fun AssetManager.addAssetPath(path: String) = StubApk.addAssetPath(this, path)
 
 fun Context.wrap(): Context = if (this is PatchedContext) this else PatchedContext(this)
 

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

@@ -2,7 +2,7 @@ package com.topjohnwu.magisk.core
 
 import android.os.Build
 import androidx.databinding.ObservableBoolean
-import com.topjohnwu.magisk.DynAPK
+import com.topjohnwu.magisk.StubApk
 import com.topjohnwu.magisk.core.model.UpdateInfo
 import com.topjohnwu.magisk.core.utils.net.NetworkObserver
 import com.topjohnwu.magisk.data.repository.NetworkService
@@ -16,7 +16,7 @@ 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

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

@@ -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/Receiver.kt

@@ -5,6 +5,7 @@ import android.content.ContextWrapper
 import android.content.Intent
 import com.topjohnwu.magisk.core.base.BaseReceiver
 import com.topjohnwu.magisk.di.ServiceLocator
+import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.GlobalScope
@@ -42,9 +43,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,5 +1,6 @@
 package com.topjohnwu.magisk.core.base
 
+import android.Manifest.permission.REQUEST_INSTALL_PACKAGES
 import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
 import android.content.Context
 import android.content.Intent
@@ -9,11 +10,16 @@ import android.os.Build
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts.GetContent
 import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
+import androidx.annotation.WorkerThread
 import androidx.appcompat.app.AppCompatActivity
 import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.utils.RequestInstall
+import com.topjohnwu.magisk.core.utils.UninstallPackage
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.core.wrap
 import com.topjohnwu.magisk.ktx.reflectField
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
 
 abstract class BaseActivity : AppCompatActivity() {
 
@@ -22,6 +28,10 @@ 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 val getContent = registerForActivityResult(GetContent()) {
@@ -29,6 +39,11 @@ abstract class BaseActivity : AppCompatActivity() {
         contentCallback = null
     }
 
+    private var uninstallLatch = CountDownLatch(1)
+    private val uninstallPkg = registerForActivityResult(UninstallPackage()) {
+        uninstallLatch.countDown()
+    }
+
     override fun applyOverrideConfiguration(config: Configuration?) {
         // Force applying our preferred local
         config?.setLocale(currentLocale)
@@ -57,7 +72,11 @@ 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) {
@@ -65,6 +84,13 @@ abstract class BaseActivity : AppCompatActivity() {
         getContent.launch(type)
     }
 
+    @WorkerThread
+    fun uninstallAndWait(pkg: String) {
+        uninstallLatch = CountDownLatch(1)
+        uninstallPkg.launch(pkg)
+        uninstallLatch.await(3, TimeUnit.SECONDS)
+    }
+
     override fun recreate() {
         startActivity(Intent().setComponent(intent.component))
         finish()

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

@@ -1,77 +0,0 @@
-package com.topjohnwu.magisk.core.download
-
-import android.app.AlarmManager
-import android.app.PendingIntent
-import android.content.Intent
-import androidx.core.content.getSystemService
-import androidx.core.net.toFile
-import com.topjohnwu.magisk.DynAPK
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.ForegroundTracker
-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.copyAndClose
-import com.topjohnwu.magisk.ktx.writeTo
-import java.io.File
-import java.io.InputStream
-import java.io.OutputStream
-
-private class TeeOutputStream(
-    private val o1: OutputStream,
-    private val o2: OutputStream
-) : OutputStream() {
-    override fun write(b: Int) {
-        o1.write(b)
-        o2.write(b)
-    }
-    override fun write(b: ByteArray?, off: Int, len: Int) {
-        o1.write(b, off, len)
-        o2.write(b, off, len)
-    }
-    override fun close() {
-        o1.close()
-        o2.close()
-    }
-}
-
-suspend fun DownloadService.handleAPK(subject: Subject.Manager, stream: InputStream) {
-    fun write(output: OutputStream) {
-        val external = subject.externalFile.outputStream()
-        stream.copyAndClose(TeeOutputStream(external, output))
-    }
-
-    if (isRunningAsStub) {
-        val apk = subject.file.toFile()
-        val id = subject.notifyId
-        write(DynAPK.update(this).outputStream())
-        if (Info.stub!!.version < subject.stub.versionCode) {
-            // Also upgrade stub
-            update(id) {
-                it.setProgress(0, 0, true)
-                    .setContentTitle(getString(R.string.hide_app_title))
-                    .setContentText("")
-            }
-            service.fetchFile(subject.stub.link).byteStream().writeTo(apk)
-            val patched = File(apk.parent, "patched.apk")
-            HideAPK.patch(this, apk, patched, packageName, applicationInfo.nonLocalizedLabel)
-            apk.delete()
-            patched.renameTo(apk)
-        } else {
-            val intent = packageManager.getLaunchIntentForPackage(packageName)
-            intent!!.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            //noinspection InlinedApi
-            val flag = PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-            val pending = PendingIntent.getActivity(this, id, intent, flag)
-            if (ForegroundTracker.hasForeground) {
-                val alarm = getSystemService<AlarmManager>()
-                alarm!!.set(AlarmManager.RTC, System.currentTimeMillis() + 1000, pending)
-            }
-            stopSelf()
-            Runtime.getRuntime().exit(0)
-        }
-    } else {
-        write(subject.file.outputStream())
-    }
-}

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

@@ -1,38 +0,0 @@
-package com.topjohnwu.magisk.core.download
-
-import android.net.Uri
-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
-import java.util.zip.ZipOutputStream
-
-fun InputStream.toModule(file: Uri, installer: InputStream) {
-
-    val input = ZipInputStream(buffered())
-    val output = ZipOutputStream(file.outputStream().buffered())
-
-    withStreams(input, output) { zin, zout ->
-        zout.putNextEntry(ZipEntry("META-INF/"))
-        zout.putNextEntry(ZipEntry("META-INF/com/"))
-        zout.putNextEntry(ZipEntry("META-INF/com/google/"))
-        zout.putNextEntry(ZipEntry("META-INF/com/google/android/"))
-        zout.putNextEntry(ZipEntry("META-INF/com/google/android/update-binary"))
-        installer.copyTo(zout)
-
-        zout.putNextEntry(ZipEntry("META-INF/com/google/android/updater-script"))
-        zout.write("#MAGISK\n".toByteArray(charset("UTF-8")))
-
-        zin.forEach { entry ->
-            val path = entry.name
-            if (path.isNotEmpty() && !path.startsWith("META-INF")) {
-                zout.putNextEntry(ZipEntry(path))
-                if (!entry.isDirectory) {
-                    zin.copyTo(zout)
-                }
-            }
-        }
-    }
-}

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

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

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

@@ -6,7 +6,6 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Parcelable
-import androidx.core.net.toFile
 import androidx.core.net.toUri
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.model.MagiskJson
@@ -16,7 +15,6 @@ import com.topjohnwu.magisk.core.utils.MediaStoreUtils
 import com.topjohnwu.magisk.di.AppContext
 import com.topjohnwu.magisk.ktx.cachedFile
 import com.topjohnwu.magisk.ui.flash.FlashFragment
-import com.topjohnwu.magisk.utils.APKInstall
 import com.topjohnwu.magisk.view.Notifications
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
@@ -34,6 +32,8 @@ sealed class Subject : Parcelable {
     abstract val file: Uri
     abstract val title: String
     abstract val notifyId: Int
+    open val autoLaunch: Boolean get() = true
+    open val postDownload: (() -> Unit)? get() = null
 
     abstract fun pendingIntent(context: Context): PendingIntent?
 
@@ -45,20 +45,19 @@ sealed class Subject : Parcelable {
     ) : Subject() {
         override val url: String get() = module.zipUrl
         override val title: String get() = module.downloadFilename
+        override val autoLaunch: Boolean get() = action == Action.Flash
 
         @IgnoredOnParcel
         override val file by lazy {
             MediaStoreUtils.getFile(title).uri
         }
 
-        override fun pendingIntent(context: Context) = when (action) {
-            Action.Flash -> FlashFragment.installIntent(context, file)
-            else -> null
-        }
+        override fun pendingIntent(context: Context) =
+            FlashFragment.installIntent(context, file)
     }
 
     @Parcelize
-    class Manager(
+    class App(
         private val json: MagiskJson = Info.remote.magisk,
         val stub: StubJson = Info.remote.stub,
         override val notifyId: Int = Notifications.nextId()
@@ -71,14 +70,12 @@ sealed class Subject : Parcelable {
             cachedFile("manager.apk")
         }
 
-        val externalFile get() = MediaStoreUtils.getFile("$title.apk").uri
+        @IgnoredOnParcel
+        override var postDownload: (() -> Unit)? = null
 
-        override fun pendingIntent(context: Context): PendingIntent {
-            val receiver = APKInstall.register(context, null, null)
-            APKInstall.installapk(context, file.toFile())
-            val intent = receiver.waitIntent() ?: Intent()
-            return intent.toPending(context)
-        }
+        @IgnoredOnParcel
+        var intent: Intent? = null
+        override fun pendingIntent(context: Context) = intent?.toPending(context)
     }
 
     @SuppressLint("InlinedApi")

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

@@ -18,7 +18,7 @@ class Query(private val _query: String) {
 
     suspend inline fun <R : Any> query(crossinline mapper: (Map<String, String>) -> R?): List<R> =
         withContext(Dispatchers.Default) {
-            Shell.su(query).await().out.map { line ->
+            Shell.cmd(query).await().out.map { line ->
                 async {
                     line.split("\\|".toRegex())
                         .map { it.split("=", limit = 2) }
@@ -32,7 +32,7 @@ class Query(private val _query: String) {
 
     suspend inline fun query() = query { it }
 
-    suspend inline fun commit() = Shell.su(query).to(null).await()
+    suspend inline fun commit() = Shell.cmd(query).to(null).await()
 }
 
 class Delete : Query.Builder {

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

@@ -46,15 +46,15 @@ data class LocalModule(
             if (enable) {
                 disableFile.delete()
                 if (Const.Version.atLeast_21_2())
-                    Shell.su("copy_sepolicy_rules").submit()
+                    Shell.cmd("copy_sepolicy_rules").submit()
                 else
-                    Shell.su("mkdir -p $dir", "cp -af $ruleFile $dir").submit()
+                    Shell.cmd("mkdir -p $dir", "cp -af $ruleFile $dir").submit()
             } else {
                 !disableFile.createNewFile()
                 if (Const.Version.atLeast_21_2())
-                    Shell.su("copy_sepolicy_rules").submit()
+                    Shell.cmd("copy_sepolicy_rules").submit()
                 else
-                    Shell.su("rm -rf $dir").submit()
+                    Shell.cmd("rm -rf $dir").submit()
             }
         }
 
@@ -65,15 +65,15 @@ data class LocalModule(
                 if (updateFile.exists()) return
                 removeFile.createNewFile()
                 if (Const.Version.atLeast_21_2())
-                    Shell.su("copy_sepolicy_rules").submit()
+                    Shell.cmd("copy_sepolicy_rules").submit()
                 else
-                    Shell.su("rm -rf $PERSIST/$id").submit()
+                    Shell.cmd("rm -rf $PERSIST/$id").submit()
             } else {
                 removeFile.delete()
                 if (Const.Version.atLeast_21_2())
-                    Shell.su("copy_sepolicy_rules").submit()
+                    Shell.cmd("copy_sepolicy_rules").submit()
                 else
-                    Shell.su("cp -af $ruleFile $PERSIST/$id").submit()
+                    Shell.cmd("cp -af $ruleFile $PERSIST/$id").submit()
             }
         }
 
@@ -103,7 +103,7 @@ data class LocalModule(
 
     init {
         runCatching {
-            parseProps(Shell.su("dos2unix < $path/module.prop").exec().out)
+            parseProps(Shell.cmd("dos2unix < $path/module.prop").exec().out)
         }
 
         if (id.isEmpty()) {

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

@@ -36,7 +36,7 @@ class SuRequestHandler(
 
         // Never allow com.topjohnwu.magisk (could be malware)
         if (policy.packageName == BuildConfig.APPLICATION_ID) {
-            Shell.su("(pm uninstall ${BuildConfig.APPLICATION_ID})& >/dev/null 2>&1").exec()
+            Shell.cmd("(pm uninstall ${BuildConfig.APPLICATION_ID})& >/dev/null 2>&1").exec()
             return false
         }
 

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

@@ -63,7 +63,7 @@ open class FlashZip(
 
         console.add("- Installing ${mUri.displayName}")
 
-        return Shell.su("sh $installDir/update-binary dummy 1 \'$zipFile\'")
+        return Shell.cmd("sh $installDir/update-binary dummy 1 \'$zipFile\'")
             .to(console, logs).exec().isSuccess
     }
 
@@ -79,7 +79,7 @@ open class FlashZip(
             Timber.e(e)
             false
         } finally {
-            Shell.su("cd /", "rm -rf $installDir ${Const.TMPDIR}").submit()
+            Shell.cmd("cd /", "rm -rf $installDir ${Const.TMPDIR}").submit()
         }
     }
 }

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

@@ -5,8 +5,8 @@ import android.content.Context
 import android.content.Intent
 import android.widget.Toast
 import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID
-import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.StubApk
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
@@ -14,6 +14,7 @@ import com.topjohnwu.magisk.core.Provider
 import com.topjohnwu.magisk.core.utils.AXML
 import com.topjohnwu.magisk.core.utils.Keygen
 import com.topjohnwu.magisk.di.ServiceLocator
+import com.topjohnwu.magisk.ktx.await
 import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.magisk.signing.JarMap
 import com.topjohnwu.magisk.signing.SignApk
@@ -21,18 +22,19 @@ import com.topjohnwu.magisk.utils.APKInstall
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Runnable
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
+import java.io.OutputStream
 import java.security.SecureRandom
 
 object HideAPK {
 
     private const val ALPHA = "abcdefghijklmnopqrstuvwxyz"
     private const val ALPHADOTS = "$ALPHA....."
-    private const val APP_NAME = "Magisk"
     private const val ANDROID_MANIFEST = "AndroidManifest.xml"
 
     // Some arbitrary limit
@@ -65,27 +67,29 @@ object HideAPK {
 
     fun patch(
         context: Context,
-        apk: File, out: File,
+        apk: File, out: OutputStream,
         pkg: String, label: CharSequence
     ): Boolean {
+        val info = context.packageManager.getPackageArchiveInfo(apk.path, 0) ?: return false
+        val name = info.applicationInfo.nonLocalizedLabel.toString()
         try {
-            val jar = JarMap.open(apk, true)
-            val je = jar.getJarEntry(ANDROID_MANIFEST)
-            val xml = AXML(jar.getRawData(je))
+            JarMap.open(apk, true).use { jar ->
+                val je = jar.getJarEntry(ANDROID_MANIFEST)
+                val xml = AXML(jar.getRawData(je))
 
-            if (!xml.findAndPatch(APPLICATION_ID to pkg, APP_NAME to label.toString()))
-                return false
+                if (!xml.findAndPatch(APPLICATION_ID to pkg, name to label.toString()))
+                    return false
 
-            // Write apk changes
-            jar.getOutputStream(je).write(xml.bytes)
-            val keys = Keygen(context)
-            SignApk.sign(keys.cert, keys.key, jar, FileOutputStream(out))
+                // Write apk changes
+                jar.getOutputStream(je).use { it.write(xml.bytes) }
+                val keys = Keygen(context)
+                SignApk.sign(keys.cert, keys.key, jar, out)
+                return true
+            }
         } catch (e: Exception) {
             Timber.e(e)
             return false
         }
-
-        return true
     }
 
     private fun launchApp(activity: Activity, pkg: String) {
@@ -100,7 +104,7 @@ object HideAPK {
         activity.finish()
     }
 
-    private suspend fun patchAndHide(activity: Activity, label: String): Boolean {
+    private suspend fun patchAndHide(activity: Activity, label: String, onFailure: Runnable): Boolean {
         val stub = File(activity.cacheDir, "stub.apk")
         try {
             svc.fetchFile(Info.remote.stub.link).byteStream().writeTo(stub)
@@ -108,7 +112,8 @@ object HideAPK {
             Timber.e(e)
             stub.createNewFile()
             val cmd = "\$MAGISKBIN/magiskinit -x manager ${stub.path}"
-            if (!Shell.su(cmd).exec().isSuccess) return false
+            if (!Shell.cmd(cmd).exec().isSuccess)
+                return false
         }
 
         // Generate a new random package name and signature
@@ -116,18 +121,24 @@ object HideAPK {
         val pkg = genPackageName()
         Config.keyStoreRaw = ""
 
-        if (!patch(activity, stub, repack, pkg, label))
+        if (!patch(activity, stub, FileOutputStream(repack), pkg, label))
             return false
 
         // Install and auto launch app
-        val receiver = APKInstall.register(activity, pkg) {
+        val session = APKInstall.startSession(activity, pkg, onFailure) {
             launchApp(activity, pkg)
         }
+
         val cmd = "adb_pm_install $repack ${activity.applicationInfo.uid}"
-        if (!Shell.su(cmd).exec().isSuccess) {
-            APKInstall.installapk(activity, repack)
-            receiver.waitIntent()?.let { activity.startActivity(it) }
+        if (Shell.su(cmd).exec().isSuccess) return true
+
+        try {
+            session.install(activity, repack)
+        } catch (e: IOException) {
+            Timber.e(e)
+            return false
         }
+        session.waitIntent()?.let { activity.startActivity(it) } ?: return false
         return true
     }
 
@@ -139,33 +150,45 @@ object HideAPK {
             setCancelable(false)
             show()
         }
-        val result = withContext(Dispatchers.IO) {
-            patchAndHide(activity, label)
-        }
-        if (!result) {
+        val onFailure = Runnable {
             dialog.dismiss()
             Utils.toast(R.string.failure, Toast.LENGTH_LONG)
         }
+        val success = withContext(Dispatchers.IO) {
+            patchAndHide(activity, label, onFailure)
+        }
+        if (!success) onFailure.run()
     }
 
     @Suppress("DEPRECATION")
-    fun restore(activity: Activity) {
+    suspend fun restore(activity: Activity) {
         val dialog = android.app.ProgressDialog(activity).apply {
             setTitle(activity.getString(R.string.restore_img_msg))
             isIndeterminate = true
             setCancelable(false)
             show()
         }
-        val apk = DynAPK.current(activity)
-        val receiver = APKInstall.register(activity, APPLICATION_ID) {
+        val onFailure = Runnable {
+            dialog.dismiss()
+            Utils.toast(R.string.failure, Toast.LENGTH_LONG)
+        }
+        val apk = StubApk.current(activity)
+        val session = APKInstall.startSession(activity, APPLICATION_ID, onFailure) {
             launchApp(activity, APPLICATION_ID)
             dialog.dismiss()
         }
         val cmd = "adb_pm_install $apk ${activity.applicationInfo.uid}"
-        Shell.su(cmd).submit(Shell.EXECUTOR) { ret ->
-            if (ret.isSuccess) return@submit
-            APKInstall.installapk(activity, apk)
-            receiver.waitIntent()?.let { activity.startActivity(it) }
+        if (Shell.su(cmd).await().isSuccess) return
+        val success = withContext(Dispatchers.IO) {
+            try {
+                session.install(activity, apk)
+            } catch (e: IOException) {
+                Timber.e(e)
+                return@withContext false
+            }
+            session.waitIntent()?.let { activity.startActivity(it) } ?: return@withContext false
+            return@withContext true
         }
+        if (!success) onFailure.run()
     }
 }

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

@@ -6,8 +6,8 @@ import android.widget.Toast
 import androidx.annotation.WorkerThread
 import androidx.core.os.postDelayed
 import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.StubApk
 import com.topjohnwu.magisk.core.*
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
@@ -93,7 +93,7 @@ abstract class MagiskInstallImpl protected constructor(
         try {
             // Extract binaries
             if (isRunningAsStub) {
-                val zf = ZipFile(DynAPK.current(context))
+                val zf = ZipFile(StubApk.current(context))
 
                 // Also extract magisk32 on non 64-bit only 64-bit devices
                 val is32lib = Const.CPU_ABI_32?.let {
@@ -452,7 +452,7 @@ abstract class MagiskInstaller(
         if (success) {
             console.add("- All done!")
         } else {
-            Shell.sh("rm -rf $installDir").submit()
+            Shell.cmd("rm -rf $installDir").submit()
             console.add("! Installation failed")
         }
         return success
@@ -497,7 +497,7 @@ abstract class MagiskInstaller(
             val success = super.exec()
             if (success) {
                 UiThreadHandler.handler.postDelayed(3000) {
-                    Shell.su("pm uninstall ${context.packageName}").exec()
+                    Shell.cmd("pm uninstall ${context.packageName}").exec()
                 }
             }
             return success

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

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

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

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.os.Binder
 import android.os.IBinder
+import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ipc.RootService
 import timber.log.Timber
 import java.util.concurrent.CountDownLatch
@@ -12,11 +13,7 @@ import kotlin.system.exitProcess
 
 class RootRegistry(stub: Any?) : RootService() {
 
-    constructor() : this(null)
-
-    private val className: String? = stub?.javaClass?.name
-
-    init {
+    constructor() : this(null) {
         // Always log full stack trace with Timber
         Timber.plant(Timber.DebugTree())
         Thread.setDefaultUncaughtExceptionHandler { _, e ->
@@ -25,6 +22,8 @@ class RootRegistry(stub: Any?) : RootService() {
         }
     }
 
+    private val className: String? = stub?.javaClass?.name
+
     override fun onBind(intent: Intent): IBinder {
         // TODO: PLACEHOLDER
         return Binder()
@@ -50,6 +49,6 @@ class RootRegistry(stub: Any?) : RootService() {
     }
 
     companion object {
-        var bindTask: Runnable? = null
+        var bindTask: Shell.Task? = null
     }
 }

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

@@ -1,8 +1,8 @@
 package com.topjohnwu.magisk.core.utils
 
 import android.content.Context
-import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.StubApk
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
@@ -19,7 +19,7 @@ import java.util.jar.JarFile
 class ShellInit : Shell.Initializer() {
     override fun onInit(context: Context, shell: Shell): Boolean {
         if (shell.isRoot) {
-            RootRegistry.bindTask?.run()
+            RootRegistry.bindTask?.let { shell.execTask(it) }
             RootRegistry.bindTask = null
         }
         shell.newJob().apply {
@@ -29,7 +29,7 @@ class ShellInit : Shell.Initializer() {
             if (isRunningAsStub) {
                 if (!shell.isRoot)
                     return true
-                val jar = JarFile(DynAPK.current(context))
+                val jar = JarFile(StubApk.current(context))
                 val bb = jar.getJarEntry("lib/${Const.CPU_ABI}/libbusybox.so")
                 localBB = context.deviceProtectedContext.cachedFile("busybox")
                 localBB.delete()
@@ -42,7 +42,7 @@ class ShellInit : Shell.Initializer() {
             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
+                Info.noDataExec = !shell.newJob().add("$localBB sh -c \"$localBB true\"").exec().isSuccess
             }
 
             if (Info.noDataExec) {

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

@@ -0,0 +1,21 @@
+package com.topjohnwu.magisk.core.utils
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.activity.result.contract.ActivityResultContract
+
+class UninstallPackage : ActivityResultContract<String, Boolean>() {
+
+    @Suppress("DEPRECATION")
+    override fun createIntent(context: Context, input: String): Intent {
+        val uri = Uri.Builder().scheme("package").opaquePart(input).build()
+        val intent = Intent(Intent.ACTION_UNINSTALL_PACKAGE, uri)
+        intent.putExtra(Intent.EXTRA_RETURN_RESULT, true)
+        return intent
+    }
+
+    override fun parseResult(resultCode: Int, intent: Intent?) =
+        resultCode == Activity.RESULT_OK
+}

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

@@ -38,8 +38,7 @@ fun InputStream.unzip(folder: File, path: String, junkPath: Boolean) {
             }
             SuFileOutputStream.open(dest).use { out -> zin.copyTo(out) }
         }
-    } catch (e: IOException) {
-        e.printStackTrace()
-        throw e
+    } catch (e: IllegalArgumentException) {
+        throw IOException(e)
     }
 }