Release Magisk v24.1

Co-authored-by: 南宫雪珊 <vvb2060@gmail.com>
Co-authored-by: 残页 <31466456+canyie@users.noreply.github.com>

.github/ccache.sh

@@ -0,0 +1,19 @@
+OS=$(uname)
+CCACHE_VER=4.4
+
+case $OS in
+  Darwin )
+    brew install ccache
+    ln -s $(which ccache) ./ccache
+    ;;
+  Linux )
+    sudo apt-get install -y ccache
+    ln -s $(which ccache) ./ccache
+    ;;
+  * )
+    curl -OL https://github.com/ccache/ccache/releases/download/v${CCACHE_VER}/ccache-${CCACHE_VER}-windows-64.zip
+    unzip -j ccache-*-windows-64.zip '*/ccache.exe'
+    ;;
+esac
+mkdir ./.ccache
+./ccache -o compiler_check='%compiler% -dumpmachine; %compiler% -dumpversion'

.github/workflows/build.yml

@@ -10,6 +10,7 @@ on:
       - 'buildSrc/**'
       - 'build.py'
       - 'gradle.properties'
+      - '.github/workflows/build.yml'
   pull_request:
     branches: [ master ]
   workflow_dispatch:
@@ -21,7 +22,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, windows-latest, macOS-latest ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+    env:
+      NDK_CCACHE: ${{ github.workspace }}/ccache
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
 
     steps:
       - name: Check out
@@ -40,50 +44,43 @@ jobs:
         with:
           python-version: '3.x'
 
