Release Magisk v29.0

[skip ci]

.gitattributes

@@ -12,13 +12,11 @@
 
 # Denote all files that are truly binary and should not be modified.
 tools/** binary
+tools/rustup-wrapper/** -binary
+tools/elf-cleaner/** -binary
 *.jar binary
 *.exe binary
 *.apk binary
 *.png binary
 *.jpg binary
 *.ttf binary
-
-# Help GitHub detect languages
-native/jni/external/** linguist-vendored
-native/jni/systemproperties/** linguist-language=C++

.github/actions/setup/action.yml

@@ -26,6 +26,15 @@ runs:
 
     - name: Cache sccache
       uses: actions/cache@v4
+      if: ${{ github.event_name != 'pull_request' }}
+      with:
+        path: .sccache
+        key: sccache-${{ runner.os }}-${{ github.sha }}
+        restore-keys: sccache-${{ runner.os }}-
+
+    - name: Restore sccache
+      uses: actions/cache/restore@v4
+      if: ${{ github.event_name == 'pull_request' }}
       with:
         path: .sccache
         key: sccache-${{ runner.os }}-${{ github.sha }}
@@ -55,7 +64,7 @@ runs:
 
     - name: Cache Gradle dependencies
       uses: actions/cache@v4
-      if: inputs.is-asset-build == 'true'
+      if: ${{ inputs.is-asset-build == 'true' && github.event_name != 'pull_request' }}
       with:
         path: |
           .gradle/caches
@@ -66,7 +75,7 @@ runs:
 
     - name: Restore Gradle dependencies
       uses: actions/cache/restore@v4
-      if: inputs.is-asset-build == 'false'
+      if: ${{ inputs.is-asset-build == 'false' || github.event_name == 'pull_request' }}
       with:
         path: |
           .gradle/caches
@@ -78,19 +87,17 @@ runs:
 
     - name: Cache Gradle build cache
       uses: actions/cache@v4
-      if: inputs.is-asset-build == 'true'
+      if: ${{ inputs.is-asset-build == 'true' && github.event_name != 'pull_request' }}
       with:
-        path: |
-          .gradle/caches/build-cache-*
+        path: .gradle/caches/build-cache-*
         key: gradle-build-cache-${{ github.sha }}
         restore-keys: gradle-build-cache-
 
     - name: Restore Gradle build cache
       uses: actions/cache/restore@v4
-      if: inputs.is-asset-build == 'false'
+      if: ${{ inputs.is-asset-build == 'false' || github.event_name == 'pull_request' }}
       with:
-        path: |
-          .gradle/caches/build-cache-*
+        path: .gradle/caches/build-cache-*
         key: gradle-build-cache-${{ github.sha }}
         restore-keys: gradle-build-cache-
         enableCrossOsArchive: true

.github/workflows/build.yml

@@ -6,9 +6,7 @@ on:
     paths:
       - "app/**"
       - "native/**"
-      - "buildSrc/**"
       - "build.py"
-      - "gradle.properties"
       - ".github/workflows/build.yml"
   pull_request:
     branches: [master]
@@ -17,7 +15,7 @@ on:
 jobs:
   build:
     name: Build Magisk artifacts
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
       fail-fast: false
     steps:
@@ -38,7 +36,7 @@ jobs:
         run: ./build.py -v all
 
       - name: Stop gradle daemon
-        run: ./gradlew --stop
+        run: ./app/gradlew --stop
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
@@ -60,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-latest]
+        os: [windows-2025, ubuntu-24.04]
     steps:
       - name: Check out
         uses: actions/checkout@v4
@@ -74,20 +72,23 @@ jobs:
         run: python build.py -v -c .github/ci.prop all
 
       - name: Stop gradle daemon
-        run: ./gradlew --stop
+        run: ./app/gradlew --stop
 
   avd-test:
     name: Test API ${{ matrix.version }} (x86_64)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
+    if: ${{ github.event_name != 'push' }}
     strategy:
       fail-fast: false
       matrix:
-        version: [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34]
+        version: [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35]
         type: [""]
         include:
-          - version: 35
+          - version: 36
             type: "google_apis"
+          - version: 36
+            type: "google_apis_ps16k"
 
     steps:
       - name: Check out
@@ -122,8 +123,9 @@ jobs:
 
   avd-test-32:
     name: Test API ${{ matrix.version }} (x86)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
+    if: ${{ github.event_name != 'push' }}
     strategy:
       fail-fast: false
       matrix:
@@ -161,20 +163,19 @@ jobs:
             kernel.log
             logcat.log
 
-  cf_test:
+  cf-test:
     name: Test ${{ matrix.device }}
     runs-on: ubuntu-24.04
     needs: build
+    if: ${{ github.event_name != 'push' }}
     env:
       CF_HOME: /home/runner/aosp_cf_phone
     strategy:
       fail-fast: false
       matrix:
         include:
-          - branch: "aosp-main"
-            device: "aosp_cf_x86_64_phone"
-          - branch: "aosp-main-throttled"
-            device: "aosp_cf_x86_64_phone_pgagnostic"
+          - branch: "aosp-android-latest-release"
+            device: "aosp_cf_x86_64_only_phone"
 
     steps:
       - name: Check out
@@ -193,7 +194,7 @@ jobs:
 
       - name: Run Cuttlefish test
         timeout-minutes: 10
-        run: su $USER -c 'scripts/cuttlefish.sh test'
+        run: sudo -E -u $USER scripts/cuttlefish.sh test
 
       - name: Upload logs on error
         if: ${{ failure() }}

.gitignore

@@ -2,18 +2,13 @@ out
 *.zip
 *.jks
 *.apk
+*.log
 /config.prop
 /notes.md
-/update.sh
-/app/dict.txt
 
 # Built binaries
 native/out
 
-# Android Studio / Gradle
+# Android Studio
 *.iml
-.gradle
 .idea
-/local.properties
-/build
-/captures

.gitmodules

@@ -4,18 +4,12 @@
 [submodule "lz4"]
 	path = native/src/external/lz4
 	url = https://github.com/lz4/lz4.git
-[submodule "bzip2"]
-	path = native/src/external/bzip2
-	url = https://github.com/nemequ/bzip2.git
 [submodule "xz"]
 	path = native/src/external/xz
 	url = https://github.com/xz-mirror/xz.git
 [submodule "libcxx"]
 	path = native/src/external/libcxx
 	url = https://github.com/topjohnwu/libcxx.git
-[submodule "zlib"]
-	path = native/src/external/zlib
-	url = https://android.googlesource.com/platform/external/zlib
 [submodule "zopfli"]
 	path = native/src/external/zopfli
 	url = https://github.com/google/zopfli.git
@@ -31,6 +25,3 @@
 [submodule "crt0"]
 	path = native/src/external/crt0
 	url = https://github.com/topjohnwu/crt0.git
-[submodule "termux-elf-cleaner"]
-	path = tools/termux-elf-cleaner
-	url = https://github.com/termux/termux-elf-cleaner.git

README.MD

@@ -20,9 +20,9 @@ Some highlight features:
 
 Click the icon below to download Magisk apk.
 
-[![](https://img.shields.io/badge/Magisk-v27.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v27.0)
-[![](https://img.shields.io/badge/Magisk%20Beta-v28.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v28.0)
-[![](https://img.shields.io/badge/Magisk-Canary-red)](https://github.com/topjohnwu/Magisk/releases/tag/canary-28002)
+[![](https://img.shields.io/badge/Magisk-v28.1-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v28.1)
+[![](https://img.shields.io/badge/Magisk%20Beta-v29.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v29.0)
+[![](https://img.shields.io/badge/Magisk-Canary-red)](https://github.com/topjohnwu/Magisk/releases/tag/canary-28104)
 
 ## Useful Links
 

app/.gitignore

@@ -0,0 +1,7 @@
+/dict.txt
+
+# Gradle
+.gradle
+.kotlin
+/local.properties
+/build

app/apk/build.gradle.kts

@@ -35,7 +35,7 @@ android {
 }
 
 dependencies {
-    implementation(project(":app:core"))
+    implementation(project(":core"))
     coreLibraryDesugaring(libs.jdk.libs)
 
     implementation(libs.indeterminate.checkbox)

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

@@ -1,10 +1,13 @@
 package com.topjohnwu.magisk.arch
 
+import android.content.ContentResolver
 import android.view.KeyEvent
 import androidx.databinding.ViewDataBinding
 import androidx.navigation.NavController
 import androidx.navigation.NavDirections
 import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.navOptions
+import com.topjohnwu.magisk.utils.AccessibilityUtils
 
 abstract class NavigationActivity<Binding : ViewDataBinding> : UIActivity<Binding>() {
 
@@ -31,7 +34,17 @@ abstract class NavigationActivity<Binding : ViewDataBinding> : UIActivity<Bindin
         }
     }
 
+    companion object {
+        fun navigate(directions: NavDirections, navigation: NavController, cr: ContentResolver) {
+            if (AccessibilityUtils.isAnimationEnabled(cr)) {
+                navigation.navigate(directions)
+            } else {
+                navigation.navigate(directions, navOptions {})
+            }
+        }
+    }
+
     fun NavDirections.navigate() {
-        navigation.navigate(this)
+        navigate(this, navigation, contentResolver)
     }
 }

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

@@ -17,6 +17,8 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.download.DownloadEngine
 import com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding
 import com.topjohnwu.magisk.core.R as CoreR
+import androidx.navigation.findNavController
+import com.topjohnwu.magisk.arch.NavigationActivity
 
 class HomeFragment : BaseFragment<FragmentHomeMd2Binding>(), MenuProvider {
 
@@ -68,7 +70,13 @@ class HomeFragment : BaseFragment<FragmentHomeMd2Binding>(), MenuProvider {
     override fun onMenuItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_settings ->
-                HomeFragmentDirections.actionHomeFragmentToSettingsFragment().navigate()
+                activity?.let {
+                    NavigationActivity.navigate(
+                        HomeFragmentDirections.actionHomeFragmentToSettingsFragment(),
+                        it.findNavController(R.id.main_nav_host),
+                        it.contentResolver,
+                    )
+                }
             R.id.action_reboot -> activity?.let { RebootMenu.inflate(it).show() }
             else -> return super.onOptionsItemSelected(item)
         }

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

@@ -41,7 +41,7 @@ object RebootMenu {
             activity.getSystemService<PowerManager>()?.isRebootingUserspaceSupported == true) {
             menu.menu.findItem(R.id.action_reboot_userspace).isVisible = true
         }
-        if (Const.Version.isCanary()) {
+        if (Const.Version.atLeast_28_0()) {
             menu.menu.findItem(R.id.action_reboot_safe_mode).isChecked = Config.bootloop >= 2
         } else {
             menu.menu.findItem(R.id.action_reboot_safe_mode).isVisible = false

app/apk/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt

@@ -5,6 +5,7 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
+import android.widget.HorizontalScrollView
 import androidx.core.view.MenuProvider
 import androidx.core.view.isVisible
 import com.topjohnwu.magisk.R
@@ -12,6 +13,7 @@ import com.topjohnwu.magisk.arch.BaseFragment
 import com.topjohnwu.magisk.arch.viewModel
 import com.topjohnwu.magisk.databinding.FragmentLogMd2Binding
 import com.topjohnwu.magisk.ui.MainActivity
+import com.topjohnwu.magisk.utils.AccessibilityUtils
 import com.topjohnwu.magisk.utils.MotionRevealHelper
 import rikka.recyclerview.addEdgeSpacing
 import rikka.recyclerview.addItemSpacing
@@ -56,6 +58,11 @@ class LogFragment : BaseFragment<FragmentLogMd2Binding>(), MenuProvider {
             addItemSpacing(R.dimen.l1, R.dimen.l_50, R.dimen.l1)
             fixEdgeEffect()
         }
+
+        if (!AccessibilityUtils.isAnimationEnabled(requireContext().contentResolver)) {
+            val scrollView = view.findViewById<HorizontalScrollView>(R.id.log_scroll_magisk)
+            scrollView.setOverScrollMode(View.OVER_SCROLL_NEVER)
+        }
     }
 
 

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

@@ -13,6 +13,7 @@ import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.arch.BaseViewModel
 import com.topjohnwu.magisk.core.AppContext
 import com.topjohnwu.magisk.core.BuildConfig
+import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.R
@@ -92,7 +93,7 @@ class SettingsViewModel : BaseViewModel(), BaseSettingsItem.Handler {
             DownloadPath -> withExternalRW(doAction)
             UpdateChecker -> withPostNotificationPermission(doAction)
             Authentication -> AuthEvent(doAction).publish()
-            Hide, Restore -> withInstallPermission(doAction)
+            AutomaticResponse -> if (Config.suAuth) AuthEvent(doAction).publish() else doAction()
             else -> doAction()
         }
     }

app/apk/src/main/java/com/topjohnwu/magisk/utils/AccessibilityUtils.kt

@@ -0,0 +1,14 @@
+package com.topjohnwu.magisk.utils
+
+import android.content.ContentResolver
+import android.provider.Settings
+
+class AccessibilityUtils {
+    companion object {
+        fun isAnimationEnabled(cr: ContentResolver): Boolean {
+            return !(Settings.Global.getFloat(cr, Settings.Global.ANIMATOR_DURATION_SCALE, 1.0f) == 0.0f
+                && Settings.Global.getFloat(cr, Settings.Global.TRANSITION_ANIMATION_SCALE, 1.0f) == 0.0f
+                && Settings.Global.getFloat(cr, Settings.Global.WINDOW_ANIMATION_SCALE, 1.0f) == 0.0f)
+        }
+    }
+}

app/apk/src/main/res/layout/include_log_magisk.xml

@@ -16,6 +16,7 @@
         android:layout_height="match_parent">
 
         <HorizontalScrollView
+            android:id="@+id/log_scroll_magisk"
             gone="@{viewModel.loading}"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

app/build.gradle.kts

@@ -1,5 +1,11 @@
-tasks.register("clean") {
+plugins {
+    id("MagiskPlugin")
+}
+
+tasks.register("clean", Delete::class) {
+    delete(rootProject.layout.buildDirectory)
+
     subprojects.forEach {
-        dependsOn(":app:${it.name}:clean")
+        dependsOn(":${it.name}:clean")
     }
 }

app/buildSrc/src/main/java/DesugarClassVisitorFactory.kt

@@ -0,0 +1,122 @@
+import com.android.build.api.instrumentation.AsmClassVisitorFactory
+import com.android.build.api.instrumentation.ClassContext
+import com.android.build.api.instrumentation.ClassData
+import com.android.build.api.instrumentation.InstrumentationParameters
+import org.objectweb.asm.ClassVisitor
+import org.objectweb.asm.MethodVisitor
+import org.objectweb.asm.Opcodes
+import org.objectweb.asm.Opcodes.ASM9
+
+private const val DESUGAR_CLASS_NAME = "com.topjohnwu.magisk.core.utils.Desugar"
+private const val ZIP_ENTRY_CLASS_NAME = "java.util.zip.ZipEntry"
+private const val ZIP_OUT_STREAM_CLASS_NAME = "org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream"
+private const val ZIP_UTIL_CLASS_NAME = "org/apache/commons/compress/archivers/zip/ZipUtil"
+private const val ZIP_ENTRY_GET_TIME_DESC = "()Ljava/nio/file/attribute/FileTime;"
+private const val DESUGAR_GET_TIME_DESC =
+    "(Ljava/util/zip/ZipEntry;)Ljava/nio/file/attribute/FileTime;"
+
+private fun ClassData.isTypeOf(name: String) = className == name || superClasses.contains(name)
+
+abstract class DesugarClassVisitorFactory : AsmClassVisitorFactory<InstrumentationParameters.None> {
+    override fun createClassVisitor(
+        classContext: ClassContext,
+        nextClassVisitor: ClassVisitor
+    ): ClassVisitor {
+        return if (classContext.currentClassData.className == ZIP_OUT_STREAM_CLASS_NAME) {
+            ZipEntryPatcher(classContext, ZipOutputStreamPatcher(nextClassVisitor))
+        } else {
+            ZipEntryPatcher(classContext, nextClassVisitor)
+        }
+    }
+
+    override fun isInstrumentable(classData: ClassData) = classData.className != DESUGAR_CLASS_NAME
+
+    // Patch ALL references to ZipEntry#getXXXTime
+    class ZipEntryPatcher(
+        private val classContext: ClassContext,
+        cv: ClassVisitor
+    ) : ClassVisitor(ASM9, cv) {
+        override fun visitMethod(
+            access: Int,
+            name: String?,
+            descriptor: String?,
+            signature: String?,
+            exceptions: Array<out String>?
+        ) = MethodPatcher(super.visitMethod(access, name, descriptor, signature, exceptions))
+
+        inner class MethodPatcher(mv: MethodVisitor?) : MethodVisitor(ASM9, mv) {
+            override fun visitMethodInsn(
+                opcode: Int,
+                owner: String,
+                name: String,
+                descriptor: String,
+                isInterface: Boolean
+            ) {
+                if (!process(owner, name, descriptor)) {
+                    super.visitMethodInsn(opcode, owner, name, descriptor, isInterface)
+                }
+            }
+
+            private fun process(owner: String, name: String, descriptor: String): Boolean {
+                val classData = classContext.loadClassData(owner.replace("/", ".")) ?: return false
+                if (!classData.isTypeOf(ZIP_ENTRY_CLASS_NAME))
+                    return false
+                if (descriptor != ZIP_ENTRY_GET_TIME_DESC)
+                    return false
+                return when (name) {
+                    "getLastModifiedTime", "getLastAccessTime", "getCreationTime" -> {
+                        mv.visitMethodInsn(
+                            Opcodes.INVOKESTATIC,
+                            DESUGAR_CLASS_NAME.replace('.', '/'),
+                            name,
+                            DESUGAR_GET_TIME_DESC,
+                            false
+                        )
+                        true
+                    }
+                    else -> false
+                }
+            }
+        }
+    }
+
+    // Patch ZipArchiveOutputStream#copyFromZipInputStream
+    class ZipOutputStreamPatcher(cv: ClassVisitor) : ClassVisitor(ASM9, cv) {
+        override fun visitMethod(
+            access: Int,
+            name: String,
+            descriptor: String,
+            signature: String?,
+            exceptions: Array<out String?>?
+        ): MethodVisitor? {
+            return if (name == "copyFromZipInputStream") {
+                MethodPatcher(super.visitMethod(access, name, descriptor, signature, exceptions))
+            } else {
+                super.visitMethod(access, name, descriptor, signature, exceptions)
+            }
+        }
+
+        class MethodPatcher(mv: MethodVisitor?) : MethodVisitor(ASM9, mv) {
+            override fun visitMethodInsn(
+                opcode: Int,
+                owner: String,
+                name: String,
+                descriptor: String?,
+                isInterface: Boolean
+            ) {
+                if (owner == ZIP_UTIL_CLASS_NAME && name == "checkRequestedFeatures") {
+                    // Redirect
+                    mv.visitMethodInsn(
+                        Opcodes.INVOKESTATIC,
+                        DESUGAR_CLASS_NAME.replace('.', '/'),
+                        name,
+                        descriptor,
+                        false
+                    )
+                } else {
+                    super.visitMethodInsn(opcode, owner, name, descriptor, isInterface)
+                }
+            }
+        }
+    }
+}

app/buildSrc/src/main/java/Plugin.kt

@@ -14,7 +14,7 @@ private val defaultAbis = setOf("armeabi-v7a", "x86", "arm64-v8a", "x86_64")
 object Config {
     operator fun get(key: String): String? {
         val v = props[key] as? String ?: return null
-        return if (v.isBlank()) null else v
+        return v.ifBlank { null }
     }
 
     fun contains(key: String) = get(key) != null
@@ -28,19 +28,21 @@ object Config {
     }
 }
 
+val Project.baseDir: File get() = rootProject.file("..")
+
 class MagiskPlugin : Plugin<Project> {
     override fun apply(project: Project) = project.applyPlugin()
 
     private fun Project.applyPlugin() {
-        initRandom(rootProject.file("app/dict.txt"))
+        initRandom(rootProject.file("dict.txt"))
         props.clear()
         rootProject.file("gradle.properties").inputStream().use { props.load(it) }
         val configPath: String? by this
-        val config = configPath?.let { File(it) } ?: rootProject.file("config.prop")
+        val config = configPath?.let { File(it) } ?: File(baseDir, "config.prop")
         if (config.exists())
             config.inputStream().use { props.load(it) }
 
-        val repo = FileRepository(rootProject.file(".git"))
+        val repo = FileRepository(File(baseDir, ".git"))
         val refId = repo.refDatabase.exactRef("HEAD").objectId
         commitHash = repo.newObjectReader().abbreviate(refId, 8).name()
     }

app/buildSrc/src/main/java/Setup.kt

@@ -17,7 +17,6 @@ import org.gradle.api.Action
 import org.gradle.api.DefaultTask
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
-import org.gradle.api.Task
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Copy
@@ -72,10 +71,10 @@ private val Project.androidComponents
 
 fun Project.setupCommon() {
     androidBase {
-        compileSdkVersion(35)
-        buildToolsVersion = "34.0.0"
+        compileSdkVersion(36)
+        buildToolsVersion = "36.0.0"
         ndkPath = "$sdkDirectory/ndk/magisk"
-        ndkVersion = "27.0.12077973"
+        ndkVersion = "29.0.13113456"
 
         defaultConfig {
             minSdk = 23
@@ -90,6 +89,7 @@ fun Project.setupCommon() {
             resources {
                 excludes += arrayOf(
                     "/META-INF/*",
+                    "/META-INF/androidx/**",
                     "/META-INF/versions/**",
                     "/org/bouncycastle/**",
                     "/org/apache/commons/**",
@@ -116,6 +116,27 @@ fun Project.setupCommon() {
     }
 }
 
+private fun Project.downloadFile(url: String, checksum: String): File {
+    val file = layout.buildDirectory.file(checksum).get().asFile
+    if (file.exists()) {
+        val md = MessageDigest.getInstance("SHA-256")
+        file.inputStream().use { md.update(it.readAllBytes()) }
+        val hash = HexFormat.of().formatHex(md.digest())
+        if (hash != checksum) {
+            file.delete()
+        }
+    }
+    if (!file.exists()) {
+        file.parentFile.mkdirs()
+        URI(url).toURL().openStream().use { dl ->
+            file.outputStream().use {
+                dl.copyTo(it)
+            }
+        }
+    }
+    return file
+}
+
 const val BUSYBOX_DOWNLOAD_URL =
     "https://github.com/topjohnwu/magisk-files/releases/download/files/busybox-1.36.1.1.zip"
 const val BUSYBOX_ZIP_CHECKSUM =
@@ -130,7 +151,7 @@ fun Project.setupCoreLib() {
         into("src/main/jniLibs")
         for (abi in abiList) {
             into(abi) {
-                from(rootProject.file("native/out/$abi")) {
+                from(File(baseDir, "native/out/$abi")) {
                     include("magiskboot", "magiskinit", "magiskpolicy", "magisk", "libinit-ld.so")
                     rename { if (it.endsWith(".so")) it else "lib$it.so" }
                 }
@@ -145,34 +166,17 @@ fun Project.setupCoreLib() {
 
     val downloadBusybox by tasks.registering(Copy::class) {
         dependsOn(syncLibs)
-        val bb = layout.buildDirectory.file(BUSYBOX_ZIP_CHECKSUM).get().asFile
-        if (bb.exists()) {
-            val md = MessageDigest.getInstance("SHA-256")
-            bb.inputStream().use { md.update(it.readAllBytes()) }
-            val hash = HexFormat.of().formatHex(md.digest())
-            if (hash != BUSYBOX_ZIP_CHECKSUM) {
-                bb.delete()
-            }
-        }
-        if (!bb.exists()) {
-            bb.parentFile.mkdirs()
-            URI(BUSYBOX_DOWNLOAD_URL).toURL().openStream().use { dl ->
-                bb.outputStream().use {
-                    dl.copyTo(it)
-                }
-            }
-        }
-        from(zipTree(bb))
+        from(zipTree(downloadFile(BUSYBOX_DOWNLOAD_URL, BUSYBOX_ZIP_CHECKSUM)))
         include(abiList.map { "$it/libbusybox.so" })
         into("src/main/jniLibs")
     }
 
     val syncResources by tasks.registering(Sync::class) {
         into("src/main/resources/META-INF/com/google/android")
-        from(rootProject.file("scripts/update_binary.sh")) {
+        from(File(baseDir, "scripts/update_binary.sh")) {
             rename { "update-binary" }
         }
-        from(rootProject.file("scripts/flash_script.sh")) {
+        from(File(baseDir, "scripts/flash_script.sh")) {
             rename { "updater-script" }
         }
     }
@@ -183,7 +187,7 @@ fun Project.setupCoreLib() {
         tasks.getByPath("merge${variantCapped}JniLibFolders").dependsOn(downloadBusybox)
         processJavaResourcesProvider.configure { dependsOn(syncResources) }
 
-        val stubTask = tasks.getByPath(":app:stub:comment$variantCapped")
+        val stubTask = tasks.getByPath(":stub:comment$variantCapped")
         val stubApk = stubTask.outputs.files.asFileTree.filter {
             it.name.endsWith(".apk")
         }
@@ -193,14 +197,14 @@ fun Project.setupCoreLib() {
             inputs.property("version", Config.version)
             inputs.property("versionCode", Config.versionCode)
             into("src/${this@all.name}/assets")
-            from(rootProject.file("scripts")) {
+            from(File(baseDir, "scripts")) {
                 include("util_functions.sh", "boot_patch.sh", "addon.d.sh",
                     "app_functions.sh", "uninstaller.sh", "module_installer.sh")
             }
-            from(rootProject.file("tools/bootctl"))
+            from(File(baseDir, "tools/bootctl"))
             into("chromeos") {
-                from(rootProject.file("tools/futility"))
-                from(rootProject.file("tools/keys")) {
+                from(File(baseDir, "tools/futility"))
+                from(File(baseDir, "tools/keys")) {
                     include("kernel_data_key.vbprivk", "kernel.keyblock")
                 }
             }
@@ -290,7 +294,7 @@ fun Project.setupAppCommon() {
         signingConfigs {
             create("config") {
                 Config["keyStore"]?.also {
-                    storeFile = rootProject.file(it)
+                    storeFile = File(baseDir, it)
                     storePassword = Config["keyStorePass"]
                     keyAlias = Config["keyAlias"]
                     keyPassword = Config["keyPass"]
@@ -299,7 +303,10 @@ fun Project.setupAppCommon() {
         }
 
         defaultConfig {
-            targetSdk = 35
+            targetSdk = 36
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt")
+            )
         }
 
         buildTypes {
@@ -460,3 +467,31 @@ fun Project.setupStubApk() {
         delete.addAll(listOf("src/debug/AndroidManifest.xml", "src/release/AndroidManifest.xml"))
     }
 }
+
+const val LSPOSED_DOWNLOAD_URL =
+    "https://github.com/LSPosed/LSPosed/releases/download/v1.9.2/LSPosed-v1.9.2-7024-zygisk-release.zip"
+const val LSPOSED_CHECKSUM =
+    "0ebc6bcb465d1c4b44b7220ab5f0252e6b4eb7fe43da74650476d2798bb29622"
+
+const val SHAMIKO_DOWNLOAD_URL =
+    "https://github.com/LSPosed/LSPosed.github.io/releases/download/shamiko-383/Shamiko-v1.2.1-383-release.zip"
+const val SHAMIKO_CHECKSUM =
+    "93754a038c2d8f0e985bad45c7303b96f70a93d8335060e50146f028d3a9b13f"
+
+fun Project.setupTestApk() {
+    setupAppCommon()
+
+    androidApp.applicationVariants.all {
+        val variantCapped = name.replaceFirstChar { it.uppercase() }
+        val dlTask by tasks.register("download${variantCapped}Lsposed", Sync::class) {
+            from(downloadFile(LSPOSED_DOWNLOAD_URL, LSPOSED_CHECKSUM)) {
+                rename { "lsposed.zip" }
+            }
+            from(downloadFile(SHAMIKO_DOWNLOAD_URL, SHAMIKO_CHECKSUM)) {
+                rename { "shamiko.zip" }
+            }
+            into("src/${this@all.name}/assets")
+        }
+        mergeAssetsProvider.configure { dependsOn(dlTask) }
+    }
+}

app/core/build.gradle.kts

@@ -29,7 +29,7 @@ android {
 }
 
 dependencies {
-    api(project(":app:shared"))
+    api(project(":shared"))
 
     api(libs.timber)
     api(libs.markwon.core)
@@ -60,5 +60,10 @@ dependencies {
     implementation(libs.activity)
     implementation(libs.collection.ktx)
     implementation(libs.profileinstaller)
-    implementation(libs.lifecycle.process)
+
+    // We also implement all our tests in this module.
+    // However, we don't want to bundle test dependencies.
+    // That's why we make it compileOnly.
+    compileOnly(libs.test.junit)
+    compileOnly(libs.test.uiautomator)
 }

app/core/proguard-rules.pro

@@ -37,12 +37,4 @@
 -flattenpackagehierarchy
 -allowaccessmodification
 
--dontwarn org.bouncycastle.jsse.BCSSLParameters
--dontwarn org.bouncycastle.jsse.BCSSLSocket
--dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
--dontwarn org.commonmark.ext.gfm.strikethrough.Strikethrough
--dontwarn org.conscrypt.Conscrypt*
--dontwarn org.conscrypt.ConscryptHostnameVerifier
--dontwarn org.openjsse.javax.net.ssl.SSLParameters
--dontwarn org.openjsse.javax.net.ssl.SSLSocket
--dontwarn org.openjsse.net.ssl.OpenJSSE
+-dontwarn org.junit.**

app/core/src/main/AndroidManifest.xml

@@ -14,7 +14,6 @@
     <application
         android:name=".App"
         android:icon="@drawable/ic_launcher"
-        android:multiArch="true"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning"
         tools:remove="android:appComponentFactory">
 

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

@@ -16,7 +16,6 @@ import com.topjohnwu.magisk.StubApk
 import com.topjohnwu.magisk.core.base.UntrackedActivity
 import com.topjohnwu.magisk.core.utils.LocaleSetting
 import com.topjohnwu.magisk.core.utils.NetworkObserver
-import com.topjohnwu.magisk.core.utils.ProcessLifecycle
 import com.topjohnwu.magisk.core.utils.RootUtils
 import com.topjohnwu.magisk.core.utils.ShellInit
 import com.topjohnwu.superuser.Shell
@@ -40,6 +39,7 @@ object AppContext : ContextWrapper(null),
 
     private var ref = WeakReference<Activity>(null)
     private lateinit var application: Application
+    private lateinit var networkObserver: NetworkObserver
 
     init {
         // Always log full stack trace with Timber
@@ -56,6 +56,10 @@ object AppContext : ContextWrapper(null),
         LocaleSetting.instance.updateResource(resources)
     }
 
+    override fun onActivityStarted(activity: Activity) {
+        networkObserver.postCurrentState()
+    }
+
     override fun onActivityResumed(activity: Activity) {
         if (activity is UntrackedActivity) return
         ref = WeakReference(activity)
@@ -102,8 +106,7 @@ object AppContext : ContextWrapper(null),
             val lm = getSystemService(LocaleManager::class.java)
             lm.overrideLocaleConfig = LocaleSetting.localeConfig
         }
-        ProcessLifecycle.init(this)
-        NetworkObserver.init(this)
+        networkObserver = NetworkObserver.init(this)
         if (!BuildConfig.DEBUG && !isRunningAsStub) {
             GlobalScope.launch(Dispatchers.IO) {
                 ProfileInstaller.writeProfile(this@AppContext)
@@ -120,7 +123,6 @@ object AppContext : ContextWrapper(null),
     }
 
     override fun onActivityCreated(activity: Activity, bundle: Bundle?) {}
-    override fun onActivityStarted(activity: Activity) {}
     override fun onActivityStopped(activity: Activity) {}
     override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) {}
     override fun onActivityDestroyed(activity: Activity) {}

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

@@ -83,7 +83,7 @@ object Config : PreferenceConfig, DBConfig {
         const val SU_AUTO_ALLOW = 2
 
         // su timeout
-        val TIMEOUT_LIST = intArrayOf(0, -1, 10, 20, 30, 60)
+        val TIMEOUT_LIST = longArrayOf(0, -1, 10, 20, 30, 60)
     }
 
     private val defaultChannel =

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

@@ -14,7 +14,7 @@ object Const {
         else Build.SUPPORTED_32_BIT_ABIS.firstOrNull()
 
     // Paths
-    const val MAGISK_PATH  = "/data/adb/modules"
+    const val MODULE_PATH  = "/data/adb/modules"
     const val TMPDIR = "/dev/tmp"
     const val MAGISK_LOG = "/cache/magisk.log"
 
@@ -28,6 +28,7 @@ object Const {
 
         fun atLeast_24_0() = Info.env.versionCode >= 24000 || isCanary()
         fun atLeast_25_0() = Info.env.versionCode >= 25000 || isCanary()
+        fun atLeast_28_0() = Info.env.versionCode >= 28000 || isCanary()
         fun isCanary() = isCanary(Info.env.versionCode)
 
         fun isCanary(ver: Int) = ver > 0 && ver % 100 != 0

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

@@ -47,7 +47,6 @@ object Info {
         private set
     private var crypto = ""
 
-    var hasGMS = true
     val isEmulator =
         Build.DEVICE.contains("vsoc")
             || getProperty("ro.kernel.qemu", "0") == "1"

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

@@ -11,6 +11,7 @@ import androidx.core.content.getSystemService
 import com.topjohnwu.magisk.core.base.BaseJobService
 import com.topjohnwu.magisk.core.di.ServiceLocator
 import com.topjohnwu.magisk.core.download.DownloadEngine
+import com.topjohnwu.magisk.core.download.DownloadSession
 import com.topjohnwu.magisk.core.download.Subject
 import com.topjohnwu.magisk.view.Notifications
 import kotlinx.coroutines.Dispatchers
@@ -25,7 +26,7 @@ class JobService : BaseJobService() {
     @TargetApi(value = 34)
     inner class Session(
         private var params: JobParameters
-    ) : DownloadEngine.Session {
+    ) : DownloadSession {
 
         override val context get() = this@JobService
         val engine = DownloadEngine(this)

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

@@ -3,7 +3,6 @@ package com.topjohnwu.magisk.core
 import android.os.Bundle
 import com.topjohnwu.magisk.core.base.BaseProvider
 import com.topjohnwu.magisk.core.su.SuCallbackHandler
-import com.topjohnwu.magisk.core.su.TestHandler
 
 class Provider : BaseProvider() {
 
@@ -13,7 +12,7 @@ class Provider : BaseProvider() {
                 SuCallbackHandler.run(context!!, method, extras)
                 Bundle.EMPTY
             }
-            else -> TestHandler.run(method)
+            else -> Bundle.EMPTY
         }
     }
 }

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

@@ -7,9 +7,10 @@ import androidx.core.app.ServiceCompat
 import androidx.core.content.IntentCompat
 import com.topjohnwu.magisk.core.base.BaseService
 import com.topjohnwu.magisk.core.download.DownloadEngine
+import com.topjohnwu.magisk.core.download.DownloadSession
 import com.topjohnwu.magisk.core.download.Subject
 
-class Service : BaseService(), DownloadEngine.Session {
+class Service : BaseService(), DownloadSession {
 
     private var mEngine: DownloadEngine? = null
     override val context get() = this

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

@@ -7,9 +7,13 @@ import kotlinx.coroutines.withContext
 
 open class MagiskDB {
 
-    suspend fun <R> exec(
+    class Literal(
+        val str: String
+    )
+
+    suspend inline fun <R> exec(
         query: String,
-        mapper: suspend (Map<String, String>) -> R
+        crossinline mapper: (Map<String, String>) -> R
     ): List<R> {
         return withContext(Dispatchers.IO) {
             val out = Shell.cmd("magisk --sqlite '$query'").await().out
@@ -18,13 +22,15 @@ open class MagiskDB {
                     .map { it.split("=", limit = 2) }
                     .filter { it.size == 2 }
                     .associate { it[0] to it[1] }
-                    .let { mapper(it) }
+                    .let(mapper)
             }
         }
     }
 
-    suspend inline fun exec(query: String) {
-        exec(query) {}
+    suspend fun exec(query: String) {
+        withContext(Dispatchers.IO) {
+            Shell.cmd("magisk --sqlite '$query'").await()
+        }
     }
 
     fun Map<String, Any>.toQuery(): String {
@@ -33,6 +39,7 @@ open class MagiskDB {
             when (it) {
                 is Boolean -> if (it) "1" else "0"
                 is Number -> it.toString()
+                is Literal -> it.str
                 else -> "\"$it\""
             }
         }

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

@@ -3,24 +3,24 @@ package com.topjohnwu.magisk.core.data.magiskdb
 import com.topjohnwu.magisk.core.AppContext
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.model.su.SuPolicy
-import java.util.concurrent.TimeUnit
+
+private const val SELECT_QUERY = "SELECT (until - strftime(\"%s\", \"now\")) AS remain, *"
 
 class PolicyDao : MagiskDB() {
 
     suspend fun deleteOutdated() {
-        val nowSeconds = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())
         val query = "DELETE FROM ${Table.POLICY} WHERE " +
-            "(until > 0 AND until < $nowSeconds) OR until < 0"
+            "(until > 0 AND until < strftime(\"%s\", \"now\")) OR until < 0"
         exec(query)
     }
 
     suspend fun delete(uid: Int) {
-        val query = "DELETE FROM ${Table.POLICY} WHERE uid == $uid"
+        val query = "DELETE FROM ${Table.POLICY} WHERE uid=$uid"
         exec(query)
     }
 
     suspend fun fetch(uid: Int): SuPolicy? {
-        val query = "SELECT * FROM ${Table.POLICY} WHERE uid == $uid LIMIT = 1"
+        val query = "$SELECT_QUERY FROM ${Table.POLICY} WHERE uid=$uid LIMIT 1"
         return exec(query, ::toPolicy).firstOrNull()
     }
 
@@ -35,7 +35,7 @@ class PolicyDao : MagiskDB() {
     }
 
     suspend fun fetchAll(): List<SuPolicy> {
-        val query = "SELECT * FROM ${Table.POLICY} WHERE uid/100000 == ${Const.USER_ID}"
+        val query = "$SELECT_QUERY FROM ${Table.POLICY} WHERE uid/100000=${Const.USER_ID}"
         return exec(query, ::toPolicy).filterNotNull()
     }
 
@@ -43,8 +43,15 @@ class PolicyDao : MagiskDB() {
         val uid = map["uid"]?.toInt() ?: return null
         val policy = SuPolicy(uid)
 
+        map["until"]?.toLong()?.let { until ->
+            if (until <= 0) {
+                policy.remain = until
+            } else {
+                map["remain"]?.toLong()?.let { policy.remain = it }
+            }
+        }
+
         map["policy"]?.toInt()?.let { policy.policy = it }
-        map["until"]?.toLong()?.let { policy.until = it }
         map["logging"]?.toInt()?.let { policy.logging = it != 0 }
         map["notification"]?.toInt()?.let { policy.notification = it != 0 }
         return policy

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

@@ -3,7 +3,7 @@ package com.topjohnwu.magisk.core.data.magiskdb
 class SettingsDao : MagiskDB() {
 
     suspend fun delete(key: String) {
-        val query = "DELETE FROM ${Table.SETTINGS} WHERE key == \"$key\""
+        val query = "DELETE FROM ${Table.SETTINGS} WHERE key=\"$key\""
         exec(query)
     }
 
@@ -14,7 +14,7 @@ class SettingsDao : MagiskDB() {
     }
 
     suspend fun fetch(key: String, default: Int = -1): Int {
-        val query = "SELECT value FROM ${Table.SETTINGS} WHERE key == \"$key\" LIMIT 1"
+        val query = "SELECT value FROM ${Table.SETTINGS} WHERE key=\"$key\" LIMIT 1"
         return exec(query) { it["value"]?.toInt() }.firstOrNull() ?: default
     }
 }

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

@@ -3,7 +3,7 @@ package com.topjohnwu.magisk.core.data.magiskdb
 class StringDao : MagiskDB() {
 
     suspend fun delete(key: String) {
-        val query = "DELETE FROM ${Table.STRINGS} WHERE key == \"$key\""
+        val query = "DELETE FROM ${Table.STRINGS} WHERE key=\"$key\""
         exec(query)
     }
 
@@ -14,7 +14,7 @@ class StringDao : MagiskDB() {
     }
 
     suspend fun fetch(key: String, default: String = ""): String {
-        val query = "SELECT value FROM ${Table.STRINGS} WHERE key == \"$key\" LIMIT 1"
+        val query = "SELECT value FROM ${Table.STRINGS} WHERE key=\"$key\" LIMIT 1"
         return exec(query) { it["value"] }.firstOrNull() ?: default
     }
 }

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

@@ -5,7 +5,6 @@ import com.squareup.moshi.Moshi
 import com.topjohnwu.magisk.ProviderInstaller
 import com.topjohnwu.magisk.core.BuildConfig
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.utils.LocaleSetting
 import okhttp3.Cache
 import okhttp3.ConnectionSpec
@@ -72,9 +71,7 @@ fun createOkHttpClient(context: Context): OkHttpClient {
         chain.proceed(request.build())
     }
 
-    if (!ProviderInstaller.install(context)) {
-        Info.hasGMS = false
-    }
+    ProviderInstaller.install(context)
 
     return builder.build()
 }

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

@@ -7,7 +7,6 @@ import android.app.PendingIntent
 import android.app.job.JobInfo
 import android.app.job.JobScheduler
 import android.content.Context
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -16,7 +15,6 @@ import androidx.collection.isNotEmpty
 import androidx.core.content.getSystemService
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.MutableLiveData
-import com.topjohnwu.magisk.StubApk
 import com.topjohnwu.magisk.core.AppContext
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.JobService
@@ -25,18 +23,8 @@ import com.topjohnwu.magisk.core.base.IActivityExtension
 import com.topjohnwu.magisk.core.cmp
 import com.topjohnwu.magisk.core.di.ServiceLocator
 import com.topjohnwu.magisk.core.intent
-import com.topjohnwu.magisk.core.isRunningAsStub
-import com.topjohnwu.magisk.core.ktx.cachedFile
-import com.topjohnwu.magisk.core.ktx.copyAll
-import com.topjohnwu.magisk.core.ktx.copyAndClose
-import com.topjohnwu.magisk.core.ktx.forEach
 import com.topjohnwu.magisk.core.ktx.set
-import com.topjohnwu.magisk.core.ktx.withStreams
-import com.topjohnwu.magisk.core.ktx.writeTo
-import com.topjohnwu.magisk.core.tasks.AppMigration
-import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
 import com.topjohnwu.magisk.core.utils.ProgressInputStream
-import com.topjohnwu.magisk.utils.APKInstall
 import com.topjohnwu.magisk.view.Notifications
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -44,13 +32,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import okhttp3.ResponseBody
 import timber.log.Timber
-import java.io.IOException
 import java.io.InputStream
-import java.io.OutputStream
-import java.util.zip.ZipEntry
-import java.util.zip.ZipFile
-import java.util.zip.ZipInputStream
-import java.util.zip.ZipOutputStream
 
 /**
  * This class drives the execution of file downloads and notification management.
@@ -69,16 +51,7 @@ import java.util.zip.ZipOutputStream
  * For API 23 - 33, we use a foreground service as a session.
  * For API 34 and higher, we use user-initiated job services as a session.
  */
-class DownloadEngine(
-    private val session: Session
-) {
-
-    interface Session {
-        val context: Context
-
-        fun attachNotification(id: Int, builder: Notification.Builder)
-        fun onDownloadComplete()
-    }
+class DownloadEngine(session: DownloadSession) : DownloadSession by session, DownloadNotifier {
 
     companion object {
         const val ACTION = "com.topjohnwu.magisk.DOWNLOAD"
@@ -99,33 +72,35 @@ class DownloadEngine(
             }
         }
 
-        private fun createIntent(context: Context, subject: Subject) =
-            if (Build.VERSION.SDK_INT >= 34) {
-                context.intent<com.topjohnwu.magisk.core.Receiver>()
-                    .setAction(ACTION)
-                    .putExtra(SUBJECT_KEY, subject)
-            } else {
-                context.intent<com.topjohnwu.magisk.core.Service>()
-                    .setAction(ACTION)
-                    .putExtra(SUBJECT_KEY, subject)
-            }
+        private fun createBroadcastIntent(context: Context, subject: Subject) =
+            context.intent<com.topjohnwu.magisk.core.Receiver>()
+                .setAction(ACTION)
+                .putExtra(SUBJECT_KEY, subject)
+
+        private fun createServiceIntent(context: Context, subject: Subject) =
+            context.intent<com.topjohnwu.magisk.core.Service>()
+                .setAction(ACTION)
+                .putExtra(SUBJECT_KEY, subject)
 
         @SuppressLint("InlinedApi")
         fun getPendingIntent(context: Context, subject: Subject): PendingIntent {
             val flag = PendingIntent.FLAG_IMMUTABLE or
                 PendingIntent.FLAG_UPDATE_CURRENT or
                 PendingIntent.FLAG_ONE_SHOT
-            val intent = createIntent(context, subject)
             return if (Build.VERSION.SDK_INT >= 34) {
                 // On API 34+, download tasks are handled with a user-initiated job.
                 // However, there is no way to schedule a new job directly with a pending intent.
                 // As a workaround, we send the subject to a broadcast receiver and have it
                 // schedule the job for us.
+                val intent = createBroadcastIntent(context, subject)
                 PendingIntent.getBroadcast(context, REQUEST_CODE, intent, flag)
-            } else if (Build.VERSION.SDK_INT >= 26) {
-                PendingIntent.getForegroundService(context, REQUEST_CODE, intent, flag)
             } else {
-                PendingIntent.getService(context, REQUEST_CODE, intent, flag)
+                val intent = createServiceIntent(context, subject)
+                if (Build.VERSION.SDK_INT >= 26) {
+                    PendingIntent.getForegroundService(context, REQUEST_CODE, intent, flag)
+                } else {
+                    PendingIntent.getService(context, REQUEST_CODE, intent, flag)
+                }
             }
         }
 
@@ -140,6 +115,7 @@ class DownloadEngine(
             }
         }
 
+        @SuppressLint("MissingPermission")
         fun start(context: Context, subject: Subject) {
             if (Build.VERSION.SDK_INT >= 34) {
                 val scheduler = context.getSystemService<JobScheduler>()!!
@@ -152,24 +128,29 @@ class DownloadEngine(
                     .setTransientExtras(extras)
                     .build()
                 scheduler.schedule(info)
-            } else if (Build.VERSION.SDK_INT >= 26) {
-                context.startForegroundService(createIntent(context, subject))
             } else {
-                context.startService(createIntent(context, subject))
+                val intent = createServiceIntent(context, subject)
+                if (Build.VERSION.SDK_INT >= 26) {
+                    context.startForegroundService(intent)
+                } else {
+                    context.startService(intent)
+                }
             }
         }
     }
 
+    private val notifications = SparseArrayCompat<Notification.Builder>()
+    private var attachedId = -1
+    private val job = Job()
+    private val processor = DownloadProcessor(this)
+    private val network get() = ServiceLocator.networkService
+
     fun download(subject: Subject) {
         notifyUpdate(subject.notifyId)
         CoroutineScope(job + Dispatchers.IO).launch {
             try {
                 val stream = network.fetchFile(subject.url).toProgressStream(subject)
-                when (subject) {
-                    is Subject.App -> handleApp(stream, subject)
-                    is Subject.Module -> handleModule(stream, subject.file)
-                    else -> stream.copyAndClose(subject.file.outputStream())
-                }
+                processor.handle(stream, subject)
                 val activity = AppContext.foregroundActivity
                 if (activity != null && subject.autoLaunch) {
                     notifyRemove(subject.notifyId)
@@ -187,16 +168,13 @@ class DownloadEngine(
     @Synchronized
     fun reattach() {
         val builder = notifications[attachedId] ?: return
-        session.attachNotification(attachedId, builder)
+        attachNotification(attachedId, builder)
     }
 
-    private val notifications = SparseArrayCompat<Notification.Builder>()
-    private var attachedId = -1
-
-    private val job = Job()
-
-    private val context get() = session.context
-    private val network get() = ServiceLocator.networkService
+    private fun attach(id: Int, notification: Notification.Builder) {
+        attachedId = id
+        attachNotification(id, notification)
+    }
 
     private fun finalNotify(id: Int, editor: (Notification.Builder) -> Unit): Int {
         val notification = notifyRemove(id)?.also(editor) ?: return -1
@@ -223,19 +201,14 @@ class DownloadEngine(
         subject.pendingIntent(context)?.let { intent -> it.setContentIntent(intent) }
     }
 
-    private fun attachNotification(id: Int, notification: Notification.Builder) {
-        attachedId = id
-        session.attachNotification(id, notification)
-    }
-
     @Synchronized
-    private fun notifyUpdate(id: Int, editor: (Notification.Builder) -> Unit = {}) {
+    override fun notifyUpdate(id: Int, editor: (Notification.Builder) -> Unit) {
         val notification = (notifications[id] ?: Notifications.startProgress("").also {
             notifications[id] = it
         }).apply(editor)
 
         if (attachedId < 0)
-            attachNotification(id, notification)
+            attach(id, notification)
         else
             Notifications.mgr.notify(id, notification.build())
     }
@@ -255,11 +228,11 @@ class DownloadEngine(
                     // There are still remaining notifications, pick one and attach to the session
                     val anotherId = notifications.keyAt(0)
                     val notification = notifications.valueAt(0)
-                    attachNotification(anotherId, notification)
+                    attach(anotherId, notification)
                 } else {
                     // No more notifications left, terminate the session
                     attachedId = -1
-                    session.onDownloadComplete()
+                    onDownloadComplete()
                 }
             }
         }
@@ -268,90 +241,6 @@ class DownloadEngine(
         return n
     }
 
-    private suspend fun handleApp(stream: InputStream, subject: Subject.App) {
-        val external = subject.file.outputStream()
-
-        if (isRunningAsStub) {
-            val updateApk = StubApk.update(context)
-            try {
-                // Download full APK to stub update path
-                stream.copyAndClose(TeeOutputStream(external, updateApk.outputStream()))
-
-                // Also upgrade stub
-                notifyUpdate(subject.notifyId) {
-                    it.setProgress(0, 0, true)
-                        .setContentTitle(context.getString(R.string.hide_app_title))
-                        .setContentText("")
-                }
-
-                // Extract stub
-                val zf = ZipFile(updateApk)
-                val apk = context.cachedFile("stub.apk")
-                apk.delete()
-                zf.getInputStream(zf.getEntry("assets/stub.apk")).writeTo(apk)
-                zf.close()
-
-                // Patch and install
-                subject.intent = AppMigration.upgradeStub(context, apk)
-                    ?: throw IOException("HideAPK patch error")
-                apk.delete()
-            } catch (e: Exception) {
-                // If any error occurred, do not let stub load the new APK
-                updateApk.delete()
-                throw e
-            }
-        } else {
-            val session = APKInstall.startSession(context)
-            stream.copyAndClose(TeeOutputStream(external, session.openStream(context)))
-            subject.intent = session.waitIntent()
-        }
-    }
-
-    private suspend fun handleModule(src: InputStream, file: Uri) {
-        val input = ZipInputStream(src)
-        val output = ZipOutputStream(file.outputStream())
-
-        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"))
-            context.assets.open("module_installer.sh").use { it.copyAll(zout) }
-
-            zout.putNextEntry(ZipEntry("META-INF/com/google/android/updater-script"))
-            zout.write("#MAGISK\n".toByteArray())
-
-            zin.forEach { entry ->
-                val path = entry.name
-                if (path.isNotEmpty() && !path.startsWith("META-INF")) {
-                    zout.putNextEntry(ZipEntry(path))
-                    if (!entry.isDirectory) {
-                        zin.copyAll(zout)
-                    }
-                }
-            }
-        }
-    }
-
-    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()
-        }
-    }
-
     private fun ResponseBody.toProgressStream(subject: Subject): InputStream {
         val max = contentLength()
         val total = max.toFloat() / 1048576

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

@@ -0,0 +1,122 @@
+package com.topjohnwu.magisk.core.download
+
+import android.net.Uri
+import com.topjohnwu.magisk.StubApk
+import com.topjohnwu.magisk.core.R
+import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.ktx.cachedFile
+import com.topjohnwu.magisk.core.ktx.copyAll
+import com.topjohnwu.magisk.core.ktx.copyAndClose
+import com.topjohnwu.magisk.core.ktx.withInOut
+import com.topjohnwu.magisk.core.ktx.writeTo
+import com.topjohnwu.magisk.core.tasks.AppMigration
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
+import com.topjohnwu.magisk.utils.APKInstall
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream
+import org.apache.commons.compress.archivers.zip.ZipFile
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+
+class DownloadProcessor(notifier: DownloadNotifier) : DownloadNotifier by notifier {
+
+    suspend fun handle(stream: InputStream, subject: Subject) {
+        when (subject) {
+            is Subject.App -> handleApp(stream, subject)
+            is Subject.Module -> handleModule(stream, subject.file)
+            else -> stream.copyAndClose(subject.file.outputStream())
+        }
+    }
+
+    suspend fun handleApp(stream: InputStream, subject: Subject.App) {
+        val external = subject.file.outputStream()
+
+        if (isRunningAsStub) {
+            val updateApk = StubApk.update(context)
+            try {
+                // Download full APK to stub update path
+                stream.copyAndClose(TeeOutputStream(external, updateApk.outputStream()))
+
+                // Also upgrade stub
+                notifyUpdate(subject.notifyId) {
+                    it.setProgress(0, 0, true)
+                        .setContentTitle(context.getString(R.string.hide_app_title))
+                        .setContentText("")
+                }
+
+                // Extract stub
+                val apk = context.cachedFile("stub.apk")
+                ZipFile.Builder().setFile(updateApk).get().use { zf ->
+                    apk.delete()
+                    zf.getInputStream(zf.getEntry("assets/stub.apk")).writeTo(apk)
+                }
+
+                // Patch and install
+                subject.intent = AppMigration.upgradeStub(context, apk)
+                    ?: throw IOException("HideAPK patch error")
+                apk.delete()
+            } catch (e: Exception) {
+                // If any error occurred, do not let stub load the new APK
+                updateApk.delete()
+                throw e
+            }
+        } else {
+            val session = APKInstall.startSession(context)
+            stream.copyAndClose(TeeOutputStream(external, session.openStream(context)))
+            subject.intent = session.waitIntent()
+        }
+    }
+
+    suspend fun handleModule(src: InputStream, file: Uri) {
+        val tmp = context.cachedFile("module.zip")
+        try {
+            // First download the entire zip into cache so we can process it
+            src.writeTo(tmp)
+
+            val input = ZipFile.Builder().setFile(tmp).get()
+            val output = ZipArchiveOutputStream(file.outputStream())
+            withInOut(input, output) { zin, zout ->
+                zout.putArchiveEntry(ZipArchiveEntry("META-INF/"))
+                zout.closeArchiveEntry()
+                zout.putArchiveEntry(ZipArchiveEntry("META-INF/com/"))
+                zout.closeArchiveEntry()
+                zout.putArchiveEntry(ZipArchiveEntry("META-INF/com/google/"))
+                zout.closeArchiveEntry()
+                zout.putArchiveEntry(ZipArchiveEntry("META-INF/com/google/android/"))
+                zout.closeArchiveEntry()
+
+                zout.putArchiveEntry(ZipArchiveEntry("META-INF/com/google/android/update-binary"))
+                context.assets.open("module_installer.sh").use { it.copyAll(zout) }
+                zout.closeArchiveEntry()
+
+                zout.putArchiveEntry(ZipArchiveEntry("META-INF/com/google/android/updater-script"))
+                zout.write("#MAGISK\n".toByteArray())
+                zout.closeArchiveEntry()
+
+                // Then simply copy all entries to output
+                zin.copyRawEntries(zout) { entry -> !entry.name.startsWith("META-INF") }
+            }
+        } finally {
+            tmp.delete()
+        }
+    }
+
+    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()
+        }
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.topjohnwu.magisk.core.download
+
+import android.app.Notification
+import android.content.Context
+
+interface DownloadSession {
+    val context: Context
+    fun attachNotification(id: Int, builder: Notification.Builder)
+    fun onDownloadComplete()
+}
+
+interface DownloadNotifier {
+    val context: Context
+    fun notifyUpdate(id: Int, editor: (Notification.Builder) -> Unit = {})
+}

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

@@ -2,7 +2,11 @@ package com.topjohnwu.magisk.core.ktx
 
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.content.*
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
+import android.content.IntentFilter
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
@@ -23,7 +27,6 @@ import com.topjohnwu.magisk.core.utils.RootUtils
 import com.topjohnwu.magisk.utils.APKInstall
 import com.topjohnwu.superuser.internal.UiThreadHandler
 import java.io.File
-import kotlin.String
 
 fun Context.getBitmap(id: Int): Bitmap {
     var drawable = getDrawable(id)!!

app/core/src/main/java/com/topjohnwu/magisk/core/ktx/XJVM.kt

@@ -8,6 +8,7 @@ import kotlinx.coroutines.flow.flatMapMerge
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.withContext
+import java.io.Closeable
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
@@ -17,24 +18,14 @@ import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.Collections
 import java.util.Locale
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
 
-inline fun ZipInputStream.forEach(callback: (ZipEntry) -> Unit) {
-    var entry: ZipEntry? = nextEntry
-    while (entry != null) {
-        callback(entry)
-        entry = nextEntry
-    }
-}
-
-inline fun <In : InputStream, Out : OutputStream> withStreams(
-    inStream: In,
-    outStream: Out,
+inline fun <In : Closeable, Out : Closeable> withInOut(
+    input: In,
+    output: Out,
     withBoth: (In, Out) -> Unit
 ) {
-    inStream.use { reader ->
-        outStream.use { writer ->
+    input.use { reader ->
+        output.use { writer ->
             withBoth(reader, writer)
         }
     }
@@ -64,7 +55,7 @@ suspend inline fun InputStream.copyAndClose(
     out: OutputStream,
     bufferSize: Int = DEFAULT_BUFFER_SIZE,
     dispatcher: CoroutineDispatcher = Dispatchers.IO
-) = withStreams(this, out) { i, o -> i.copyAll(o, bufferSize, dispatcher) }
+) = withInOut(this, out) { i, o -> i.copyAll(o, bufferSize, dispatcher) }
 
 @Throws(IOException::class)
 suspend inline fun InputStream.writeTo(

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

@@ -5,14 +5,15 @@ import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.di.ServiceLocator
 import com.topjohnwu.magisk.core.utils.RootUtils
 import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.nio.ExtendedFile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.io.IOException
-import java.util.*
+import java.util.Locale
 
 data class LocalModule(
-    private val path: String,
+    private val base: ExtendedFile,
 ) : Module() {
     private val svc get() = ServiceLocator.networkService
 
@@ -24,20 +25,18 @@ data class LocalModule(
     var description: String = ""
     var updateInfo: OnlineModule? = null
     var outdated = false
-
     private var updateUrl: String = ""
-    private val removeFile = RootUtils.fs.getFile(path, "remove")
-    private val disableFile = RootUtils.fs.getFile(path, "disable")
-    private val updateFile = RootUtils.fs.getFile(path, "update")
-    private val riruFolder = RootUtils.fs.getFile(path, "riru")
-    private val zygiskFolder = RootUtils.fs.getFile(path, "zygisk")
-    private val unloaded = RootUtils.fs.getFile(zygiskFolder, "unloaded")
 
-    val updated: Boolean get() = updateFile.exists()
-    val isRiru: Boolean get() = (id == "riru-core") || riruFolder.exists()
-    val isZygisk: Boolean get() = zygiskFolder.exists()
-    val zygiskUnloaded: Boolean get() = unloaded.exists()
-    val hasAction: Boolean;
+    private val removeFile = base.getChildFile("remove")
+    private val disableFile = base.getChildFile("disable")
+    private val updateFile = base.getChildFile("update")
+    val zygiskFolder = base.getChildFile("zygisk")
+
+    val updated get() = updateFile.exists()
+    val isRiru = (id == "riru-core") || base.getChildFile("riru").exists()
+    val isZygisk = zygiskFolder.exists()
+    val zygiskUnloaded = zygiskFolder.getChildFile("unloaded").exists()
+    val hasAction = base.getChildFile("action.sh").exists()
 
     var enable: Boolean
         get() = !disableFile.exists()
@@ -90,19 +89,16 @@ data class LocalModule(
 
     init {
         runCatching {
-            parseProps(Shell.cmd("dos2unix < $path/module.prop").exec().out)
+            parseProps(Shell.cmd("dos2unix < $base/module.prop").exec().out)
         }
 
         if (id.isEmpty()) {
-            val sep = path.lastIndexOf('/')
-            id = path.substring(sep + 1)
+            id = base.name
         }
 
         if (name.isEmpty()) {
             name = id
         }
-
-        hasAction = RootUtils.fs.getFile(path, "action.sh").exists()
     }
 
     suspend fun fetch(): Boolean {
@@ -125,14 +121,14 @@ data class LocalModule(
 
     companion object {
 
-        fun loaded() = RootUtils.fs.getFile(Const.MAGISK_PATH).exists()
+        fun loaded() = RootUtils.fs.getFile(Const.MODULE_PATH).exists()
 
         suspend fun installed() = withContext(Dispatchers.IO) {
-            RootUtils.fs.getFile(Const.MAGISK_PATH)
+            RootUtils.fs.getFile(Const.MODULE_PATH)
                 .listFiles()
                 .orEmpty()
                 .filter { !it.isFile && !it.isHidden }
-                .map { LocalModule("${Const.MAGISK_PATH}/${it.name}") }
+                .map { LocalModule(it) }
                 .sortedBy { it.name.lowercase(Locale.ROOT) }
         }
     }

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

@@ -1,22 +1,32 @@
 package com.topjohnwu.magisk.core.model.su
 
-class SuPolicy(val uid: Int) {
+import com.topjohnwu.magisk.core.data.magiskdb.MagiskDB
+
+class SuPolicy(
+    val uid: Int,
+    var policy: Int = INTERACTIVE,
+    var remain: Long = -1L,
+    var logging: Boolean = true,
+    var notification: Boolean = true,
+) {
     companion object {
         const val INTERACTIVE = 0
         const val DENY = 1
         const val ALLOW = 2
     }
 
-    var policy: Int = INTERACTIVE
-    var until: Long = -1L
-    var logging: Boolean = true
-    var notification: Boolean = true
-
-    fun toMap(): MutableMap<String, Any> = mutableMapOf(
-        "uid" to uid,
-        "policy" to policy,
-        "until" to until,
-        "logging" to logging,
-        "notification" to notification
-    )
+    fun toMap(): MutableMap<String, Any> {
+        val until = if (remain <= 0) {
+            remain
+        } else {
+            MagiskDB.Literal("(strftime(\"%s\", \"now\") + $remain)")
+        }
+        return mutableMapOf(
+            "uid" to uid,
+            "policy" to policy,
+            "until" to until,
+            "logging" to logging,
+            "notification" to notification
+        )
+    }
 }

app/core/src/main/java/com/topjohnwu/magisk/core/signing/ByteArrayStream.java

@@ -4,6 +4,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.ByteBuffer;
 
 public class ByteArrayStream extends ByteArrayOutputStream {
 
@@ -27,4 +28,8 @@ public class ByteArrayStream extends ByteArrayOutputStream {
     public ByteArrayInputStream getInputStream() {
         return new ByteArrayInputStream(buf, 0, count);
     }
+
+    public ByteBuffer toByteBuffer() {
+        return ByteBuffer.wrap(buf, 0, count);
+    }
 }

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

@@ -510,7 +510,7 @@ public class SignApk {
         privateKey[0] = key;
 
         // Generate, in memory, an APK signed using standard JAR Signature Scheme.
-        ByteArrayOutputStream v1SignedApkBuf = new ByteArrayOutputStream();
+        ByteArrayStream v1SignedApkBuf = new ByteArrayStream();
         JarOutputStream outputJar = new JarOutputStream(v1SignedApkBuf);
         // Use maximum compression for compressed entries because the APK lives forever on
         // the system partition.
@@ -519,8 +519,7 @@ public class SignApk {
         copyFiles(manifest, inputJar, outputJar, timestamp, alignment);
         signFile(manifest, publicKey, privateKey, timestamp, outputJar);
         outputJar.close();
-        ByteBuffer v1SignedApk = ByteBuffer.wrap(v1SignedApkBuf.toByteArray());
-        v1SignedApkBuf.reset();
+        ByteBuffer v1SignedApk = v1SignedApkBuf.toByteBuffer();
 
         ByteBuffer[] outputChunks;
         List<ApkSignerV2.SignerConfig> signerConfigs = createV2SignerConfigs(privateKey, publicKey,

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

@@ -62,7 +62,7 @@ class SuRequestHandler(
             return false
         }
         output = File(fifo)
-        policy = SuPolicy(uid)
+        policy = policyDB.fetch(uid) ?: SuPolicy(uid)
         try {
             pkgInfo = pm.getPackageInfo(uid, pid) ?: PackageInfo().apply {
                 val name = pm.getNameForUid(uid) ?: throw PackageManager.NameNotFoundException()
@@ -81,15 +81,13 @@ class SuRequestHandler(
         return true
     }
 
-    suspend fun respond(action: Int, time: Int) {
-        val until = if (time > 0)
-            TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()) +
-                TimeUnit.MINUTES.toSeconds(time.toLong())
-        else
-            time.toLong()
-
+    suspend fun respond(action: Int, time: Long) {
         policy.policy = action
-        policy.until = until
+        if (time >= 0) {
+            policy.remain = TimeUnit.MINUTES.toSeconds(time)
+        } else {
+            policy.remain = time
+        }
 
         withContext(Dispatchers.IO) {
             try {
@@ -100,7 +98,7 @@ class SuRequestHandler(
             } catch (e: IOException) {
                 Timber.e(e)
             }
-            if (until >= 0) {
+            if (time >= 0) {
                 policyDB.update(policy)
             }
         }

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

@@ -1,80 +0,0 @@
-package com.topjohnwu.magisk.core.su
-
-import android.os.Bundle
-import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.di.ServiceLocator
-import com.topjohnwu.magisk.core.tasks.MagiskInstaller
-import com.topjohnwu.magisk.core.utils.RootUtils
-import com.topjohnwu.superuser.CallbackList
-import com.topjohnwu.superuser.Shell
-import kotlinx.coroutines.Runnable
-import kotlinx.coroutines.runBlocking
-import timber.log.Timber
-
-object TestHandler {
-
-    object LogList : CallbackList<String>(Runnable::run) {
-        override fun onAddElement(e: String) {
-            Timber.i(e)
-        }
-    }
-
-    fun run(method: String): Bundle {
-        var reason: String? = null
-
-        fun prerequisite(): Boolean {
-            // Make sure the Magisk app can get root
-            val shell = Shell.getShell()
-            if (!shell.isRoot) {
-                reason = "shell not root"
-                return false
-            }
-
-            // Make sure the root service is running
-            RootUtils.Connection.await()
-            return true
-        }
-
-        fun setup(): Boolean {
-            return runBlocking {
-                MagiskInstaller.Emulator(LogList, LogList).exec()
-            }
-        }
-
-        fun test(): Boolean {
-            // Make sure Zygisk works correctly
-            if (!Info.isZygiskEnabled) {
-                reason = "zygisk not enabled"
-                return false
-            }
-
-            // Clear existing grant for ADB shell
-            runBlocking {
-                ServiceLocator.policyDB.delete(2000)
-                Config.suAutoResponse = Config.Value.SU_AUTO_ALLOW
-                Config.prefs.edit().commit()
-            }
-            return true
-        }
-
-        val result = prerequisite() && runCatching {
-            when (method) {
-                "setup" -> setup()
-                "test" -> test()
-                else -> {
-                    reason = "unknown method"
-                    false
-                }
-            }
-        }.getOrElse {
-            reason = it.stackTraceToString()
-            false
-        }
-
-        return Bundle().apply {
-            putBoolean("result", result)
-            if (reason != null) putString("reason", reason)
-        }
-    }
-}

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

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.app.ActivityOptions
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.os.Build
 import android.widget.Toast
 import com.topjohnwu.magisk.StubApk
@@ -13,7 +14,6 @@ import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.R
 import com.topjohnwu.magisk.core.ktx.await
-import com.topjohnwu.magisk.core.ktx.copyAndClose
 import com.topjohnwu.magisk.core.ktx.toast
 import com.topjohnwu.magisk.core.ktx.writeTo
 import com.topjohnwu.magisk.core.signing.JarMap
@@ -23,11 +23,9 @@ import com.topjohnwu.magisk.core.utils.Keygen
 import com.topjohnwu.magisk.utils.APKInstall
 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
@@ -38,6 +36,7 @@ object AppMigration {
     private const val ALPHA = "abcdefghijklmnopqrstuvwxyz"
     private const val ALPHADOTS = "$ALPHA....."
     private const val ANDROID_MANIFEST = "AndroidManifest.xml"
+    private const val TEST_PKG_NAME = "$APP_PACKAGE_NAME.test"
 
     // Some arbitrary limit
     const val MAX_LABEL_LENGTH = 32
@@ -133,21 +132,15 @@ object AppMigration {
                 val je = jar.getJarEntry(ANDROID_MANIFEST)
                 val xml = AXML(jar.getRawData(je))
                 val generator = classNameGenerator()
-
-                if (!xml.patchStrings {
-                    for (i in it.indices) {
-                        val s = it[i]
-                        if (s.contains(APP_PACKAGE_NAME)) {
-                            it[i] = s.replace(APP_PACKAGE_NAME, pkg)
-                        } else if (s.contains(PLACEHOLDER)) {
-                            it[i] = generator.next()
-                        } else if (s == origLabel) {
-                            it[i] = label.toString()
-                        }
+                val p = xml.patchStrings {
+                    when {
+                        it.contains(APP_PACKAGE_NAME) -> it.replace(APP_PACKAGE_NAME, pkg)
+                        it.contains(PLACEHOLDER) -> generator.next()
+                        it == origLabel -> label.toString()
+                        else -> it
                     }
-                }) {
-                    return false
                 }
+                if (!p) return false
 
                 // Write apk changes
                 jar.getOutputStream(je).use { it.write(xml.bytes) }
@@ -161,52 +154,87 @@ object AppMigration {
         }
     }
 
-    private fun launchApp(activity: Activity, pkg: String) {
-        val intent = activity.packageManager.getLaunchIntentForPackage(pkg) ?: return
+    private fun patchTest(apk: File, out: File, pkg: String): Boolean {
+        try {
+            JarMap.open(apk, true).use { jar ->
+                val je = jar.getJarEntry(ANDROID_MANIFEST)
+                val xml = AXML(jar.getRawData(je))
+                val p = xml.patchStrings {
+                    when (it) {
+                        APP_PACKAGE_NAME -> pkg
+                        TEST_PKG_NAME -> "$pkg.test"
+                        else -> it
+                    }
+                }
+                if (!p) return false
+
+                // Write apk changes
+                jar.getOutputStream(je).use { it.write(xml.bytes) }
+                val keys = Keygen()
+                out.outputStream().use { SignApk.sign(keys.cert, keys.key, jar, it) }
+                return true
+            }
+        } catch (e: Exception) {
+            Timber.e(e)
+            return false
+        }
+    }
+
+    private fun launchApp(context: Context, pkg: String) {
+        val intent = context.packageManager.getLaunchIntentForPackage(pkg) ?: return
         intent.putExtra(Const.Key.PREV_CONFIG, Config.toBundle())
         val options = ActivityOptions.makeBasic()
         if (Build.VERSION.SDK_INT >= 34) {
             options.setShareIdentityEnabled(true)
         }
-        activity.startActivity(intent, options.toBundle())
-        activity.finish()
+        context.startActivity(intent, options.toBundle())
+        if (context is Activity) {
+            context.finish()
+        }
     }
 
-    private suspend fun patchAndHide(activity: Activity, label: String, onFailure: Runnable): Boolean {
-        val stub = File(activity.cacheDir, "stub.apk")
+    suspend fun patchAndHide(context: Context, label: String, pkg: String? = null): Boolean {
+        val stub = File(context.cacheDir, "stub.apk")
         try {
-            activity.assets.open("stub.apk").writeTo(stub)
+            context.assets.open("stub.apk").writeTo(stub)
         } catch (e: IOException) {
             Timber.e(e)
             return false
         }
 
-        // Generate a new random package name and signature
-        val repack = File(activity.cacheDir, "patched.apk")
-        val pkg = genPackageName()
+        // Generate a new random signature and package name if needed
+        val pkg = pkg ?: genPackageName()
         Config.keyStoreRaw = ""
 
-        if (!patch(activity, stub, FileOutputStream(repack), pkg, label))
-            return false
+        // Check and patch the test APK
+        try {
+            val info = context.packageManager.getApplicationInfo(TEST_PKG_NAME, 0)
+            val testApk = File(info.sourceDir)
+            val testRepack = File(context.cacheDir, "test.apk")
+            if (!patchTest(testApk, testRepack, pkg))
+                return false
+            val cmd = "adb_pm_install $testRepack $pkg.test"
+            if (!Shell.cmd(cmd).exec().isSuccess)
+                return false
+        } catch (e: PackageManager.NameNotFoundException) {
+        }
+
+        val repack = File(context.cacheDir, "patched.apk")
+        repack.outputStream().use {
+            if (!patch(context, stub, it, pkg, label))
+                return false
+        }
 
         // Install and auto launch app
-        val session = APKInstall.startSession(activity, pkg, onFailure) {
+        val cmd = "adb_pm_install $repack $pkg"
+        if (Shell.cmd(cmd).exec().isSuccess) {
             Config.suManager = pkg
             Shell.cmd("touch $AppApkPath").exec()
-            launchApp(activity, pkg)
-        }
-
-        val cmd = "adb_pm_install $repack $pkg"
-        if (Shell.cmd(cmd).exec().isSuccess) return true
-
-        try {
-            repack.inputStream().copyAndClose(session.openStream(activity))
-        } catch (e: IOException) {
-            Timber.e(e)
+            launchApp(context, pkg)
+            return true
+        } else {
             return false
         }
-        session.waitIntent()?.let { activity.startActivity(it) } ?: return false
-        return true
     }
 
     @Suppress("DEPRECATION")
@@ -217,14 +245,25 @@ object AppMigration {
             setCancelable(false)
             show()
         }
-        val onFailure = Runnable {
+        val success = withContext(Dispatchers.IO) {
+            patchAndHide(activity, label)
+        }
+        if (!success) {
             dialog.dismiss()
             activity.toast(R.string.failure, Toast.LENGTH_LONG)
         }
-        val success = withContext(Dispatchers.IO) {
-            patchAndHide(activity, label, onFailure)
+    }
+
+    suspend fun restoreApp(context: Context): Boolean {
+        val apk = StubApk.current(context)
+        val cmd = "adb_pm_install $apk $APP_PACKAGE_NAME"
+        if (Shell.cmd(cmd).await().isSuccess) {
+            Config.suManager = ""
+            Shell.cmd("touch $AppApkPath").exec()
+            launchApp(context, APP_PACKAGE_NAME)
+            return true
         }
-        if (!success) onFailure.run()
+        return false
     }
 
     @Suppress("DEPRECATION")
@@ -235,30 +274,10 @@ object AppMigration {
             setCancelable(false)
             show()
         }
-        val onFailure = Runnable {
-            dialog.dismiss()
+        if (!restoreApp(activity)) {
             activity.toast(R.string.failure, Toast.LENGTH_LONG)
         }
-        val apk = StubApk.current(activity)
-        val session = APKInstall.startSession(activity, APP_PACKAGE_NAME, onFailure) {
-            Config.suManager = ""
-            Shell.cmd("touch $AppApkPath").exec()
-            launchApp(activity, APP_PACKAGE_NAME)
-            dialog.dismiss()
-        }
-        val cmd = "adb_pm_install $apk $APP_PACKAGE_NAME"
-        if (Shell.cmd(cmd).await().isSuccess) return
-        val success = withContext(Dispatchers.IO) {
-            try {
-                apk.inputStream().copyAndClose(session.openStream(activity))
-            } 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()
+        dialog.dismiss()
     }
 
     suspend fun upgradeStub(context: Context, apk: File): Intent? {

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

@@ -7,7 +7,6 @@ import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.ktx.writeTo
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.displayName
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
-import com.topjohnwu.magisk.core.utils.unzip
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -47,20 +46,14 @@ open class FlashZip(
             }
         }
 
-        val isValid = try {
-            zipFile.unzip(installDir, "META-INF/com/google/android", true)
-            val script = File(installDir, "updater-script")
-            script.readText().contains("#MAGISK")
+        try {
+            val binary = File(installDir, "update-binary")
+            AppContext.assets.open("module_installer.sh").use { it.writeTo(binary) }
         } catch (e: IOException) {
             console.add("! Unzip error")
             throw e
         }
 
-        if (!isValid) {
-            console.add("! This zip is not a Magisk module!")
-            return false
-        }
-
         console.add("- Installing ${mUri.displayName}")
 
         return Shell.cmd("sh $installDir/update-binary dummy 1 \'$zipFile\'")

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

@@ -17,7 +17,6 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.di.ServiceLocator
 import com.topjohnwu.magisk.core.isRunningAsStub
 import com.topjohnwu.magisk.core.ktx.copyAll
-import com.topjohnwu.magisk.core.ktx.copyAndClose
 import com.topjohnwu.magisk.core.ktx.writeTo
 import com.topjohnwu.magisk.core.utils.DummyList
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
@@ -47,7 +46,6 @@ import java.io.OutputStream
 import java.io.PushbackInputStream
 import java.nio.ByteBuffer
 import java.security.SecureRandom
-import java.util.Arrays
 import java.util.Locale
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -134,7 +132,6 @@ abstract class MagiskInstallImpl protected constructor(
                         if (entry != null) {
                             val magisk32 = File(installDir, "magisk32")
                             zf.getInputStream(entry).writeTo(magisk32)
-                            magisk32.setExecutable(true)
                         }
                     }
                 }
@@ -149,11 +146,15 @@ abstract class MagiskInstallImpl protected constructor(
                     Os.symlink(lib.path, "$installDir/$name")
                 }
 
-                // Also symlink magisk32 on 64-bit devices that supports 32-bit
-                val lib32 = info.javaClass.getDeclaredField("secondaryNativeLibraryDir")
-                    .get(info) as String?
-                if (lib32 != null) {
-                    Os.symlink("$lib32/libmagisk.so", "$installDir/magisk32");
+                // Also extract magisk32 on 64-bit devices that supports 32-bit
+                val abi32 = Const.CPU_ABI_32
+                if (Process.is64Bit() && abi32 != null) {
+                    val name = "lib/$abi32/libmagisk.so"
+                    val entry = javaClass.classLoader!!.getResourceAsStream(name)
+                    if (entry != null) {
+                        val magisk32 = File(installDir, "magisk32")
+                        entry.writeTo(magisk32)
+                    }
                 }
             }
 
@@ -191,7 +192,8 @@ abstract class MagiskInstallImpl protected constructor(
         return true
     }
 
-    private suspend fun InputStream.copyAndCloseOut(out: OutputStream) = out.use { copyAll(it) }
+    private suspend fun InputStream.copyAndCloseOut(out: OutputStream) =
+        out.use { copyAll(it, 1024 * 1024) }
 
     private class NoAvailableStream(s: InputStream) : FilterInputStream(s) {
         // Make sure available is never called on the actual stream and always return 0
@@ -225,8 +227,8 @@ abstract class MagiskInstallImpl protected constructor(
         console.add("- Processing tar file")
         var entry: TarArchiveEntry? = tarIn.nextEntry
 
-        fun TarArchiveEntry.decompressedStream(): InputStream {
-            val stream = if (name.endsWith(".lz4"))
+        fun decompressedStream(): InputStream {
+            val stream = if (tarIn.currentEntry.name.endsWith(".lz4"))
                 FramedLZ4CompressorInputStream(tarIn, true) else tarIn
             return NoAvailableStream(stream)
         }
@@ -252,9 +254,9 @@ abstract class MagiskInstallImpl protected constructor(
 
             if (bootItem != null) {
                 console.add("-- Extracting: ${bootItem.name}")
-                entry.decompressedStream().copyAndCloseOut(bootItem.file.newOutputStream())
+                decompressedStream().copyAndCloseOut(bootItem.file.newOutputStream())
             } else if (entry.name.contains("vbmeta.img")) {
-                val rawData = entry.decompressedStream().readBytes()
+                val rawData = decompressedStream().readBytes()
                 // Valid vbmeta.img should be at least 256 bytes
                 if (rawData.size < 256)
                     continue
@@ -287,7 +289,7 @@ abstract class MagiskInstallImpl protected constructor(
             } else {
                 console.add("-- Copying   : ${entry.name}")
                 tarOut.putArchiveEntry(entry)
-                tarIn.copyAll(tarOut, bufferSize = 1024 * 1024)
+                tarIn.copyAll(tarOut)
                 tarOut.closeArchiveEntry()
             }
             entry = tarIn.nextEntry ?: break
@@ -429,7 +431,7 @@ abstract class MagiskInstallImpl protected constructor(
 
         // Process input file
         try {
-            PushbackInputStream(uri.inputStream(), 512).use { src ->
+            PushbackInputStream(uri.inputStream().buffered(1024 * 1024), 512).use { src ->
                 val head = ByteArray(512)
                 if (src.read(head) != head.size) {
                     console.add("! Invalid input file")
@@ -438,12 +440,13 @@ abstract class MagiskInstallImpl protected constructor(
                 src.unread(head)
 
                 val magic = head.copyOf(4)
-                val tarMagic = Arrays.copyOfRange(head, 257, 262)
+                val tarMagic = head.copyOfRange(257, 262)
 
                 srcBoot = if (tarMagic.contentEquals("ustar".toByteArray())) {
                     // tar file
                     outFile = MediaStoreUtils.getFile("$destName.tar")
-                    outStream = TarArchiveOutputStream(outFile.uri.outputStream()).also {
+                    val os = outFile.uri.outputStream().buffered(1024 * 1024)
+                    outStream = TarArchiveOutputStream(os).also {
                         it.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_STAR)
                         it.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU)
                     }
@@ -500,7 +503,7 @@ abstract class MagiskInstallImpl protected constructor(
                 bootItem.file = newBoot
                 bootItem.copyTo(outStream as TarArchiveOutputStream)
             } else {
-                newBoot.newInputStream().copyAndClose(outStream)
+                newBoot.newInputStream().use { it.copyAll(outStream, 1024 * 1024) }
             }
             newBoot.delete()
 
@@ -514,6 +517,8 @@ abstract class MagiskInstallImpl protected constructor(
             outFile.delete()
             Timber.e(e)
             return false
+        } finally {
+            outStream.close()
         }
 
         // Fix up binaries
@@ -597,7 +602,9 @@ abstract class MagiskInstallImpl protected constructor(
         if (result)
             return true
 
-        Shell.cmd("rm -rf $installDir").submit()
+        // Not every operation initializes installDir
+        if (::installDir.isInitialized)
+            Shell.cmd("rm -rf $installDir").submit()
         return false
     }
 

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

@@ -29,7 +29,7 @@ class AXML(b: ByteArray) {
      * Followed by an array of uint32_t with size = number of strings
      * Each entry points to an offset into the string data
      */
-    fun patchStrings(patchFn: (Array<String>) -> Unit): Boolean {
+    fun patchStrings(mapFn: (String) -> String): Boolean {
         val buffer = ByteBuffer.wrap(bytes).order(LITTLE_ENDIAN)
 
         fun findStringPool(): Int {
@@ -65,7 +65,9 @@ class AXML(b: ByteArray) {
         }
 
         val strArr = strList.toTypedArray()
-        patchFn(strArr)
+        for (i in strArr.indices) {
+            strArr[i] = mapFn(strArr[i])
+        }
 
         // Write everything before string data, will patch values later
         val baos = RawByteStream()

app/core/src/main/java/com/topjohnwu/magisk/core/utils/Desugar.java

@@ -2,6 +2,10 @@ package com.topjohnwu.magisk.core.utils;
 
 import android.os.Build;
 
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
+import org.apache.commons.compress.archivers.zip.ZipUtil;
+
 import java.nio.file.attribute.FileTime;
 import java.util.zip.ZipEntry;
 
@@ -29,4 +33,15 @@ public class Desugar {
             return null;
         }
     }
+
+    /**
+     * Within {@link ZipArchiveOutputStream#copyFromZipInputStream}, we redirect the method call
+     * {@link ZipUtil#checkRequestedFeatures} to this method. This is safe because the only usage
+     * of copyFromZipInputStream is in {@link ZipArchiveOutputStream#addRawArchiveEntry},
+     * which does not need to actually understand the content of the zip entry. By removing
+     * this feature check, we can modify zip files using unsupported compression methods.
+     */
+    public static void checkRequestedFeatures(final ZipArchiveEntry ze) {
+        // No-op
+    }
 }

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

@@ -11,13 +11,10 @@ import android.net.NetworkRequest
 import android.os.PowerManager
 import androidx.collection.ArraySet
 import androidx.core.content.getSystemService
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ProcessLifecycleOwner
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.ktx.registerRuntimeReceiver
 
-class NetworkObserver(context: Context): DefaultLifecycleObserver {
+class NetworkObserver(context: Context) {
     private val manager = context.getSystemService<ConnectivityManager>()!!
 
     private val networkCallback = object : ConnectivityManager.NetworkCallback() {
@@ -55,16 +52,13 @@ class NetworkObserver(context: Context): DefaultLifecycleObserver {
         manager.registerNetworkCallback(request, networkCallback)
         val filter = IntentFilter(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED)
         context.applicationContext.registerRuntimeReceiver(receiver, filter)
-        ProcessLifecycleOwner.get().lifecycle.addObserver(this)
     }
 
-    override fun onStart(owner: LifecycleOwner) {
-        postCurrentState()
-    }
-
-    private fun postCurrentState() {
-        postValue(manager.getNetworkCapabilities(manager.activeNetwork)
-            ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) ?: false)
+    fun postCurrentState() {
+        postValue(
+            manager.getNetworkCapabilities(manager.activeNetwork)
+                ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) == true
+        )
     }
 
     private fun postValue(b: Boolean) {

app/core/src/main/java/com/topjohnwu/magisk/core/utils/ProcessLifecycle.java

@@ -1,15 +0,0 @@
-package com.topjohnwu.magisk.core.utils;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.LifecycleDispatcher;
-import androidx.lifecycle.ProcessLifecycleOwner;
-
-// Use Java to bypass Kotlin internal visibility modifier
-public class ProcessLifecycle {
-    public static void init(@NonNull Context context) {
-        LifecycleDispatcher.init(context);
-        ProcessLifecycleOwner.init$lifecycle_process_release(context);
-    }
-}

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

@@ -1,50 +0,0 @@
-package com.topjohnwu.magisk.core.utils
-
-import com.topjohnwu.magisk.core.ktx.copyAll
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
-import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream
-import org.apache.commons.compress.archivers.zip.ZipFile
-import java.io.File
-import java.io.IOException
-import java.io.InputStream
-
-@Throws(IOException::class)
-suspend fun File.unzip(folder: File, path: String = "", junkPath: Boolean = false) {
-    ZipFile.Builder().setFile(this).get().use { zip ->
-        for (entry in zip.entries) {
-            if (!entry.name.startsWith(path) || entry.isDirectory) {
-                // Ignore directories, only create files
-                continue
-            }
-            val name = if (junkPath)
-                entry.name.substring(entry.name.lastIndexOf('/') + 1)
-            else
-                entry.name
-            val dest = File(folder, name)
-            dest.parentFile?.mkdirs()
-            dest.outputStream().use { out -> zip.getInputStream(entry).copyAll(out) }
-        }
-    }
-}
-
-@Throws(IOException::class)
-suspend fun InputStream.unzip(folder: File, path: String = "", junkPath: Boolean = false) {
-    ZipArchiveInputStream(this).use { zin ->
-        var entry: ZipArchiveEntry
-        while (true) {
-            entry = zin.nextEntry ?: break
-            if (!entry.name.startsWith(path) || entry.isDirectory) {
-                // Ignore directories, only create files
-                continue
-            }
-            val name = if (junkPath)
-                entry.name.substring(entry.name.lastIndexOf('/') + 1)
-            else
-                entry.name
-
-            val dest = File(folder, name)
-            dest.parentFile?.mkdirs()
-            dest.outputStream().use { out -> zin.copyAll(out) }
-        }
-    }
-}

app/core/src/main/java/com/topjohnwu/magisk/test/AdditionalTest.kt

@@ -0,0 +1,138 @@
+package com.topjohnwu.magisk.test
+
+import android.os.ParcelFileDescriptor.AutoCloseInputStream
+import androidx.annotation.Keep
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.uiautomator.By
+import androidx.test.uiautomator.Until
+import com.topjohnwu.magisk.core.model.module.LocalModule
+import com.topjohnwu.magisk.core.utils.RootUtils
+import com.topjohnwu.magisk.test.Environment.Companion.EMPTY_ZYGISK
+import com.topjohnwu.magisk.test.Environment.Companion.INVALID_ZYGISK
+import com.topjohnwu.magisk.test.Environment.Companion.MOUNT_TEST
+import com.topjohnwu.magisk.test.Environment.Companion.REMOVE_TEST
+import com.topjohnwu.magisk.test.Environment.Companion.SEPOLICY_RULE
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.runBlocking
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Assume.assumeTrue
+import org.junit.BeforeClass
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
+import java.util.regex.Pattern
+
+@Keep
+@RunWith(AndroidJUnit4::class)
+class AdditionalTest : BaseTest {
+
+    companion object {
+        private const val SHELL_PKG = "com.android.shell"
+        private const val LSPOSED_CATEGORY = "org.lsposed.manager.LAUNCH_MANAGER"
+        private const val LSPOSED_PKG = "org.lsposed.manager"
+
+        private lateinit var modules: List<LocalModule>
+
+        @BeforeClass
+        @JvmStatic
+        fun before() {
+            BaseTest.prerequisite()
+            runBlocking {
+                modules = LocalModule.installed()
+            }
+        }
+    }
+
+    @After
+    fun teardown() {
+        device.pressHome()
+    }
+
+    @Test
+    fun testModuleCount() {
+        var expected = 2
+        if (Environment.mount()) expected++
+        if (Environment.preinit()) expected++
+        if (Environment.lsposed()) expected++
+        if (Environment.shamiko()) expected++
+        assertEquals("Module count incorrect", expected, modules.size)
+    }
+
+    @Test
+    fun testLsposed() {
+        assumeTrue(Environment.lsposed())
+
+        val module = modules.find { it.id == "zygisk_lsposed" }
+        assertNotNull("zygisk_lsposed is not installed", module)
+        module!!
+        assertFalse("zygisk_lsposed is not enabled", module.zygiskUnloaded)
+
+        // Launch lsposed manager to ensure the module is active
+        uiAutomation.executeShellCommand(
+            "am start -c $LSPOSED_CATEGORY $SHELL_PKG/.BugreportWarningActivity"
+        ).let { pfd -> AutoCloseInputStream(pfd).use { it.readBytes() } }
+
+        val pattern = Pattern.compile("$LSPOSED_PKG:id/.*")
+        assertNotNull(
+            "LSPosed manager launch failed",
+            device.wait(Until.hasObject(By.res(pattern)), TimeUnit.SECONDS.toMillis(10))
+        )
+    }
+
+    @Test
+    fun testModuleMount() {
+        assumeTrue(Environment.mount())
+
+        assertNotNull("$MOUNT_TEST is not installed", modules.find { it.id == MOUNT_TEST })
+        assertTrue(
+            "/system/etc/newfile should exist",
+            RootUtils.fs.getFile("/system/etc/newfile").exists()
+        )
+        assertFalse(
+            "/system/bin/screenrecord should not exist",
+            RootUtils.fs.getFile("/system/bin/screenrecord").exists()
+        )
+        val egg = RootUtils.fs.getFile("/system/app/EasterEgg").list() ?: arrayOf()
+        assertTrue(
+            "/system/app/EasterEgg should be empty",
+            egg.isEmpty()
+        )
+    }
+
+    @Test
+    fun testSepolicyRule() {
+        assumeTrue(Environment.preinit())
+
+        assertNotNull("$SEPOLICY_RULE is not installed", modules.find { it.id == SEPOLICY_RULE })
+        assertTrue(
+            "Module sepolicy.rule is not applied",
+            Shell.cmd("magiskpolicy --print-rules | grep -q magisk_test").exec().isSuccess
+        )
+    }
+
+    @Test
+    fun testEmptyZygiskModule() {
+        val module = modules.find { it.id == EMPTY_ZYGISK }
+        assertNotNull("$EMPTY_ZYGISK is not installed", module)
+        module!!
+        assertTrue("$EMPTY_ZYGISK should be zygisk unloaded", module.zygiskUnloaded)
+    }
+
+    @Test
+    fun testInvalidZygiskModule() {
+        val module = modules.find { it.id == INVALID_ZYGISK }
+        assertNotNull("$INVALID_ZYGISK is not installed", module)
+        module!!
+        assertTrue("$INVALID_ZYGISK should be zygisk unloaded", module.zygiskUnloaded)
+    }
+
+    @Test
+    fun testRemoveModule() {
+        assertNull("$REMOVE_TEST should be removed", modules.find { it.id == REMOVE_TEST })
+    }
+}

app/core/src/main/java/com/topjohnwu/magisk/test/BaseTest.kt

@@ -0,0 +1,27 @@
+package com.topjohnwu.magisk.test
+
+import android.app.Instrumentation
+import android.app.UiAutomation
+import android.content.Context
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
+import com.topjohnwu.magisk.core.utils.RootUtils
+import com.topjohnwu.superuser.Shell
+import org.junit.Assert.assertTrue
+
+interface BaseTest {
+    val instrumentation: Instrumentation
+        get() = InstrumentationRegistry.getInstrumentation()
+    val appContext: Context get() = instrumentation.targetContext
+    val testContext: Context get() = instrumentation.context
+    val uiAutomation: UiAutomation get() = instrumentation.uiAutomation
+    val device: UiDevice get() = UiDevice.getInstance(instrumentation)
+
+    companion object {
+        fun prerequisite() {
+            assertTrue("Should have root access", Shell.getShell().isRoot)
+            // Make sure the root service is running
+            RootUtils.Connection.await()
+        }
+    }
+}

app/core/src/main/java/com/topjohnwu/magisk/test/Environment.kt

@@ -0,0 +1,246 @@
+package com.topjohnwu.magisk.test
+
+import android.app.Notification
+import android.os.Build
+import androidx.annotation.Keep
+import androidx.core.net.toUri
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.topjohnwu.magisk.core.BuildConfig.APP_PACKAGE_NAME
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.download.DownloadNotifier
+import com.topjohnwu.magisk.core.download.DownloadProcessor
+import com.topjohnwu.magisk.core.ktx.cachedFile
+import com.topjohnwu.magisk.core.model.module.LocalModule
+import com.topjohnwu.magisk.core.tasks.AppMigration
+import com.topjohnwu.magisk.core.tasks.FlashZip
+import com.topjohnwu.magisk.core.tasks.MagiskInstaller
+import com.topjohnwu.magisk.core.utils.RootUtils
+import com.topjohnwu.superuser.CallbackList
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.nio.ExtendedFile
+import kotlinx.coroutines.runBlocking
+import org.apache.commons.compress.archivers.zip.ZipFile
+import org.junit.Assert.assertArrayEquals
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.BeforeClass
+import org.junit.Test
+import org.junit.runner.RunWith
+import timber.log.Timber
+import java.io.File
+import java.io.PrintStream
+
+@Keep
+@RunWith(AndroidJUnit4::class)
+class Environment : BaseTest {
+
+    companion object {
+        @BeforeClass
+        @JvmStatic
+        fun before() = BaseTest.prerequisite()
+
+        // The kernel running on emulators < API 26 does not play well with
+        // magic mount. Skip mount_test on those legacy platforms.
+        fun mount(): Boolean {
+            return Build.VERSION.SDK_INT >= 26
+        }
+
+        // It is possible that there are no suitable preinit partition to use
+        fun preinit(): Boolean {
+            return Shell.cmd("magisk --preinit-device").exec().isSuccess
+        }
+
+        fun lsposed(): Boolean {
+            return Build.VERSION.SDK_INT in 27..34
+        }
+
+        fun shamiko(): Boolean {
+            return Build.VERSION.SDK_INT >= 27
+        }
+
+        private const val MODULE_ERROR = "Module zip processing incorrect"
+        const val MOUNT_TEST = "mount_test"
+        const val SEPOLICY_RULE = "sepolicy_rule"
+        const val INVALID_ZYGISK = "invalid_zygisk"
+        const val REMOVE_TEST = "remove_test"
+        const val EMPTY_ZYGISK = "empty_zygisk"
+    }
+
+    object TimberLog : CallbackList<String>(Runnable::run) {
+        override fun onAddElement(e: String) {
+            Timber.i(e)
+        }
+    }
+
+    private fun checkModuleZip(file: File) {
+        // Make sure module processing is correct
+        ZipFile.Builder().setFile(file).get().use { zip ->
+            val meta = zip.entries
+                .asSequence()
+                .filter { it.name.startsWith("META-INF") }
+                .toMutableList()
+            assertEquals(MODULE_ERROR, 6, meta.size)
+
+            val binary = zip.getInputStream(
+                zip.getEntry("META-INF/com/google/android/update-binary")
+            ).use { it.readBytes() }
+            val ref = appContext.assets.open("module_installer.sh").use { it.readBytes() }
+            assertArrayEquals(MODULE_ERROR, ref, binary)
+
+            val script = zip.getInputStream(
+                zip.getEntry("META-INF/com/google/android/updater-script")
+            ).use { it.readBytes() }
+            assertArrayEquals(MODULE_ERROR, "#MAGISK\n".toByteArray(), script)
+        }
+    }
+
+    private fun setupMountTest(root: ExtendedFile) {
+        val error = "$MOUNT_TEST setup failed"
+        val path = root.getChildFile(MOUNT_TEST)
+
+        // Create /system/etc/newfile
+        val etc = path.getChildFile("system").getChildFile("etc")
+        assertTrue(error, etc.mkdirs())
+        assertTrue(error, etc.getChildFile("newfile").createNewFile())
+
+        // Create /system/app/EasterEgg/.replace
+        val egg = path.getChildFile("system").getChildFile("app").getChildFile("EasterEgg")
+        assertTrue(error, egg.mkdirs())
+        assertTrue(error, egg.getChildFile(".replace").createNewFile())
+
+        // Delete /system/bin/screenrecord
+        val bin = path.getChildFile("system").getChildFile("bin")
+        assertTrue(error, bin.mkdirs())
+        assertTrue(error, Shell.cmd("mknod $bin/screenrecord c 0 0").exec().isSuccess)
+
+        assertTrue(error, Shell.cmd("set_default_perm $path").exec().isSuccess)
+    }
+
+    private fun setupSepolicyRuleModule(root: ExtendedFile) {
+        val error = "$SEPOLICY_RULE setup failed"
+        val path = root.getChildFile(SEPOLICY_RULE)
+        assertTrue(error, path.mkdirs())
+
+        // Add sepolicy patch
+        PrintStream(path.getChildFile("sepolicy.rule").newOutputStream()).use {
+            it.println("type magisk_test domain")
+        }
+
+        assertTrue(error, Shell.cmd(
+            "set_default_perm $path",
+            "copy_preinit_files"
+        ).exec().isSuccess)
+    }
+
+    private fun setupEmptyZygiskModule(root: ExtendedFile) {
+        val error = "$EMPTY_ZYGISK setup failed"
+        val path = root.getChildFile(EMPTY_ZYGISK)
+
+        // Create an empty zygisk folder
+        val module = LocalModule(path)
+        assertTrue(error, module.zygiskFolder.mkdirs())
+    }
+
+    private fun setupInvalidZygiskModule(root: ExtendedFile) {
+        val error = "$INVALID_ZYGISK setup failed"
+        val path = root.getChildFile(INVALID_ZYGISK)
+
+        // Create invalid zygisk libraries
+        val module = LocalModule(path)
+        assertTrue(error, module.zygiskFolder.mkdirs())
+        assertTrue(error, module.zygiskFolder.getChildFile("armeabi-v7a.so").createNewFile())
+        assertTrue(error, module.zygiskFolder.getChildFile("arm64-v8a.so").createNewFile())
+        assertTrue(error, module.zygiskFolder.getChildFile("x86.so").createNewFile())
+        assertTrue(error, module.zygiskFolder.getChildFile("x86_64.so").createNewFile())
+
+        assertTrue(error, Shell.cmd("set_default_perm $path").exec().isSuccess)
+    }
+
+    private fun setupRemoveModule(root: ExtendedFile) {
+        val error = "$REMOVE_TEST setup failed"
+        val path = root.getChildFile(REMOVE_TEST)
+
+        // Create a new module but mark is as "remove"
+        val module = LocalModule(path)
+        assertTrue(error, path.mkdirs())
+        assertTrue(error, path.getChildFile("service.sh").createNewFile())
+        module.remove = true
+
+        assertTrue(error, Shell.cmd("set_default_perm $path").exec().isSuccess)
+    }
+
+    @Test
+    fun setupEnvironment() {
+        runBlocking {
+            assertTrue(
+                "Magisk setup failed",
+                MagiskInstaller.Emulator(TimberLog, TimberLog).exec()
+            )
+        }
+
+        val notify = object : DownloadNotifier {
+            override val context = appContext
+            override fun notifyUpdate(id: Int, editor: (Notification.Builder) -> Unit) {}
+        }
+        val processor = DownloadProcessor(notify)
+
+        val shamiko = appContext.cachedFile("shamiko.zip")
+        runBlocking {
+            testContext.assets.open("shamiko.zip").use {
+                processor.handleModule(it, shamiko.toUri())
+            }
+            checkModuleZip(shamiko)
+            if (shamiko()) {
+                assertTrue(
+                    "Shamiko installation failed",
+                    FlashZip(shamiko.toUri(), TimberLog, TimberLog).exec()
+                )
+            }
+        }
+
+        val lsp = appContext.cachedFile("lsposed.zip")
+        runBlocking {
+            testContext.assets.open("lsposed.zip").use {
+                processor.handleModule(it, lsp.toUri())
+            }
+            checkModuleZip(lsp)
+            if (lsposed()) {
+                assertTrue(
+                    "LSPosed installation failed",
+                    FlashZip(lsp.toUri(), TimberLog, TimberLog).exec()
+                )
+            }
+        }
+
+        val root = RootUtils.fs.getFile(Const.MODULE_PATH)
+        if (mount()) { setupMountTest(root) }
+        if (preinit()) { setupSepolicyRuleModule(root) }
+        setupEmptyZygiskModule(root)
+        setupInvalidZygiskModule(root)
+        setupRemoveModule(root)
+    }
+
+    @Test
+    fun setupAppHide() {
+        runBlocking {
+            assertTrue(
+                "App hiding failed",
+                AppMigration.patchAndHide(
+                    context = appContext,
+                    label = "Settings",
+                    pkg = "repackaged.$APP_PACKAGE_NAME"
+                )
+            )
+        }
+    }
+
+    @Test
+    fun setupAppRestore() {
+        runBlocking {
+            assertTrue(
+                "App restoration failed",
+                AppMigration.restoreApp(appContext)
+            )
+        }
+    }
+}

app/core/src/main/java/com/topjohnwu/magisk/test/MagiskAppTest.kt

@@ -0,0 +1,86 @@
+package com.topjohnwu.magisk.test
+
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.Build
+import android.os.ParcelFileDescriptor.AutoCloseInputStream
+import androidx.annotation.Keep
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.model.su.SuPolicy
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
+import org.junit.BeforeClass
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
+
+@Keep
+@RunWith(AndroidJUnit4::class)
+class MagiskAppTest : BaseTest {
+
+    companion object {
+        @BeforeClass
+        @JvmStatic
+        fun before() = BaseTest.prerequisite()
+    }
+
+    @Test
+    fun testZygisk() {
+        assertTrue("Zygisk should be enabled", Info.isZygiskEnabled)
+    }
+
+    @Test
+    fun testSuRequest() {
+        // Bypass the need to actually show a dialog
+        Config.suAutoResponse = Config.Value.SU_AUTO_ALLOW
+        Config.prefs.edit().commit()
+
+        // Inject an undetermined + mute logging policy for ADB shell
+        val policy = SuPolicy(
+            uid = 2000,
+            logging = false,
+            notification = false,
+            remain = 0L
+        )
+        runBlocking {
+            ServiceLocator.policyDB.update(policy)
+        }
+
+        val filter = IntentFilter(Intent.ACTION_VIEW)
+        filter.addCategory(Intent.CATEGORY_DEFAULT)
+        val monitor = instrumentation.addMonitor(filter, null, false)
+
+        // Try to call su from ADB shell
+        val cmd = if (Build.VERSION.SDK_INT < 24) {
+            // API 23 runs executeShellCommand as root
+            "/system/xbin/su 2000 su -c id"
+        } else {
+            "su -c id"
+        }
+        val pfd = uiAutomation.executeShellCommand(cmd)
+
+        // Make sure SuRequestActivity is launched
+        val suRequest = monitor.waitForActivityWithTimeout(TimeUnit.SECONDS.toMillis(10))
+        assertNotNull("SuRequestActivity is not launched", suRequest)
+
+        // Check that the request went through
+        AutoCloseInputStream(pfd).reader().use {
+            assertTrue(
+                "Cannot grant root permission from shell",
+                it.readText().contains("uid=0")
+            )
+        }
+
+        // Check that the database is updated
+        runBlocking {
+            val policy = ServiceLocator.policyDB.fetch(2000)
+                ?: throw AssertionError("PolicyDB is invalid")
+            assertEquals("Policy for shell is incorrect", SuPolicy.ALLOW, policy.policy)
+        }
+    }
+}

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

@@ -6,25 +6,25 @@
     <string name="logs">السجلات</string>
     <string name="settings">الإعدادات</string>
     <string name="install">تثبيت</string>
-    <string name="section_home">الأساسي</string>
-    <string name="section_theme">السِمات</string>
+    <string name="section_home">الصفحة الرئيسية</string>
+    <string name="section_theme">المظهر</string>
 
     <!--Home-->
     <string name="no_connection">لا يوجد إتصال</string>
     <string name="app_changelog">تفاصيل التحديث</string>
     <string name="loading">جارٍ التحميل...</string>
     <string name="update">تحديث</string>
-    <string name="not_available">غير/متوفر</string>
+    <string name="not_available">غير متوفر</string>
     <string name="hide">إخفاء</string>
     <string name="home_package">الحزمة</string>
 
     <string name="home_support_title">تبرع لنا</string>
     <string name="home_item_source">الكود المصدري للتطبيق</string>
-    <string name="home_support_content">مـاجـيسك هي، وستظل دوماً، مجانيةً و مفتوحة المصدر، اظهر اهتمامك لنا لكي نبقيها هكذا بدعم مالي صغير</string>
+    <string name="home_support_content">ماجيسك هو، وسيظل دوماً، مجانياّ و مفتوح المصدر، اظهر اهتمامك لنا لكي نبقيه هكذا بدعم مالي صغير</string>
     <string name="home_installed_version">تم التثبيت</string>
     <string name="home_latest_version">آخر إصدار</string>
     <string name="invalid_update_channel">مصدر التحديث غير صالح</string>
-    <string name="uninstall_magisk_title">إلغاء تثبيت Magisk</string>
+    <string name="uninstall_magisk_title">إلغاء تثبيت ماجيسك</string>
     <string name="uninstall_magisk_msg">ستُعطل/ستُحذف جميع الإضافات. سيُحذف الروت، وربما ستشفر بياناتك إذا لم تكن غير مشفرة حالياً.</string>
 
     <!--Install-->
@@ -34,7 +34,7 @@
     <string name="install_options_title">الخيارات</string>
     <string name="install_method_title">الطريقة</string>
     <string name="install_next">التالي</string>
-    <string name="install_start">هيا، بنا</string>
+    <string name="install_start">هيا بنا</string>
     <string name="manager_download_install">اضغط للتنزيل و التثبيت</string>
     <string name="direct_install">تثبيت مباشر (موصى بها)</string>
     <string name="install_inactive_slot">التثبيت على المنطقة الغير نشطة (بعد OTA)</string>
@@ -87,15 +87,15 @@
 
     <!-- MagiskHide -->
     <string name="show_system_app">إظهار برامج النظام</string>
-    <string name="hide_filter_hint">البحث بالإسم</string>
+    <string name="hide_filter_hint">البحث بالاسم</string>
     <string name="hide_search">ابحث</string>
 
     <!--Module Fragment-->
-    <string name="no_info_provided">(لم توفر معلومات)</string>
+    <string name="no_info_provided">(لا تتوفر معلومات)</string>
     <string name="reboot_recovery">إعادة التشغيل إلى Recovery</string>
     <string name="reboot_bootloader">إعادة التشغيل إلى Bootloader</string>
     <string name="reboot_download">إعادة التشغيل إلى وضـع Odin</string>
-    <string name="reboot_edl">إعادة التشغيل إلى وضـعية EDL</string>
+    <string name="reboot_edl">إعادة التشغيل إلى EDL</string>
     <string name="module_version_author">%1$sبواسطة%2$s</string>
     <string name="module_state_remove">إزالة </string>
     <string name="module_state_restore">إسترجاع</string>
@@ -104,15 +104,15 @@
     <string name="external_rw_permission_denied">امنحني إذن الولوج للذاكرة الداخلية</string>
 
     <!--Settings -->
-    <string name="settings_dark_mode_title">وضـعية الِسمات</string>
-    <string name="settings_dark_mode_message">حدد الوضـع الذي يناسب ذوقك</string>
+    <string name="settings_dark_mode_title">المظهر</string>
+    <string name="settings_dark_mode_message">حدد المظهر الذي يناسب ذوقك</string>
     <string name="settings_dark_mode_light">الوضـع المضيء</string>
     <string name="settings_dark_mode_system">اتبّع النظام</string>
-    <string name="settings_dark_mode_dark">وضـع الظلام</string>
+    <string name="settings_dark_mode_dark">الوضع المظلم</string>
     <string name="settings_download_path_title">مسار التحميل</string>
     <string name="settings_download_path_message">ستحمل الملفات إلى %1$s</string>
     <string name="language">اللغة</string>
-    <string name="system_default">(الأفتراضي)</string>
+    <string name="system_default">(الإفتراضي)</string>
     <string name="settings_check_update_title">تحقق من التحديثات</string>
     <string name="settings_check_update_summary">التحقق من التحديثات في الخلفية بشكل دوري</string>
     <string name="settings_update_channel_title">مصدر التحديثات</string>
@@ -123,8 +123,8 @@
     <string name="settings_hosts_title">موانع الاعلانات</string>
     <string name="settings_hosts_summary">حجب الاعلانات دون تعديل النظام</string>
     <string name="settings_hosts_toast">تم تمكين خاصية حجب الاعلانات</string>
-    <string name="settings_app_name_hint">الإسم الجديد</string>
-    <string name="settings_app_name_helper">التطبيق الجديد سوف يملك هذا الإسم</string>
+    <string name="settings_app_name_hint">الاسم الجديد</string>
+    <string name="settings_app_name_helper">التطبيق الجديد سوف يملك هذا الاسم</string>
     <string name="settings_app_name_error">الصيغة غير مقبولة</string>
     <string name="settings_su_app_adb">التطبيقات و ADB</string>
     <string name="settings_su_app">التطبيقات فقط</string>
@@ -140,51 +140,51 @@
     <string name="auto_response">الفعل التلقائي</string>
     <string name="request_timeout">المهلة قبل الفعل التلقائي</string>
     <string name="superuser_notification">إشعارات طلبات الروت</string>
-    <string name="settings_su_reauth_title">إعادة المصادقة بعد الترقية</string>
-    <string name="settings_su_reauth_summary">أعد مصادقة صلاحيات الروت بعد إجراء ترقيات للتطبيق</string>
+    <string name="settings_su_reauth_title">إعادة المصادقة بعد التحديث</string>
+    <string name="settings_su_reauth_summary">أعد مصادقة صلاحيات الروت بعد تحديث التطبيق</string>
     <string name="settings_customization">تخصيص</string>
 
-    <string name="multiuser_mode">نمط مستخدمين متعددين</string>
+    <string name="multiuser_mode">نمط المستخدم المزدوج</string>
     <string name="settings_owner_only">مالك الجهاز فقط</string>
     <string name="settings_owner_manage">المالك هو من يحدد</string>
-    <string name="settings_user_independent">مستقل </string>
+    <string name="settings_user_independent">مستقل</string>
     <string name="owner_only_summary">للمالك فقط له صلاحيات الروت</string>
     <string name="owner_manage_summary">فقط المالك من يرفض و يمنح صلاحيات الروت</string>
     <string name="user_independent_summary">كل مستخدم له قواعد روت خاصة به</string>
 
     <string name="mount_namespace_mode">نمط Mount Namespace</string>
-    <string name="settings_ns_global">نمط Namespace العام</string>
-    <string name="settings_ns_requester">نمط NameSpace المتوارث</string>
-    <string name="settings_ns_isolate">نمط NameSpace المعزول</string>
+    <string name="settings_ns_global">نمط Namespace عام</string>
+    <string name="settings_ns_requester">نمط NameSpace متوارث</string>
+    <string name="settings_ns_isolate">نمط NameSpace معزول</string>
     <string name="global_summary">جميع الجلسات الروت تستخدم NameSpace العام</string>
     <string name="requester_summary">جميع الجلسات الروت تستخدم NameSpace المتوارث</string>
     <string name="isolate_summary">جميع الجلسات الروت تستخدم NameSpace المعزول</string>
 
     <!--Notifications-->
-    <string name="update_channel">تحديثات Magisk</string>
+    <string name="update_channel">تحديثات ماجيسك</string>
     <string name="progress_channel">إشعارات التقدم</string>
     <string name="download_complete">اكتمل التنزيل</string>
     <string name="download_file_error">فشل تنزيل الملف</string>
-    <string name="magisk_update_title">تحديث مـاجـيسك متوفر!</string>
+    <string name="magisk_update_title">تحديث ماجيسك متوفر!</string>
 
     <!--Toasts, Dialogs-->
     <string name="yes">نعم</string>
     <string name="no">لا</string>
     <string name="download">تنزيل</string>
     <string name="reboot">إعادة التشغيل</string>
-    <string name="release_notes">معلومات الأصدار الجديد</string>
-    <string name="flashing">يتم الحرق...</string>
+    <string name="release_notes">معلومات الإصدار الجديد</string>
+    <string name="flashing">يتم التثبيت...</string>
     <string name="done">تم!</string>
     <string name="failure">فشل!</string>
     <string name="open_link_failed_toast">لم يُعثر على تطبيق لفتح الرابط …</string>
     <string name="complete_uninstall">إلغاء التثبيت بالكامل</string>
     <string name="restore_img">استعادة الصور</string>
-    <string name="restore_img_msg">جار الأستعادة…</string>
-    <string name="restore_done">تم الأستعادة</string>
-    <string name="restore_fail">النسخة الاحتياطية الأصلية غير موجودة!</string>
-    <string name="setup_fail">فشل التضبيط</string>
-    <string name="env_fix_title"> الإعداد الأضافي مطلوب</string>
-    <string name="setup_msg">جار تضبيت البيئة</string>
-    <string name="unsupport_magisk_title">إصدار مـاجـيسك غير مدعوم</string>
+    <string name="restore_img_msg">جار الإستعادة…</string>
+    <string name="restore_done">تم الإستعادة</string>
+    <string name="restore_fail">النسخة الإحتياطية الأصلية غير موجودة!</string>
+    <string name="setup_fail">فشل الإعداد</string>
+    <string name="env_fix_title">الإعداد الإضافي مطلوب</string>
+    <string name="setup_msg">جار إعداد البيئة</string>
+    <string name="unsupport_magisk_title">إصدار ماجيسك غير مدعوم</string>
 
 </resources>

app/core/src/main/res/values-ast/strings.xml

@@ -4,7 +4,7 @@
     <string name="modules">Módulos</string>
     <string name="superuser">Superusuariu</string>
     <string name="logs">Rexistru</string>
-    <string name="settings">Axustes</string>
+    <string name="settings">Configuración</string>
     <string name="install">Instalar</string>
     <string name="section_home">Aniciu</string>
     <string name="section_theme">Estilos</string>
@@ -15,7 +15,7 @@
     <string name="loading">Cargando…</string>
     <string name="update">Anovar</string>
     <string name="not_available">N/D</string>
-    <string name="hide">Anubrir</string>
+    <string name="hide">Esconder</string>
     <string name="home_package">Paquete</string>
     <string name="home_app_title">Aplicación</string>
     <string name="home_notice_content">Baxa Magisk NAMÁS dende la páxina oficial de GitHub. ¡Los ficheros de fontes desconocíes puen ser maliciosos!</string>
@@ -39,10 +39,10 @@
     <string name="manager_download_install">Primi equí pa baxalu ya instalalu</string>
     <string name="direct_install">Instalación direuta (aconséyase)</string>
     <string name="install_inactive_slot">Instalar na ralura inactiva (darréu del OTA)</string>
-    <string name="install_inactive_slot_msg">¡El preséu va arrincar OBLIGATORIAMENTE na ralura inactiva darréu de reaniciar!\nUsa esta opción namás dempués d\'acabar l\'anovamientu per OTA.\n¿Quies siguir?</string>
+    <string name="install_inactive_slot_msg">¡El preséu va arrincar OBLIGATORIAMENTE na ralura inactiva dempués de reaniciar!\nUsa esta opción namás dempués d\'acabar l\'anovamientu per OTA.\n¿Quies siguir?</string>
     <string name="setup_title">Configuración adicional</string>
     <string name="select_patch_file">Seleicionar y parchiar un ficheru</string>
-    <string name="patch_file_msg">Seleiciona una imaxe en bruto (*.img) o un archivu d\'ODIN (*.tar)</string>
+    <string name="patch_file_msg">Seleiciona una imaxe en bruto (*.img), un archivu d\'ODIN (*.tar) o un ficheru payload.bin (*.bin)</string>
     <string name="reboot_delay_toast">Reaniciando en 5 segundos…</string>
     <string name="flash_screen_title">Instalación</string>
     <!--Superuser-->
@@ -81,6 +81,9 @@
     <string name="logs_cleared">El rexistru borróse correutamente</string>
     <string name="pid">PID: %1$d</string>
     <string name="target_uid">UID de destín: %1$d</string>
+    <string name="target_pid">Mount ns target PID: %s</string>
+    <string name="selinux_context">Contestu de SELinux: %s</string>
+    <string name="supp_group">Grupu suplementariu: %s</string>
     <!--SafetyNet-->
     <!--MagiskHide-->
     <string name="show_system_app">Aplicaciones del sistema</string>
@@ -94,15 +97,19 @@
     <string name="reboot_bootloader">Reaniciar al cargador d\'arrinque</string>
     <string name="reboot_download">Reaniciar al mou de descarga</string>
     <string name="reboot_edl">Reaniciar al mou EDL</string>
+    <string name="reboot_safe_mode">Mou seguru</string>
     <string name="module_version_author">%1$s por %2$s</string>
     <string name="module_state_remove">Quitar</string>
+    <string name="module_action">Aición</string>
     <string name="module_state_restore">Restaurar</string>
     <string name="module_action_install_external">Instalar dende l\'almacenamientu</string>
     <string name="update_available">Hai un anovamientu disponible</string>
     <string name="suspend_text_riru">Suspendióse\'l módulu porque s\'activó «%1$s»</string>
     <string name="suspend_text_zygisk">Suspendióse\'l módulu porque nun s\'activó «%1$s»</string>
-    <string name="zygisk_module_unloaded">El módulu de Zygisk nun cargó pola mor d\'haber incompatibilidaes</string>
+    <string name="zygisk_module_unloaded">El módulu de Zygisk nun cargó por haber incompatibilidaes</string>
     <string name="module_empty">Nun hai nengún módulu instaláu</string>
+    <string name="confirm_install">¿Quies instalar el módulu «%1$s»?</string>
+    <string name="confirm_install_title">Confirmación de la instalación</string>
     <!--Settings-->
     <string name="settings_dark_mode_title">Mou del estilu</string>
     <string name="settings_dark_mode_message">¡Seleiciona\'l mou que meyor s\'adaute al to estilu!</string>
@@ -111,7 +118,7 @@
     <string name="settings_dark_mode_dark">Escuridá</string>
     <string name="settings_download_path_title">Camín de les descargues</string>
     <string name="settings_download_path_message">Los ficheros van guardase en «%1$s»</string>
-    <string name="settings_hide_app_title">Anubrir Magisk</string>
+    <string name="settings_hide_app_title">Esconder Magisk</string>
     <string name="settings_hide_app_summary">Instala una aplicación intermedia con una ID y una etiqueta al debalu</string>
     <string name="settings_restore_app_title">Restaurar el mou visible</string>
     <string name="settings_restore_app_summary">Fai que l\'aplicación orixinal vuelva ser visible</string>
@@ -149,14 +156,19 @@
     <string name="auto_response">Rempuesta automática</string>
     <string name="request_timeout">Tiempu d\'espera de les solicitúes</string>
     <string name="superuser_notification">Avisu de superusuariu</string>
-    <string name="settings_su_reauth_title">Volver autenticar darréu d\'anovar</string>
+    <string name="settings_su_reauth_title">Volver autenticar dempués d\'anovar</string>
     <string name="settings_su_reauth_summary">Vuelve pidir los permisos de superusuariu dempués d\'anovar les aplicaciones</string>
     <string name="settings_su_tapjack_title">Proteición escontra\'l tapjacking</string>
     <string name="settings_su_tapjack_summary">El diálogu de concesión de permisos de superusuariu nun respuende a la entrada mentanto lu torgue otra ventana o superposición</string>
+    <string name="settings_su_auth_title">Autenticación d\'usuariu</string>
+    <string name="settings_su_auth_summary">Pide l\'autenticación demientres les solicitúes de superusuariu</string>
+    <string name="settings_su_auth_insecure">Nun se configuró nengún métodu d\'autenticación nel preséu</string>
     <string name="settings_customization">Personalización</string>
-    <string name="setting_add_shortcut_summary">Amiesta un atayu a la pantalla d\'aniciu en casu de que\'l nome y l\'iconu seyan difíciles de reconocer darréu d\'anubrir l\'aplicación</string>
+    <string name="setting_add_shortcut_summary">Amiesta un atayu a la pantalla d\'aniciu en casu de que\'l nome y l\'iconu seyan difíciles de reconocer dempués d\'esconder l\'aplicación</string>
     <string name="settings_doh_title">DNS per HTTPS</string>
     <string name="settings_doh_description">Una igua alternativa pal envelenamientu de DNS en dalgunos países</string>
+    <string name="settings_random_name_title">Nome de la salida aleatoriu</string>
+    <string name="settings_random_name_description">Fai que\'l nome de ficheru de la salida de les imáxenes parchiaes y los ficheros tar seya aleatoriu pa impidir la deteición</string>
     <string name="multiuser_mode">Mou de multiusuariu</string>
     <string name="settings_owner_only">Namás el propietariu del preséu</string>
     <string name="settings_owner_manage">El propietariu xestionáu del preséu</string>
@@ -186,11 +198,14 @@
     <string name="repo_install_title">Instalación de: %1$s %2$s (%3$d)</string>
     <string name="download">Baxar</string>
     <string name="reboot">Reaniciar</string>
+    <string name="close">Zarrar</string>
     <string name="release_notes">Notes de la versión</string>
     <string name="flashing">Flaxando…</string>
+    <string name="running">Executando…</string>
     <string name="done">¡Fecho!</string>
+    <string name="done_action">Completóse l\'aición de: %1$s</string>
     <string name="failure">¡Falló!</string>
-    <string name="hide_app_title">Anubriendo l\'aplicación Magisk…</string>
+    <string name="hide_app_title">Escondiendo l\'aplicación Magisk…</string>
     <string name="open_link_failed_toast">Nun s\'atopó nenguna aplicación p\'abrir l\'enllaz</string>
     <string name="complete_uninstall">Desinstalar dafechu</string>
     <string name="restore_img">Restaurar les imáxenes</string>
@@ -200,6 +215,7 @@
     <string name="setup_fail">La configuración falló</string>
     <string name="env_fix_title">Configuración adicional</string>
     <string name="env_fix_msg">El preséu precisa una configuración adicional pa que Magisk funcione afayadizamente. ¿Quies siguir y reaniciar?</string>
+    <string name="env_full_fix_msg">El preséu precisa volver flaxar Magisk pa que funcione afayadizamente. Volvi instalar Magisk dientro de l\'aplicación porque\'l mou de recuperación nun pue consiguir la información correuta del preséu.</string>
     <string name="setup_msg">Executando la configuración del entornu…</string>
     <string name="unsupport_magisk_title">Versión non compatible</string>
     <string name="unsupport_magisk_msg">Esta versión de l\'aplicación nun ye compatible coles versiones de Magisk anteriores a la %1$s.\n\nL\'aplicación va comportase como si Magisk nun tuviere instaláu, anueva Magisk namás que puedas.</string>
@@ -207,12 +223,13 @@
     <string name="unsupport_system_app_msg">Esta aplicación nun se pue executar nel espaciu del sistema. Volvi instalala mas nel espaciu del usuariu.</string>
     <string name="unsupport_other_su_msg">Detectóse un binariu «su» que nun ye de Magisk. Quita cualesquier solución de root y/o volvi instalar Magisk.</string>
     <string name="unsupport_external_storage_msg">Magisk ta instaláu nel almacenamientu esternu. Movi l\'aplicación al almacenamientu internu, por favor.</string>
-    <string name="unsupport_nonroot_stub_msg">Magisk nun pue siguir funcionando nel mou anubríu darréu que se perdió\'l root. Restaura\'l mou visible de l\'aplicación.</string>
+    <string name="unsupport_nonroot_stub_msg">Magisk nun pue siguir funcionando nel mou escondíu darréu que se perdió\'l root. Restaura\'l mou visible de l\'aplicación.</string>
     <string name="unsupport_nonroot_stub_title">@string/settings_restore_app_title</string>
     <string name="external_rw_permission_denied">Concede\'l permisu d\'almacenamientu p\'activar esta funcionalidá</string>
+    <string name="post_notifications_denied">Concede\'l permisu de los avisos p\'activar esta función</string>
     <string name="install_unknown_denied">Permite la instalación d\'aplicaciones desconocíes p\'activar esta funcionalidá</string>
     <string name="add_shortcut_title">Amestar un atayu a la pantalla d\'aniciu</string>
-    <string name="add_shortcut_msg">Darréu d\'anubrir esta aplicación, el so nome ya iconu van ser difíciles de reconocer. ¿Quies amestar un atayu a la pantalla d\'aniciu?</string>
+    <string name="add_shortcut_msg">Dempués d\'esconder esta aplicación, el so nome ya iconu van ser difíciles de reconocer. ¿Quies amestar un atayu a la pantalla d\'aniciu?</string>
     <string name="app_not_found">Nun s\'atopó nenguna aplicación pa remanar esta aición</string>
     <string name="reboot_apply_change">Reanicia p\'aplicar los cambeos</string>
     <string name="restore_app_confirmation">Esta aición va restaurar l\'aplicación orixinal y desanicia la intermedia. ¿De xuru que quies facelo?</string>

app/core/src/main/res/values-ku/strings.xml

@@ -0,0 +1,252 @@
+<resources>
+
+    <!--Sections-->
+    <string name="modules">زیادکراوەکان</string>
+    <string name="superuser">سوپەر یوسەر</string>
+    <string name="logs">تۆمارەکان</string>
+    <string name="settings">ڕێکخستنەکان</string>
+    <string name="install">دامەزراندن</string>
+    <string name="section_home">ماڵەوە</string>
+    <string name="section_theme">ڕووکارەکان</string>
+    <string name="denylist">پێڕستی ڕێگەپێنەدراوەکان</string>
+
+    <!--Home-->
+    <string name="no_connection">هێڵ بەردەست نییە</string>
+    <string name="app_changelog">گۆڕانکارییەکان</string>
+    <string name="loading">کردنەوە…</string>
+    <string name="update">بەرزکردنەوە</string>
+    <string name="not_available">نییە</string>
+    <string name="hide">شاردنەوە</string>
+    <string name="home_package">پاکێج</string>
+    <string name="home_app_title">ئەپ</string>
+
+    <string name="home_notice_content">تەنها لە گیتهەبی فەرمی ماجیسک دابگرە، لە شوێنی تر لەوانەیە زیانبەخش بێت</string>
+    <string name="home_support_title">پشتگیریمان بکە</string>
+    <string name="home_follow_title">شوێنمان بکەوە</string>
+    <string name="home_item_source">سەرچاوە</string>
+    <string name="home_support_content">ماجیسک بە خۆڕاییە و هەر واش ئەمێنێتەوە، بەهەرحاڵ ئەتوانیت پشتگیرییەکمان بکەی بۆ گرنگی پێدان</string>
+    <string name="home_installed_version">داگیراوە</string>
+    <string name="home_latest_version">دوایین وەشان</string>
+    <string name="invalid_update_channel">کەناڵێکی نوێکردنەوەی هەڵە</string>
+    <string name="uninstall_magisk_title">سڕینەوەی ماجیسک</string>
+    <string name="uninstall_magisk_msg">هەموو زیادکراوەکان دەسڕێنەوە، ڕۆت دەسڕێتەوە، و هەر ڕەمزێنراوێک بەهۆی ماجیسک کرابێ لادەچێت!</string>
+
+    <!--Install-->
+    <string name="keep_force_encryption">ڕەمزاندنی بەزۆر بهێڵەوە</string>
+    <string name="keep_dm_verity">بهێڵەوە AVB 2.0/dm-verity</string>
+    <string name="recovery_mode">دۆخی ڕیکەڤەڕی</string>
+    <string name="install_options_title">هەڵبژاردنەکان</string>
+    <string name="install_method_title">ڕێگای</string>
+    <string name="install_next">دواتر</string>
+    <string name="install_start">با بیکەین</string>
+    <string name="manager_download_install">بۆ داگرتن و ڕێکخستن کرتە بکە</string>
+    <string name="direct_install">داگرتنی ڕاستەوخۆ(پێشنیارکراوە)</string>
+    <string name="install_inactive_slot">دایبگرە بۆ خانەی ناچالاک(پاش OTA)</string>
+    <string name="install_inactive_slot_msg">ئێستا ئامێرەکەت دەچێتە خانە ناچالاکەکە، ئەمە بەکاربهێنە تەنها دوای ئەپدەیت کردن لە ڕێگەی OTA، بەردەوام دەبیت؟</string>
+    <string name="setup_title">ڕێکخستنی زیاتر</string>
+    <string name="select_patch_file">فایلێک هەڵبژێرە و پینەی بکە</string>
+    <string name="patch_file_msg">تکایە فایلێکی Tar یان img یان payload.bin هەڵبژێرە</string>
+    <string name="reboot_delay_toast">ڕێستارت کردنەوە لە ماوەی ٥ چرکە…</string>
+    <string name="flash_screen_title">ڕێکخستن</string>
+
+    <!--Superuser-->
+    <string name="su_request_title">داواکاری سوپەریوسەر</string>
+    <string name="touch_filtered_warning">ئەپێک لە سەر شاشەکەیە، ناتوانین دڵنیا بینەوە</string>
+    <string name="deny">ڕەتکردنەوە</string>
+    <string name="prompt">داواکاری</string>
+    <string name="grant">ڕێگەپێدان</string>
+    <string name="su_warning">ڕێگەپێدان بۆ تەواوی ئامێرەکەت، گەر دڵنیا نیت ڕەتی بکەوە</string>
+    <string name="forever">بۆ هەمیشە</string>
+    <string name="once">بۆ یەکجار</string>
+    <string name="tenmin">بۆ ١٠ خولەک</string>
+    <string name="twentymin">بۆ ٢٠ خولەک</string>
+    <string name="thirtymin">بۆ ٣٠ خولەک</string>
+    <string name="sixtymin">بۆ ٦٠ خولەک</string>
+    <string name="su_allow_toast">%1$s ڕێگەپێدانی سوپەریوسەری بۆ زیادکرا</string>
+    <string name="su_deny_toast">%1$s ڕێگەپێدانی سوپەریوسەر ڕەتکرایەوە</string>
+    <string name="su_snack_grant">ڕێگەپێدانی سوپەریوسەری %1$s بۆ درا</string>
+    <string name="su_snack_deny">ڕێگەپێدانی سوپەریوسەر %1$s ڕەتکرایەوە</string>
+    <string name="su_snack_notif_on">ئاگەدارکردنەوەکانی %1$s کارا کراوە</string>
+    <string name="su_snack_notif_off">ئاگەدارکردنەوەکانی %1$s کوژاوەتەوە</string>
+    <string name="su_snack_log_on">تۆمارەکانی %1$s کراوەتەوە</string>
+    <string name="su_snack_log_off">تۆمارەکانی %1$s کوژاوەتەوە</string>
+    <string name="su_revoke_title">لابردن؟</string>
+    <string name="su_revoke_msg">دڵنیابەوە بۆ لابردنی سوپەریوسەر بۆ %1$s </string>
+    <string name="toast">هێنانەسەر</string>
+    <string name="none">هیچ</string>
+
+    <string name="superuser_toggle_notification">ئاگادارییەکان</string>
+    <string name="superuser_toggle_revoke">لابردن</string>
+    <string name="superuser_policy_none">هیچ ئەپێک تا ئێستا داوای سوپەریوسەری نەکردووە</string>
+
+    <!--Logs-->
+    <string name="log_data_none">هیچ تۆمارێک نییە، ئەو ئەپانەی ڕۆتیان پێویستە زوزو بەکاریبێنە</string>
+    <string name="log_data_magisk_none">تۆمارەکانی ماجیسک بەتاڵن، باشە بۆ؟</string>
+    <string name="menuSaveLog">تۆمارەکان هەڵبگرە</string>
+    <string name="menuClearLog">تۆمارەکان بسڕەوە</string>
+    <string name="logs_cleared">بەسەرکەوتویی تۆمارەکان سڕانەوە</string>
+    <string name="pid">PID: %1$d</string>
+    <string name="target_uid">ئامانج UID: %1$d</string>
+    <string name="target_pid">Mount ns target PID: %s</string>
+    <string name="selinux_context">SELinux context: %s</string>
+    <string name="supp_group">Supplementary group: %s</string>
+
+    <!--SafetyNet-->
+
+    <!--MagiskHide-->
+    <string name="show_system_app">پیشاندانی ئەپەکانی سیستەم</string>
+    <string name="show_os_app">پیشاندانی ئەپەکان</string>
+    <string name="hide_filter_hint">پاڵاوتنی بەپێی ناو</string>
+    <string name="hide_search">گەڕان</string>
+
+    <!--Module-->
+    <string name="no_info_provided">(هیچ زانیارییەک نییە)</string>
+    <string name="reboot_userspace">ڕێستارت کردنەوە</string>
+    <string name="reboot_recovery">چوونە ناو ڕیکەڤەری</string>
+    <string name="reboot_bootloader">چوونە ناو بووتلۆدەر</string>
+    <string name="reboot_download">چوونە ناو داونلۆد</string>
+    <string name="reboot_edl">چوونە ناو EDL</string>
+    <string name="reboot_safe_mode">دۆخی پارێزراو</string>
+    <string name="module_version_author">%1$s by %2$s</string>
+    <string name="module_state_remove">سڕینەوە</string>
+    <string name="module_action">کارا</string>
+    <string name="module_state_restore">گەڕاندنەوە</string>
+    <string name="module_action_install_external">لە بیرگەکەتەوە ڕێکی بخە</string>
+    <string name="update_available">وەشانی نوێ بەردەستە</string>
+    <string name="suspend_text_riru">زیادکراوەکە کار ناکات چونکە %1$s کراوەتەوە</string>
+    <string name="suspend_text_zygisk">زیادکراوەکە کارناکات چونکە %1$s نەکراوەتەوە</string>
+    <string name="zygisk_module_unloaded">زیادکراوی Zygisk بەهۆی نەگونجان کارناکات</string>
+    <string name="module_empty">هیچ زیادکراوێک دانەبەزیوە</string>
+    <string name="confirm_install">دابەزاندنی زیادکراو %1$s?</string>
+    <string name="confirm_install_title">دڵنیابوونەوە لە دابەزاندن</string>
+
+    <!--Settings-->
+    <string name="settings_dark_mode_title">جۆری ڕووکار</string>
+    <string name="settings_dark_mode_message">حەزت لە کامەی بوو ئەوە هەڵبژێرە</string>
+    <string name="settings_dark_mode_light">هەمیشە دۆخی ڕوناک</string>
+    <string name="settings_dark_mode_system">با بەگوێرەی سیستەمەکە بێت!</string>
+    <string name="settings_dark_mode_dark">هەمیشە دۆخی تاریک</string>
+    <string name="settings_download_path_title">شوێنی داگرتنەکە</string>
+    <string name="settings_download_path_message">فایلەکان هەڵدەگیرێن لە %1$s</string>
+    <string name="settings_hide_app_title">شاردنەوەی ئەپی ماجیسک</string>
+    <string name="settings_hide_app_summary">داگرتنی ماجیسک بە ناوی جیاوە</string>
+    <string name="settings_restore_app_title">ئەپە ڕەسەنەکە بهێنەوە</string>
+    <string name="settings_restore_app_summary">ئەپەکە دەربخەوە و ڕەسەنڵ</string>
+    <string name="language">زمان</string>
+    <string name="system_default">(وەک هی ئامێرەکە)</string>
+    <string name="settings_check_update_title">گەڕان بەدوای نوێکاری</string>
+    <string name="settings_check_update_summary">گەڕان بەدوای نوێکاری خۆکارانە</string>
+    <string name="settings_update_channel_title">کەناڵی نوێکاری</string>
+    <string name="settings_update_stable">جێگیر</string>
+    <string name="settings_update_beta">پێشوەختە(بێتا)</string>
+    <string name="settings_update_custom">تایبەت</string>
+    <string name="settings_update_custom_msg">بەستەرێکی تایبەت دابنێ</string>
+    <string name="settings_zygisk_summary">کارپێکردنی بەشێکی ماجیسک لە zygote daemon</string>
+    <string name="settings_denylist_title">پێڕستی نەرێنی کراوەکان</string>
+    <string name="settings_denylist_summary">هەر ئەپێک لە پێڕستی نەرێنییەکان کاریگەریەکانی ماجیسکی لەسەر نییە</string>
+    <string name="settings_denylist_config_title">دەستکاریکردنی پێڕستی نەرێنیکراوەکان</string>
+    <string name="settings_denylist_config_summary">ئەو ئەپە هەڵبژێرە کە دەتەوێت نەرێنیی بکەیت</string>
+    <string name="settings_hosts_title">هۆستی ناسیستەمی</string>
+    <string name="settings_hosts_summary"> هۆستی ناسیستەمی بۆ لابردنی ڕیکلامەکان</string>
+    <string name="settings_hosts_toast"> هۆستی ناسیستەمی زیادکرا</string>
+    <string name="settings_app_name_hint">ناوی نوێ</string>
+    <string name="settings_app_name_helper">ئەپەکە بەم ناوەوە دروست دەکرێتەوە</string>
+    <string name="settings_app_name_error">هەڵەیە</string>
+    <string name="settings_su_app_adb">ئەپەکان و ADB</string>
+    <string name="settings_su_app">تەنها ئەپەکان</string>
+    <string name="settings_su_adb">ADB تەنها</string>
+    <string name="settings_su_disable">ناچالاک کراوە</string>
+    <string name="settings_su_request_10">10 چرکە</string>
+    <string name="settings_su_request_15">15 چرکە</string>
+    <string name="settings_su_request_20">20 چرکە</string>
+    <string name="settings_su_request_30">30 چرکە</string>
+    <string name="settings_su_request_45">45 چرکە</string>
+    <string name="settings_su_request_60">60 چرکە</string>
+    <string name="superuser_access">دەسەڵاتی سوپەریوسەر</string>
+    <string name="auto_response">وەڵامدانەوەی خۆکارانە</string>
+    <string name="request_timeout">ماوەی وەڵامدانەوە</string>
+    <string name="superuser_notification">ئاگەدارییەکانی سوپەریوسەر</string>
+    <string name="settings_su_reauth_title">پرسیاربکەوە دوای هەر نوێکردنەوەیەک</string>
+    <string name="settings_su_reauth_summary">دوای نوێکردنەوەی ئەپەکان دووبارە پرسیار بکەوە بۆ دەسەڵاتی سوپەریوسەر</string>
+    <string name="settings_su_tapjack_title">پارێزگاری کردن لە ئەگەری دەستلێدانی تر</string>
+    <string name="settings_su_tapjack_summary"> کاتێک ئەپێکی تر بەسەر شاشەکەوەیە، سوپەر یوسەر وەڵام ناداتەوە لە کردنی هەر بژاردەیەک لەبەر پارێزراوی</string>
+    <string name="settings_su_auth_title">دڵنیاکردنەوەی کەسی</string>
+    <string name="settings_su_auth_summary">داواکاری بکە بۆ دڵنیاکردنەوەی کەسی لەکاتی داواکاری سوپەریوسەر</string>
+    <string name="settings_su_auth_insecure">هیچ دڵنیاکردنەوەیەک نییە</string>
+    <string name="settings_customization">دەستکاریکردن</string>
+    <string name="setting_add_shortcut_summary">یەک ئایکۆنی جوان زیادبکە بۆ سەر شاشەکە ئەگەر قورس بوو ئەوەی خۆی بدۆزیتەوە</string>
+    <string name="settings_doh_title">DNS بەسەر HTTPS</string>
+    <string name="settings_doh_description">Workaround DNS خراپە لە هەندێک شوێن</string>
+    <string name="settings_random_name_title">ناوێک لەخۆیەوە</string>
+    <string name="settings_random_name_description">دانانی ناوێک لەخۆوە تاوەکوو ئاشکرا نەبێت</string>
+
+    <string name="multiuser_mode">دۆخی فرەبەکارهێنەر</string>
+    <string name="settings_owner_only">تەنها خاوەنی ئامێر</string>
+    <string name="settings_owner_manage">خاوەنی ئامێر</string>
+    <string name="settings_user_independent">بەکارهێنەری سەربەخۆ</string>
+    <string name="owner_only_summary">تەنها خاوەنەکە دۆخی ڕۆتی هەیە</string>
+    <string name="owner_manage_summary">تەنها خاوەنەکە دەسەڵاتی بەکارهێنانی ڕۆتی هەیە</string>
+    <string name="user_independent_summary">هەر بەکارهێنەرێک یاسای جیاوازی هەیە</string>
+
+    <string name="mount_namespace_mode">چونە دۆخی بۆشایی ناو</string>
+    <string name="settings_ns_global">بۆشاییناوی گشتی</string>
+    <string name="settings_ns_requester">بۆشایی ناوی خۆیی</string>
+    <string name="settings_ns_isolate">بۆشایی ناوی جیا</string>
+    <string name="global_summary">هەمو ڕۆتەکان ناوی گشتی بەکار ئەهێنن</string>
+    <string name="requester_summary">هەمو ڕۆتەکان ناوی خۆیی بەکار ئەهێنن</string>
+    <string name="isolate_summary">هەمو ڕۆتەکان ناوی جیا بەکار ئەهێنن</string>
+
+    <!--Notifications-->
+    <string name="update_channel">نوێکردنەوەکانی ماجیسک</string>
+    <string name="progress_channel">ئاگادارییە کاراکان</string>
+    <string name="updated_channel">نوێکردنەوە سەرکەوتووبوو</string>
+    <string name="download_complete">داگرتن سەرکەوتووبوو</string>
+    <string name="download_file_error">هەڵەیەک رووی دا لەکاتی داگرتنی فایلەکە</string>
+    <string name="magisk_update_title">وەشانی نوێی ماجیسک ئامادەیە!</string>
+    <string name="updated_title">ماجیسک نوێکراوە!</string>
+    <string name="updated_text">کرتە بکە بۆ کردنەوەی ئەپ</string>
+
+    <!--Toasts, Dialogs-->
+    <string name="yes">بەڵێ</string>
+    <string name="no">نەخێر</string>
+    <string name="repo_install_title">داگرتن %1$s %2$s(%3$d)</string>
+    <string name="download">داگرتن</string>
+    <string name="reboot">ڕێستارت</string>
+    <string name="close">داخستن</string>
+    <string name="release_notes">نێبینییەکان</string>
+    <string name="flashing">فلاش کردن</string>
+    <string name="running">کار کردن...</string>
+    <string name="done">تەواو!</string>
+    <string name="done_action">کارکردنی %1$s تەواو بوو</string>
+    <string name="failure">Failed!</string>
+    <string name="hide_app_title">شاردنەوەی ئەپی ماجیسک…</string>
+    <string name="open_link_failed_toast">هیچ ئەپێک تییە تا لینکەکەی پێ بکرێتەوە</string>
+    <string name="complete_uninstall">سڕینەوەی تەواوی</string>
+    <string name="restore_img">هێنانەوەی img</string>
+    <string name="restore_img_msg">هێنانەوە…</string>
+    <string name="restore_done">هاتەوە!</string>
+    <string name="restore_fail">هیچ فایلێکی هەڵگیراوت نیە!</string>
+    <string name="setup_fail">ڕێکخستن شکستی هێنا</string>
+    <string name="env_fix_title">پێویستی بە ڕێکخستنی زیاترە</string>
+    <string name="env_fix_msg">مۆبایلەکەت پێویستی بە ڕێکخستنی زیاترە، ئایا ئەتەوێت بەردەوام بیت و ڕێستارتی بکەیتەوە؟</string>
+    <string name="env_full_fix_msg"> پێویستە دوبارە ماجیسک دابگریتەوە بۆ ئەوەی بەباشی کاربکات تکایە ماجیسک دابگرەوە لەناو ئەپەکە خۆی چونکە لە ڕیکەڤەرییەوە ناتوانرێ زانیاری تەواو لەسەر ئامێرەکە دەستبخرێت </string>
+    <string name="setup_msg">دەستپێکردن....</string>
+    <string name="unsupport_magisk_title">وەشانی ماجیسک پاڵپشتینەکراوە</string>
+    <string name="unsupport_magisk_msg">وەشانی ماجیسکەکەت زۆر کۆنە وەک ئەوە وایە هەر نەبێت، تکایە نوێی بکەوە بە زوترین کات</string>
+    <string name="unsupport_general_title">باری نائاسایی</string>
+    <string name="unsupport_system_app_msg">ئەم ئەپە وەکو ئەپی سیستەم کارناکات، تکایە بیگۆڕەوە بۆ ئەپی ئاسایی</string>
+    <string name="unsupport_other_su_msg"> \"su\" binary یەکی بێگانە دۆزرایەوە، تکایە جگە لە ماجیسک ئەپی تر بەکارمەهێنە بۆ ڕۆت کردن  </string>
+    <string name="unsupport_external_storage_msg">ماجیسک لە بیرگەی دەرەکی داگیراوە، تکایە بیبەوە بۆ ناوەکی</string>
+    <string name="unsupport_nonroot_stub_msg">ئەپە شاراوەکە کار ناکات چونکە ڕۆتەکە نەماوە، تکایە ئەپە ڕەسەنەکە بگەڕێنەوە</string>
+    <string name="unsupport_nonroot_stub_title">@string/settings_restore_app_title</string>
+    <string name="external_rw_permission_denied">ڕەزامەندی بیرگە بدە تاوەکوو ئەمە کار بکات</string>
+    <string name="post_notifications_denied">ڕەزامەندی ئاگاداری بکە تاوەکوو ئەمە کار بکات</string>
+    <string name="install_unknown_denied">ڕەزامەندی "install unknown apps" تاوەکوو کار بکات</string>
+    <string name="add_shortcut_title">زیادی بکە بۆ سەر شاشە</string>
+    <string name="add_shortcut_msg">دوای شاردنەوەی ئەم ئەپە، ئەتەوێت یەک ئایکۆنی جوان زیادبکەیت بۆ سەر شاشەکە ئەگەر قورس بوو ئەوەی خۆی بدۆزیتەوە؟</string>
+    <string name="app_not_found">هیچ ئەپێک نەدۆزرایەوە تاوەکوو ئەم کارەی پێ بکرێت</string>
+    <string name="reboot_apply_change">ڕێستارت بکە تاوەکوو کاریگەریەکان کار بکەن</string>
+    <string name="restore_app_confirmation">ئەمە ئەپە ڕەسەنەکە ئەهێنێتەوە، دڵنیایت لە کردنی؟</string>
+
+</resources>
+      

app/core/src/main/res/values-ru/strings.xml

@@ -87,6 +87,9 @@
     <string name="logs_cleared">Логи успешно очищены</string>
     <string name="pid">PID: %1$d</string>
     <string name="target_uid">Целевой UID: %1$d</string>
+    <string name="target_pid">Целевой PID пространства имён: %s</string>
+    <string name="selinux_context">Контекст SELinux: %s</string>
+    <string name="supp_group">Дополнительная группа: %s</string>
 
     <!--SafetyNet-->
 
@@ -164,11 +167,16 @@
     <string name="settings_su_reauth_title">Повторная аутентификация</string>
     <string name="settings_su_reauth_summary">Повторный запрос прав суперпользователя после обновления приложений</string>
     <string name="settings_su_tapjack_title">Защита от перехвата нажатий</string>
+    <string name="settings_su_auth_title">Аутентификация пользователя</string>
+    <string name="settings_su_auth_summary">Требовать аутентификацию пользователя при запросах Superuser</string>
+    <string name="settings_su_auth_insecure">На устройстве не настроен метод аутентификации</string>
     <string name="settings_su_tapjack_summary">Окно запроса прав суперпользователя будет неактивно пока активированы наложения экрана</string>
     <string name="settings_customization">Персонализация</string>
     <string name="setting_add_shortcut_summary">Добавить ярлык на рабочий стол для удобного восприятия приложения после его скрытия</string>
     <string name="settings_doh_title">DNS поверх HTTPS</string>
     <string name="settings_doh_description">Активировать DoH (используйте при проблемах с подключением к сети)</string>
+    <string name="settings_random_name_title">Случайное имя образа</string>
+    <string name="settings_random_name_description">Генерировать случайные имена для патченных образов и tar-файлов для предотвращения обнаружения</string>
 
     <string name="multiuser_mode">Многопользовательский режим</string>
     <string name="settings_owner_only">Только администратор</string>

app/core/src/main/res/values-sr/strings.xml

@@ -1,99 +1,57 @@
 <resources>
-    <!--Universal-->
 
-    <!--Welcome Activity-->
+    <!--Sections-->
     <string name="modules">Модули</string>
     <string name="superuser">Супер-корисник</string>
-    <string name="logs">Дневник</string>
+    <string name="logs">Логови</string>
     <string name="settings">Подешавања</string>
     <string name="install">Инсталација</string>
+    <string name="section_home">Почетно</string>
+    <string name="section_theme">Теме</string>
+    <string name="denylist">Листа забрана</string>
 
-    <!--Status Fragment-->
-    <string name="invalid_update_channel">Непостојећи Канал Ажурирања</string>
+    <!--Home-->
+    <string name="no_connection">Недоступна конекција</string>
+    <string name="app_changelog">Промене у апликацији</string>
+    <string name="loading">Учитавање…</string>
+    <string name="update">Ажурирање</string>
+    <string name="not_available">N/A</string>
+    <string name="hide">Сакриј</string>
+    <string name="home_package">Пакет</string>
+    <string name="home_app_title">Апл.</string>
 
-    <!--Install Fragment-->
+    <string name="home_notice_content">Преузмите Magisk САМО са званичне GitHub странице. Фајлови из непознатих извора могу бити малициозни!</string>
+    <string name="home_support_title">Подржите нас</string>
+    <string name="home_follow_title">Запратите нас</string>
+    <string name="home_item_source">Извор</string>
+    <string name="home_support_content">Magisk јесте и увек ће бити бесплатан и open source. Можете показати да вам је стало својом донацијом.</string>
+    <string name="home_installed_version">Инсталирано</string>
+    <string name="home_latest_version">Најновије</string>
+    <string name="invalid_update_channel">Невалидан канал ажурирања</string>
+    <string name="uninstall_magisk_title">Деинсталирај Magisk</string>
+    <string name="uninstall_magisk_msg">Сви модули ће бити онемогућени/уклоњени!\nКорен ће бити уклоњен!\nСвако неенкриптовано интерно складиште ће употребом Magisk-а бити поново енкриптовано!</string>
+
+    <!--Install-->
     <string name="keep_force_encryption">Задржи форсирану енкрипцију</string>
     <string name="keep_dm_verity">Задржи AVB 2.0/dm-verity</string>
-    <string name="uninstall_magisk_title">Унинсталирај Магиск</string>
-    <string name="uninstall_magisk_msg">Сви модули ће бити онеспособљени/уклоњени. Корен ће бити уклоњен, и потенцијално енкриптовати твоје податке уколико већ нису енкриптовани</string>
-    <string name="update">Ажурирање</string>
-
-    <!--Module Fragment-->
-    <string name="no_info_provided">(Без информација)</string>
-
-    <!--Repo Fragment-->
-    <string name="update_available">Ажурирање доступно</string>
-    <string name="home_installed_version">Инсталирано</string>
-
-    <!--Log Fragment-->
-    <string name="menuSaveLog">Сачувај дневник</string>
-    <string name="menuClearLog">Обриши дневник</string>
-    <string name="logs_cleared">Дневник успешно креиран</string>
-
-    <!--About Activity-->
-    <string name="app_changelog">Дневник промена апликације</string>
-
-    <!--Toasts, Dialogs-->
-    <string name="repo_install_title">Инсталирај %1$s %2$s(%3$d)</string>
-    <string name="download">Преузми</string>
-    <string name="reboot">Рестартуј</string>
-    <string name="magisk_update_title">Нови Адбејт Магиска Доступан!</string>
-    <string name="release_notes">Белешке обљављивања</string>
+    <string name="recovery_mode">Режим опоравка</string>
+    <string name="install_options_title">Опције</string>
+    <string name="install_method_title">Метод</string>
+    <string name="install_next">Наредно</string>
+    <string name="install_start">Почнимо</string>
     <string name="manager_download_install">Притисни да преузмеш и инсталираш</string>
-    <string name="update_channel">Магиск Ажурирање</string>
-    <string name="flashing">Флешовање</string>
-    <string name="direct_install">Директна Инсталација (Препоручено)</string>
-    <string name="complete_uninstall">Комплетна Унинсталација</string>
-    <string name="restore_done">Повратак успешан!</string>
-    <string name="restore_fail">Фабрички бекап не постоји!</string>
-    <string name="download_file_error">Грешка при преузимању фајла</string>
-
-    <!--Settings Activity -->
-    <string name="language">Језик</string>
-    <string name="system_default">(Фабрички Система)</string>
-    <string name="settings_update_channel_title">Канал Ажурирања</string>
-    <string name="settings_update_stable">Стабилан</string>
-    <string name="settings_update_beta">Бета</string>
-    <string name="settings_update_custom">По наруџби</string>
-    <string name="settings_update_custom_msg">Унеси наруџбени УРЛ</string>
-    <string name="settings_hosts_title">Без-системски домаћини (hosts)</string>
-    <string name="settings_hosts_summary">Подршка без-системских домаћина за апликације за блокирање реклама</string>
-
-    <string name="settings_su_app_adb">Апликације и АДБ</string>
-    <string name="settings_su_app">Само Апликације</string>
-    <string name="settings_su_adb">Само АДБ</string>
-    <string name="settings_su_disable">Онемогућено</string>
-    <string name="settings_su_request_10">10 секунди</string>
-    <string name="settings_su_request_15">15 секунди</string>
-    <string name="settings_su_request_20">20 секунди</string>
-    <string name="settings_su_request_30">30 секунди</string>
-    <string name="settings_su_request_45">45 секунди</string>
-    <string name="settings_su_request_60">60 секунди</string>
-    <string name="superuser_access">Приступ Супер-кориснику</string>
-    <string name="auto_response">Аутоматски одговор</string>
-    <string name="request_timeout">Истек захтева</string>
-    <string name="superuser_notification">Нотификације Супер-корисника</string>
-    <string name="settings_su_reauth_title">Поново одобри после ажурирања</string>
-    <string name="settings_su_reauth_summary">Поново одобри дозволу Супер-корисника после ажурирања апликације</string>
-
-    <string name="multiuser_mode">Више-кориснички режим</string>
-    <string name="settings_owner_only">Власник уређаја само</string>
-    <string name="settings_owner_manage">Одређено од стране власника</string>
-    <string name="settings_user_independent">Независно од корисника</string>
-    <string name="owner_only_summary">Само власник има приступ корену</string>
-    <string name="owner_manage_summary">Само власник може да приступа корену и да прими захтеве за њега</string>
-    <string name="user_independent_summary">Сваки корисник има своја правила корена</string>
-
-    <string name="mount_namespace_mode">Постоље режима имена простора</string>
-    <string name="settings_ns_global">Глобално име простора</string>
-    <string name="settings_ns_requester">Наслеђено име простора</string>
-    <string name="settings_ns_isolate">Ограђено име простора</string>
-    <string name="global_summary">Све коренске сесије користе глобално име простора</string>
-    <string name="requester_summary">Коренске сесије ће наследити свој простор именовања</string>
-    <string name="isolate_summary">Свака коренска сесија ће имати свој изоловани простор именовања</string>
+    <string name="direct_install">Директна инсталација (Препоручено)</string>
+    <string name="install_inactive_slot">Инсталација на неактиван слот (Након OTA)</string>
+    <string name="install_inactive_slot_msg">Ваш уређај ће бити ФОРСИРАН да се покрене на тренутно неактивном слоту након поновног покретања!\nКористите опцију само кад се OTA заврши.\nНастави?</string>
+    <string name="setup_title">Додатне поставке</string>
+    <string name="select_patch_file">Изаберите фајл</string>
+    <string name="patch_file_msg">Изаберите слику (*.img) или ODIN tarfile (*.tar) или payload.bin (*.bin)</string>
+    <string name="reboot_delay_toast">Поново покретање за 5 секунди…</string>
+    <string name="flash_screen_title">Инсталација</string>
 
     <!--Superuser-->
     <string name="su_request_title">Супер-кориснички захтев</string>
+    <string name="touch_filtered_warning">Magisk не може да верификује ваш одговор, јер апликација прикрива супер-кориснички захтев</string>
     <string name="deny">Забрани</string>
     <string name="prompt">Захтев</string>
     <string name="grant">Дозволи</string>
@@ -104,20 +62,190 @@
     <string name="twentymin">20 мин</string>
     <string name="thirtymin">30 мин</string>
     <string name="sixtymin">60 мин</string>
-    <string name="su_allow_toast">%1$s је добио права на Супер-корисника</string>
-    <string name="su_deny_toast">%1$s није добио права на Супер-корисника</string>
+    <string name="su_allow_toast">%1$s је добио права на супер-корисника</string>
+    <string name="su_deny_toast">%1$s није добио права на супер-корисника</string>
     <string name="su_snack_grant">Супер-корисничка права од %1$s су пружена</string>
     <string name="su_snack_deny">Супер-корисничка права од %1$s су одбијена</string>
     <string name="su_snack_notif_on">Нотификације од %1$s су омогућене</string>
     <string name="su_snack_notif_off">Нотификације од %1$s су онемогућене</string>
-    <string name="su_snack_log_on">Записивање у дневник за %1$s је омогућено</string>
-    <string name="su_snack_log_off">Записивање у дневник за %1$s је онемогућено</string>
+    <string name="su_snack_log_on">Логовање за %1$s је омогућено</string>
+    <string name="su_snack_log_off">Логовање за %1$s је онемогућено</string>
     <string name="su_revoke_title">Опозови?</string>
-    <string name="su_revoke_msg">Потврди да опозовеш права од %1$s?</string>
-    <string name="toast">Тост</string>
-    <string name="none">Ниједан</string>
+    <string name="su_revoke_msg">Потврди да опозовеш права на супер-корисника од %1$s?</string>
+    <string name="toast">Toast</string>
+    <string name="none">Ништа</string>
 
-    <!--Superuser logs-->
-    <string name="target_uid">Циљани УИД: %1$d</string>
+    <string name="superuser_toggle_notification">Нотификације</string>
+    <string name="superuser_toggle_revoke">Опозови</string>
+    <string name="superuser_policy_none">Ниједна апликација није тражила пермисије за супер-корисника још увек.</string>
+
+    <!--Logs-->
+    <string name="log_data_none">Немате логова, покушајте користити коренске апликације више</string>
+    <string name="log_data_magisk_none">Magisk логови су празни, то је чудно</string>
+    <string name="menuSaveLog">Сачувај лог</string>
+    <string name="menuClearLog">Уклони лог</string>
+    <string name="logs_cleared">Лог успешно уклоњен</string>
+    <string name="pid">PID: %1$d</string>
+    <string name="target_uid">Циљани UID: %1$d</string>
+    <string name="target_pid">Mount ns цињани PID: %s</string>
+    <string name="selinux_context">SELinux контекст: %s</string>
+    <string name="supp_group">Допунска група: %s</string>
+
+    <!--SafetyNet-->
+
+    <!--MagiskHide-->
+    <string name="show_system_app">Прикажи системске апл.</string>
+    <string name="show_os_app">Прикажи апл. ОС-а</string>
+    <string name="hide_filter_hint">Филтрирај по имену</string>
+    <string name="hide_search">Претрага</string>
+
+    <!--Module-->
+    <string name="no_info_provided">(Без информација)</string>
+    <string name="reboot_userspace">Лако поново покретање</string>
+    <string name="reboot_recovery">Поново покрени за опоравак</string>
+    <string name="reboot_bootloader">Поново покрени за bootloader</string>
+    <string name="reboot_download">Поново покрени за преузимање</string>
+    <string name="reboot_edl">Поново покрени за EDL</string>
+    <string name="reboot_safe_mode">Сигуран мод</string>
+    <string name="module_version_author">%1$s од %2$s</string>
+    <string name="module_state_remove">Уклони</string>
+    <string name="module_action">Акција</string>
+    <string name="module_state_restore">Поврати</string>
+    <string name="module_action_install_external">Инсталирај из складишта</string>
+    <string name="update_available">Ажурирање доступно</string>
+    <string name="suspend_text_riru">Модул је суспендован јер је %1$s омогућено</string>
+    <string name="suspend_text_zygisk">Модул је суспендован јер %1$s није омогућено</string>
+    <string name="zygisk_module_unloaded">Zygisk модул није учитан због некомпатибилности</string>
+    <string name="module_empty">Ниједан модул није инсталиран</string>
+    <string name="confirm_install">Инсталирај модул %1$s?</string>
+    <string name="confirm_install_title">Потврда инсталације</string>
+
+    <!--Settings-->
+    <string name="settings_dark_mode_title">Тема</string>
+    <string name="settings_dark_mode_message">Изаберите тему која вам највише одговара!</string>
+    <string name="settings_dark_mode_light">Увек светло</string>
+    <string name="settings_dark_mode_system">Прати систем</string>
+    <string name="settings_dark_mode_dark">Увек тамно</string>
+    <string name="settings_download_path_title">Путања за преузимање</string>
+    <string name="settings_download_path_message">Фајлови ће бити сачувани на %1$s</string>
+    <string name="settings_hide_app_title">Сакриј Magisk апл.</string>
+    <string name="settings_hide_app_summary">Инсталирај proxy апликацију са насумичним ID-јем пакета и прилагођеном лабелом</string>
+    <string name="settings_restore_app_title">Поврати Magisk апл.</string>
+    <string name="settings_restore_app_summary">Откриј апл. и поврати оригинални APK</string>
+    <string name="language">Језик</string>
+    <string name="system_default">(Подразумевано системски)</string>
+    <string name="settings_check_update_title">Провери ажурирања</string>
+    <string name="settings_check_update_summary">Периодично провери ажурирања у позадини</string>
+    <string name="settings_update_channel_title">Канал ажурирања</string>
+    <string name="settings_update_stable">Стабилно</string>
+    <string name="settings_update_beta">Бета</string>
+    <string name="settings_update_custom">Прилагођено</string>
+    <string name="settings_update_custom_msg">Унеси прилагођени URL канала</string>
+    <string name="settings_zygisk_summary">Покрени делове Magisk-а у zygote daemon-у</string>
+    <string name="settings_denylist_title">Спроведи листу забрана</string>
+    <string name="settings_denylist_summary">Процеси на листи забрана ће повратити све Magisk измене</string>
+    <string name="settings_denylist_config_title">Конфигуриши листу забрана</string>
+    <string name="settings_denylist_config_summary">Изабери процесе који ће бити на листи забрана</string>
+    <string name="settings_hosts_title">Безсистемски домаћини (hosts)</string>
+    <string name="settings_hosts_summary">Подршка безсистемских домаћина за апликације блокирања реклама</string>
+    <string name="settings_hosts_toast">Модул безсистемских домаћина додат</string>
+    <string name="settings_app_name_hint">Ново име</string>
+    <string name="settings_app_name_helper">Апл. ће бити спакована под овим именом</string>
+    <string name="settings_app_name_error">Невалидан формат</string>
+    <string name="settings_su_app_adb">Апликације и ADB</string>
+    <string name="settings_su_app">Само апликације</string>
+    <string name="settings_su_adb">Само ADB</string>
+    <string name="settings_su_disable">Онемогућено</string>
+    <string name="settings_su_request_10">10 секунди</string>
+    <string name="settings_su_request_15">15 секунди</string>
+    <string name="settings_su_request_20">20 секунди</string>
+    <string name="settings_su_request_30">30 секунди</string>
+    <string name="settings_su_request_45">45 секунди</string>
+    <string name="settings_su_request_60">60 секунди</string>
+    <string name="superuser_access">Приступ супер-корисника</string>
+    <string name="auto_response">Аутоматски одговор</string>
+    <string name="request_timeout">Истек захтева</string>
+    <string name="superuser_notification">Нотификације супер-корисника</string>
+    <string name="settings_su_reauth_title">Поново одобри након ажурирања</string>
+    <string name="settings_su_reauth_summary">Поново тражи пермисије супер-корисника након ажурирања апликација</string>
+    <string name="settings_su_tapjack_title">Заштита од tapjacking-а</string>
+    <string name="settings_su_tapjack_summary">Prompt дијалог супер-корисника неће реаговати док је прикривен другим прозором или overlay-ем</string>
+    <string name="settings_su_auth_title">Аутентификација корисника</string>
+    <string name="settings_su_auth_summary">Тражи аутентификацију корисника током захтева супер-корисника</string>
+    <string name="settings_su_auth_insecure">Ниједан метод аутентификације није подешен на уређају</string>
+    <string name="settings_customization">Прилагођавање</string>
+    <string name="setting_add_shortcut_summary">Додај лепу пречицу на почетни екран у случају да се име и иконица не препознају лако након скривања апликације</string>
+    <string name="settings_doh_title">DNS преко HTTPS-а</string>
+    <string name="settings_doh_description">Заобилазно решење DNS тровања у неким нацијама</string>
+    <string name="settings_random_name_title">Насумично име на излазу</string>
+    <string name="settings_random_name_description">Насумично име излазног фајла слика и tar фајлова ради спречавања детекције</string>
+
+    <string name="multiuser_mode">Вишекориснички режим</string>
+    <string name="settings_owner_only">Само власник уређаја</string>
+    <string name="settings_owner_manage">Одређено од стране власника</string>
+    <string name="settings_user_independent">Независно од корисника</string>
+    <string name="owner_only_summary">Само власник има приступ корену</string>
+    <string name="owner_manage_summary">Само власник може да приступа корену и да прима захтеве за њега</string>
+    <string name="user_independent_summary">Сваки корисник има своја правила корена</string>
+
+    <string name="mount_namespace_mode">Mount режим namespace-а</string>
+    <string name="settings_ns_global">Глобални namespace</string>
+    <string name="settings_ns_requester">Наслеђени namespace</string>
+    <string name="settings_ns_isolate">Изоловани namespace</string>
+    <string name="global_summary">Све коренске сесије користе глобални mount namespace</string>
+    <string name="requester_summary">Коренске сесије ће наследити namespace од подносиоца захтева</string>
+    <string name="isolate_summary">Свака коренска сесија ће имати свој изоловани namespace</string>
+
+    <!--Notifications-->
+    <string name="update_channel">Ажурирања Magisk-а</string>
+    <string name="progress_channel">Нотификације о прогресу</string>
+    <string name="updated_channel">Ажурирање завршено</string>
+    <string name="download_complete">Преузимање завршено</string>
+    <string name="download_file_error">Грешка при преузимању фајла</string>
+    <string name="magisk_update_title">Ажурирање Magisk-а доступно!</string>
+    <string name="updated_title">Magisk је ажуриран</string>
+    <string name="updated_text">Кликни да отвориш апликацију</string>
+
+    <!--Toasts, Dialogs-->
+    <string name="yes">Да</string>
+    <string name="no">Не</string>
+    <string name="repo_install_title">Инсталирај %1$s %2$s(%3$d)</string>
+    <string name="download">Преузми</string>
+    <string name="reboot">Поново покрени</string>
+    <string name="close">Затвори</string>
+    <string name="release_notes">Release notes</string>
+    <string name="flashing">Флешовање…</string>
+    <string name="running">Покретање…</string>
+    <string name="done">Завршено!</string>
+    <string name="done_action">Покретање акције %1$s завршено</string>
+    <string name="failure">Неуспешно!</string>
+    <string name="hide_app_title">Скривање Magisk апликације…</string>
+    <string name="open_link_failed_toast">Није пронађена апликација за отварање линка</string>
+    <string name="complete_uninstall">Комплетна деинсталација</string>
+    <string name="restore_img">Поврати слике</string>
+    <string name="restore_img_msg">Повратак…</string>
+    <string name="restore_done">Повратак успешан!</string>
+    <string name="restore_fail">Фабрички бекап не постоји!</string>
+    <string name="setup_fail">Неуспешна поставка</string>
+    <string name="env_fix_title">Потребно додатно подешавање</string>
+    <string name="env_fix_msg">Ваш уређај захтева додатно подешавање да би Magisk радио како треба. Да ли желите наставити и покренути поново?</string>
+    <string name="env_full_fix_msg">Ваш уређај захтева поновно флешовање да би Magisk радио како треба. Реинсталирајте Magisk кроз апликацију, режим опоравка не може добити тачне информације о уређају.</string>
+    <string name="setup_msg">Покретање подешавања окружења…</string>
+    <string name="unsupport_magisk_title">Неподржана верзија Magisk-а</string>
+    <string name="unsupport_magisk_msg">Ова верзија апликације не подржава Magisk верзије мање од %1$s.\n\nАпликација ће се понашати као да Magisk није инсталиран, молимо ажурирајте Magisk што пре.</string>
+    <string name="unsupport_general_title">Ненормално стање</string>
+    <string name="unsupport_system_app_msg">Покретање апликације као системске није подржано. Молимо поставите апликацију да буде корисничка.</string>
+    <string name="unsupport_other_su_msg">Детектован \"su\" binary који није Magisk-ов. Молимо уклоните конкурентно коренско решење и/или реинсталирајте Magisk.</string>
+    <string name="unsupport_external_storage_msg">Magisk је инсталиран на екстерно складиште. Молимо померите апл. у интерно складиште.</string>
+    <string name="unsupport_nonroot_stub_msg">Скривена Magisk апликација не може наставити са радом јер је корен изгубљен. Молимо повратите оригинални APK.</string>
+    <string name="unsupport_nonroot_stub_title">@string/settings_restore_app_title</string>
+    <string name="external_rw_permission_denied">Дозволите пермисију за складиште да бисте омогућили ову функционалност</string>
+    <string name="post_notifications_denied">Дозволите пермисију за нотификације да бисте омогућили ову функционалност</string>
+    <string name="install_unknown_denied">Дозволите "инсталирање непознатих апликација" да бисте омогућили ову функционалност</string>
+    <string name="add_shortcut_title">Додај пречицу на почетни екран</string>
+    <string name="add_shortcut_msg">Након скривања апликације, њено име и иконицу ћете тешко препознати. Желите ли додати лепу пречицу на почетни екран?</string>
+    <string name="app_not_found">Није пронађена апликација за ову акцију</string>
+    <string name="reboot_apply_change">Поново покрени да примениш измене</string>
+    <string name="restore_app_confirmation">Ово ће вратити скривену апликацију на оригиналну. Да ли стварно то желите?</string>
 
 </resources>

app/core/src/main/res/values-uk/strings.xml

@@ -130,8 +130,8 @@
     <string name="settings_update_custom">Власний</string>
     <string name="settings_update_custom_msg">Вставте власний URL</string>
     <string name="settings_zygisk_summary">Запускати частини Magisk в сервісі zygote</string>
-    <string name="settings_denylist_title">Enforce DenyList</string>
-    <string name="settings_denylist_summary">Processes on the denylist will have all Magisk modifications reverted</string>
+    <string name="settings_denylist_title">Увімкнути DenyList</string>
+    <string name="settings_denylist_summary">Всі зміни, внесені Magisk, будуть приховані від процесів, позначених у DenyList</string>
     <string name="settings_denylist_config_title">Налаштувати DenyList</string>
     <string name="settings_denylist_config_summary">Вибрати процеси, які будуть додані до denylist</string>
     <string name="settings_hosts_title">Позасистемні хости</string>
@@ -156,7 +156,7 @@
     <string name="superuser_notification">Сповіщення суперкористувача</string>
     <string name="settings_su_reauth_title">Повторна автентифікація</string>
     <string name="settings_su_reauth_summary">Перевидача прав суперкористувача після оновлення застосунку</string>
-    <string name="settings_su_tapjack_title">Увімкнути захист від Tapjack</string>
+    <string name="settings_su_tapjack_title">Увімкнути захист від підміни натискань</string>
     <string name="settings_su_tapjack_summary">Діалогове вікно суперкористувача не буде отримувати ввід від користувача, коли вікно перекрито іншим застосунком чи вікном</string>
     <string name="settings_customization">Оформлення</string>
     <string name="setting_add_shortcut_summary">Додати ярлик на домашній екран для зручного сприйняття застосунку після його приховування</string>

app/gradle.properties

@@ -30,5 +30,4 @@ android.nonFinalResIds=false
 
 # Magisk
 magisk.stubVersion=40
-magisk.versionCode=28002
-magisk.ondkVersion=r27.4
+magisk.versionCode=29000

app/gradle/libs.versions.toml

@@ -1,17 +1,17 @@
 [versions]
-kotlin = "2.0.21"
-android = "8.7.2"
-ksp = "2.0.21-1.0.28"
+kotlin = "2.1.20"
+android = "8.9.2"
+ksp = "2.1.20-1.0.31"
 rikka = "1.3.0"
-navigation = "2.8.4"
+navigation = "2.8.9"
 libsu = "6.0.0"
-moshi = "1.15.1"
+moshi = "1.15.2"
 okhttp = "4.12.0"
 retrofit = "2.11.0"
-room = "2.6.1"
+room = "2.7.1"
 
 [libraries]
-bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version = "1.79" }
+bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version = "1.80" }
 commons-compress = { module = "org.apache.commons:commons-compress", version = "1.27.1" }
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit" }
@@ -23,28 +23,31 @@ okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.
 moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
 moshi-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi" }
 timber = { module = "com.jakewharton.timber:timber", version = "5.0.1" }
-jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version = "6.10.0.202406032230-r" }
+jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version = "7.1.0.202411261347-r" }
 
 # AndroidX
-activity = { module = "androidx.activity:activity", version = "1.9.3" }
+activity = { module = "androidx.activity:activity", version = "1.10.1" }
 appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
-core-ktx = { module = "androidx.core:core-ktx", version = "1.15.0" }
+core-ktx = { module = "androidx.core:core-ktx", version = "1.16.0" }
 core-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.1" }
-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.0" }
-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version = "1.8.5" }
+constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.1" }
+fragment-ktx = { module = "androidx.fragment:fragment-ktx", version = "1.8.6" }
 navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation" }
 navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" }
 profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version = "1.4.1" }
-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.3.2" }
+recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.4.0" }
 room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
 room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
 room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version = "1.1.0" }
-transition = { module = "androidx.transition:transition", version = "1.5.1" }
-collection-ktx = { module = "androidx.collection:collection-ktx", version = "1.4.5" }
-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version = "2.8.7" }
+transition = { module = "androidx.transition:transition", version = "1.6.0" }
+collection-ktx = { module = "androidx.collection:collection-ktx", version = "1.5.0" }
 material = { module = "com.google.android.material:material", version = "1.12.0" }
-jdk-libs = { module = "com.android.tools:desugar_jdk_libs_nio", version = "2.1.3" }
+jdk-libs = { module = "com.android.tools:desugar_jdk_libs_nio", version = "2.1.5" }
+test-runner = { module = "androidx.test:runner", version = "1.6.2" }
+test-rules = { module = "androidx.test:rules", version = "1.6.1" }
+test-junit = { module = "androidx.test.ext:junit", version = "1.2.1" }
+test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version = "2.3.0" }
 
 # topjohnwu
 indeterminate-checkbox = { module = "com.github.topjohnwu:indeterminate-checkbox", version = "1.0.7" }

app/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

app/gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

app/settings.gradle.kts

@@ -8,4 +8,4 @@ dependencyResolutionManagement {
     }
 }
 rootProject.name = "Magisk"
-include(":app:apk", ":app:core", ":app:shared", ":app:stub", ":native")
+include(":apk", ":core", ":shared", ":stub", ":test")

app/shared/src/main/AndroidManifest.xml

@@ -25,6 +25,7 @@
 
     <application
         android:allowBackup="false"
+        android:enableOnBackInvokedCallback="false"
         android:label="Magisk"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"

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

@@ -7,12 +7,12 @@ public class ProviderInstaller {
 
     private static final String GMS_PACKAGE_NAME = "com.google.android.gms";
 
-    public static boolean install(Context context) {
+    public static void install(Context context) {
         try {
             // Check if gms is a system app
             ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo(GMS_PACKAGE_NAME, 0);
             if ((appInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
-                return false;
+                return;
             }
 
             // Try installing new SSL provider from Google Play Service
@@ -22,9 +22,7 @@ public class ProviderInstaller {
                     .loadClass("com.google.android.gms.common.security.ProviderInstallerImpl")
                     .getMethod("insertProvider", Context.class)
                     .invoke(null, gms);
-        } catch (Exception e) {
-            return false;
+        } catch (Exception ignored) {
         }
-        return true;
     }
 }

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

@@ -12,7 +12,7 @@ import dalvik.system.BaseDexClassLoader;
 public class DynamicClassLoader extends BaseDexClassLoader {
 
     public DynamicClassLoader(File apk) {
-        this(apk, getSystemClassLoader());
+        this(apk, DynamicClassLoader.class.getClassLoader());
     }
 
     public DynamicClassLoader(File apk, ClassLoader parent) {

app/stub/build.gradle.kts

@@ -41,5 +41,5 @@ android {
 setupStubApk()
 
 dependencies {
-    implementation(project(":app:shared"))
+    implementation(project(":shared"))
 }

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="upgrade_msg">عليك الترقية Magisk لإكمال تهيئة التطبيق. هل تريد التنزيل والتثبيت؟</string>
-    <string name="no_internet_msg">يرجى اللإتصال بالإنترنت! ترقية Magisk مطلوبة.</string>
+    <string name="upgrade_msg">عليك بتحديث ماجيسك لإكمال تهيئة التطبيق. هل تريد التنزيل والتثبيت؟</string>
+    <string name="no_internet_msg">يرجى الإتصال بالإنترنت! تحديث ماجيسك مطلوب.</string>
     <string name="dling">جارٍ التنزيل</string>
     <string name="relaunch_app">يرجى إعادة تشغيل التطبيق يدوياً</string>
 </resources>

app/stub/src/main/res/values-ku/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="upgrade_msg">ماجیسکەکەت بەرزبکەوە بۆ وەشانی تەواوەتی، دەتەوێت دایبگریت و ڕێکیبخەیت؟</string>
+    <string name="no_internet_msg">تکایە پەیوەست ببە بە ئینتەرنێتەوە، پێویستە ماجیسکەکەت ڕێک بخەیت.</string>
+    <string name="dling">داگرتن</string>
+    <string name="relaunch_app">تکایە دووبارە ئەپەکە بکەوە</string>
+</resources>

app/stub/src/main/res/values-sr/strings.xml

@@ -1 +1,7 @@
-<resources></resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="upgrade_msg">Ажурирајте Magisk да бисте завршили постављање. Преузми и инсталирај?</string>
+    <string name="no_internet_msg">Молимо повежите се на интернет! Неопходно је ажурирање Magisk-а.</string>
+    <string name="dling">Преузимање</string>
+    <string name="relaunch_app">Молимо покрените апликацију поново</string>
+</resources>

app/test/.gitignore

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

app/test/build.gradle.kts

@@ -0,0 +1,30 @@
+plugins {
+    id("com.android.application")
+    kotlin("android")
+}
+
+android {
+    namespace = "com.topjohnwu.magisk.test"
+
+    defaultConfig {
+        applicationId = "com.topjohnwu.magisk.test"
+        versionCode = 1
+        versionName = "1.0"
+        proguardFile("proguard-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+        }
+    }
+}
+
+setupTestApk()
+
+dependencies {
+    implementation(libs.test.runner)
+    implementation(libs.test.rules)
+    implementation(libs.test.junit)
+    implementation(libs.test.uiautomator)
+}

app/test/proguard-rules.pro

@@ -0,0 +1,13 @@
+# Keep all test dependencies
+-keep class org.junit.** { *; }
+-keep class androidx.test.** { *; }
+
+# Make sure the classloader constructor is kept
+-keepclassmembers class com.topjohnwu.magisk.test.TestClassLoader { <init>(); }
+
+# Repackage dependencies
+-repackageclasses 'deps'
+-allowaccessmodification
+
+# Keep attributes for stacktrace
+-keepattributes *

app/test/src/main/AndroidManifest.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+
+    <queries tools:node="removeAll" />
+
+    <application tools:node="replace">
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation
+        android:name="com.topjohnwu.magisk.test.AppTestRunner"
+        android:targetPackage="com.topjohnwu.magisk" />
+
+    <instrumentation
+        android:name="com.topjohnwu.magisk.test.TestRunner"
+        android:targetPackage="com.topjohnwu.magisk.test" />
+
+</manifest>

app/test/src/main/java/com/topjohnwu/magisk/test/AppMigrationTest.kt

@@ -0,0 +1,88 @@
+package com.topjohnwu.magisk.test
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.ParcelFileDescriptor.AutoCloseInputStream
+import androidx.annotation.Keep
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.After
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+@Keep
+@RunWith(AndroidJUnit4::class)
+class AppMigrationTest {
+
+    companion object {
+        private const val APP_PKG = "com.topjohnwu.magisk"
+        private const val STUB_PKG = "repackaged.$APP_PKG"
+        private const val RECEIVER_TIMEOUT = 20L
+    }
+
+    private val instrumentation get() = InstrumentationRegistry.getInstrumentation()
+    private val context get() = instrumentation.context
+    private val uiAutomation get() = instrumentation.uiAutomation
+    private val registeredReceivers = mutableListOf<BroadcastReceiver>()
+
+    class PackageRemoveMonitor(
+        context: Context,
+        private val packageName: String
+    ) : BroadcastReceiver() {
+
+        val latch = CountDownLatch(1)
+
+        init {
+            val filter = IntentFilter(Intent.ACTION_PACKAGE_REMOVED)
+            filter.addDataScheme("package")
+            context.registerReceiver(this, filter)
+        }
+
+        override fun onReceive(context: Context, intent: Intent) {
+            if (intent.action != Intent.ACTION_PACKAGE_REMOVED)
+                return
+            val data = intent.data ?: return
+            val pkg = data.schemeSpecificPart
+            if (pkg == packageName) latch.countDown()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        registeredReceivers.forEach(context::unregisterReceiver)
+    }
+
+    private fun testAppMigration(pkg: String, method: String) {
+        val receiver = PackageRemoveMonitor(context, pkg)
+        registeredReceivers.add(receiver)
+
+        // Trigger the test to run migration
+        val pfd = uiAutomation.executeShellCommand(
+            "am instrument -w --user 0 -e class .Environment#$method " +
+                "$pkg.test/${AppTestRunner::class.java.name}"
+        )
+        val output = AutoCloseInputStream(pfd).reader().use { it.readText() }
+        assertTrue("$method failed, inst out: $output", output.contains("OK ("))
+
+        // Wait for migration to complete
+        assertTrue(
+            "$pkg uninstallation failed",
+            receiver.latch.await(RECEIVER_TIMEOUT, TimeUnit.SECONDS)
+        )
+    }
+
+    @Test
+    fun testAppHide() {
+        testAppMigration(APP_PKG, "setupAppHide")
+    }
+
+    @Test
+    fun testAppRestore() {
+        testAppMigration(STUB_PKG, "setupAppRestore")
+    }
+}

app/test/src/main/java/com/topjohnwu/magisk/test/Runners.kt

@@ -0,0 +1,35 @@
+package com.topjohnwu.magisk.test
+
+import android.os.Bundle
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnitRunner
+
+open class TestRunner : AndroidJUnitRunner() {
+    override fun onCreate(arguments: Bundle) {
+        // Support short-hand ".ClassName"
+        arguments.getString("class")?.let {
+            val classArg = it.split(",").joinToString(separator = ",") { clz ->
+                if (clz.startsWith(".")) {
+                    "com.topjohnwu.magisk.test$clz"
+                } else {
+                    clz
+                }
+            }
+            arguments.putString("class", classArg)
+        }
+        super.onCreate(arguments)
+    }
+}
+
+class AppTestRunner : TestRunner() {
+    override fun onCreate(arguments: Bundle) {
+        // Force using the target context's classloader to run tests
+        arguments.putString("classLoader", TestClassLoader::class.java.name)
+        super.onCreate(arguments)
+    }
+}
+
+private val targetClassLoader inline get() =
+    InstrumentationRegistry.getInstrumentation().targetContext.classLoader
+
+class TestClassLoader : ClassLoader(targetClassLoader)

build.gradle.kts

@@ -1,7 +0,0 @@
-plugins {
-    id("MagiskPlugin")
-}
-
-tasks.register("clean", Delete::class) {
-    delete(rootProject.layout.buildDirectory)
-}

build.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import argparse
+import copy
 import glob
-import lzma
 import multiprocessing
 import os
 import platform
@@ -56,14 +56,6 @@ if is_windows:
 if not sys.version_info >= (3, 8):
     error("Requires Python 3.8+")
 
-try:
-    sdk_path = Path(os.environ["ANDROID_HOME"])
-except KeyError:
-    try:
-        sdk_path = Path(os.environ["ANDROID_SDK_ROOT"])
-    except KeyError:
-        error("Please set Android SDK path to environment variable ANDROID_HOME")
-
 cpu_count = multiprocessing.cpu_count()
 os_name = platform.system().lower()
 
@@ -75,20 +67,11 @@ support_abis = {
     "x86_64": "x86_64-linux-android",
     "riscv64": "riscv64-linux-android",
 }
+default_archs = {"armeabi-v7a", "x86", "arm64-v8a", "x86_64"}
 default_targets = {"magisk", "magiskinit", "magiskboot", "magiskpolicy"}
 support_targets = default_targets | {"resetprop"}
 rust_targets = {"magisk", "magiskinit", "magiskboot", "magiskpolicy"}
-
-# Common paths
-ndk_root = sdk_path / "ndk"
-ndk_path = ndk_root / "magisk"
-ndk_build = ndk_path / "ndk-build"
-rust_bin = ndk_path / "toolchains" / "rust" / "bin"
-llvm_bin = ndk_path / "toolchains" / "llvm" / "prebuilt" / f"{os_name}-x86_64" / "bin"
-cargo = rust_bin / "cargo"
-gradlew = Path.cwd() / "gradlew"
-adb_path = sdk_path / "platform-tools" / "adb"
-native_gen_path = Path("native", "out", "generated").resolve()
+ondk_version = "r29.1"
 
 # Global vars
 config = {}
@@ -161,37 +144,31 @@ def cmd_out(cmds: list):
     )
 
 
-def xz(data):
-    return lzma.compress(data, preset=9, check=lzma.CHECK_NONE)
-
-
 ###############
 # Build Native
 ###############
 
 
 def clean_elf():
-    if is_windows:
-        elf_cleaner = Path("tools", "elf-cleaner.exe")
-    else:
-        elf_cleaner = Path("native", "out", "elf-cleaner")
-        if not elf_cleaner.exists():
-            execv(
-                [
-                    "gcc",
-                    '-DPACKAGE_NAME="termux-elf-cleaner"',
-                    '-DPACKAGE_VERSION="2.1.1"',
-                    '-DCOPYRIGHT="Copyright (C) 2022 Termux."',
-                    "tools/termux-elf-cleaner/elf-cleaner.cpp",
-                    "tools/termux-elf-cleaner/arghandling.c",
-                    "-o",
-                    elf_cleaner,
-                ]
-            )
-    cmds = [elf_cleaner, "--api-level", "23"]
+    cargo_toml = Path("tools", "elf-cleaner", "Cargo.toml")
+    cmds = ["run", "--release", "--manifest-path", cargo_toml]
+    if args.verbose == 0:
+        cmds.append("-q")
+    elif args.verbose > 1:
+        cmds.append("--verbose")
+    cmds.append("--")
     cmds.extend(glob.glob("native/out/*/magisk"))
     cmds.extend(glob.glob("native/out/*/magiskpolicy"))
-    execv(cmds)
+    run_cargo(cmds)
+
+
+def collect_ndk_build():
+    for arch in build_abis.keys():
+        arch_dir = Path("native", "libs", arch)
+        out_dir = Path("native", "out", arch)
+        for source in arch_dir.iterdir():
+            target = out_dir / source.name
+            mv(source, target)
 
 
 def run_ndk_build(cmds: list):
@@ -209,17 +186,8 @@ def run_ndk_build(cmds: list):
         error("Build binary failed!")
     os.chdir("..")
 
-    for arch in build_abis.keys():
-        arch_dir = Path("native", "libs", arch)
-        out_dir = Path("native", "out", arch)
-        for source in arch_dir.iterdir():
-            target = out_dir / source.name
-            mv(source, target)
-
 
 def build_cpp_src(targets: set):
-    dump_flag_header()
-
     cmds = []
     clean = False
 
@@ -239,6 +207,7 @@ def build_cpp_src(targets: set):
 
     if cmds:
         run_ndk_build(cmds)
+        collect_ndk_build()
 
     cmds.clear()
 
@@ -251,17 +220,18 @@ def build_cpp_src(targets: set):
     if cmds:
         cmds.append("B_CRT0=1")
         run_ndk_build(cmds)
+        collect_ndk_build()
 
     if clean:
         clean_elf()
 
 
 def run_cargo(cmds):
+    ensure_paths()
     env = os.environ.copy()
-    env["PATH"] = f'{rust_bin}{os.pathsep}{env["PATH"]}'
-    env["CARGO_BUILD_RUSTC"] = str(rust_bin / f"rustc{EXE_EXT}")
+    env["RUSTUP_TOOLCHAIN"] = str(rust_sysroot)
     env["CARGO_BUILD_RUSTFLAGS"] = f"-Z threads={min(8, cpu_count)}"
-    return execv([cargo, *cmds], env)
+    return execv(["cargo", *cmds], env)
 
 
 def build_rust_src(targets: set):
@@ -334,15 +304,22 @@ def dump_flag_header():
     flag_txt += f'#define MAGISK_VER_CODE     {config["versionCode"]}\n'
     flag_txt += f"#define MAGISK_DEBUG        {0 if args.release else 1}\n"
 
+    native_gen_path = Path("native", "out", "generated")
     native_gen_path.mkdir(mode=0o755, parents=True, exist_ok=True)
-    write_if_diff(Path(native_gen_path, "flags.h"), flag_txt)
+    write_if_diff(native_gen_path / "flags.h", flag_txt)
+
+    rust_flag_txt = f'pub const MAGISK_VERSION: &str = "{config["version"]}";\n'
+    rust_flag_txt += f'pub const MAGISK_VER_CODE: i32 = {config["versionCode"]};\n'
+    write_if_diff(native_gen_path / "flags.rs", rust_flag_txt)
 
 
 def build_native():
+    ensure_paths()
+
     # Verify NDK install
     try:
         with open(Path(ndk_path, "ONDK_VERSION"), "r") as ondk_ver:
-            assert ondk_ver.read().strip(" \t\r\n") == config["ondkVersion"]
+            assert ondk_ver.read().strip(" \t\r\n") == ondk_version
     except:
         error('Unmatched NDK. Please install/upgrade NDK with "build.py ndk"')
 
@@ -362,6 +339,7 @@ def build_native():
     if ccache := shutil.which("ccache"):
         os.environ["NDK_CCACHE"] = ccache
 
+    dump_flag_header()
     build_rust_src(targets)
     build_cpp_src(targets)
 
@@ -397,24 +375,28 @@ def find_jdk():
     if no_jdk:
         error(
             "Please set Android Studio's path to environment variable ANDROID_STUDIO,\n"
-            + "or install JDK 17 and make sure 'javac' is available in PATH"
+            + "or install JDK 21 and make sure 'javac' is available in PATH"
         )
 
     return env
 
 
 def build_apk(module: str):
+    ensure_paths()
     env = find_jdk()
+    props = args.config.resolve()
 
+    os.chdir("app")
     build_type = "Release" if args.release else "Debug"
     proc = execv(
         [
             gradlew,
             f"{module}:assemble{build_type}",
-            f"-PconfigPath={args.config.resolve()}",
+            f"-PconfigPath={props}",
         ],
         env=env,
     )
+    os.chdir("..")
     if proc.returncode != 0:
         error(f"Build {module} failed!")
 
@@ -423,22 +405,23 @@ def build_apk(module: str):
     paths = module.split(":")
 
     apk = f"{paths[-1]}-{build_type}.apk"
-    source = Path(*paths, "build", "outputs", "apk", build_type, apk)
+    source = Path("app", *paths, "build", "outputs", "apk", build_type, apk)
     target = config["outdir"] / apk
     mv(source, target)
-    header(f"Output: {target}")
+    return target
 
 
 def build_app():
     header("* Building the Magisk app")
-    build_apk(":app:apk")
+    apk = build_apk(":apk")
 
     build_type = "release" if args.release else "debug"
 
     # Rename apk-variant.apk to app-variant.apk
-    source = config["outdir"] / f"apk-{build_type}.apk"
-    target = config["outdir"] / f"app-{build_type}.apk"
+    source = apk
+    target = apk.parent / apk.name.replace("apk-", "app-")
     mv(source, target)
+    header(f"Output: {target}")
 
     # Stub building is directly integrated into the main app
     # build process. Copy the stub APK into output directory.
@@ -449,7 +432,23 @@ def build_app():
 
 def build_stub():
     header("* Building the stub app")
-    build_apk(":app:stub")
+    apk = build_apk(":stub")
+    header(f"Output: {apk}")
+
+
+def build_test():
+    global args
+    args_bak = copy.copy(args)
+    # Test APK has to be built as release to prevent classname clash
+    args.release = True
+    try:
+        header("* Building the test app")
+        source = build_apk(":test")
+        target = source.parent / "test.apk"
+        mv(source, target)
+        header(f"Output: {target}")
+    finally:
+        args = args_bak
 
 
 ################
@@ -458,6 +457,7 @@ def build_stub():
 
 
 def cleanup():
+    ensure_paths()
     support_targets = {"native", "cpp", "rust", "app"}
     if args.targets:
         targets = set(args.targets) & support_targets
@@ -481,16 +481,21 @@ def cleanup():
             rm(rs_gen)
 
     if "native" in targets:
+        header("* Cleaning native")
         rm_rf(Path("native", "out"))
+        rm_rf(Path("tools", "elf-cleaner", "target"))
 
     if "app" in targets:
         header("* Cleaning app")
-        execv([gradlew, ":app:clean"], env=find_jdk())
+        os.chdir("app")
+        execv([gradlew, ":clean"], env=find_jdk())
+        os.chdir("..")
 
 
 def build_all():
     build_native()
     build_app()
+    build_test()
 
 
 ############
@@ -498,6 +503,46 @@ def build_all():
 ############
 
 
+def gen_ide():
+    ensure_paths()
+    set_archs({args.abi})
+
+    # Dump flags for both C++ and Rust code
+    dump_flag_header()
+
+    # Run build.rs to generate Rust/C++ FFI bindings
+    os.chdir(Path("native", "src"))
+    run_cargo(["check"])
+    os.chdir(Path("..", ".."))
+
+    # Generate compilation database
+    rm_rf(Path("native", "compile_commands.json"))
+    run_ndk_build(
+        [
+            "B_MAGISK=1",
+            "B_INIT=1",
+            "B_BOOT=1",
+            "B_POLICY=1",
+            "B_PRELOAD=1",
+            "B_PROP=1",
+            "B_CRT0=1",
+            "compile_commands.json",
+        ]
+    )
+
+
+def clippy_cli():
+    args.force_out = True
+    set_archs(default_archs)
+
+    os.chdir(Path("native", "src"))
+    cmds = ["clippy", "--no-deps", "--target"]
+    for triple in build_abis.values():
+        run_cargo(cmds + [triple])
+        run_cargo(cmds + [triple, "--release"])
+    os.chdir(Path("..", ".."))
+
+
 def cargo_cli():
     args.force_out = True
     if len(args.commands) >= 1 and args.commands[0] == "--":
@@ -508,10 +553,10 @@ def cargo_cli():
 
 
 def setup_ndk():
-    ndk_ver = config["ondkVersion"]
-    url = f"https://github.com/topjohnwu/ondk/releases/download/{ndk_ver}/ondk-{ndk_ver}-{os_name}.tar.xz"
+    ensure_paths()
+    url = f"https://github.com/topjohnwu/ondk/releases/download/{ondk_version}/ondk-{ondk_version}-{os_name}.tar.xz"
     ndk_archive = url.split("/")[-1]
-    ondk_path = Path(ndk_root, f"ondk-{ndk_ver}")
+    ondk_path = Path(ndk_root, f"ondk-{ondk_version}")
 
     header(f"* Downloading and extracting {ndk_archive}")
     rm_rf(ondk_path)
@@ -526,14 +571,54 @@ def setup_ndk():
     mv(ondk_path, ndk_path)
 
 
+def setup_rustup():
+    wrapper_dir = Path(args.wrapper_dir)
+    rm_rf(wrapper_dir)
+    wrapper_dir.mkdir(mode=0o755, parents=True, exist_ok=True)
+    if "CARGO_HOME" in os.environ:
+        cargo_home = Path(os.environ["CARGO_HOME"])
+    else:
+        cargo_home = Path.home() / ".cargo"
+    cargo_bin = cargo_home / "bin"
+    for src in cargo_bin.iterdir():
+        tgt = wrapper_dir / src.name
+        tgt.symlink_to(f"rustup{EXE_EXT}")
+
+    # Build rustup-wrapper
+    wrapper_src = Path("tools", "rustup-wrapper")
+    cargo_toml = wrapper_src / "Cargo.toml"
+    cmds = ["build", "--release", f"--manifest-path={cargo_toml}"]
+    if args.verbose > 1:
+        cmds.append("--verbose")
+    run_cargo(cmds)
+
+    # Replace rustup with wrapper
+    wrapper = wrapper_dir / (f"rustup{EXE_EXT}")
+    wrapper.unlink(missing_ok=True)
+    cp(wrapper_src / "target" / "release" / (f"rustup-wrapper{EXE_EXT}"), wrapper)
+    wrapper.chmod(0o755)
+
+
+##################
+# AVD and testing
+##################
+
+
 def push_files(script):
+    if args.build:
+        build_all()
+    ensure_adb()
+
     abi = cmd_out([adb_path, "shell", "getprop", "ro.product.cpu.abi"])
     if not abi:
         error("Cannot detect emulator ABI")
 
-    apk = Path(
-        config["outdir"], ("app-release.apk" if args.release else "app-debug.apk")
-    )
+    if args.apk:
+        apk = Path(args.apk)
+    else:
+        apk = Path(
+            config["outdir"], ("app-release.apk" if args.release else "app-debug.apk")
+        )
 
     # Extract busybox from APK
     busybox = Path(config["outdir"], "busybox")
@@ -555,9 +640,6 @@ def push_files(script):
 
 
 def setup_avd():
-    if not args.skip:
-        build_all()
-
     header("* Setting up emulator")
 
     push_files(Path("scripts", "avd_magisk.sh"))
@@ -568,17 +650,8 @@ def setup_avd():
 
 
 def patch_avd_file():
-    if not args.skip:
-        build_all()
-
     input = Path(args.image)
-    if args.output:
-        output = Path(args.output)
-    else:
-        output = input.parent / f"{input.name}.magisk"
-
-    src_file = f"/data/local/tmp/{input.name}"
-    out_file = f"{src_file}.magisk"
+    output = Path(args.output)
 
     header(f"* Patching {input.name}")
 
@@ -588,6 +661,9 @@ def patch_avd_file():
     if proc.returncode != 0:
         error("adb push failed!")
 
+    src_file = f"/data/local/tmp/{input.name}"
+    out_file = f"{src_file}.magisk"
+
     proc = execv([adb_path, "shell", "sh", "/data/local/tmp/avd_patch.sh", src_file])
     if proc.returncode != 0:
         error("avd_patch.sh failed!")
@@ -599,37 +675,47 @@ def patch_avd_file():
     header(f"Output: {output}")
 
 
-def setup_rustup():
-    wrapper_dir = Path(args.wrapper_dir)
-    rm_rf(wrapper_dir)
-    wrapper_dir.mkdir(mode=0o755, parents=True, exist_ok=True)
-    if "CARGO_HOME" in os.environ:
-        cargo_home = Path(os.environ["CARGO_HOME"])
-    else:
-        cargo_home = Path.home() / ".cargo"
-    cargo_bin = cargo_home / "bin"
-    for src in cargo_bin.iterdir():
-        tgt = wrapper_dir / src.name
-        tgt.symlink_to(src)
-
-    # Build rustup_wrapper
-    wrapper_src = Path("tools", "rustup_wrapper")
-    cargo_toml = wrapper_src / "Cargo.toml"
-    cmds = ["build", "--release", f"--manifest-path={cargo_toml}"]
-    if args.verbose > 1:
-        cmds.append("--verbose")
-    run_cargo(cmds)
-
-    # Replace rustup with wrapper
-    wrapper = wrapper_dir / (f"rustup{EXE_EXT}")
-    wrapper.unlink(missing_ok=True)
-    cp(wrapper_src / "target" / "release" / (f"rustup_wrapper{EXE_EXT}"), wrapper)
-    wrapper.chmod(0o755)
+##########################
+# Config, paths, argparse
+##########################
 
 
-##################
-# Config and args
-##################
+def ensure_paths():
+    global sdk_path, ndk_root, ndk_path, ndk_build, rust_sysroot
+    global llvm_bin, gradlew, adb_path, native_gen_path
+
+    # Skip if already initialized
+    if "sdk_path" in globals():
+        return
+
+    try:
+        sdk_path = Path(os.environ["ANDROID_HOME"])
+    except KeyError:
+        try:
+            sdk_path = Path(os.environ["ANDROID_SDK_ROOT"])
+        except KeyError:
+            error("Please set Android SDK path to environment variable ANDROID_HOME")
+
+    ndk_root = sdk_path / "ndk"
+    ndk_path = ndk_root / "magisk"
+    ndk_build = ndk_path / "ndk-build"
+    rust_sysroot = ndk_path / "toolchains" / "rust"
+    llvm_bin = (
+        ndk_path / "toolchains" / "llvm" / "prebuilt" / f"{os_name}-x86_64" / "bin"
+    )
+    adb_path = sdk_path / "platform-tools" / "adb"
+    gradlew = Path.cwd() / "app" / "gradlew"
+
+
+# We allow using several functionality with only ADB
+def ensure_adb():
+    global adb_path
+    if "adb_path" not in globals():
+        adb_path = shutil.which("adb")
+        if not adb_path:
+            error("Command 'adb' cannot be found in PATH")
+        else:
+            adb_path = Path(adb_path)
 
 
 def parse_props(file):
@@ -649,6 +735,12 @@ def parse_props(file):
     return props
 
 
+def set_archs(archs: set):
+    triples = map(support_abis.get, archs)
+    global build_abis
+    build_abis = dict(zip(archs, triples))
+
+
 def load_config():
     commit_hash = cmd_out(["git", "rev-parse", "--short=8", "HEAD"])
 
@@ -663,8 +755,9 @@ def load_config():
     if args.config.exists():
         config.update(parse_props(args.config))
 
-    if Path("gradle.properties").exists():
-        for key, value in parse_props("gradle.properties").items():
+    gradle_props = Path("app", "gradle.properties")
+    if gradle_props.exists():
+        for key, value in parse_props(gradle_props).items():
             if key.startswith("magisk."):
                 config[key[7:]] = value
 
@@ -680,12 +773,9 @@ def load_config():
         abiList = re.split("\\s*,\\s*", config["abiList"])
         archs = set(abiList) & support_abis.keys()
     else:
-        archs = {"armeabi-v7a", "x86", "arm64-v8a", "x86_64"}
+        archs = default_archs
 
-    triples = map(support_abis.get, archs)
-
-    global build_abis
-    build_abis = dict(zip(archs, triples))
+    set_archs(archs)
 
 
 def parse_args():
@@ -719,6 +809,8 @@ def parse_args():
 
     stub_parser = subparsers.add_parser("stub", help="build the stub app")
 
+    test_parser = subparsers.add_parser("test", help="build the test app")
+
     clean_parser = subparsers.add_parser("clean", help="cleanup")
     clean_parser.add_argument(
         "targets", nargs="*", help="native, cpp, rust, java, or empty to clean all"
@@ -727,17 +819,19 @@ def parse_args():
     ndk_parser = subparsers.add_parser("ndk", help="setup Magisk NDK")
 
     emu_parser = subparsers.add_parser("emulator", help="setup AVD for development")
+    emu_parser.add_argument("apk", help="a Magisk APK to use", nargs="?")
     emu_parser.add_argument(
-        "-s", "--skip", action="store_true", help="skip building binaries and the app"
+        "-b", "--build", action="store_true", help="build before patching"
     )
 
     avd_patch_parser = subparsers.add_parser(
         "avd_patch", help="patch AVD ramdisk.img or init_boot.img"
     )
     avd_patch_parser.add_argument("image", help="path to ramdisk.img or init_boot.img")
-    avd_patch_parser.add_argument("output", help="optional output file name", nargs="?")
+    avd_patch_parser.add_argument("output", help="output file name")
+    avd_patch_parser.add_argument("--apk", help="a Magisk APK to use")
     avd_patch_parser.add_argument(
-        "-s", "--skip", action="store_true", help="skip building binaries and the app"
+        "-b", "--build", action="store_true", help="build before patching"
     )
 
     cargo_parser = subparsers.add_parser(
@@ -745,18 +839,26 @@ def parse_args():
     )
     cargo_parser.add_argument("commands", nargs=argparse.REMAINDER)
 
+    clippy_parser = subparsers.add_parser("clippy", help="run clippy on Rust sources")
+
     rustup_parser = subparsers.add_parser("rustup", help="setup rustup wrapper")
     rustup_parser.add_argument(
         "wrapper_dir", help="path to setup rustup wrapper binaries"
     )
 
+    gen_parser = subparsers.add_parser("gen", help="generate files for IDE")
+    gen_parser.add_argument("--abi", default="arm64-v8a", help="target ABI to generate")
+
     # Set callbacks
     all_parser.set_defaults(func=build_all)
     native_parser.set_defaults(func=build_native)
     cargo_parser.set_defaults(func=cargo_cli)
+    clippy_parser.set_defaults(func=clippy_cli)
     rustup_parser.set_defaults(func=setup_rustup)
+    gen_parser.set_defaults(func=gen_ide)
     app_parser.set_defaults(func=build_app)
     stub_parser.set_defaults(func=build_stub)
+    test_parser.set_defaults(func=build_test)
     emu_parser.set_defaults(func=setup_avd)
     avd_patch_parser.set_defaults(func=patch_avd_file)
     clean_parser.set_defaults(func=cleanup)
@@ -769,7 +871,13 @@ def parse_args():
     return parser.parse_args()
 
 
-args = parse_args()
-load_config()
-vars(args)["force_out"] = False
-args.func()
+def main():
+    global args
+    args = parse_args()
+    load_config()
+    vars(args)["force_out"] = False
+    args.func()
+
+
+if __name__ == "__main__":
+    main()

buildSrc/src/main/java/DesugarClassVisitorFactory.kt

@@ -1,67 +0,0 @@
-import com.android.build.api.instrumentation.AsmClassVisitorFactory
-import com.android.build.api.instrumentation.ClassContext
-import com.android.build.api.instrumentation.ClassData
-import com.android.build.api.instrumentation.InstrumentationParameters
-import org.objectweb.asm.ClassVisitor
-import org.objectweb.asm.MethodVisitor
-import org.objectweb.asm.Opcodes
-import org.objectweb.asm.Opcodes.ASM9
-
-private const val DESUGAR_CLASS_NAME = "com.topjohnwu.magisk.core.utils.Desugar"
-private const val ZIP_ENTRY_GET_TIME_DESC = "()Ljava/nio/file/attribute/FileTime;"
-private const val DESUGAR_GET_TIME_DESC = "(Ljava/util/zip/ZipEntry;)Ljava/nio/file/attribute/FileTime;"
-
-abstract class DesugarClassVisitorFactory : AsmClassVisitorFactory<InstrumentationParameters.None> {
-    override fun createClassVisitor(
-        classContext: ClassContext,
-        nextClassVisitor: ClassVisitor
-    ): ClassVisitor {
-        return DesugarClassVisitor(nextClassVisitor)
-    }
-
-    override fun isInstrumentable(classData: ClassData) = classData.className != DESUGAR_CLASS_NAME
-
-    class DesugarClassVisitor(cv: ClassVisitor) : ClassVisitor(ASM9, cv) {
-        override fun visitMethod(
-            access: Int,
-            name: String?,
-            descriptor: String?,
-            signature: String?,
-            exceptions: Array<out String>?
-        ): MethodVisitor {
-            return DesugarMethodVisitor(super.visitMethod(access, name, descriptor, signature, exceptions))
-        }
-    }
-
-    class DesugarMethodVisitor(mv: MethodVisitor?) : MethodVisitor(ASM9, mv) {
-        override fun visitMethodInsn(
-            opcode: Int,
-            owner: String,
-            name: String,
-            descriptor: String,
-            isInterface: Boolean
-        ) {
-            if (!process(name, descriptor)) {
-                super.visitMethodInsn(opcode, owner, name, descriptor, isInterface)
-            }
-        }
-
-        private fun process(name: String, descriptor: String): Boolean {
-            if (descriptor != ZIP_ENTRY_GET_TIME_DESC)
-                return false
-            when (name) {
-                "getLastModifiedTime", "getLastAccessTime", "getCreationTime" -> {
-                    mv.visitMethodInsn(
-                        Opcodes.INVOKESTATIC,
-                        DESUGAR_CLASS_NAME.replace('.', '/'),
-                        name,
-                        DESUGAR_GET_TIME_DESC,
-                        false
-                    )
-                }
-                else -> return false
-            }
-            return true
-        }
-    }
-}

docs/build.md

@@ -40,12 +40,9 @@
 
 ### Developing Rust
 
-The Magisk NDK package [ONDK](https://github.com/topjohnwu/ondk) (the one installed with `./build.py ndk`) bundles a complete Rust toolchain, so _building_ the Magisk project itself does not require any further configuration. However, if you'd like to work on the Rust codebase with proper support, you'd need some setup as most development tools are built around `rustup`.
+First, install [rustup](https://www.rust-lang.org/tools/install), the official Rust toolchain manager. The Magisk NDK package [ONDK](https://github.com/topjohnwu/ondk) (the one installed with `./build.py ndk`) bundles a complete Rust toolchain, so _building_ the Magisk project itself does not require any further configuration.
 
-Let's first setup `rustup` to use our custom ONDK Rust toolchain by default:
-
-- Install [rustup](https://rustup.rs/), the official Rust toolchain manager
-- Link the ONDK Rust toolchain and set it as default:
+However, if you'd like to work on the Rust codebase, it'll be easier if you link ONDK's Rust toolchain in `rustup` and set it as default so several development tools and IDEs will work properly:
 
 ```bash
 # Link the ONDK toolchain with the name "magisk"
@@ -54,7 +51,7 @@ rustup toolchain link magisk "$ANDROID_HOME/ndk/magisk/toolchains/rust"
 rustup default magisk
 ```
 
-If you plan to use VSCode, you can then install the [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer) plugin and everything should be good to go. If you plan to use Jetbrain IDEs (e.g. [Rustrover](https://www.jetbrains.com/rust/), or its Rust Plugin), due to its poor support with custom toolchains, we need some additional setup:
+If you plan to use VSCode, you can then install the [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer) plugin and everything should be good to go. If you plan to use Jetbrain IDEs (e.g. [Rustrover](https://www.jetbrains.com/rust/), or its Rust Plugin), we need some additional setup:
 
 - Install the official nightly toolchain and add some components. We won't actually use the nightly toolchain for anything other than tricking the IDE to cooperate; the magic happens in the wrapper we setup in the next step.
 

docs/changes.md

@@ -1,5 +1,22 @@
 # Magisk Changelog
 
+### v29.0
+
+- [General] Massive internal refactoring and code migration
+- [App] Support downloading module zip files with XZ compression
+- [App] Disable app animations when system animations are disabled
+- [MagiskMount] Support systemlessly deleting files with modules using blank file nodes
+- [MagiskInit] Redesign sepolicy patching and injection logic
+- [MagiskSU] Better TTY/PTY support
+
+### v28.1
+
+- [App] Fix stub APK download link
+- [App] Fix support for Android lower than 8.0
+- [General] Fix support for MTK Samsung devices
+- [MagiskInit] Fix a regression for 2SI devices
+- [MagiskPolicy] Fix a regression causing `overlay.d` replaced files to be not accessible
+
 ### v28.0
 
 - [General] Support 16k page size

docs/faq.md

@@ -7,9 +7,10 @@ If you have USB debugging enabled in developer options, connect your phone to th
 If unfortunately you do not have USB debugging enabled you can boot using the Safe Mode key combo to cause Magisk to create an empty file named 'disable' in modules directories which disables modules when next booted with Magisk. Most modern Android devices support such a special key combo at boot to enter system Safe Mode as an emergency option, but **please note** that Magisk's key combo detection occurs _earlier_ than system detection so the key combo timing indicated by many online guides may need to be altered to activate Magisk's Safe Mode. (It's possible to activate system Safe Mode but not Magisk Safe Mode and vice versa.)
 
 The following details should ensure that modules are properly disabled:
-1) Many online guides for entering Safe Mode say 'When the animated logo appears, press and hold the volume down button until the system boots' or similar. This may actually be _too late_ for Magisk detection however and result in activating system Safe Mode but modules are not disabled.
-2) By pressing the volume down button some seconds before the animation and releasing it as soon as the boot animation appears, Magisk's Safe Mode should be activated without activating system Safe Mode (thus avoiding disabling other device and app settings) and the device should then simply boot to normal system with modules disabled.
-3) By pressing the volume down button some seconds before the animation and holding it until the system boots, both Magisk's Safe Mode and system Safe Mode should be activated. Next, after booting back to normal system, modules will be disabled.
+
+1. Many online guides for entering Safe Mode say 'When the animated logo appears, press and hold the volume down button until the system boots' or similar. This may actually be _too late_ for Magisk detection however and result in activating system Safe Mode but modules are not disabled.
+2. By pressing the volume down button some seconds before the animation and releasing it as soon as the boot animation appears, Magisk's Safe Mode should be activated without activating system Safe Mode (thus avoiding disabling other device and app settings) and the device should then simply boot to normal system with modules disabled.
+3. By pressing the volume down button some seconds before the animation and holding it until the system boots, both Magisk's Safe Mode and system Safe Mode should be activated. Next, after booting back to normal system, modules will be disabled.
 
 ### Q: Why is X app detecting root?
 
@@ -20,3 +21,9 @@ Magisk no longer handles root hiding. There are plenty of Magisk/Zygisk modules
 When hiding the Magisk app, it will install a "stub" APK that has nothing in it. The only functionality this stub app has is downloading the full Magisk app APK into its internal storage and dynamically loading it. Due to the fact that the APK is literally _empty_, it does not contain the image resource for the app icon.
 
 When you open the hidden Magisk app, it will offer you the option to create a shortcut in the homescreen (which has both the correct app name and icon) for your convenience. You can also manually ask the app to create the icon in app settings.
+
+### Q: How to use Magisk in the emulator?
+
+With the emulator running and accessible via ADB, run `./build.py emulator <path to Magisk APK>` to temporarily install Magisk on to the emulator. The patch is not persistent, meaning Magisk will be lost after a reboot, so re-execute the script to emulate a reboot if required.
+
+The script is only tested on the official Android Virtual Device (AVD) shipped alongside Android Studio; other emulators may work, but the emulator must have SELinux enabled.

docs/guides.md

@@ -124,6 +124,8 @@ If you place a file named `.replace` in any of the folders, instead of merging i
 
 If you want to replace files in `/vendor`, `/product`, or `/system_ext`, please place them under `system/vendor`, `system/product`, and `system/system_ext` respectively. Magisk will transparently handle whether these partitions are in a separate partition or not.
 
+If you want to remove a specific file or folder, please place a dummy character device with major number 0 and minor number 0 in the same path. For example, if you want to remove `/system/app/GoogleCamera`, you can `mknod GoogleCamera c 0 0` in `$MODDIR/system/app`.
+
 #### Zygisk
 
 Zygisk is a feature of Magisk that allows advanced module developers to run code directly in every Android applications' processes before they are specialized and running. For more details about the Zygisk API and building a Zygisk module, please checkout the [Zygisk Module Sample](https://github.com/topjohnwu/zygisk-module-sample) project.
@@ -138,7 +140,7 @@ If your module requires some additional sepolicy patches, please add those rules
 
 ## Magisk Module Installer
 
-A Magisk module installer is a Magisk module packaged in a zip file that can be flashed in the Magisk app or custom recoveries such as TWRP. The simplest Magisk module installer is just a Magisk module packed as a zip file, in addition to the following files:
+A Magisk module installer is a Magisk module packaged in a zip file that can be flashed in the Magisk app or custom recoveries such as TWRP. The simplest Magisk module installer is just a Magisk module packed as a zip file, in addition to the following files only if the module supports flashing in recovery:
 
 - `update-binary`: Download the latest [module_installer.sh](https://github.com/topjohnwu/Magisk/blob/master/scripts/module_installer.sh) and rename/copy that script as `update-binary`
 - `updater-script`: This file should only contain the string `#MAGISK`
@@ -148,7 +150,7 @@ The module installer script will setup the environment, extract the module files
 ```
 module.zip
 │
-├── META-INF
+├── META-INF                           <--- Only needed for flashing in recovery
 │   └── com
 │       └── google
 │           └── android
@@ -212,7 +214,7 @@ set_perm_recursive <directory> <owner> <group> <dirpermission> <filepermission>
 
 For convenience, you can also declare a list of folders you want to replace in the variable name `REPLACE`. The module installer script will create the `.replace` file into the folders listed in `REPLACE`. For example:
 
-```
+```sh
 REPLACE="
 /system/app/YouTube
 /system/app/Bloatware
@@ -221,6 +223,17 @@ REPLACE="
 
 The list above will result in the following files being created: `$MODPATH/system/app/YouTube/.replace` and `$MODPATH/system/app/Bloatware/.replace`.
 
+For convenience, you can also declare a list of files/folders you want to remove in the variable name `REMOVE`. The module installer script will create the corresponding dummy devices. For example:
+
+```sh
+REMOVE="
+/system/app/YouTube
+/system/fonts/Roboto.ttf
+"
+```
+
+The list above will result in the following dummy devices being created: `$MODPATH/system/app/YouTube` and `$MODPATH/system/fonts/Roboto.ttf`.
+
 #### Notes
 
 - When your module is downloaded with the Magisk app, `update-binary` will be **forcefully** replaced with the latest [`module_installer.sh`](https://github.com/topjohnwu/Magisk/blob/master/scripts/module_installer.sh). **DO NOT** try to add any custom logic in `update-binary`.

docs/install.md

@@ -76,7 +76,7 @@ As a summary, after installing Magisk in recovery **(starting from power off)**:
 Before proceeding, please acknowledge that:
 
 - Installing Magisk **WILL** trip your Knox Warranty Bit, this action is not reversible in any way.
-- Installing Magisk for the first time **REQUIRES** a full data wipe (this is **NOT** counting the data wipe when unlocking bootloader). Please make a backup your data.
+- Installing Magisk for the first time **REQUIRES** a full data wipe (this is **NOT** counting the data wipe when unlocking bootloader). Please make a backup of your data.
 
 ### Flashing Tools
 
@@ -86,7 +86,7 @@ Before proceeding, please acknowledge that:
 
 ### Requirements
 
-To verify whether or not Magisk can be installed in your Samsung device, you first must check the OEM Lock and KnoxGuard (RMM) status, to do so boot your device in Download mode with its key combo.
+To verify whether or not Magisk can be installed in your Samsung device, you first must check the OEM Lock and KnoxGuard (RMM) status. To do so, boot your device in Download mode with its key combo.
 
 Possible OEM Lock values are the following:
 - **ON (L)**: fully locked.

docs/releases/28100.md

@@ -0,0 +1,33 @@
+## 2024.12.6 Magisk v28.1
+
+- [App] Fix stub APK download link
+- [App] Fix support for Android lower than 8.0
+- [General] Fix support for MTK Samsung devices
+- [MagiskInit] Fix a regression for 2SI devices
+- [MagiskPolicy] Fix a regression causing `overlay.d` replaced files to be not accessible
+
+## Magisk v28.0 Changes
+
+- [General] Support 16k page size
+- [General] Add basic support for RISC-V (not built in releases)
+- [General] Use a minimal libc to build static executables (`magiskinit` and `magiskboot`) for smaller sizes
+- [Core] Remove unnecessary mirror for magic mount
+- [Core] Update boot image detection logic to support more devices
+- [MagiskInit] Rewrite 2SI logic for injecting `magiskinit` as `init`
+- [MagiskInit] Update preinit partition detection
+- [Zygisk] Update internal JNI hooking implementation
+- [MagiskPolicy] Preserve sepolicy config flag after patching
+- [MagiskPolicy] Optimize patching rules to reduce the amount of new rules being injected
+- [DenyList] Support enforcing denylist when Zygisk is disabled
+- [Resetprop] Improve implementation to workaround several property modification detections
+- [Resetprop] Update to properly work with property overlays
+- [App] Major internal code refactoring
+- [App] Support patching Samsung firmware with images larger than 8GiB
+- [App] Use user-initiated job instead of foreground services on Android 14
+- [App] Support Android 13+ built-in per-app language preferences
+- [App] Add `action.sh` support to allow modules to define an action triggered from UI
+- [MagiskBoot] Support spliting kernel images without decompression
+- [MagiskBoot] Properly support vendor boot images
+- [MagiskBoot] Disable Samsung PROCA from kernel image
+
+### Full Changelog: [here](https://topjohnwu.github.io/Magisk/changes.html)

docs/releases/29000.md

@@ -0,0 +1,16 @@
+## 2025.5.14 Magisk v29.0
+
+This release looks minor at the surface, however, the entire codebase has gone through significant refactoring and migration. The native code in Magisk used to be mainly C++, but several contributors and I have been steadily rewriting parts of the code in Rust since April 2022. After years of effort, the Rust-ification of the project slowly began picking up steam, and at the moment of this release, over 40% of the native code has been rewritten in Rust, with several major subsystem rewrites in the PR queue, planned to be merged for the next release.
+
+Many might wonder, why introduce a new language to the project? My reason is actually not to reduce memory safety issues (although it is a nice side benefit), but to be able to develop Magisk using a more modern programming language. After using Rust for a while, it's clear to me that using Rust allows me to write more correct code and makes me happier compared to dealing with C++. People share the [same sentiment as I do](https://threadreaderapp.com/thread/1577667445719912450.html).
+
+## Changelog
+
+- [General] Massive internal refactoring and code migration
+- [App] Support downloading module zip files with XZ compression
+- [App] Disable app animations when system animations are disabled
+- [MagiskMount] Support systemlessly deleting files with modules using blank file nodes
+- [MagiskInit] Redesign sepolicy patching and injection logic
+- [MagiskSU] Better TTY/PTY support
+
+### Full Changelog: [here](https://topjohnwu.github.io/Magisk/changes.html)

docs/releases/index.md

@@ -1,5 +1,7 @@
 # Release Notes
 
+- [v29.0](29000.md)
+- [v28.1](28100.md)
 - [v28.0](28000.md)
 - [v27.0](27000.md)
 - [v26.4](26400.md)

native/.gitignore

@@ -5,3 +5,4 @@ libs
 /.cxx
 *-rs.cpp
 *-rs.hpp
+/compile_commands.json

native/src/.cargo/config.toml

@@ -8,5 +8,5 @@ target-dir = "../out/rust"
 
 [unstable]
 build-std = ["std", "panic_abort"]
-build-std-features = ["panic_immediate_abort"]
+build-std-features = ["panic_immediate_abort", "optimize_for_size"]
 profile-rustflags = true