-      - name: Set up GitHub env (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          $ndk_ver = Select-String -Path "gradle.properties" -Pattern "^magisk.fullNdkVersion=" | % { $_ -replace ".*=" }
-          echo "ANDROID_SDK_ROOT=$env:ANDROID_SDK_ROOT" >> $env:GITHUB_ENV
-          echo "MAGISK_NDK_VERSION=$ndk_ver" >> $env:GITHUB_ENV
-          echo "GRADLE_OPTS=-Dorg.gradle.daemon=false" >> $env:GITHUB_ENV
+      - name: Set up ccache
+        run: bash .github/ccache.sh
 
-      - name: Set up GitHub env (Unix)
-        if: runner.os != 'Windows'
-        run: |
-          ndk_ver=$(sed -n 's/^magisk.fullNdkVersion=//p' gradle.properties)
-          echo ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT >> $GITHUB_ENV
-          echo MAGISK_NDK_VERSION=$ndk_ver >> $GITHUB_ENV
-
-      - name: Cache Gradle
+      - name: Cache Gradle dependencies
         uses: actions/cache@v2
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
+            !~/.gradle/caches/build-cache-*
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
           restore-keys: ${{ runner.os }}-gradle-
 
-      - name: Cache NDK
-        id: ndk-cache
+      - name: Cache build cache
         uses: actions/cache@v2
         with:
-          path: ${{ env.ANDROID_SDK_ROOT }}/ndk/magisk
-          key: ${{ runner.os }}-ndk-${{ env.MAGISK_NDK_VERSION }}
+          path: |
+            ${{ github.workspace }}/.ccache
+            ~/.gradle/caches/build-cache-*
+          key: ${{ runner.os }}-build-cache-${{ github.sha }}
+          restore-keys: ${{ runner.os }}-build-cache-
 
       - name: Set up NDK
-        if: steps.ndk-cache.outputs.cache-hit != 'true'
-        run: python build.py ndk
+        run: python build.py -v ndk
 
       - name: Build release
-        run: python build.py -vr all
-
-      - name: Refresh flag
-        run: touch gradle.properties
-        shell: bash
+        run: |
+          ./ccache -zp
+          python build.py -vr all
 
       - name: Build debug
-        run: python build.py -v all
+        run: |
+          python build.py -v all
+          ./ccache -s
+
+      - name: Stop gradle daemon
+        run: ./gradlew --stop
 
       # Only upload artifacts built on Linux
       - name: Upload build artifact

.github/workflows/issues.yml

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

.gitignore

@@ -4,6 +4,7 @@ out
 *.apk
 /config.prop
 /update.sh
+/dict.txt
 
 # Built binaries
 native/out

.gitmodules

@@ -34,6 +34,12 @@
 [submodule "zlib"]
 	path = native/jni/external/zlib
 	url = https://android.googlesource.com/platform/external/zlib
+[submodule "parallel-hashmap"]
+	path = native/jni/external/parallel-hashmap
+	url = https://github.com/greg7mdp/parallel-hashmap.git
 [submodule "termux-elf-cleaner"]
 	path = tools/termux-elf-cleaner
 	url = https://github.com/termux/termux-elf-cleaner.git
+[submodule "zopfli"]
+	path = native/jni/external/zopfli
+	url = https://github.com/google/zopfli.git

README.MD

@@ -2,28 +2,29 @@
 
 [![Downloads](https://img.shields.io/badge/dynamic/json?color=green&label=Downloads&query=totalString&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk-files%2Fcount%2Fcount.json&cacheSeconds=1800)](https://raw.githubusercontent.com/topjohnwu/magisk-files/count/count.json)
 
+#### This is not an officially supported Google product
+
 ## Introduction
 
 Magisk is a suite of open source software for customizing Android, supporting devices higher than Android 5.0.<br>
-Here are some feature highlights:
+Some highlight features:
 
 - **MagiskSU**: Provide root access for applications
 - **Magisk Modules**: Modify read-only partitions by installing modules
-- **MagiskHide**: Hide Magisk from root detections / system integrity checks
 - **MagiskBoot**: The most complete tool for unpacking and repacking Android boot images
+- **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-v22.1-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v22.1)
-[![](https://img.shields.io/badge/Magisk%20Beta-v22.1-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v22.1)
+[![](https://img.shields.io/badge/Magisk-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)
 
 ## 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))
 
@@ -40,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/jdk/Contents/Home"`
-	- Linux: `export PATH="/path/to/androidstudio/jre/bin:$PATH"`
-	- Windows: Add `C:\Path\To\Android Studio\jre\bin` to environment variable `PATH`
+  - 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/proguard-rules.pro

@@ -16,17 +16,17 @@
 #   public *;
 #}
 
+# Parcelable
+-keepclassmembers class * implements android.os.Parcelable {
+    public static final ** CREATOR;
+}
+
 # Kotlin
 -assumenosideeffects class kotlin.jvm.internal.Intrinsics {
 	public static void check*(...);
 	public static void throw*(...);
 }
 
-# Snet
--keepclassmembers class com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper { *; }
--keep,allowobfuscation interface com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper$Callback
--keepclassmembers class * implements com.topjohnwu.magisk.ui.safetynet.SafetyNetHelper$Callback { *; }
-
 # Stub
 -keep class com.topjohnwu.magisk.core.App { <init>(java.lang.Object); }
 -keepclassmembers class androidx.appcompat.app.AppCompatDelegateImpl {
@@ -44,6 +44,10 @@
 -repackageclasses 'a'
 -allowaccessmodification
 
+-obfuscationdictionary ../dict.txt
+-classobfuscationdictionary ../dict.txt
+-packageobfuscationdictionary ../dict.txt
+
 -dontwarn org.bouncycastle.jsse.BCSSLParameters
 -dontwarn org.bouncycastle.jsse.BCSSLSocket
 -dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider

app/shared/build.gradle.kts

@@ -2,13 +2,14 @@ plugins {
     id("com.android.library")
 }
 
+setupCommon()
+
 android {
     defaultConfig {
-        vectorDrawables.useSupportLibrary = true
         consumerProguardFiles("proguard-rules.pro")
     }
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+    api("io.michaelrocks:paranoid-core:0.3.7")
 }

app/shared/src/debug/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:usesCleartextTraffic="true"
+        tools:ignore="UnusedAttribute" />
+
+</manifest>

app/shared/src/main/AndroidManifest.xml

@@ -7,6 +7,8 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
+    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="29"
@@ -20,8 +22,6 @@
         android:label="Magisk"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
-        android:theme="@android:style/Theme.Translucent.NoTitleBar"
-        android:usesCleartextTraffic="true"
-        tools:ignore="UnusedAttribute" />
+        android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
 </manifest>

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

@@ -1,5 +1,7 @@
 package com.topjohnwu.magisk;
 
+import static android.os.Build.VERSION.SDK_INT;
+
 import android.content.Context;
 import android.content.res.AssetManager;
 
@@ -7,14 +9,10 @@ import java.io.File;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import static android.os.Build.VERSION.SDK_INT;
+import io.michaelrocks.paranoid.Obfuscate;
 
+@Obfuscate
 public class DynAPK {
-
-    // Indices of the object array
-    private static final int STUB_VERSION_ENTRY = 0;
-    private static final int CLASS_COMPONENT_MAP = 1;
-
     private static File dynDir;
     private static Method addAssetPath;
 
@@ -38,21 +36,6 @@ public class DynAPK {
         return new File(getDynDir(c), "update.apk");
     }
 
-    public static Data load(Object o) {
-        Object[] arr = (Object[]) o;
-        Data data = new Data();
-        data.version = (int) arr[STUB_VERSION_ENTRY];
-        data.classToComponent = (Map<String, String>) arr[CLASS_COMPONENT_MAP];
-        return data;
-    }
-
-    public static Object pack(Data data) {
-        Object[] arr = new Object[2];
-        arr[STUB_VERSION_ENTRY] = data.version;
-        arr[CLASS_COMPONENT_MAP] = data.classToComponent;
-        return arr;
-    }
-
     public static void addAssetPath(AssetManager asset, String path) {
         try {
             if (addAssetPath == null)
@@ -62,7 +45,28 @@ public class DynAPK {
     }
 
     public static class Data {
-        public int version;
-        public Map<String, String> classToComponent;
+        // 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/ProviderInstaller.java

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

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

@@ -1,48 +1,121 @@
 package com.topjohnwu.magisk.utils;
 
-import android.app.Activity;
+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;
+import static android.content.pm.PackageInstaller.STATUS_SUCCESS;
+
+import android.app.PendingIntent;
 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 com.topjohnwu.magisk.FileProvider;
+import android.util.Log;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
-public class APKInstall {
+import io.michaelrocks.paranoid.Obfuscate;
 
-    public static Intent installIntent(Context c, File apk) {
-        Intent intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
-        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        if (Build.VERSION.SDK_INT >= 24) {
-            intent.setData(FileProvider.getUriForFile(c, c.getPackageName() + ".provider", apk));
-        } else {
-            //noinspection ResultOfMethodCallIgnored SetWorldReadable
-            apk.setReadable(true, false);
-            intent.setData(Uri.fromFile(apk));
+@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);
         }
-        return intent;
     }
 
-    public static void install(Context c, File apk) {
-        c.startActivity(installIntent(c, apk));
+    public static void transfer(InputStream in, OutputStream out) throws IOException {
+        int size = 8192;
+        var buffer = new byte[size];
+        int read;
+        while ((read = in.read(buffer, 0, size)) >= 0) {
+            out.write(buffer, 0, read);
+        }
     }
 
-    public static void registerInstallReceiver(Context c, BroadcastReceiver r) {
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
-        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
+    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");
-        c.getApplicationContext().registerReceiver(r, filter);
+        context.registerReceiver(receiver, filter);
+        context.registerReceiver(receiver, new IntentFilter(APKInstall.class.getName()));
+        return receiver;
     }
 
-    public static void installHideResult(Activity c, File apk) {
-        Intent intent = installIntent(c, apk);
-        intent.putExtra(Intent.EXTRA_RETURN_RESULT, true);
-        c.startActivityForResult(intent, 0); // Ignore result, use install receiver
+    public static class InstallReceiver extends BroadcastReceiver {
+        private final Context context;
+        private final String packageName;
+        private final Runnable onSuccess;
+        private final CountDownLatch latch = new CountDownLatch(1);
+        private Intent intent = null;
+
+        private InstallReceiver(Context context, String packageName, Runnable onSuccess) {
+            this.context = context;
+            this.packageName = packageName;
+            this.onSuccess = onSuccess;
+        }
+
+        @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;
+                String pkg = data.getSchemeSpecificPart();
+                if (pkg.equals(packageName)) {
+                    onSuccess.run();
+                    context.unregisterReceiver(this);
+                }
+                return;
+            }
+            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
+        public Intent waitIntent() {
+            try {
+                //noinspection ResultOfMethodCallIgnored
+                latch.await(5, TimeUnit.SECONDS);
+            } catch (Exception ignored) {
+            }
+            return intent;
+        }
     }
 }

app/src/main/AndroidManifest.xml

@@ -12,9 +12,8 @@
         android:multiArch="true"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
 
-        <!-- Splash -->
         <activity
-            android:name=".core.SplashActivity"
+            android:name=".ui.MainActivity"
             android:exported="true"
             android:theme="@style/SplashTheme">
             <intent-filter>
@@ -27,10 +26,6 @@
             </intent-filter>
         </activity>
 
-        <!-- Main -->
-        <activity android:name=".ui.MainActivity" />
-
-        <!-- Superuser -->
         <activity
             android:name=".ui.surequest.SuRequestActivity"
             android:directBootAware="true"
@@ -43,7 +38,6 @@
             </intent-filter>
         </activity>
 
-        <!-- Receiver -->
         <receiver
             android:name=".core.Receiver"
             android:directBootAware="true"
@@ -54,15 +48,21 @@
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
+                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
 
                 <data android:scheme="package" />
             </intent-filter>
         </receiver>
 
-        <!-- DownloadService -->
-        <service android:name=".core.download.DownloadService" />
+        <service
+            android:name=".core.download.DownloadService"
+            android:exported="false" />
+
+        <service
+            android:name=".core.JobService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
-        <!-- FileProvider -->
         <provider
             android:name=".core.Provider"
             android:authorities="${applicationId}.provider"
@@ -70,23 +70,18 @@
             android:exported="false"
             android:grantUriPermissions="true" />
 
-        <!-- Hardcode GMS version -->
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="12451000" />
-
-        <!-- Initialize WorkManager on-demand -->
-        <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
-            tools:node="remove"
-            tools:ignore="ExportedContentProvider" />
-
         <!-- We don't invalidate Room -->
         <service
             android:name="androidx.room.MultiInstanceInvalidationService"
             tools:node="remove" />
 
+        <!-- We don't need emoji compat -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="remove" />
+
     </application>
 
 </manifest>

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

@@ -13,15 +13,14 @@ import androidx.navigation.NavDirections
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.ktx.startAnimations
 
-abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
-    Fragment(), BaseUIComponent<VM> {
+abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHolder {
 
-    val activity get() = requireActivity() as BaseUIActivity<*, *>
+    val activity get() = getActivity() as? NavigationActivity<*>
     protected lateinit var binding: Binding
     protected abstract val layoutRes: Int
 
-    override val viewRoot: View get() = binding.root
-    private val navigation get() = activity.navigation
+    private val navigation get() = activity?.navigation
+    open val snackbarAnchorView: View? get() = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -35,19 +34,19 @@ abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
     ): View? {
         binding = DataBindingUtil.inflate<Binding>(inflater, layoutRes, container, false).also {
             it.setVariable(BR.viewModel, viewModel)
-            it.lifecycleOwner = this
+            it.lifecycleOwner = viewLifecycleOwner
         }
         return binding.root
     }
 
     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
     }
@@ -63,7 +62,7 @@ abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
         super.onViewCreated(view, savedInstanceState)
         binding.addOnRebindCallback(object : OnRebindCallback<Binding>() {
             override fun onPreBind(binding: Binding): Boolean {
-                this@BaseUIFragment.onPreBind(binding)
+                this@BaseFragment.onPreBind(binding)
                 return true
             }
         })
@@ -83,9 +82,3 @@ abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
     }
 
 }
-
-interface ReselectionTarget {
-
-    fun onReselected()
-
-}

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

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

@@ -13,12 +13,12 @@ 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 com.topjohnwu.magisk.utils.ObservableHost
-import com.topjohnwu.magisk.utils.set
 import kotlinx.coroutines.Job
 
 abstract class BaseViewModel(
@@ -77,7 +77,7 @@ abstract class BaseViewModel(
         PermissionEvent(permission, callback).publish()
     }
 
-    fun withExternalRW(callback: () -> Unit) {
+    inline fun withExternalRW(crossinline callback: () -> Unit) {
         withPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) {
             if (!it) {
                 SnackbarEvent(R.string.external_rw_permission_denied).publish()
@@ -98,8 +98,8 @@ abstract class BaseViewModel(
         _viewEvents.postValue(this)
     }
 
-    fun NavDirections.navigate() {
-        _viewEvents.postValue(NavigationEvent(this))
+    fun NavDirections.navigate(pop: Boolean = false) {
+        _viewEvents.postValue(NavigationEvent(this, pop))
     }
 
 }

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

@@ -1,48 +0,0 @@
-package com.topjohnwu.magisk.arch
-
-import androidx.databinding.ViewDataBinding
-import com.topjohnwu.magisk.databinding.ComparableRvItem
-import com.topjohnwu.magisk.databinding.RvItem
-import com.topjohnwu.magisk.utils.DiffObservableList
-import com.topjohnwu.magisk.utils.FilterableDiffObservableList
-import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
-import me.tatarka.bindingcollectionadapter2.ItemBinding
-import me.tatarka.bindingcollectionadapter2.OnItemBind
-
-fun <T : ComparableRvItem<*>> diffListOf(
-    vararg newItems: T
-) = diffListOf(newItems.toList())
-
-fun <T : ComparableRvItem<*>> diffListOf(
-    newItems: List<T>
-) = DiffObservableList(object : DiffObservableList.Callback<T> {
-    override fun areItemsTheSame(oldItem: T, newItem: T) = oldItem.genericItemSameAs(newItem)
-    override fun areContentsTheSame(oldItem: T, newItem: T) = oldItem.genericContentSameAs(newItem)
-}).also { it.update(newItems) }
-
-fun <T : ComparableRvItem<*>> filterableListOf(
-    vararg newItems: T
-) = FilterableDiffObservableList(object : DiffObservableList.Callback<T> {
-    override fun areItemsTheSame(oldItem: T, newItem: T) = oldItem.genericItemSameAs(newItem)
-    override fun areContentsTheSame(oldItem: T, newItem: T) = oldItem.genericContentSameAs(newItem)
-}).also { it.update(newItems.toList()) }
-
-fun <T : RvItem> adapterOf() = object : BindingRecyclerViewAdapter<T>() {
-    override fun onBindBinding(
-        binding: ViewDataBinding,
-        variableId: Int,
-        layoutRes: Int,
-        position: Int,
-        item: T
-    ) {
-        super.onBindBinding(binding, variableId, layoutRes, position, item)
-        item.onBindingBound(binding)
-    }
-}
-
-inline fun <T : RvItem> itemBindingOf(
-    crossinline body: (ItemBinding<*>) -> Unit = {}
-) = OnItemBind<T> { itemBinding, _, item ->
-    item.bind(itemBinding)
-    body(itemBinding)
-}

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

@@ -0,0 +1,35 @@
+package com.topjohnwu.magisk.arch
+
+import android.view.KeyEvent
+import androidx.databinding.ViewDataBinding
+import androidx.navigation.NavController
+import androidx.navigation.NavDirections
+import androidx.navigation.fragment.NavHostFragment
+
+abstract class NavigationActivity<Binding : ViewDataBinding> : UIActivity<Binding>() {
+
+    abstract val navHostId: Int
+
+    private val navHostFragment by lazy {
+        supportFragmentManager.findFragmentById(navHostId) as NavHostFragment
+    }
+
+    protected val currentFragment get() =
+        navHostFragment.childFragmentManager.fragments.getOrNull(0) as? BaseFragment<*>
+
+    val navigation: NavController get() = navHostFragment.navController
+
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        return currentFragment?.onKeyEvent(event) == true || super.dispatchKeyEvent(event)
+    }
+
+    override fun onBackPressed() {
+        if (currentFragment?.onBackPressed()?.not() == true) {
+            super.onBackPressed()
+        }
+    }
+
+    fun NavDirections.navigate() {
+        navigation.navigate(this)
+    }
+}

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

@@ -1,17 +0,0 @@
-package com.topjohnwu.magisk.arch
-
-import android.os.Handler
-import androidx.core.os.postDelayed
-import com.topjohnwu.superuser.internal.UiThreadHandler
-
-interface Queryable {
-
-    val queryDelay: Long
-    val queryHandler: Handler get() = UiThreadHandler.handler
-
-    fun submitQuery() {
-        queryHandler.postDelayed(queryDelay) { query() }
-    }
-
-    fun query()
-}

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

@@ -4,39 +4,25 @@ import android.content.res.Resources
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
-import android.view.KeyEvent
 import android.view.View
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.res.use
+import androidx.core.view.WindowCompat
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
-import androidx.navigation.NavController
-import androidx.navigation.NavDirections
-import androidx.navigation.fragment.NavHostFragment
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.base.BaseActivity
-import com.topjohnwu.magisk.ui.inflater.LayoutInflaterFactory
-import com.topjohnwu.magisk.ui.theme.Theme
+import rikka.insets.WindowInsetsHelper
+import rikka.layoutinflater.view.LayoutInflaterFactory
 
-abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
-    BaseActivity(), BaseUIComponent<VM> {
+abstract class UIActivity<Binding : ViewDataBinding> : BaseActivity(), ViewModelHolder {
 
     protected lateinit var binding: Binding
     protected abstract val layoutRes: Int
-    protected open val themeRes: Int = Theme.selected.themeRes
 
-    private val navHostFragment by lazy {
-        supportFragmentManager.findFragmentById(navHostId) as? NavHostFragment
-    }
-    private val topFragment get() = navHostFragment?.childFragmentManager?.fragments?.getOrNull(0)
-    protected val currentFragment get() = topFragment as? BaseUIFragment<*, *>
-
-    override val viewRoot: View get() = binding.root
-    open val navigation: NavController? get() = navHostFragment?.navController
-
-    open val navHostId: Int = 0
     open val snackbarView get() = binding.root
+    open val snackbarAnchorView: View? get() = null
 
     init {
         val theme = Config.darkTheme
@@ -45,8 +31,8 @@ abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
 
     override fun onCreate(savedInstanceState: Bundle?) {
         layoutInflater.factory2 = LayoutInflaterFactory(delegate)
+            .addOnViewCreatedListener(WindowInsetsHelper.LISTENER)
 
-        setTheme(themeRes)
         super.onCreate(savedInstanceState)
 
         startObserveEvents()
@@ -57,17 +43,13 @@ abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
             .use { it.getDrawable(0) }
             .also { window.setBackgroundDrawable(it) }
 
-        window?.decorView?.let {
-            it.systemUiVisibility = (it.systemUiVisibility
-                    or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                    or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION)
-        }
+        WindowCompat.setDecorFitsSystemWindows(window, false)
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             window?.decorView?.post {
                 // If navigation bar is short enough (gesture navigation enabled), make it transparent
-                if (window.decorView.rootWindowInsets?.systemWindowInsetBottom ?: 0 < Resources.getSystem().displayMetrics.density * 40) {
+                if ((window.decorView.rootWindowInsets?.systemWindowInsetBottom
+                        ?: 0) < Resources.getSystem().displayMetrics.density * 40) {
                     window.navigationBarColor = Color.TRANSPARENT
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                         window.navigationBarDividerColor = Color.TRANSPARENT
@@ -89,7 +71,7 @@ abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
     }
 
     fun setAccessibilityDelegate(delegate: View.AccessibilityDelegate?) {
-        viewRoot.rootView.accessibilityDelegate = delegate
+        binding.root.rootView.accessibilityDelegate = delegate
     }
 
     override fun onResume() {
@@ -97,23 +79,9 @@ abstract class BaseUIActivity<VM : BaseViewModel, Binding : ViewDataBinding> :
         viewModel.requestRefresh()
     }
 
-    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-        return currentFragment?.onKeyEvent(event) == true || super.dispatchKeyEvent(event)
-    }
-
     override fun onEventDispatched(event: ViewEvent) = when (event) {
         is ContextExecutor -> event(this)
         is ActivityExecutor -> event(this)
         else -> Unit
     }
-
-    override fun onBackPressed() {
-        if (navigation == null || currentFragment?.onBackPressed()?.not() == true) {
-            super.onBackPressed()
-        }
-    }
-
-    fun NavDirections.navigate() {
-        navigation?.navigate(this)
-    }
 }

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

@@ -18,9 +18,9 @@ interface ContextExecutor {
 }
 
 interface ActivityExecutor {
-    operator fun invoke(activity: BaseUIActivity<*, *>)
+    operator fun invoke(activity: UIActivity<*>)
 }
 
 interface FragmentExecutor {
-    operator fun invoke(fragment: BaseUIFragment<*, *>)
+    operator fun invoke(fragment: BaseFragment<*>)
 }

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

@@ -1,12 +1,10 @@
 package com.topjohnwu.magisk.arch
 
-import android.view.View
 import androidx.lifecycle.LifecycleOwner
 
-interface BaseUIComponent<VM : BaseViewModel> : LifecycleOwner {
+interface ViewModelHolder : LifecycleOwner {
 
-    val viewRoot: View
-    val viewModel: VM
+    val viewModel: BaseViewModel
 
     fun startObserveEvents() {
         viewModel.viewEvents.observe(this) {

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

@@ -6,34 +6,28 @@ import android.app.Application
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.work.WorkManager
 import com.topjohnwu.magisk.DynAPK
-import com.topjohnwu.magisk.core.utils.AppShellInit
-import com.topjohnwu.magisk.core.utils.BusyBoxInit
-import com.topjohnwu.magisk.core.utils.IODispatcherExecutor
-import com.topjohnwu.magisk.core.utils.updateConfig
+import com.topjohnwu.magisk.core.utils.*
 import com.topjohnwu.magisk.di.ServiceLocator
-import com.topjohnwu.magisk.ktx.unwrap
 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.io.File
 import kotlin.system.exitProcess
 
 open class App() : Application() {
 
     constructor(o: Any) : this() {
-        Info.stub = DynAPK.load(o)
+        val data = DynAPK.Data(o)
+        // Add the root service name mapping
+        data.classToComponent[RootRegistry::class.java.name] = data.rootService.name
+        // Send back the actual root service class
+        data.rootService = RootRegistry::class.java
+        Info.stub = data
     }
 
     init {
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
-        Shell.setDefaultBuilder(Shell.Builder.create()
-            .setFlags(Shell.FLAG_MOUNT_MASTER)
-            .setInitializers(BusyBoxInit::class.java, AppShellInit::class.java)
-            .setTimeout(2))
-        Shell.EXECUTOR = IODispatcherExecutor()
-
         // Always log full stack trace with Timber
         Timber.plant(Timber.DebugTree())
         Thread.setDefaultUncaughtExceptionHandler { _, e ->
@@ -42,46 +36,57 @@ open class App() : Application() {
         }
     }
 
-    override fun attachBaseContext(base: Context) {
-        // Some context magic
+    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 impl: Context
-        if (base is Application) {
-            app = base
-            impl = base.baseContext
+        val base: Context
+        if (context is Application) {
+            app = context
+            base = context.baseContext
         } else {
             app = this
-            impl = base
+            base = context
         }
-        val wrapped = impl.wrap()
-        super.attachBaseContext(wrapped)
+        super.attachBaseContext(base)
+        ServiceLocator.context = base
 
-        val info = base.applicationInfo
-        val libDir = runCatching {
-            info.javaClass.getDeclaredField("secondaryNativeLibraryDir").get(info) as String?
-        }.getOrNull() ?: info.nativeLibraryDir
-        Const.NATIVE_LIB_DIR = File(libDir)
+        refreshLocale()
+        AppApkPath = if (isRunningAsStub) {
+            DynAPK.current(base).path
+        } else {
+            base.packageResourcePath
+        }
 
-        ServiceLocator.context = wrapped
-        AssetHack.init(impl)
-        app.registerActivityLifecycleCallbacks(ForegroundTracker)
-        WorkManager.initialize(impl.wrapJob(), androidx.work.Configuration.Builder().build())
+        base.resources.patch()
+        app.registerActivityLifecycleCallbacks(ActivityTracker)
     }
 
-    // This is required as some platforms expect ContextImpl
-    override fun getBaseContext(): Context {
-        return super.getBaseContext().unwrap()
+    override fun onCreate() {
+        super.onCreate()
+        RootRegistry.bindTask = RootService.createBindTask(
+            intent<RootRegistry>(),
+            UiThreadHandler.executor,
+            RootRegistry.Connection
+        )
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
-        resources.updateConfig(newConfig)
+        if (resources.configuration.diff(newConfig) != 0) {
+            resources.setConfig(newConfig)
+        }
         if (!isRunningAsStub)
             super.onConfigurationChanged(newConfig)
     }
 }
 
 @SuppressLint("StaticFieldLeak")
-object ForegroundTracker : Application.ActivityLifecycleCallbacks {
+object ActivityTracker : Application.ActivityLifecycleCallbacks {
 
     @Volatile
     var foreground: Activity? = null

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

@@ -6,9 +6,9 @@ import android.util.Xml
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.edit
 import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.core.utils.BiometricHelper
 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
@@ -37,6 +37,8 @@ object Config : PreferenceModel, DBConfig {
         const val SU_MULTIUSER_MODE = "multiuser_mode"
         const val SU_MNT_NS = "mnt_ns"
         const val SU_BIOMETRIC = "su_biometric"
+        const val ZYGISK = "zygisk"
+        const val DENYLIST = "denylist"
         const val SU_MANAGER = "requester"
         const val KEYSTORE = "keystore"
 
@@ -59,9 +61,6 @@ object Config : PreferenceModel, DBConfig {
         const val BOOT_ID = "boot_id"
         const val ASKED_HOME = "asked_home"
         const val DOH = "doh"
-
-        // system state
-        const val MAGISKHIDE = "magiskhide"
     }
 
     object Value {
@@ -111,9 +110,10 @@ object Config : PreferenceModel, DBConfig {
         else
             Value.DEFAULT_CHANNEL
 
-    @JvmStatic var keepVerity = false
-    @JvmStatic var keepEnc = false
-    @JvmStatic var recovery = false
+    @JvmField var keepVerity = false
+    @JvmField var keepEnc = false
+    @JvmField var patchVbmeta = false
+    @JvmField var recovery = false
 
     var bootId by preference(Key.BOOT_ID, "")
     var askedHome by preference(Key.ASKED_HOME, false)
@@ -133,7 +133,6 @@ object Config : PreferenceModel, DBConfig {
     var suTapjack by preference(Key.SU_TAPJACK, true)
     var checkUpdate by preference(Key.CHECK_UPDATES, true)
     var doh by preference(Key.DOH, false)
-    var magiskHide by preference(Key.MAGISKHIDE, true)
     var showSystemApp by preference(Key.SHOW_SYSTEM_APP, false)
 
     var customChannelUrl by preference(Key.CUSTOM_CHANNEL, "")
@@ -149,6 +148,8 @@ object Config : PreferenceModel, DBConfig {
     var suMntNamespaceMode by dbSettings(Key.SU_MNT_NS, Value.NAMESPACE_MODE_REQUESTER)
     var suMultiuserMode by dbSettings(Key.SU_MULTIUSER_MODE, Value.MULTIUSER_MODE_OWNER_ONLY)
     var suBiometric by dbSettings(Key.SU_BIOMETRIC, false)
+    var zygisk by dbSettings(Key.ZYGISK, false)
+    var denyList by DBBoolSettingsNoWrite(Key.DENYLIST, false)
     var suManager by dbStrings(Key.SU_MANAGER, "", true)
     var keyStoreRaw by dbStrings(Key.KEYSTORE, "", true)
 
@@ -173,12 +174,6 @@ object Config : PreferenceModel, DBConfig {
                 else if (it.toInt() > Value.CANARY_CHANNEL)
                     putString(Key.UPDATE_CHANNEL, Value.CANARY_CHANNEL.toString())
             }
-
-            // Write database configs
-            putString(Key.ROOT_ACCESS, rootMode.toString())
-            putString(Key.SU_MNT_NS, suMntNamespaceMode.toString())
-            putString(Key.SU_MULTIUSER_MODE, suMultiuserMode.toString())
-            putBoolean(Key.SU_BIOMETRIC, BiometricHelper.isEnabled)
         }
     }
 

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

@@ -3,58 +3,55 @@ package com.topjohnwu.magisk.core
 import android.os.Build
 import android.os.Process
 import com.topjohnwu.magisk.BuildConfig
-import java.io.File
 
 @Suppress("DEPRECATION")
 object Const {
 
-    val CPU_ABI: String = Build.SUPPORTED_ABIS[0]
-    val CPU_ABI_32: String = Build.SUPPORTED_32_BIT_ABIS.firstOrNull() ?: CPU_ABI
+    val CPU_ABI: String get() = Build.SUPPORTED_ABIS[0]
+
+    // Null if 32-bit only or 64-bit only
+    val CPU_ABI_32 =
+        if (Build.SUPPORTED_64_BIT_ABIS.isEmpty()) null
+        else Build.SUPPORTED_32_BIT_ABIS.firstOrNull()
 
     // Paths
     lateinit var MAGISKTMP: String
-    lateinit var NATIVE_LIB_DIR: File
     val MAGISK_PATH get() = "$MAGISKTMP/modules"
     const val TMPDIR = "/dev/tmp"
     const val MAGISK_LOG = "/cache/magisk.log"
 
-    // Versions
-    const val SNET_EXT_VER = 17
-    const val SNET_REVISION = "23.0"
-    const val BOOTCTL_REVISION = "22.0"
-
     // Misc
     val USER_ID = Process.myUid() / 100000
+    val APP_IS_CANARY get() = Version.isCanary(BuildConfig.VERSION_CODE)
 
     object Version {
-        const val MIN_VERSION = "v20.4"
-        const val MIN_VERCODE = 20400
+        const val MIN_VERSION = "v21.0"
+        const val MIN_VERCODE = 21000
 
-        fun atLeast_21_0() = Info.env.magiskVersionCode >= 21000 || isCanary()
-        fun atLeast_21_2() = Info.env.magiskVersionCode >= 21200 || isCanary()
-        fun isCanary() = Info.env.magiskVersionCode % 100 != 0
+        fun atLeast_21_2() = Info.env.versionCode >= 21200 || isCanary()
+        fun atLeast_24_0() = Info.env.versionCode >= 24000 || isCanary()
+        fun isCanary() = isCanary(Info.env.versionCode)
+
+        fun isCanary(ver: Int) = ver > 0 && ver % 100 != 0
     }
 
     object ID {
-        // notifications
-        const val APK_UPDATE_NOTIFICATION_ID = 5
+        const val JOB_SERVICE_ID = 7
         const val UPDATE_NOTIFICATION_CHANNEL = "update"
         const val PROGRESS_NOTIFICATION_CHANNEL = "progress"
-        const val CHECK_MAGISK_UPDATE_WORKER_ID = "magisk_update"
     }
 
     object Url {
         const val PATREON_URL = "https://www.patreon.com/topjohnwu"
         const val SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk"
 
-        val CHANGELOG_URL = if (BuildConfig.VERSION_CODE % 100 != 0) Info.remote.magisk.note
+        val CHANGELOG_URL = if (APP_IS_CANARY) Info.remote.magisk.note
         else "https://topjohnwu.github.io/Magisk/releases/${BuildConfig.VERSION_CODE}.md"
 
         const val GITHUB_RAW_URL = "https://raw.githubusercontent.com/"
         const val GITHUB_API_URL = "https://api.github.com/"
         const val GITHUB_PAGE_URL = "https://topjohnwu.github.io/magisk-files/"
         const val JS_DELIVR_URL = "https://cdn.jsdelivr.net/gh/"
-        const val OFFICIAL_REPO = "https://magisk-modules-repo.github.io/submission/modules.json"
     }
 
     object Key {
@@ -74,7 +71,6 @@ object Const {
     object Nav {
         const val HOME = "home"
         const val SETTINGS = "settings"
-        const val HIDE = "hide"
         const val MODULES = "modules"
         const val SUPERUSER = "superuser"
     }

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

@@ -2,11 +2,7 @@
 
 package com.topjohnwu.magisk.core
 
-import android.annotation.SuppressLint
 import android.app.Activity
-import android.app.job.JobInfo
-import android.app.job.JobScheduler
-import android.app.job.JobWorkItem
 import android.content.ComponentName
 import android.content.Context
 import android.content.ContextWrapper
@@ -15,33 +11,38 @@ import android.content.res.AssetManager
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.util.DisplayMetrics
-import androidx.annotation.RequiresApi
 import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.utils.refreshLocale
-import com.topjohnwu.magisk.core.utils.updateConfig
+import com.topjohnwu.magisk.core.utils.syncLocale
+import com.topjohnwu.magisk.di.AppContext
 
-fun AssetManager.addAssetPath(path: String) {
-    DynAPK.addAssetPath(this, path)
+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 Context.wrap(inject: Boolean = false): Context =
-    if (inject) ReInjectedContext(this) else InjectedContext(this)
+fun Resources.patch(): Resources {
+    syncLocale()
+    if (isRunningAsStub)
+        assets.addAssetPath(AppApkPath)
+    return this
+}
 
-fun Context.wrapJob(): Context = object : InjectedContext(this) {
-
-    override fun getApplicationContext() = this
-
-    @SuppressLint("NewApi")
-    override fun getSystemService(name: String): Any? {
-        return super.getSystemService(name).let {
-            when {
-                !isRunningAsStub -> it
-                name == JOB_SCHEDULER_SERVICE -> JobSchedulerWrapper(it as JobScheduler)
-                else -> it
-            }
-        }
-    }
+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)
 }
 
 fun Class<*>.cmp(pkg: String) =
@@ -53,74 +54,6 @@ inline fun <reified T> Activity.redirect() = Intent(intent)
 
 inline fun <reified T> Context.intent() = Intent().setComponent(T::class.java.cmp(packageName))
 
-private open class InjectedContext(base: Context) : ContextWrapper(base) {
-    open val res: Resources get() = AssetHack.resource
-    override fun getAssets(): AssetManager = res.assets
-    override fun getResources() = res
-    override fun getClassLoader() = javaClass.classLoader!!
-    override fun createConfigurationContext(config: Configuration): Context {
-        return super.createConfigurationContext(config).wrap(true)
-    }
-}
-
-private class ReInjectedContext(base: Context) : InjectedContext(base) {
-    override val res by lazy { base.resources.patch() }
-    private fun Resources.patch(): Resources {
-        updateConfig()
-        if (isRunningAsStub)
-            assets.addAssetPath(AssetHack.apk)
-        return this
-    }
-}
-
-object AssetHack {
-
-    lateinit var resource: Resources
-    lateinit var apk: String
-
-    fun init(context: Context) {
-        resource = context.resources
-        refreshLocale()
-        if (isRunningAsStub) {
-            apk = DynAPK.current(context).path
-            resource.assets.addAssetPath(apk)
-        } else {
-            apk = context.packageResourcePath
-        }
-    }
-
-    fun newResource(): Resources {
-        val asset = AssetManager::class.java.newInstance()
-        asset.addAssetPath(apk)
-        val config = Configuration(resource.configuration)
-        val metrics = DisplayMetrics()
-        metrics.setTo(resource.displayMetrics)
-        return Resources(asset, metrics, config)
-    }
-}
-
-@RequiresApi(28)
-private class JobSchedulerWrapper(private val base: JobScheduler) : JobScheduler() {
-    override fun schedule(job: JobInfo) = base.schedule(job.patch())
-    override fun enqueue(job: JobInfo, work: JobWorkItem) = base.enqueue(job.patch(), work)
-    override fun cancel(jobId: Int) = base.cancel(jobId)
-    override fun cancelAll() = base.cancelAll()
-    override fun getAllPendingJobs(): List<JobInfo> = base.allPendingJobs
-    override fun getPendingJob(jobId: Int) = base.getPendingJob(jobId)
-    private fun JobInfo.patch(): JobInfo {
-        // Swap out the service of JobInfo
-        val component = service.run {
-            ComponentName(packageName,
-                Info.stub?.classToComponent?.get(className) ?: className)
-        }
-        javaClass.getDeclaredField("service").apply {
-            isAccessible = true
-        }.set(this, component)
-
-        return this
-    }
-}
-
 // Keep a reference to these resources to prevent it from
 // being removed when running "remove unused resources"
 val shouldKeepResources = listOf(
@@ -128,9 +61,11 @@ val shouldKeepResources = listOf(
     R.string.release_notes,
     R.string.invalid_update_channel,
     R.string.update_available,
-    R.string.safetynet_api_error,
     R.drawable.ic_device,
-    R.drawable.ic_hide_select_md2,
     R.drawable.ic_more,
-    R.drawable.ic_magisk_delete
+    R.drawable.ic_magisk_delete,
+    R.drawable.ic_refresh_data_md2,
+    R.drawable.ic_order_date,
+    R.drawable.ic_order_name,
+    R.array.allow_timeout,
 )

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

@@ -11,8 +11,6 @@ import com.topjohnwu.magisk.ktx.getProperty
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils.fastCmd
 import com.topjohnwu.superuser.internal.UiThreadHandler
-import java.io.File
-import java.io.IOException
 
 val isRunningAsStub get() = Info.stub != null
 
@@ -31,16 +29,20 @@ object Info {
     // Device state
     @JvmStatic val env by lazy { loadState() }
     @JvmField var isSAR = false
-    @JvmField var isAB = false
-    @JvmField val isVirtualAB = getProperty("ro.virtual_ab.enabled", "false") == "true"
+    var isAB = false
+    @JvmField val isZygiskEnabled = System.getenv("ZYGISK_ENABLED") == "1"
     @JvmStatic val isFDE get() = crypto == "block"
     @JvmField var ramdisk = false
-    @JvmField var hasGMS = true
-    @JvmField val isPixel = Build.BRAND == "google"
-    @JvmField val isEmulator = getProperty("ro.kernel.qemu", "0") == "1"
+    @JvmField var vbmeta = false
     var crypto = ""
     var noDataExec = false
 
+    @JvmField var hasGMS = true
+    val isSamsung = Build.MANUFACTURER.equals("samsung", ignoreCase = true)
+    @JvmField val isEmulator =
+        getProperty("ro.kernel.qemu", "0") == "1" ||
+            getProperty("ro.boot.qemu", "0") == "1"
+
     val isConnected by lazy {
         ObservableBoolean(false).also { field ->
             NetworkObserver.observe(AppContext) {
@@ -49,41 +51,20 @@ object Info {
         }
     }
 
-    val isNewReboot by lazy {
-        try {
-            val id = File("/proc/sys/kernel/random/boot_id").readText()
-            if (id != Config.bootId) {
-                Config.bootId = id
-                true
-            } else {
-                false
-            }
-        } catch (e: IOException) {
-            false
-        }
-    }
-
     private fun loadState() = Env(
         fastCmd("magisk -v").split(":".toRegex())[0],
-        runCatching { fastCmd("magisk -V").toInt() }.getOrDefault(-1),
-        Shell.su("magiskhide status").exec().isSuccess
+        runCatching { fastCmd("magisk -V").toInt() }.getOrDefault(-1)
     )
 
     class Env(
-        val magiskVersionString: String = "",
-        code: Int = -1,
-        hide: Boolean = false
+        val versionString: String = "",
+        code: Int = -1
     ) {
-        val magiskHide get() = Config.magiskHide
-        val magiskVersionCode = when {
+        val versionCode = when {
             code < Const.Version.MIN_VERCODE -> -1
             else -> if (Shell.rootAccess()) code else -1
         }
         val isUnsupported = code > 0 && code < Const.Version.MIN_VERCODE
-        val isActive = magiskVersionCode >= 0
-
-        init {
-            Config.magiskHide = hide
-        }
+        val isActive = versionCode >= 0
     }
 }

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

@@ -0,0 +1,57 @@
+package com.topjohnwu.magisk.core
+
+import android.app.job.JobInfo
+import android.app.job.JobParameters
+import android.app.job.JobScheduler
+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.view.Notifications
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import java.util.concurrent.TimeUnit
+
+class JobService : BaseJobService() {
+
+    private val job = Job()
+    private val svc get() = ServiceLocator.networkService
+
+    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)
+            }
+            jobFinished(params, false)
+        }
+        return false
+    }
+
+    override fun onStopJob(params: JobParameters): Boolean {
+        job.cancel()
+        return false
+    }
+
+    companion object {
+        fun schedule(context: Context) {
+            val scheduler = context.getSystemService<JobScheduler>() ?: return
+            if (Config.checkUpdate) {
+                val cmp = JobService::class.java.cmp(context.packageName)
+                val info = JobInfo.Builder(Const.ID.JOB_SERVICE_ID, cmp)
+                    .setPeriodic(TimeUnit.HOURS.toMillis(12))
+                    .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                    .setRequiresDeviceIdle(true)
+                    .build()
+                scheduler.schedule(info)
+            } else {
+                scheduler.cancel(Const.ID.JOB_SERVICE_ID)
+            }
+        }
+    }
+}

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

@@ -1,23 +1,25 @@
 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.FileProvider
 import com.topjohnwu.magisk.core.su.SuCallbackHandler
 import java.io.File
 
-open class Provider : FileProvider() {
+class Provider : ContentProvider() {
 
-    override fun attachInfo(context: Context, info: ProviderInfo?) {
+    override fun attachInfo(context: Context, info: ProviderInfo) {
         super.attachInfo(context.wrap(), info)
     }
 
     override fun call(method: String, arg: String?, extras: Bundle?): Bundle? {
-        SuCallbackHandler(context!!, method, extras)
+        SuCallbackHandler.run(context!!, method, extras)
         return Bundle.EMPTY
     }
 
@@ -36,4 +38,11 @@ open class Provider : FileProvider() {
         fun PREFS_URI(pkg: String) =
             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
 }