Release Magisk v30.1

[skip ci]

.github/actions/setup/action.yml

@@ -70,7 +70,7 @@ runs:
           .gradle/caches
           .gradle/wrapper
           !.gradle/caches/build-cache-*
-        key: gradle-cache-${{ hashFiles('gradle/**') }}
+        key: gradle-cache-${{ hashFiles('app/gradle/**') }}
         restore-keys: gradle-cache-
 
     - name: Restore Gradle dependencies

.github/workflows/build.yml

@@ -6,10 +6,7 @@ on:
     paths:
       - "app/**"
       - "native/**"
-      - "buildSrc/**"
       - "build.py"
-      - "gradle.properties"
-      - "gradle/libs.versions.toml"
       - ".github/workflows/build.yml"
   pull_request:
     branches: [master]
@@ -39,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
@@ -75,7 +72,7 @@ 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)
@@ -113,7 +110,7 @@ jobs:
         timeout-minutes: 10
         env:
           AVD_TEST_LOG: 1
-        run: scripts/avd_test.sh ${{ matrix.version }} ${{ matrix.type }}
+        run: scripts/avd.sh test ${{ matrix.version }} ${{ matrix.type }}
 
       - name: Upload logs on error
         if: ${{ failure() }}
@@ -155,7 +152,7 @@ jobs:
         env:
           FORCE_32_BIT: 1
           AVD_TEST_LOG: 1
-        run: scripts/avd_test.sh ${{ matrix.version }}
+        run: scripts/avd.sh test ${{ matrix.version }}
 
       - name: Upload logs on error
         if: ${{ failure() }}
@@ -197,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,19 +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
-.kotlin
-/local.properties
-/build
-/captures

.gitmodules

@@ -10,9 +10,6 @@
 [submodule "libcxx"]
 	path = native/src/external/libcxx
 	url = https://github.com/topjohnwu/libcxx.git
-[submodule "zopfli"]
-	path = native/src/external/zopfli
-	url = https://github.com/google/zopfli.git
 [submodule "cxx-rs"]
 	path = native/src/external/cxx-rs
 	url = https://github.com/topjohnwu/cxx.git

README.MD

@@ -16,13 +16,7 @@ Some highlight features:
 
 ## Downloads
 
-[Github](https://github.com/topjohnwu/Magisk/) is the only source where you can get official Magisk information and downloads.
-
-Click the icon below to download Magisk apk.
-
-[![](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-v28.1-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v28.1)
-[![](https://img.shields.io/badge/Magisk-Canary-red)](https://github.com/topjohnwu/Magisk/releases/tag/canary-28104)
+[Github](https://github.com/topjohnwu/Magisk/releases) is the only source where you can get official Magisk information and downloads.
 
 ## 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/databinding/DataBindingAdapters.kt

@@ -24,6 +24,7 @@ import androidx.core.widget.ImageViewCompat
 import androidx.databinding.BindingAdapter
 import androidx.databinding.InverseBindingAdapter
 import androidx.databinding.InverseBindingListener
+import androidx.databinding.InverseMethod
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.GridLayoutManager
@@ -33,9 +34,11 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.chip.Chip
+import com.google.android.material.slider.Slider
 import com.google.android.material.textfield.TextInputLayout
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.model.su.SuPolicy
 import com.topjohnwu.magisk.utils.TextHolder
 import com.topjohnwu.superuser.internal.UiThreadHandler
 import com.topjohnwu.widget.IndeterminateCheckBox
@@ -306,3 +309,38 @@ fun TextView.setText(text: TextHolder) {
 fun Spinner.setAdapter(items: Array<Any>, layoutRes: Int) {
     adapter = ArrayAdapter(context, layoutRes, items)
 }
+
+@BindingAdapter("labelFormatter")
+fun Slider.setLabelFormatter(formatter: (Float) -> Int) {
+    setLabelFormatter { value -> resources.getString(formatter(value)) }
+}
+
+@InverseBindingAdapter(attribute = "android:value")
+fun Slider.getValueBinding() = value
+
+@BindingAdapter("android:valueAttrChanged")
+fun Slider.setListener(attrChange: InverseBindingListener) {
+    addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
+        override fun onStartTrackingTouch(slider: Slider) = Unit
+        override fun onStopTrackingTouch(slider: Slider) = attrChange.onChange()
+    })
+}
+
+@InverseMethod("sliderValueToPolicy")
+fun policyToSliderValue(policy: Int): Float {
+    return when (policy) {
+        SuPolicy.DENY -> 1f
+        SuPolicy.RESTRICT -> 2f
+        SuPolicy.ALLOW -> 3f
+        else -> 1f
+    }
+}
+
+fun sliderValueToPolicy(value: Float): Int {
+    return when (value) {
+        1f -> SuPolicy.DENY
+        2f -> SuPolicy.RESTRICT
+        3f -> SuPolicy.ALLOW
+        else -> SuPolicy.DENY
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/dialog/ManagerInstallDialog.kt

@@ -3,7 +3,6 @@ package com.topjohnwu.magisk.dialog
 import com.topjohnwu.magisk.core.AppContext
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.R
-import com.topjohnwu.magisk.core.di.ServiceLocator
 import com.topjohnwu.magisk.core.download.DownloadEngine
 import com.topjohnwu.magisk.core.download.Subject
 import com.topjohnwu.magisk.view.MagiskDialog
@@ -11,15 +10,10 @@ import java.io.File
 
 class ManagerInstallDialog : MarkDownDialog() {
 
-    private val svc get() = ServiceLocator.networkService
-
     override suspend fun getMarkdownText(): String {
-        val text = svc.fetchString(Info.remote.magisk.note)
+        val text = Info.update.note
         // Cache the changelog
-        AppContext.cacheDir.listFiles { _, name -> name.endsWith(".md") }.orEmpty().forEach {
-            it.delete()
-        }
-        File(AppContext.cacheDir, "${Info.remote.magisk.versionCode}.md").writeText(text)
+        File(AppContext.cacheDir, "${Info.update.versionCode}.md").writeText(text)
         return text
     }
 

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

@@ -91,16 +91,15 @@ class HomeViewModel(
 
     override suspend fun doLoadWork() {
         appState = State.LOADING
-        Info.getRemote(svc)?.apply {
+        Info.fetchUpdate(svc)?.apply {
             appState = when {
-                BuildConfig.APP_VERSION_CODE < magisk.versionCode -> State.OUTDATED
+                BuildConfig.APP_VERSION_CODE < versionCode -> State.OUTDATED
                 else -> State.UP_TO_DATE
             }
 
             val isDebug = Config.updateChannel == Config.Value.DEBUG_CHANNEL
             managerRemoteVersion =
-                ("${magisk.version} (${magisk.versionCode})" +
-                    if (isDebug) " (D)" else "").asText()
+                ("$version (${versionCode})" + if (isDebug) " (D)" else "").asText()
         } ?: run {
             appState = State.INVALID
             managerRemoteVersion = CoreR.string.not_available.asText()

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

@@ -14,9 +14,8 @@ import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.BaseViewModel
 import com.topjohnwu.magisk.core.AppContext
-import com.topjohnwu.magisk.core.BuildConfig
+import com.topjohnwu.magisk.core.BuildConfig.APP_VERSION_CODE
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.base.ContentResultCallback
 import com.topjohnwu.magisk.core.ktx.toast
@@ -70,17 +69,16 @@ class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel()
     init {
         viewModelScope.launch(Dispatchers.IO) {
             try {
-                val file = File(AppContext.cacheDir, "${BuildConfig.APP_VERSION_CODE}.md")
-                val text = when {
-                    file.exists() -> file.readText()
-                    Const.Url.CHANGELOG_URL.isEmpty() -> ""
+                val noteFile = File(AppContext.cacheDir, "${APP_VERSION_CODE}.md")
+                val noteText = when {
+                    noteFile.exists() -> noteFile.readText()
                     else -> {
-                        val str = svc.fetchString(Const.Url.CHANGELOG_URL)
-                        file.writeText(str)
-                        str
+                        val note = svc.fetchUpdate(APP_VERSION_CODE).note
+                        noteFile.writeText(note)
+                        note
                     }
                 }
-                val spanned = markwon.toMarkdown(text)
+                val spanned = markwon.toMarkdown(noteText)
                 withContext(Dispatchers.Main) {
                     notes = spanned
                 }
@@ -100,13 +98,15 @@ class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel()
     }
 
     override fun onSaveState(state: Bundle) {
-        state.putParcelable(INSTALL_STATE_KEY, InstallState(
-            methodId,
-            step,
-            Config.keepVerity,
-            Config.keepEnc,
-            Config.recovery
-        ))
+        state.putParcelable(
+            INSTALL_STATE_KEY, InstallState(
+                methodId,
+                step,
+                Config.keepVerity,
+                Config.keepEnc,
+                Config.recovery
+            )
+        )
     }
 
     override fun onRestoreState(state: Bundle) {
@@ -124,6 +124,7 @@ class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel()
         override fun onActivityLaunch() {
             AppContext.toast(CoreR.string.patch_file_msg, Toast.LENGTH_LONG)
         }
+
         override fun onActivityResult(result: Uri) {
             uri.value = result
         }

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

@@ -147,19 +147,11 @@ object UpdateChannel : BaseSettingsItem.Selector() {
         get() = Config.updateChannel
         set(value) {
             Config.updateChannel = value
-            Info.remote = Info.EMPTY_REMOTE
+            Info.resetUpdate()
         }
 
     override val title = CoreR.string.settings_update_channel_title.asText()
-
     override val entryRes = CoreR.array.update_channel
-    override fun entries(res: Resources): Array<String> {
-        return super.entries(res).let {
-            if (!Const.APP_IS_CANARY && !BuildConfig.DEBUG)
-                it.copyOfRange(0, Config.Value.CANARY_CHANNEL)
-            else it
-        }
-    }
 }
 
 object UpdateChannelUrl : BaseSettingsItem.Input() {
@@ -169,7 +161,7 @@ object UpdateChannelUrl : BaseSettingsItem.Input() {
         get() = Config.customChannelUrl
         set(value) {
             Config.customChannelUrl = value
-            Info.remote = Info.EMPTY_REMOTE
+            Info.resetUpdate()
             notifyPropertyChanged(BR.description)
         }
 
@@ -330,6 +322,12 @@ object Reauthenticate : BaseSettingsItem.Toggle() {
     override var value by Config::suReAuth
 
     override fun refresh() {
-        isEnabled = Build.VERSION.SDK_INT < Build.VERSION_CODES.O && Info.showSuperUser
+        isEnabled = Build.VERSION.SDK_INT < Build.VERSION_CODES.O
     }
 }
+
+object Restrict : BaseSettingsItem.Toggle() {
+    override val title = CoreR.string.settings_su_restrict_title.asText()
+    override val description = CoreR.string.settings_su_restrict_summary.asText()
+    override var value by Config::suRestrict
+}

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

@@ -83,6 +83,9 @@ class SettingsViewModel : BaseViewModel(), BaseSettingsItem.Handler {
                 // Can hide overlay windows on 12.0+
                 list.remove(Tapjack)
             }
+            if (Const.Version.atLeast_30_1()) {
+                list.add(Restrict)
+            }
         }
 
         return list

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

@@ -4,11 +4,13 @@ import android.graphics.drawable.Drawable
 import androidx.databinding.Bindable
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.model.su.SuPolicy
 import com.topjohnwu.magisk.databinding.DiffItem
 import com.topjohnwu.magisk.databinding.ItemWrapper
 import com.topjohnwu.magisk.databinding.ObservableRvItem
 import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.magisk.core.R as CoreR
 
 class PolicyRvItem(
     private val viewModel: SuperuserViewModel,
@@ -33,14 +35,34 @@ class PolicyRvItem(
     var isExpanded = false
         set(value) = set(value, field, { field = it }, BR.expanded)
 
+    val showSlider = Config.suRestrict || item.policy == SuPolicy.RESTRICT
+
     @get:Bindable
     var isEnabled
-        get() = item.policy == SuPolicy.ALLOW
+        get() = item.policy >= SuPolicy.ALLOW
         set(value) = setImpl(value, isEnabled) {
             notifyPropertyChanged(BR.enabled)
-            viewModel.togglePolicy(this, value)
+            viewModel.updatePolicy(this, if (it) SuPolicy.ALLOW else SuPolicy.DENY)
         }
 
+    @get:Bindable
+    var sliderValue
+        get() = item.policy
+        set(value) = setImpl(value, sliderValue) {
+            notifyPropertyChanged(BR.sliderValue)
+            notifyPropertyChanged(BR.enabled)
+            viewModel.updatePolicy(this, it)
+        }
+
+    val sliderValueToPolicyString: (Float) -> Int = { value ->
+        when (value.toInt()) {
+            1 -> CoreR.string.deny
+            2 -> CoreR.string.restrict
+            3 -> CoreR.string.grant
+            else -> CoreR.string.deny
+        }
+    }
+
     @get:Bindable
     var shouldNotify
         get() = item.notification

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

@@ -156,15 +156,16 @@ class SuperuserViewModel(
         }
     }
 
-    fun togglePolicy(item: PolicyRvItem, enable: Boolean) {
+    fun updatePolicy(item: PolicyRvItem, policy: Int) {
         val items = itemsPolicies.filter { it.item.uid == item.item.uid }
         fun updateState() {
             viewModelScope.launch {
-                val res = if (enable) R.string.su_snack_grant else R.string.su_snack_deny
-                item.item.policy = if (enable) SuPolicy.ALLOW else SuPolicy.DENY
+                val res = if (policy >= SuPolicy.ALLOW) R.string.su_snack_grant else R.string.su_snack_deny
+                item.item.policy = policy
                 db.update(item.item)
                 items.forEach {
                     it.notifyPropertyChanged(BR.enabled)
+                    it.notifyPropertyChanged(BR.sliderValue)
                 }
                 SnackbarEvent(res.asText(item.appName)).publish()
             }

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

@@ -25,7 +25,7 @@
 
         <include
             android:id="@+id/log_track_container"
-            bullet="@{item.log.action == 2 ? R.drawable.ic_check_md2 : R.drawable.ic_close_md2}"
+            bullet="@{item.log.action >= 2 ? R.drawable.ic_check_md2 : R.drawable.ic_close_md2}"
             isBottom="@{item.isBottom}"
             isSelected="@{item.log.action != 2}"
             isTop="@{item.isTop}"

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

@@ -5,6 +5,8 @@
 
     <data>
 
+        <import type="com.topjohnwu.magisk.databinding.DataBindingAdaptersKt" />
+
         <variable
             name="item"
             type="com.topjohnwu.magisk.ui.superuser.PolicyRvItem" />
@@ -85,16 +87,32 @@
                         app:layout_constraintVertical_bias="0"
                         tools:text="com.topjohnwu.magisk" />
 
-                    <com.google.android.material.switchmaterial.SwitchMaterial
+                    <FrameLayout
                         android:id="@+id/policy_indicator"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="@dimen/l1"
-                        android:checked="@={item.enabled}"
                         android:nextFocusLeft="@id/policy"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <com.google.android.material.switchmaterial.SwitchMaterial
+                            gone="@{item.showSlider}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:checked="@={item.enabled}" />
+
+                        <com.google.android.material.slider.Slider
+                            goneUnless="@{item.showSlider}"
+                            labelFormatter="@{item.sliderValueToPolicyString}"
+                            android:layout_width="96dp"
+                            android:layout_height="wrap_content"
+                            android:stepSize="1"
+                            android:value="@={DataBindingAdaptersKt.policyToSliderValue(item.sliderValue)}"
+                            android:valueFrom="1"
+                            android:valueTo="3" />
+                    </FrameLayout>
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 

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/build.gradle.kts

@@ -30,5 +30,6 @@ dependencies {
     implementation(libs.ksp.plugin)
     implementation(libs.navigation.safe.args.plugin)
     implementation(libs.lsparanoid.plugin)
+    implementation(libs.moshi.plugin)
     implementation(libs.jgit)
 }

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

@@ -0,0 +1,77 @@
+import com.android.build.api.artifact.ArtifactTransformationRequest
+import com.android.build.api.dsl.ApkSigningConfig
+import com.android.builder.internal.packaging.IncrementalPackager
+import com.android.tools.build.apkzlib.sign.SigningExtension
+import com.android.tools.build.apkzlib.sign.SigningOptions
+import com.android.tools.build.apkzlib.zfile.ZFiles
+import com.android.tools.build.apkzlib.zip.ZFileOptions
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.TaskAction
+import java.io.File
+import java.security.KeyStore
+import java.security.cert.X509Certificate
+import java.util.jar.JarFile
+
+abstract class AddCommentTask: DefaultTask() {
+    @get:Input
+    abstract val comment: Property<String>
+
+    @get:Input
+    abstract val signingConfig: Property<ApkSigningConfig>
+
+    @get:InputFiles
+    abstract val apkFolder: DirectoryProperty
+
+    @get:OutputDirectory
+    abstract val outFolder: DirectoryProperty
+
+    @get:Internal
+    abstract val transformationRequest: Property<ArtifactTransformationRequest<AddCommentTask>>
+
+    @TaskAction
+    fun taskAction() = transformationRequest.get().submit(this) { artifact ->
+        val inFile = File(artifact.outputFile)
+        val outFile = outFolder.file(inFile.name).get().asFile
+
+        val privateKey = signingConfig.get().getPrivateKey()
+        val signingOptions = SigningOptions.builder()
+            .setMinSdkVersion(0)
+            .setV1SigningEnabled(true)
+            .setV2SigningEnabled(true)
+            .setKey(privateKey.privateKey)
+            .setCertificates(privateKey.certificate as X509Certificate)
+            .setValidation(SigningOptions.Validation.ASSUME_INVALID)
+            .build()
+        val options = ZFileOptions().apply {
+            noTimestamps = true
+            autoSortFiles = true
+        }
+        outFile.parentFile?.mkdirs()
+        inFile.copyTo(outFile, overwrite = true)
+        ZFiles.apk(outFile, options).use {
+            SigningExtension(signingOptions).register(it)
+            it.eocdComment = comment.get().toByteArray()
+            it.get(IncrementalPackager.APP_METADATA_ENTRY_PATH)?.delete()
+            it.get(IncrementalPackager.VERSION_CONTROL_INFO_ENTRY_PATH)?.delete()
+            it.get(JarFile.MANIFEST_NAME)?.delete()
+        }
+
+        outFile
+    }
+
+    private fun ApkSigningConfig.getPrivateKey(): KeyStore.PrivateKeyEntry {
+        val keyStore = KeyStore.getInstance(storeType ?: KeyStore.getDefaultType())
+        storeFile!!.inputStream().use {
+            keyStore.load(it, storePassword!!.toCharArray())
+        }
+        val keyPwdArray = keyPassword!!.toCharArray()
+        val entry = keyStore.getEntry(keyAlias!!, KeyStore.PasswordProtection(keyPwdArray))
+        return entry as KeyStore.PrivateKeyEntry
+    }
+}

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

@@ -5,6 +5,12 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.provideDelegate
 import java.io.File
 import java.util.Properties
+import java.util.Random
+
+// Set non-zero value here to fix the random seed for reproducible builds
+// CI builds are always reproducible
+val RAND_SEED = if (System.getenv("CI") != null) 42 else 0
+lateinit var RANDOM: Random
 
 private val props = Properties()
 private var commitHash = ""
@@ -14,7 +20,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 +34,25 @@ object Config {
     }
 }
 
+fun Project.rootFile(path: String): File {
+    val file = File(path)
+    return if (file.isAbsolute) file
+    else File(rootProject.file(".."), path)
+}
+
 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 = rootFile(configPath ?: "config.prop")
         if (config.exists())
             config.inputStream().use { props.load(it) }
 
-        val repo = FileRepository(rootProject.file(".git"))
+        val repo = FileRepository(rootFile(".git"))
         val refId = repo.refDatabase.exactRef("HEAD").objectId
         commitHash = repo.newObjectReader().abbreviate(refId, 8).name()
     }

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

@@ -1,33 +1,18 @@
-import com.android.build.api.artifact.ArtifactTransformationRequest
 import com.android.build.api.artifact.SingleArtifact
-import com.android.build.api.dsl.ApkSigningConfig
 import com.android.build.api.instrumentation.FramesComputationMode.COMPUTE_FRAMES_FOR_INSTRUMENTED_METHODS
 import com.android.build.api.instrumentation.InstrumentationScope
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
-import com.android.builder.internal.packaging.IncrementalPackager
-import com.android.tools.build.apkzlib.sign.SigningExtension
-import com.android.tools.build.apkzlib.sign.SigningOptions
-import com.android.tools.build.apkzlib.zfile.ZFiles
-import com.android.tools.build.apkzlib.zip.ZFileOptions
 import org.apache.tools.ant.filters.FixCrLfFilter
 import org.gradle.api.Action
-import org.gradle.api.DefaultTask
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Copy
 import org.gradle.api.tasks.Delete
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.StopExecutionException
 import org.gradle.api.tasks.Sync
-import org.gradle.api.tasks.TaskAction
 import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.exclude
 import org.gradle.kotlin.dsl.filter
@@ -36,18 +21,14 @@ import org.gradle.kotlin.dsl.getValue
 import org.gradle.kotlin.dsl.named
 import org.gradle.kotlin.dsl.provideDelegate
 import org.gradle.kotlin.dsl.register
-import org.gradle.kotlin.dsl.registering
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.net.URI
-import java.security.KeyStore
 import java.security.MessageDigest
-import java.security.cert.X509Certificate
 import java.util.HexFormat
-import java.util.jar.JarFile
 import java.util.zip.Deflater
 import java.util.zip.DeflaterOutputStream
 import java.util.zip.ZipEntry
@@ -60,13 +41,13 @@ private fun Project.androidBase(configure: Action<BaseExtension>) =
 private fun Project.android(configure: Action<BaseAppModuleExtension>) =
     extensions.configure("android", configure)
 
-private val Project.androidApp: BaseAppModuleExtension
+internal val Project.androidApp: BaseAppModuleExtension
     get() = extensions["android"] as BaseAppModuleExtension
 
 private val Project.androidLib: LibraryExtension
     get() = extensions["android"] as LibraryExtension
 
-private val Project.androidComponents
+internal val Project.androidComponents
     get() = extensions.getByType(ApplicationAndroidComponentsExtension::class.java)
 
 fun Project.setupCommon() {
@@ -74,7 +55,7 @@ fun Project.setupCommon() {
         compileSdkVersion(36)
         buildToolsVersion = "36.0.0"
         ndkPath = "$sdkDirectory/ndk/magisk"
-        ndkVersion = "29.0.13113456"
+        ndkVersion = "28.1.13356709"
 
         defaultConfig {
             minSdk = 23
@@ -89,6 +70,7 @@ fun Project.setupCommon() {
             resources {
                 excludes += arrayOf(
                     "/META-INF/*",
+                    "/META-INF/androidx/**",
                     "/META-INF/versions/**",
                     "/org/bouncycastle/**",
                     "/org/apache/commons/**",
@@ -144,49 +126,45 @@ const val BUSYBOX_ZIP_CHECKSUM =
 fun Project.setupCoreLib() {
     setupCommon()
 
-    val abiList = Config.abiList
+    androidLib.libraryVariants.all {
+        val variant = name
+        val variantCapped = name.replaceFirstChar { it.uppercase() }
+        val abiList = Config.abiList
 
-    val syncLibs by tasks.registering(Sync::class) {
-        into("src/main/jniLibs")
-        for (abi in abiList) {
-            into(abi) {
-                from(rootProject.file("native/out/$abi")) {
-                    include("magiskboot", "magiskinit", "magiskpolicy", "magisk", "libinit-ld.so")
-                    rename { if (it.endsWith(".so")) it else "lib$it.so" }
+        val syncLibs = tasks.register("sync${variantCapped}JniLibs", Sync::class) {
+            into("src/$variant/jniLibs")
+            for (abi in abiList) {
+                into(abi) {
+                    from(rootFile("native/out/$abi")) {
+                        include("magiskboot", "magiskinit", "magiskpolicy", "magisk", "libinit-ld.so")
+                        rename { if (it.endsWith(".so")) it else "lib$it.so" }
+                    }
                 }
             }
+            from(zipTree(downloadFile(BUSYBOX_DOWNLOAD_URL, BUSYBOX_ZIP_CHECKSUM)))
+            include(abiList.map { "$it/libbusybox.so" })
+            onlyIf {
+                if (inputs.sourceFiles.files.size != abiList.size * 6)
+                    throw StopExecutionException("Please build binaries first! (./build.py binary)")
+                true
+            }
         }
-        onlyIf {
-            if (inputs.sourceFiles.files.size != abiList.size * 5)
-                throw StopExecutionException("Please build binaries first! (./build.py binary)")
-            true
+
+        tasks.getByPath("merge${variantCapped}JniLibFolders").dependsOn(syncLibs)
+
+        val syncResources = tasks.register("sync${variantCapped}Resources", Sync::class) {
+            into("src/$variant/resources/META-INF/com/google/android")
+            from(rootFile("scripts/update_binary.sh")) {
+                rename { "update-binary" }
+            }
+            from(rootFile("scripts/flash_script.sh")) {
+                rename { "updater-script" }
+            }
         }
-    }
 
-    val downloadBusybox by tasks.registering(Copy::class) {
-        dependsOn(syncLibs)
-        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")) {
-            rename { "update-binary" }
-        }
-        from(rootProject.file("scripts/flash_script.sh")) {
-            rename { "updater-script" }
-        }
-    }
-
-    androidLib.libraryVariants.all {
-        val variantCapped = name.replaceFirstChar { it.uppercase() }
-
-        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")
         }
@@ -195,15 +173,15 @@ fun Project.setupCoreLib() {
             dependsOn(stubTask)
             inputs.property("version", Config.version)
             inputs.property("versionCode", Config.versionCode)
-            into("src/${this@all.name}/assets")
-            from(rootProject.file("scripts")) {
+            into("src/$variant/assets")
+            from(rootFile("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(rootFile("tools/bootctl"))
             into("chromeos") {
-                from(rootProject.file("tools/futility"))
-                from(rootProject.file("tools/keys")) {
+                from(rootFile("tools/futility"))
+                from(rootFile("tools/keys")) {
                     include("kernel_data_key.vbprivk", "kernel.keyblock")
                 }
             }
@@ -228,72 +206,14 @@ fun Project.setupCoreLib() {
     }
 }
 
-private fun ApkSigningConfig.getPrivateKey(): KeyStore.PrivateKeyEntry {
-    val keyStore = KeyStore.getInstance(storeType ?: KeyStore.getDefaultType())
-    storeFile!!.inputStream().use {
-        keyStore.load(it, storePassword!!.toCharArray())
-    }
-    val keyPwdArray = keyPassword!!.toCharArray()
-    val entry = keyStore.getEntry(keyAlias!!, KeyStore.PasswordProtection(keyPwdArray))
-    return entry as KeyStore.PrivateKeyEntry
-}
-
-abstract class AddCommentTask: DefaultTask() {
-    @get:Input
-    abstract val comment: Property<String>
-
-    @get:Input
-    abstract val signingConfig: Property<ApkSigningConfig>
-
-    @get:InputFiles
-    abstract val apkFolder: DirectoryProperty
-
-    @get:OutputDirectory
-    abstract val outFolder: DirectoryProperty
-
-    @get:Internal
-    abstract val transformationRequest: Property<ArtifactTransformationRequest<AddCommentTask>>
-
-    @TaskAction
-    fun taskAction() = transformationRequest.get().submit(this) { artifact ->
-        val inFile = File(artifact.outputFile)
-        val outFile = outFolder.file(inFile.name).get().asFile
-
-        val privateKey = signingConfig.get().getPrivateKey()
-        val signingOptions = SigningOptions.builder()
-            .setMinSdkVersion(0)
-            .setV1SigningEnabled(true)
-            .setV2SigningEnabled(true)
-            .setKey(privateKey.privateKey)
-            .setCertificates(privateKey.certificate as X509Certificate)
-            .setValidation(SigningOptions.Validation.ASSUME_INVALID)
-            .build()
-        val options = ZFileOptions().apply {
-            noTimestamps = true
-            autoSortFiles = true
-        }
-        outFile.parentFile?.mkdirs()
-        inFile.copyTo(outFile, overwrite = true)
-        ZFiles.apk(outFile, options).use {
-            SigningExtension(signingOptions).register(it)
-            it.eocdComment = comment.get().toByteArray()
-            it.get(IncrementalPackager.APP_METADATA_ENTRY_PATH)?.delete()
-            it.get(IncrementalPackager.VERSION_CONTROL_INFO_ENTRY_PATH)?.delete()
-            it.get(JarFile.MANIFEST_NAME)?.delete()
-        }
-
-        outFile
-    }
-}
-
 fun Project.setupAppCommon() {
     setupCommon()
 
     android {
         signingConfigs {
-            create("config") {
-                Config["keyStore"]?.also {
-                    storeFile = rootProject.file(it)
+            Config["keyStore"]?.also {
+                create("config") {
+                    storeFile = rootFile(it)
                     storePassword = Config["keyStorePass"]
                     keyAlias = Config["keyAlias"]
                     keyPassword = Config["keyPass"]
@@ -309,15 +229,12 @@ fun Project.setupAppCommon() {
         }
 
         buildTypes {
-            signingConfigs["config"].also {
-                debug {
-                    signingConfig = if (it.storeFile?.exists() == true) it
-                    else signingConfigs["debug"]
-                }
-                release {
-                    signingConfig = if (it.storeFile?.exists() == true) it
-                    else signingConfigs["debug"]
-                }
+            val config = signingConfigs.findByName("config") ?: signingConfigs["debug"]
+            debug {
+                signingConfig = config
+            }
+            release {
+                signingConfig = config
             }
         }
 
@@ -384,89 +301,6 @@ fun Project.setupMainApk() {
     }
 }
 
-fun Project.setupStubApk() {
-    setupAppCommon()
-
-    androidComponents.onVariants { variant ->
-        val variantName = variant.name
-        val variantCapped = variantName.replaceFirstChar { it.uppercase() }
-        val manifestUpdater =
-            project.tasks.register("${variantName}ManifestProducer", ManifestUpdater::class.java) {
-                dependsOn("generate${variantCapped}ObfuscatedClass")
-                applicationId = variant.applicationId
-                appClassDir.set(layout.buildDirectory.dir("generated/source/app/$variantName"))
-                factoryClassDir.set(layout.buildDirectory.dir("generated/source/factory/$variantName"))
-            }
-        variant.artifacts.use(manifestUpdater)
-            .wiredWithFiles(
-                ManifestUpdater::mergedManifest,
-                ManifestUpdater::outputManifest)
-            .toTransform(SingleArtifact.MERGED_MANIFEST)
-    }
-
-    androidApp.applicationVariants.all {
-        val variantCapped = name.replaceFirstChar { it.uppercase() }
-        val variantLowered = name.lowercase()
-        val outFactoryClassDir = layout.buildDirectory.file("generated/source/factory/${variantLowered}").get().asFile
-        val outAppClassDir = layout.buildDirectory.file("generated/source/app/${variantLowered}").get().asFile
-        val outResDir = layout.buildDirectory.dir("generated/source/res/${variantLowered}").get().asFile
-        val aapt = File(androidApp.sdkDirectory, "build-tools/${androidApp.buildToolsVersion}/aapt2")
-        val apk = layout.buildDirectory.file("intermediates/linked_resources_binary_format/" +
-            "${variantLowered}/process${variantCapped}Resources/linked-resources-binary-format-${variantLowered}.ap_").get().asFile
-
-        val genManifestTask = tasks.register("generate${variantCapped}ObfuscatedClass") {
-            inputs.property("seed", RAND_SEED)
-            outputs.dirs(outFactoryClassDir, outAppClassDir)
-            doLast {
-                outFactoryClassDir.mkdirs()
-                outAppClassDir.mkdirs()
-                genStubClasses(outFactoryClassDir, outAppClassDir)
-            }
-        }
-        registerJavaGeneratingTask(genManifestTask, outFactoryClassDir, outAppClassDir)
-
-        val processResourcesTask = tasks.named("process${variantCapped}Resources") {
-            outputs.dir(outResDir)
-            doLast {
-                val apkTmp = File("${apk}.tmp")
-                exec {
-                    commandLine(aapt, "optimize", "-o", apkTmp, "--collapse-resource-names", apk)
-                }
-
-                val bos = ByteArrayOutputStream()
-                ZipFile(apkTmp).use { src ->
-                    ZipOutputStream(apk.outputStream()).use {
-                        it.setLevel(Deflater.BEST_COMPRESSION)
-                        it.putNextEntry(ZipEntry("AndroidManifest.xml"))
-                        src.getInputStream(src.getEntry("AndroidManifest.xml")).transferTo(it)
-                        it.closeEntry()
-                    }
-                    DeflaterOutputStream(bos, Deflater(Deflater.BEST_COMPRESSION)).use {
-                        src.getInputStream(src.getEntry("resources.arsc")).transferTo(it)
-                    }
-                }
-                apkTmp.delete()
-                genEncryptedResources(bos.toByteArray(), outResDir)
-            }
-        }
-
-        registerJavaGeneratingTask(processResourcesTask, outResDir)
-    }
-    // Override optimizeReleaseResources task
-    val apk = layout.buildDirectory.file("intermediates/linked_resources_binary_format/" +
-        "release/processReleaseResources/linked-resources-binary-format-release.ap_").get().asFile
-    val optRes = layout.buildDirectory.file("intermediates/optimized_processed_res/" +
-        "release/optimizeReleaseResources/resources-release-optimize.ap_").get().asFile
-    afterEvaluate {
-        tasks.named("optimizeReleaseResources") {
-            doLast { apk.copyTo(optRes, true) }
-        }
-    }
-    tasks.named<Delete>("clean") {
-        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 =

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

@@ -1,8 +1,11 @@
+import com.android.build.api.artifact.SingleArtifact
 import org.gradle.api.DefaultTask
+import org.gradle.api.Project
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.Delete
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.InputFiles
@@ -10,22 +13,25 @@ import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.PathSensitive
 import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
+import org.gradle.kotlin.dsl.assign
+import org.gradle.kotlin.dsl.named
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.PrintStream
 import java.security.SecureRandom
 import java.util.Random
+import java.util.zip.Deflater
+import java.util.zip.DeflaterOutputStream
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+import java.util.zip.ZipOutputStream
 import javax.crypto.Cipher
 import javax.crypto.CipherOutputStream
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
 import kotlin.random.asKotlinRandom
 
-// Set non-zero value here to fix the random seed for reproducible builds
-// CI builds are always reproducible
-val RAND_SEED = if (System.getenv("CI") != null) 42 else 0
-private lateinit var RANDOM: Random
 private val kRANDOM get() = RANDOM.asKotlinRandom()
 
 private val c1 = mutableListOf<String>()
@@ -72,7 +78,7 @@ private fun PrintStream.byteField(name: String, bytes: ByteArray) {
 }
 
 @CacheableTask
-abstract class ManifestUpdater: DefaultTask() {
+private abstract class ManifestUpdater: DefaultTask() {
     @get:Input
     abstract val applicationId: Property<String>
 
@@ -182,9 +188,7 @@ abstract class ManifestUpdater: DefaultTask() {
 }
 
 
-fun genStubClasses(factoryOutDir: File, appOutDir: File) {
-    fun String.ind(level: Int) = replaceIndentByMargin("    ".repeat(level))
-
+private fun genStubClasses(factoryOutDir: File, appOutDir: File) {
     val classNameGenerator = sequence {
         fun notJavaKeyword(name: String) = when (name) {
             "do", "if", "for", "int", "new", "try" -> false
@@ -228,7 +232,7 @@ fun genStubClasses(factoryOutDir: File, appOutDir: File) {
     genClass("StubApplication", appOutDir)
 }
 
-fun genEncryptedResources(res: ByteArray, outDir: File) {
+private fun genEncryptedResources(res: ByteArray, outDir: File) {
     val mainPkgDir = File(outDir, "com/topjohnwu/magisk")
     mainPkgDir.mkdirs()
 
@@ -259,3 +263,86 @@ fun genEncryptedResources(res: ByteArray, outDir: File) {
         it.println("}")
     }
 }
+
+fun Project.setupStubApk() {
+    setupAppCommon()
+
+    androidComponents.onVariants { variant ->
+        val variantName = variant.name
+        val variantCapped = variantName.replaceFirstChar { it.uppercase() }
+        val manifestUpdater =
+            project.tasks.register("${variantName}ManifestProducer", ManifestUpdater::class.java) {
+                dependsOn("generate${variantCapped}ObfuscatedClass")
+                applicationId = variant.applicationId
+                appClassDir.set(layout.buildDirectory.dir("generated/source/app/$variantName"))
+                factoryClassDir.set(layout.buildDirectory.dir("generated/source/factory/$variantName"))
+            }
+        variant.artifacts.use(manifestUpdater)
+            .wiredWithFiles(
+                ManifestUpdater::mergedManifest,
+                ManifestUpdater::outputManifest)
+            .toTransform(SingleArtifact.MERGED_MANIFEST)
+    }
+
+    androidApp.applicationVariants.all {
+        val variantCapped = name.replaceFirstChar { it.uppercase() }
+        val variantLowered = name.lowercase()
+        val outFactoryClassDir = layout.buildDirectory.file("generated/source/factory/${variantLowered}").get().asFile
+        val outAppClassDir = layout.buildDirectory.file("generated/source/app/${variantLowered}").get().asFile
+        val outResDir = layout.buildDirectory.dir("generated/source/res/${variantLowered}").get().asFile
+        val aapt = File(androidApp.sdkDirectory, "build-tools/${androidApp.buildToolsVersion}/aapt2")
+        val apk = layout.buildDirectory.file("intermediates/linked_resources_binary_format/" +
+                "${variantLowered}/process${variantCapped}Resources/linked-resources-binary-format-${variantLowered}.ap_").get().asFile
+
+        val genManifestTask = tasks.register("generate${variantCapped}ObfuscatedClass") {
+            inputs.property("seed", RAND_SEED)
+            outputs.dirs(outFactoryClassDir, outAppClassDir)
+            doLast {
+                outFactoryClassDir.mkdirs()
+                outAppClassDir.mkdirs()
+                genStubClasses(outFactoryClassDir, outAppClassDir)
+            }
+        }
+        registerJavaGeneratingTask(genManifestTask, outFactoryClassDir, outAppClassDir)
+
+        val processResourcesTask = tasks.named("process${variantCapped}Resources") {
+            outputs.dir(outResDir)
+            doLast {
+                val apkTmp = File("${apk}.tmp")
+                exec {
+                    commandLine(aapt, "optimize", "-o", apkTmp, "--collapse-resource-names", apk)
+                }
+
+                val bos = ByteArrayOutputStream()
+                ZipFile(apkTmp).use { src ->
+                    ZipOutputStream(apk.outputStream()).use {
+                        it.setLevel(Deflater.BEST_COMPRESSION)
+                        it.putNextEntry(ZipEntry("AndroidManifest.xml"))
+                        src.getInputStream(src.getEntry("AndroidManifest.xml")).transferTo(it)
+                        it.closeEntry()
+                    }
+                    DeflaterOutputStream(bos, Deflater(Deflater.BEST_COMPRESSION)).use {
+                        src.getInputStream(src.getEntry("resources.arsc")).transferTo(it)
+                    }
+                }
+                apkTmp.delete()
+                genEncryptedResources(bos.toByteArray(), outResDir)
+            }
+        }
+
+        registerJavaGeneratingTask(processResourcesTask, outResDir)
+    }
+    // Override optimizeReleaseResources task
+    val apk = layout.buildDirectory.file("intermediates/linked_resources_binary_format/" +
+            "release/processReleaseResources/linked-resources-binary-format-release.ap_").get().asFile
+    val optRes = layout.buildDirectory.file("intermediates/optimized_processed_res/" +
+            "release/optimizeReleaseResources/resources-release-optimize.ap_").get().asFile
+    afterEvaluate {
+        tasks.named("optimizeReleaseResources") {
+            doLast { apk.copyTo(optRes, true) }
+        }
+    }
+    tasks.named<Delete>("clean") {
+        delete.addAll(listOf("src/debug/AndroidManifest.xml", "src/release/AndroidManifest.xml"))
+    }
+}

app/core/.gitignore

@@ -1,4 +1,3 @@
 /build
-src/*/assets
-src/*/jniLibs
-src/*/resources
+src/debug
+src/release

app/core/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("com.android.library")
     kotlin("android")
     kotlin("plugin.parcelize")
+    id("dev.zacsweers.moshix")
     id("com.google.devtools.ksp")
 }
 
@@ -29,7 +30,7 @@ android {
 }
 
 dependencies {
-    api(project(":app:shared"))
+    api(project(":shared"))
 
     api(libs.timber)
     api(libs.markwon.core)
@@ -48,9 +49,6 @@ dependencies {
     implementation(libs.okhttp.logging)
     implementation(libs.okhttp.dnsoverhttps)
 
-    implementation(libs.moshi)
-    ksp(libs.moshi.codegen)
-
     implementation(libs.room.runtime)
     implementation(libs.room.ktx)
     ksp(libs.room.compiler)

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/Config.kt

@@ -32,8 +32,9 @@ object Config : PreferenceConfig, DBConfig {
         const val SU_NOTIFICATION = "su_notification"
         const val SU_REAUTH = "su_reauth"
         const val SU_TAPJACK = "su_tapjack"
+        const val SU_RESTRICT = "su_restrict"
         const val CHECK_UPDATES = "check_update"
-        const val UPDATE_CHANNEL = "update_channel"
+        const val RELEASE_CHANNEL = "release_channel"
         const val CUSTOM_CHANNEL = "custom_channel"
         const val LOCALE = "locale"
         const val DARK_THEME = "dark_theme_extended"
@@ -48,7 +49,7 @@ object Config : PreferenceConfig, DBConfig {
             SU_AUTO_RESPONSE, SU_REAUTH, SU_TAPJACK)
     }
 
-    object Value {
+    object OldValue {
         // Update channels
         const val DEFAULT_CHANNEL = -1
         const val STABLE_CHANNEL = 0
@@ -56,6 +57,15 @@ object Config : PreferenceConfig, DBConfig {
         const val CUSTOM_CHANNEL = 2
         const val CANARY_CHANNEL = 3
         const val DEBUG_CHANNEL = 4
+    }
+
+    object Value {
+        // Update channels
+        const val DEFAULT_CHANNEL = -1
+        const val STABLE_CHANNEL = 0
+        const val BETA_CHANNEL = 1
+        const val DEBUG_CHANNEL = 2
+        const val CUSTOM_CHANNEL = 3
 
         // root access mode
         const val ROOT_ACCESS_DISABLED = 0
@@ -86,14 +96,6 @@ object Config : PreferenceConfig, DBConfig {
         val TIMEOUT_LIST = longArrayOf(0, -1, 10, 20, 30, 60)
     }
 
-    private val defaultChannel =
-        if (BuildConfig.DEBUG)
-            Value.DEBUG_CHANNEL
-        else if (Const.APP_IS_CANARY)
-            Value.CANARY_CHANNEL
-        else
-            Value.DEFAULT_CHANNEL
-
     @JvmField var keepVerity = false
     @JvmField var keepEnc = false
     @JvmField var recovery = false
@@ -109,7 +111,7 @@ object Config : PreferenceConfig, DBConfig {
     private var checkUpdatePrefs by preference(Key.CHECK_UPDATES, true)
     private var localePrefs by preference(Key.LOCALE, "")
     var doh by preference(Key.DOH, false)
-    var updateChannel by preferenceStrInt(Key.UPDATE_CHANNEL, defaultChannel)
+    var updateChannel by preference(Key.RELEASE_CHANNEL, Value.DEFAULT_CHANNEL)
     var customChannelUrl by preference(Key.CUSTOM_CHANNEL, "")
     var downloadDir by preference(Key.DOWNLOAD_DIR, "")
     var randName by preference(Key.RAND_NAME, true)
@@ -146,8 +148,10 @@ object Config : PreferenceConfig, DBConfig {
         }
     var suReAuth by preference(Key.SU_REAUTH, false)
     var suTapjack by preference(Key.SU_TAPJACK, true)
+    var suRestrict by preference(Key.SU_RESTRICT, false)
 
     private const val SU_FINGERPRINT = "su_fingerprint"
+    private const val UPDATE_CHANNEL = "update_channel"
 
     fun toBundle(): Bundle {
         val map = prefs.all - Key.NO_MIGRATION
@@ -183,17 +187,23 @@ object Config : PreferenceConfig, DBConfig {
         }
 
         prefs.edit {
-            // Settings migration
+            // Migrate su_fingerprint
             if (prefs.getBoolean(SU_FINGERPRINT, false))
                 suBiometric = true
             remove(SU_FINGERPRINT)
-            prefs.getString(Key.UPDATE_CHANNEL, null).also {
-                if (it == null ||
-                    it.toInt() > Value.DEBUG_CHANNEL ||
-                    it.toInt() < Value.DEFAULT_CHANNEL) {
-                    putString(Key.UPDATE_CHANNEL, defaultChannel.toString())
+
+            // Migrate update_channel
+            prefs.getString(UPDATE_CHANNEL, null)?.let {
+                val channel = when (it.toInt()) {
+                    OldValue.STABLE_CHANNEL -> Value.STABLE_CHANNEL
+                    OldValue.CANARY_CHANNEL, OldValue.BETA_CHANNEL -> Value.BETA_CHANNEL
+                    OldValue.DEBUG_CHANNEL -> Value.DEBUG_CHANNEL
+                    OldValue.CUSTOM_CHANNEL -> Value.CUSTOM_CHANNEL
+                    else -> Value.DEFAULT_CHANNEL
                 }
+                putInt(Key.RELEASE_CHANNEL, channel)
             }
+            remove(UPDATE_CHANNEL)
         }
     }
 }

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

@@ -2,6 +2,7 @@ package com.topjohnwu.magisk.core
 
 import android.os.Build
 import android.os.Process
+import com.topjohnwu.magisk.core.BuildConfig.APP_VERSION_CODE
 
 @Suppress("DEPRECATION")
 object Const {
@@ -20,18 +21,16 @@ object Const {
 
     // Misc
     val USER_ID = Process.myUid() / 100000
-    val APP_IS_CANARY get() = Version.isCanary(BuildConfig.APP_VERSION_CODE)
 
     object Version {
         const val MIN_VERSION = "v22.0"
         const val MIN_VERCODE = 22000
 
+        private fun isCanary() = (Info.env.versionCode % 100) != 0
         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
+        fun atLeast_30_1() = Info.env.versionCode >= 30100 || isCanary()
     }
 
     object ID {
@@ -43,13 +42,9 @@ object Const {
         const val PATREON_URL = "https://www.patreon.com/topjohnwu"
         const val SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk"
 
-        val CHANGELOG_URL = if (APP_IS_CANARY) Info.remote.magisk.note
-        else "https://topjohnwu.github.io/Magisk/releases/${BuildConfig.APP_VERSION_CODE}.md"
-
-        const val GITHUB_RAW_URL = "https://raw.githubusercontent.com/"
         const val GITHUB_API_URL = "https://api.github.com/"
         const val GITHUB_PAGE_URL = "https://topjohnwu.github.io/magisk-files/"
-        const val JS_DELIVR_URL = "https://cdn.jsdelivr.net/gh/"
+        const val INVALID_URL = "https://example.com/"
     }
 
     object Key {

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

@@ -19,12 +19,18 @@ object Info {
 
     var stub: StubApk.Data? = null
 
-    val EMPTY_REMOTE = UpdateInfo()
-    var remote = EMPTY_REMOTE
-    suspend fun getRemote(svc: NetworkService): UpdateInfo? {
-        return if (remote === EMPTY_REMOTE) {
-            svc.fetchUpdate()?.apply { remote = this }
-        } else remote
+    private val EMPTY_UPDATE = UpdateInfo()
+    var update = EMPTY_UPDATE
+        private set
+
+    suspend fun fetchUpdate(svc: NetworkService): UpdateInfo? {
+        return if (update === EMPTY_UPDATE) {
+            svc.fetchUpdate()?.apply { update = this }
+        } else update
+    }
+
+    fun resetUpdate() {
+        update = EMPTY_UPDATE
     }
 
     var isRooted = false

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

@@ -75,9 +75,8 @@ class JobService : BaseJobService() {
 
     private fun checkUpdate(params: JobParameters): Boolean {
         GlobalScope.launch(Dispatchers.IO) {
-            ServiceLocator.networkService.fetchUpdate()?.let {
-                Info.remote = it
-                if (Info.env.isActive && BuildConfig.APP_VERSION_CODE < it.magisk.versionCode)
+            Info.fetchUpdate(ServiceLocator.networkService)?.let {
+                if (Info.env.isActive && BuildConfig.APP_VERSION_CODE < it.versionCode)
                     Notifications.updateAvailable()
                 jobFinished(params, false)
             }

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

@@ -1,45 +0,0 @@
-package com.topjohnwu.magisk.core.data
-
-import com.topjohnwu.magisk.core.model.BranchInfo
-import com.topjohnwu.magisk.core.model.ModuleJson
-import com.topjohnwu.magisk.core.model.UpdateInfo
-import okhttp3.ResponseBody
-import retrofit2.http.GET
-import retrofit2.http.Headers
-import retrofit2.http.Path
-import retrofit2.http.Streaming
-import retrofit2.http.Url
-
-private const val BRANCH = "branch"
-private const val REPO = "repo"
-private const val FILE = "file"
-
-interface GithubPageServices {
-
-    @GET
-    suspend fun fetchUpdateJSON(@Url file: String): UpdateInfo
-}
-
-interface RawServices {
-
-    @GET
-    @Streaming
-    suspend fun fetchFile(@Url url: String): ResponseBody
-
-    @GET
-    suspend fun fetchString(@Url url: String): String
-
-    @GET
-    suspend fun fetchModuleJson(@Url url: String): ModuleJson
-
-}
-
-interface GithubApiServices {
-
-    @GET("repos/{$REPO}/branches/{$BRANCH}")
-    @Headers("Accept: application/vnd.github.v3+json")
-    suspend fun fetchBranch(
-        @Path(REPO, encoded = true) repo: String,
-        @Path(BRANCH) branch: String
-    ): BranchInfo
-}

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

@@ -0,0 +1,48 @@
+package com.topjohnwu.magisk.core.data
+
+import com.topjohnwu.magisk.core.model.ModuleJson
+import com.topjohnwu.magisk.core.model.Release
+import com.topjohnwu.magisk.core.model.UpdateJson
+import okhttp3.ResponseBody
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Headers
+import retrofit2.http.Path
+import retrofit2.http.Query
+import retrofit2.http.Streaming
+import retrofit2.http.Url
+
+interface RawUrl {
+
+    @GET
+    @Streaming
+    suspend fun fetchFile(@Url url: String): ResponseBody
+
+    @GET
+    suspend fun fetchString(@Url url: String): String
+
+    @GET
+    suspend fun fetchModuleJson(@Url url: String): ModuleJson
+
+    @GET
+    suspend fun fetchUpdateJson(@Url url: String): UpdateJson
+}
+
+interface GithubApiServices {
+
+    @GET("/repos/{owner}/{repo}/releases")
+    @Headers("Accept: application/vnd.github+json")
+    suspend fun fetchReleases(
+        @Path("owner") owner: String = "topjohnwu",
+        @Path("repo") repo: String = "Magisk",
+        @Query("per_page") per: Int = 10,
+        @Query("page") page: Int = 1,
+    ): Response<MutableList<Release>>
+
+    @GET("/repos/{owner}/{repo}/releases/latest")
+    @Headers("Accept: application/vnd.github+json")
+    suspend fun fetchLatestRelease(
+        @Path("owner") owner: String = "topjohnwu",
+        @Path("repo") repo: String = "Magisk",
+    ): Release
+}

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

@@ -5,6 +5,7 @@ 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.model.DateTimeAdapter
 import com.topjohnwu.magisk.core.utils.LocaleSetting
 import okhttp3.Cache
 import okhttp3.ConnectionSpec
@@ -77,7 +78,7 @@ fun createOkHttpClient(context: Context): OkHttpClient {
 }
 
 fun createMoshiConverterFactory(): MoshiConverterFactory {
-    val moshi = Moshi.Builder().build()
+    val moshi = Moshi.Builder().add(DateTimeAdapter()).build()
     return MoshiConverterFactory.create(moshi)
 }
 

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

@@ -35,8 +35,8 @@ object ServiceLocator {
     val markwon by lazy { createMarkwon(AppContext) }
     val networkService by lazy {
         NetworkService(
-            createApiService(retrofit, Const.Url.GITHUB_PAGE_URL),
-            createApiService(retrofit, Const.Url.GITHUB_RAW_URL),
+            createApiService(retrofit, Const.Url.INVALID_URL),
+            createApiService(retrofit, Const.Url.GITHUB_API_URL),
         )
     }
 }

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

@@ -8,7 +8,7 @@ import android.net.Uri
 import android.os.Parcelable
 import androidx.core.net.toUri
 import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.model.MagiskJson
+import com.topjohnwu.magisk.core.model.UpdateInfo
 import com.topjohnwu.magisk.core.model.module.OnlineModule
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
 import com.topjohnwu.magisk.view.Notifications
@@ -38,7 +38,7 @@ abstract class Subject : Parcelable {
 
     @Parcelize
     class App(
-        private val json: MagiskJson = Info.remote.magisk,
+        private val json: UpdateInfo = Info.update,
         override val notifyId: Int = Notifications.nextId()
     ) : Subject() {
         override val title: String get() = "Magisk-${json.version}(${json.versionCode})"

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

@@ -1,17 +1,23 @@
 package com.topjohnwu.magisk.core.model
 
 import android.os.Parcelable
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import com.squareup.moshi.JsonQualifier
+import com.squareup.moshi.ToJson
 import kotlinx.parcelize.Parcelize
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME
 
 @JsonClass(generateAdapter = true)
-data class UpdateInfo(
-    val magisk: MagiskJson = MagiskJson(),
+class UpdateJson(
+    val magisk: UpdateInfo = UpdateInfo(),
 )
 
 @Parcelize
 @JsonClass(generateAdapter = true)
-data class MagiskJson(
+data class UpdateInfo(
     val version: String = "",
     val versionCode: Int = -1,
     val link: String = "",
@@ -27,11 +33,37 @@ data class ModuleJson(
 )
 
 @JsonClass(generateAdapter = true)
-data class CommitInfo(
-    val sha: String
+data class ReleaseAssets(
+    val name: String,
+    @Json(name = "browser_download_url") val url: String,
 )
 
+class DateTimeAdapter {
+    @ToJson
+    fun toJson(date: LocalDateTime): String {
+        return date.toString()
+    }
+
+    @FromJson
+    fun fromJson(date: String): LocalDateTime {
+        return LocalDateTime.parse(date, ISO_OFFSET_DATE_TIME)
+    }
+}
+
 @JsonClass(generateAdapter = true)
-data class BranchInfo(
-    val commit: CommitInfo
-)
+data class Release(
+    @Json(name = "tag_name") val tag: String,
+    val name: String,
+    val prerelease: Boolean,
+    val assets: List<ReleaseAssets>,
+    val body: String,
+    @Json(name = "created_at") val createdTime: LocalDateTime,
+) {
+    val versionCode: Int get() {
+        return if (tag[0] == 'v') {
+            (tag.drop(1).toFloat() * 1000).toInt()
+        } else {
+            tag.drop(7).toInt()
+        }
+    }
+}

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

@@ -4,15 +4,16 @@ import com.topjohnwu.magisk.core.data.magiskdb.MagiskDB
 
 class SuPolicy(
     val uid: Int,
-    var policy: Int = INTERACTIVE,
+    var policy: Int = QUERY,
     var remain: Long = -1L,
     var logging: Boolean = true,
     var notification: Boolean = true,
 ) {
     companion object {
-        const val INTERACTIVE = 0
+        const val QUERY = 0
         const val DENY = 1
         const val ALLOW = 2
+        const val RESTRICT = 3
     }
 
     fun toMap(): MutableMap<String, Any> {

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

@@ -1,46 +1,112 @@
 package com.topjohnwu.magisk.core.repository
 
+import com.topjohnwu.magisk.core.BuildConfig
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Config.Value.BETA_CHANNEL
-import com.topjohnwu.magisk.core.Config.Value.CANARY_CHANNEL
 import com.topjohnwu.magisk.core.Config.Value.CUSTOM_CHANNEL
 import com.topjohnwu.magisk.core.Config.Value.DEBUG_CHANNEL
 import com.topjohnwu.magisk.core.Config.Value.DEFAULT_CHANNEL
 import com.topjohnwu.magisk.core.Config.Value.STABLE_CHANNEL
 import com.topjohnwu.magisk.core.Info
-import com.topjohnwu.magisk.core.data.GithubPageServices
-import com.topjohnwu.magisk.core.data.RawServices
+import com.topjohnwu.magisk.core.data.GithubApiServices
+import com.topjohnwu.magisk.core.data.RawUrl
+import com.topjohnwu.magisk.core.model.Release
+import com.topjohnwu.magisk.core.model.ReleaseAssets
+import com.topjohnwu.magisk.core.model.UpdateInfo
 import retrofit2.HttpException
 import timber.log.Timber
 import java.io.IOException
+import java.time.format.DateTimeFormatter
 
 class NetworkService(
-    private val pages: GithubPageServices,
-    private val raw: RawServices
+    private val raw: RawUrl,
+    private val api: GithubApiServices,
 ) {
     suspend fun fetchUpdate() = safe {
         var info = when (Config.updateChannel) {
-            DEFAULT_CHANNEL, STABLE_CHANNEL -> fetchStableUpdate()
+            DEFAULT_CHANNEL -> if (BuildConfig.DEBUG) fetchDebugUpdate() else fetchStableUpdate()
+            STABLE_CHANNEL -> fetchStableUpdate()
             BETA_CHANNEL -> fetchBetaUpdate()
-            CANARY_CHANNEL -> fetchCanaryUpdate()
             DEBUG_CHANNEL -> fetchDebugUpdate()
             CUSTOM_CHANNEL -> fetchCustomUpdate(Config.customChannelUrl)
             else -> throw IllegalArgumentException()
         }
-        if (info.magisk.versionCode < Info.env.versionCode &&
-            Config.updateChannel == DEFAULT_CHANNEL) {
+        if (info.versionCode < Info.env.versionCode &&
+            Config.updateChannel == DEFAULT_CHANNEL &&
+            !BuildConfig.DEBUG
+        ) {
             Config.updateChannel = BETA_CHANNEL
             info = fetchBetaUpdate()
         }
         info
     }
 
-    // UpdateInfo
-    private suspend fun fetchStableUpdate() = pages.fetchUpdateJSON("stable.json")
-    private suspend fun fetchBetaUpdate() = pages.fetchUpdateJSON("beta.json")
-    private suspend fun fetchCanaryUpdate() = pages.fetchUpdateJSON("canary.json")
-    private suspend fun fetchDebugUpdate() = pages.fetchUpdateJSON("debug.json")
-    private suspend fun fetchCustomUpdate(url: String) = pages.fetchUpdateJSON(url)
+    suspend fun fetchUpdate(version: Int) = findRelease { it.versionCode == version }.asInfo()
+
+    // Keep going through all release pages until we find a match
+    private suspend inline fun findRelease(predicate: (Release) -> Boolean): Release? {
+        var page = 1
+        while (true) {
+            val response = api.fetchReleases(page = page)
+            val releases = response.body() ?: throw HttpException(response)
+            // Remove all non Magisk releases
+            releases.removeAll { it.tag[0] != 'v' && !it.tag.startsWith("canary") }
+            // Make sure it's sorted correctly
+            releases.sortByDescending { it.createdTime }
+            releases.find(predicate)?.let { return it }
+            if (response.headers()["link"]?.contains("rel=\"next\"", ignoreCase = true) == true) {
+                page += 1
+            } else {
+                return null
+            }
+        }
+    }
+
+    private inline fun Release?.asInfo(
+        selector: (ReleaseAssets) -> Boolean = {
+            // Default selector picks the non-debug APK
+            it.name.run { endsWith(".apk") && !contains("debug") }
+        }): UpdateInfo {
+        return if (this == null) UpdateInfo()
+        else if (tag[0] == 'v') asPublicInfo(selector)
+        else asCanaryInfo(selector)
+    }
+
+    private inline fun Release.asPublicInfo(selector: (ReleaseAssets) -> Boolean): UpdateInfo {
+        val version = tag.drop(1)
+        val date = createdTime.format(DateTimeFormatter.ofPattern("yyyy.M.d"))
+        return UpdateInfo(
+            version = version,
+            versionCode = versionCode,
+            link = assets.find(selector)!!.url,
+            note = "## $date $name\n\n$body"
+        )
+    }
+
+    private inline fun Release.asCanaryInfo(selector: (ReleaseAssets) -> Boolean): UpdateInfo {
+        return UpdateInfo(
+            version = name.substring(8, 16),
+            versionCode = versionCode,
+            link = assets.find(selector)!!.url,
+            note = "## $name\n\n$body"
+        )
+    }
+
+    // Version number: debug == beta >= stable
+
+    // Find the latest non-prerelease
+    private suspend fun fetchStableUpdate() = api.fetchLatestRelease().asInfo()
+
+    // Find the latest release, regardless whether it's prerelease
+    private suspend fun fetchBetaUpdate() = findRelease { true }.asInfo()
+
+    private suspend fun fetchDebugUpdate() =
+        findRelease { true }.asInfo { it.name == "app-debug.apk" }
+
+    private suspend fun fetchCustomUpdate(url: String): UpdateInfo {
+        val info = raw.fetchUpdateJson(url).magisk
+        return info.let { it.copy(note = raw.fetchString(it.note)) }
+    }
 
     private inline fun <T> safe(factory: () -> T): T? {
         return try {

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

@@ -70,7 +70,7 @@ object SuCallbackHandler {
         }.getOrNull() ?: createSuLog(fromUid, toUid, pid, command, policy, target, seContext, gids)
 
         if (notify)
-            notify(context, log.action == SuPolicy.ALLOW, log.appName)
+            notify(context, log.action >= SuPolicy.ALLOW, log.appName)
 
         runBlocking { ServiceLocator.logRepo.insert(log) }
     }
@@ -86,7 +86,7 @@ object SuCallbackHandler {
             pm.getPackageInfo(uid, pid)?.applicationInfo?.getLabel(pm)
         }.getOrNull() ?: "[UID] $uid"
 
-        notify(context, policy == SuPolicy.ALLOW, appName)
+        notify(context, policy >= SuPolicy.ALLOW, appName)
     }
 
     private fun notify(context: Context, granted: Boolean, appName: String) {

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

@@ -82,7 +82,11 @@ class SuRequestHandler(
     }
 
     suspend fun respond(action: Int, time: Long) {
-        policy.policy = action
+        if (action == SuPolicy.ALLOW && Config.suRestrict) {
+            policy.policy = SuPolicy.RESTRICT
+        } else {
+            policy.policy = action
+        }
         if (time >= 0) {
             policy.remain = TimeUnit.MINUTES.toSeconds(time)
         } else {

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

@@ -132,7 +132,6 @@ abstract class MagiskInstallImpl protected constructor(
                         if (entry != null) {
                             val magisk32 = File(installDir, "magisk32")
                             zf.getInputStream(entry).writeTo(magisk32)
-                            magisk32.setExecutable(true)
                         }
                     }
                 }
@@ -147,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)
+                    }
                 }
             }
 

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

@@ -62,7 +62,7 @@ class NetworkObserver(context: Context) {
     }
 
     private fun postValue(b: Boolean) {
-        Info.remote = Info.EMPTY_REMOTE
+        Info.resetUpdate()
         Info.isConnected.postValue(b)
     }
 

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

@@ -7,6 +7,12 @@ 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
@@ -49,8 +55,9 @@ class AdditionalTest : BaseTest {
 
     @Test
     fun testModuleCount() {
-        var expected = 0
-        if (Environment.testModules()) expected +=2
+        var expected = 3
+        if (Environment.mount()) expected++
+        if (Environment.preinit()) expected++
         if (Environment.lsposed()) expected++
         if (Environment.shamiko()) expected++
         assertEquals("Module count incorrect", expected, modules.size)
@@ -78,37 +85,54 @@ class AdditionalTest : BaseTest {
     }
 
     @Test
-    fun testModule01() {
-        assumeTrue(Environment.testModules())
+    fun testModuleMount() {
+        assumeTrue(Environment.mount())
 
-        val module = modules.find { it.id == "test_01" }
-        assertNotNull("test_01 is not installed", module)
+        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()
+            "/system/fonts/newfile should exist",
+            RootUtils.fs.getFile("/system/fonts/newfile").exists()
         )
         assertFalse(
             "/system/bin/screenrecord should not exist",
             RootUtils.fs.getFile("/system/bin/screenrecord").exists()
         )
-        module!!
-        assertTrue("test_01 should be zygisk unloaded", module.zygiskUnloaded)
+        val egg = RootUtils.fs.getFile("/system/app/EasterEgg").list() ?: arrayOf()
+        assertTrue(
+            "/system/app/EasterEgg should be empty",
+            egg.isEmpty()
+        )
     }
 
     @Test
-    fun testModule02() {
-        assumeTrue(Environment.testModules())
+    fun testSepolicyRule() {
+        assumeTrue(Environment.preinit())
 
-        val module = modules.find { it.id == "test_02" }
-        assertNotNull("test_02 is not installed", module)
-        module!!
-        assertTrue("test_02 should be zygisk unloaded", module.zygiskUnloaded)
+        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 testModule03() {
-        assumeTrue(Environment.testModules())
+    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)
+    }
 
-        assertNull("test_03 should be removed", modules.find { it.id == "test_03" })
+    @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/Environment.kt

@@ -28,6 +28,7 @@ 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)
@@ -39,11 +40,16 @@ class Environment : BaseTest {
         fun before() = BaseTest.prerequisite()
 
         // The kernel running on emulators < API 26 does not play well with
-        // magic mount. Skip module tests on those legacy platforms.
-        fun testModules(): Boolean {
+        // 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
         }
@@ -53,6 +59,11 @@ class Environment : BaseTest {
         }
 
         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) {
@@ -83,30 +94,60 @@ class Environment : BaseTest {
         }
     }
 
-    private fun setupModule01(root: ExtendedFile) {
-        val error = "test_01 setup failed"
-        val path = root.getChildFile("test_01")
+    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")
+        // Create /system/fonts/newfile
+        val etc = path.getChildFile("system").getChildFile("fonts")
         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)
 
-        // Create an empty zygisk folder
-        val module = LocalModule(path)
-        assertTrue(error, module.zygiskFolder.mkdir())
-
         assertTrue(error, Shell.cmd("set_default_perm $path").exec().isSuccess)
     }
 
-    private fun setupModule02(root: ExtendedFile) {
-        val error = "test_02 setup failed"
-        val path = root.getChildFile("test_02")
+    private fun setupSystemlessHost() {
+        assertTrue("hosts setup failed", Shell.cmd("add_hosts_module").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)
@@ -119,9 +160,9 @@ class Environment : BaseTest {
         assertTrue(error, Shell.cmd("set_default_perm $path").exec().isSuccess)
     }
 
-    private fun setupModule03(root: ExtendedFile) {
-        val error = "test_03 setup failed"
-        val path = root.getChildFile("test_03")
+    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)
@@ -175,12 +216,13 @@ class Environment : BaseTest {
             }
         }
 
-        if (testModules()) {
-            val root = RootUtils.fs.getFile(Const.MODULE_PATH)
-            setupModule01(root)
-            setupModule02(root)
-            setupModule03(root)
-        }
+        val root = RootUtils.fs.getFile(Const.MODULE_PATH)
+        if (mount()) { setupMountTest(root) }
+        if (preinit()) { setupSepolicyRuleModule(root) }
+        setupSystemlessHost()
+        setupEmptyZygiskModule(root)
+        setupInvalidZygiskModule(root)
+        setupRemoveModule(root)
     }
 
     @Test

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-b+sr+Latn/strings.xml

@@ -0,0 +1,252 @@
+<resources>
+    <!--Author: Radoš Milićev (https://github.com/rammba)-->
+
+    <!--Sections-->
+    <string name="modules">Moduli</string>
+    <string name="superuser">Super-korisnik</string>
+    <string name="logs">Logovi</string>
+    <string name="settings">Podešavanja</string>
+    <string name="install">Instalacija</string>
+    <string name="section_home">Početno</string>
+    <string name="section_theme">Teme</string>
+    <string name="denylist">Lista zabrana</string>
+
+    <!--Home-->
+    <string name="no_connection">Nedostupna konekcija</string>
+    <string name="app_changelog">Promene u aplikaciji</string>
+    <string name="loading">Učitavanje…</string>
+    <string name="update">Ažuriranje</string>
+    <string name="not_available">N/A</string>
+    <string name="hide">Sakrij</string>
+    <string name="home_package">Paket</string>
+    <string name="home_app_title">Apl.</string>
+
+    <string name="home_notice_content">Preuzmite Magisk SAMO sa zvanične GitHub stranice. Fajlovi iz nepoznatih izvora mogu biti maliciozni!</string>
+    <string name="home_support_title">Podržite nas</string>
+    <string name="home_follow_title">Zapratite nas</string>
+    <string name="home_item_source">Izvor</string>
+    <string name="home_support_content">Magisk jeste i uvek će biti besplatan i open source. Možete pokazati da vam je stalo svojom donacijom.</string>
+    <string name="home_installed_version">Instalirano</string>
+    <string name="home_latest_version">Najnovije</string>
+    <string name="invalid_update_channel">Nevalidan kanal ažuriranja</string>
+    <string name="uninstall_magisk_title">Deinstaliraj Magisk</string>
+    <string name="uninstall_magisk_msg">Svi moduli će biti onemogućeni/uklonjeni!\nKoren će biti uklonjen!\nSvako neenkriptovano interno skladište će upotrebom Magisk-a biti ponovo enkriptovano!</string>
+
+    <!--Install-->
+    <string name="keep_force_encryption">Zadrži forsiranu enkripciju</string>
+    <string name="keep_dm_verity">Zadrži AVB 2.0/dm-verity</string>
+    <string name="recovery_mode">Režim oporavka</string>
+    <string name="install_options_title">Opcije</string>
+    <string name="install_method_title">Metod</string>
+    <string name="install_next">Naredno</string>
+    <string name="install_start">Počnimo</string>
+    <string name="manager_download_install">Pritisni da preuzmeš i instaliraš</string>
+    <string name="direct_install">Direktna instalacija (Preporučeno)</string>
+    <string name="install_inactive_slot">Instalacija na neaktivan slot (Nakon OTA)</string>
+    <string name="install_inactive_slot_msg">Vaš uređaj će biti FORSIRAN da se pokrene na trenutno neaktivnom slotu nakon ponovnog pokretanja!\nKoristite opciju samo kad se OTA završi.\nNastavi?</string>
+    <string name="setup_title">Dodatne postavke</string>
+    <string name="select_patch_file">Izaberite fajl</string>
+    <string name="patch_file_msg">Izaberite sliku (*.img) ili ODIN tarfile (*.tar) ili payload.bin (*.bin)</string>
+    <string name="reboot_delay_toast">Ponovo pokretanje za 5 sekundi…</string>
+    <string name="flash_screen_title">Instalacija</string>
+
+    <!--Superuser-->
+    <string name="su_request_title">Super-korisnički zahtev</string>
+    <string name="touch_filtered_warning">Magisk ne može da verifikuje vaš odgovor, jer aplikacija prikriva super-korisnički zahtev</string>
+    <string name="deny">Zabrani</string>
+    <string name="prompt">Zahtev</string>
+    <string name="grant">Dozvoli</string>
+    <string name="su_warning">Pruža potpun pristup vašem uređaju.\nZabranite ako niste sigurni!</string>
+    <string name="forever">Zauvek</string>
+    <string name="once">Jednom</string>
+    <string name="tenmin">10 min</string>
+    <string name="twentymin">20 min</string>
+    <string name="thirtymin">30 min</string>
+    <string name="sixtymin">60 min</string>
+    <string name="su_allow_toast">%1$s je dobio prava na super-korisnika</string>
+    <string name="su_deny_toast">%1$s nije dobio prava na super-korisnika</string>
+    <string name="su_snack_grant">Super-korisnička prava od %1$s su pružena</string>
+    <string name="su_snack_deny">Super-korisnička prava od %1$s su odbijena</string>
+    <string name="su_snack_notif_on">Notifikacije od %1$s su omogućene</string>
+    <string name="su_snack_notif_off">Notifikacije od %1$s su onemogućene</string>
+    <string name="su_snack_log_on">Logovanje za %1$s je omogućeno</string>
+    <string name="su_snack_log_off">Logovanje za %1$s je onemogućeno</string>
+    <string name="su_revoke_title">Opozovi?</string>
+    <string name="su_revoke_msg">Potvrdi da opozoveš prava na super-korisnika od %1$s?</string>
+    <string name="toast">Toast</string>
+    <string name="none">Ništa</string>
+
+    <string name="superuser_toggle_notification">Notifikacije</string>
+    <string name="superuser_toggle_revoke">Opozovi</string>
+    <string name="superuser_policy_none">Nijedna aplikacija nije tražila permisije za super-korisnika još uvek.</string>
+
+    <!--Logs-->
+    <string name="log_data_none">Nemate logova, pokušajte koristiti korenske aplikacije više</string>
+    <string name="log_data_magisk_none">Magisk logovi su prazni, to je čudno</string>
+    <string name="menuSaveLog">Sačuvaj log</string>
+    <string name="menuClearLog">Ukloni log</string>
+    <string name="logs_cleared">Log uspešno uklonjen</string>
+    <string name="pid">PID: %1$d</string>
+    <string name="target_uid">Ciljani UID: %1$d</string>
+    <string name="target_pid">Mount ns cinjani PID: %s</string>
+    <string name="selinux_context">SELinux kontekst: %s</string>
+    <string name="supp_group">Dopunska grupa: %s</string>
+
+    <!--SafetyNet-->
+
+    <!--MagiskHide-->
+    <string name="show_system_app">Prikaži sistemske apl.</string>
+    <string name="show_os_app">Prikaži apl. OS-a</string>
+    <string name="hide_filter_hint">Filtriraj po imenu</string>
+    <string name="hide_search">Pretraga</string>
+
+    <!--Module-->
+    <string name="no_info_provided">(Bez informacija)</string>
+    <string name="reboot_userspace">Lako ponovo pokretanje</string>
+    <string name="reboot_recovery">Ponovo pokreni za oporavak</string>
+    <string name="reboot_bootloader">Ponovo pokreni za bootloader</string>
+    <string name="reboot_download">Ponovo pokreni za preuzimanje</string>
+    <string name="reboot_edl">Ponovo pokreni za EDL</string>
+    <string name="reboot_safe_mode">Siguran mod</string>
+    <string name="module_version_author">%1$s od %2$s</string>
+    <string name="module_state_remove">Ukloni</string>
+    <string name="module_action">Akcija</string>
+    <string name="module_state_restore">Povrati</string>
+    <string name="module_action_install_external">Instaliraj iz skladišta</string>
+    <string name="update_available">Ažuriranje dostupno</string>
+    <string name="suspend_text_riru">Modul je suspendovan jer je %1$s omogućeno</string>
+    <string name="suspend_text_zygisk">Modul je suspendovan jer %1$s nije omogućeno</string>
+    <string name="zygisk_module_unloaded">Zygisk modul nije učitan zbog nekompatibilnosti</string>
+    <string name="module_empty">Nijedan modul nije instaliran</string>
+    <string name="confirm_install">Instaliraj modul %1$s?</string>
+    <string name="confirm_install_title">Potvrda instalacije</string>
+
+    <!--Settings-->
+    <string name="settings_dark_mode_title">Tema</string>
+    <string name="settings_dark_mode_message">Izaberite temu koja vam najviše odgovara!</string>
+    <string name="settings_dark_mode_light">Uvek svetlo</string>
+    <string name="settings_dark_mode_system">Prati sistem</string>
+    <string name="settings_dark_mode_dark">Uvek tamno</string>
+    <string name="settings_download_path_title">Putanja za preuzimanje</string>
+    <string name="settings_download_path_message">Fajlovi će biti sačuvani na %1$s</string>
+    <string name="settings_hide_app_title">Sakrij Magisk apl.</string>
+    <string name="settings_hide_app_summary">Instaliraj proxy aplikaciju sa nasumičnim ID-jem paketa i prilagođenom labelom</string>
+    <string name="settings_restore_app_title">Povrati Magisk apl.</string>
+    <string name="settings_restore_app_summary">Otkrij apl. i povrati originalni APK</string>
+    <string name="language">Jezik</string>
+    <string name="system_default">(Podrazumevano sistemski)</string>
+    <string name="settings_check_update_title">Proveri ažuriranja</string>
+    <string name="settings_check_update_summary">Periodično proveri ažuriranja u pozadini</string>
+    <string name="settings_update_channel_title">Kanal ažuriranja</string>
+    <string name="settings_update_stable">Stabilno</string>
+    <string name="settings_update_beta">Beta</string>
+    <string name="settings_update_custom">Prilagođeno</string>
+    <string name="settings_update_custom_msg">Unesi prilagođeni URL kanala</string>
+    <string name="settings_zygisk_summary">Pokreni delove Magisk-a u zygote daemon-u</string>
+    <string name="settings_denylist_title">Sprovedi listu zabrana</string>
+    <string name="settings_denylist_summary">Procesi na listi zabrana će povratiti sve Magisk izmene</string>
+    <string name="settings_denylist_config_title">Konfiguriši listu zabrana</string>
+    <string name="settings_denylist_config_summary">Izaberi procese koji će biti na listi zabrana</string>
+    <string name="settings_hosts_title">Bezsistemski domaćini (hosts)</string>
+    <string name="settings_hosts_summary">Podrška bezsistemskih domaćina za aplikacije blokiranja reklama</string>
+    <string name="settings_hosts_toast">Modul bezsistemskih domaćina dodat</string>
+    <string name="settings_app_name_hint">Novo ime</string>
+    <string name="settings_app_name_helper">Apl. će biti spakovana pod ovim imenom</string>
+    <string name="settings_app_name_error">Nevalidan format</string>
+    <string name="settings_su_app_adb">Aplikacije i ADB</string>
+    <string name="settings_su_app">Samo aplikacije</string>
+    <string name="settings_su_adb">Samo ADB</string>
+    <string name="settings_su_disable">Onemogućeno</string>
+    <string name="settings_su_request_10">10 sekundi</string>
+    <string name="settings_su_request_15">15 sekundi</string>
+    <string name="settings_su_request_20">20 sekundi</string>
+    <string name="settings_su_request_30">30 sekundi</string>
+    <string name="settings_su_request_45">45 sekundi</string>
+    <string name="settings_su_request_60">60 sekundi</string>
+    <string name="superuser_access">Pristup super-korisnika</string>
+    <string name="auto_response">Automatski odgovor</string>
+    <string name="request_timeout">Istek zahteva</string>
+    <string name="superuser_notification">Notifikacije super-korisnika</string>
+    <string name="settings_su_reauth_title">Ponovo odobri nakon ažuriranja</string>
+    <string name="settings_su_reauth_summary">Ponovo traži permisije super-korisnika nakon ažuriranja aplikacija</string>
+    <string name="settings_su_tapjack_title">Zaštita od tapjacking-a</string>
+    <string name="settings_su_tapjack_summary">Prompt dijalog super-korisnika neće reagovati dok je prikriven drugim prozorom ili overlay-em</string>
+    <string name="settings_su_auth_title">Autentifikacija korisnika</string>
+    <string name="settings_su_auth_summary">Traži autentifikaciju korisnika tokom zahteva super-korisnika</string>
+    <string name="settings_su_auth_insecure">Nijedan metod autentifikacije nije podešen na uređaju</string>
+    <string name="settings_customization">Prilagođavanje</string>
+    <string name="setting_add_shortcut_summary">Dodaj lepu prečicu na početni ekran u slučaju da se ime i ikonica ne prepoznaju lako nakon skrivanja aplikacije</string>
+    <string name="settings_doh_title">DNS preko HTTPS-a</string>
+    <string name="settings_doh_description">Zaobilazno rešenje DNS trovanja u nekim nacijama</string>
+    <string name="settings_random_name_title">Nasumično ime na izlazu</string>
+    <string name="settings_random_name_description">Nasumično ime izlaznog fajla slika i tar fajlova radi sprečavanja detekcije</string>
+
+    <string name="multiuser_mode">Višekorisnički režim</string>
+    <string name="settings_owner_only">Samo vlasnik uređaja</string>
+    <string name="settings_owner_manage">Određeno od strane vlasnika</string>
+    <string name="settings_user_independent">Nezavisno od korisnika</string>
+    <string name="owner_only_summary">Samo vlasnik ima pristup korenu</string>
+    <string name="owner_manage_summary">Samo vlasnik može da pristupa korenu i da prima zahteve za njega</string>
+    <string name="user_independent_summary">Svaki korisnik ima svoja pravila korena</string>
+
+    <string name="mount_namespace_mode">Mount režim namespace-a</string>
+    <string name="settings_ns_global">Globalni namespace</string>
+    <string name="settings_ns_requester">Nasleđeni namespace</string>
+    <string name="settings_ns_isolate">Izolovani namespace</string>
+    <string name="global_summary">Sve korenske sesije koriste globalni mount namespace</string>
+    <string name="requester_summary">Korenske sesije će naslediti namespace od podnosioca zahteva</string>
+    <string name="isolate_summary">Svaka korenska sesija će imati svoj izolovani namespace</string>
+
+    <!--Notifications-->
+    <string name="update_channel">Ažuriranja Magisk-a</string>
+    <string name="progress_channel">Notifikacije o progresu</string>
+    <string name="updated_channel">Ažuriranje završeno</string>
+    <string name="download_complete">Preuzimanje završeno</string>
+    <string name="download_file_error">Greška pri preuzimanju fajla</string>
+    <string name="magisk_update_title">Ažuriranje Magisk-a dostupno!</string>
+    <string name="updated_title">Magisk je ažuriran</string>
+    <string name="updated_text">Klikni da otvoriš aplikaciju</string>
+
+    <!--Toasts, Dialogs-->
+    <string name="yes">Da</string>
+    <string name="no">Ne</string>
+    <string name="repo_install_title">Instaliraj %1$s %2$s(%3$d)</string>
+    <string name="download">Preuzmi</string>
+    <string name="reboot">Ponovo pokreni</string>
+    <string name="close">Zatvori</string>
+    <string name="release_notes">Release notes</string>
+    <string name="flashing">Flešovanje…</string>
+    <string name="running">Pokretanje…</string>
+    <string name="done">Završeno!</string>
+    <string name="done_action">Pokretanje akcije %1$s završeno</string>
+    <string name="failure">Neuspešno!</string>
+    <string name="hide_app_title">Skrivanje Magisk aplikacije…</string>
+    <string name="open_link_failed_toast">Nije pronađena aplikacija za otvaranje linka</string>
+    <string name="complete_uninstall">Kompletna deinstalacija</string>
+    <string name="restore_img">Povrati slike</string>
+    <string name="restore_img_msg">Povratak…</string>
+    <string name="restore_done">Povratak uspešan!</string>
+    <string name="restore_fail">Fabrički bekap ne postoji!</string>
+    <string name="setup_fail">Neuspešna postavka</string>
+    <string name="env_fix_title">Potrebno dodatno podešavanje</string>
+    <string name="env_fix_msg">Vaš uređaj zahteva dodatno podešavanje da bi Magisk radio kako treba. Da li želite nastaviti i pokrenuti ponovo?</string>
+    <string name="env_full_fix_msg">Vaš uređaj zahteva ponovno flešovanje da bi Magisk radio kako treba. Reinstalirajte Magisk kroz aplikaciju, režim oporavka ne može dobiti tačne informacije o uređaju.</string>
+    <string name="setup_msg">Pokretanje podešavanja okruženja…</string>
+    <string name="unsupport_magisk_title">Nepodržana verzija Magisk-a</string>
+    <string name="unsupport_magisk_msg">Ova verzija aplikacije ne podržava Magisk verzije manje od %1$s.\n\nAplikacija će se ponašati kao da Magisk nije instaliran, molimo ažurirajte Magisk što pre.</string>
+    <string name="unsupport_general_title">Nenormalno stanje</string>
+    <string name="unsupport_system_app_msg">Pokretanje aplikacije kao sistemske nije podržano. Molimo postavite aplikaciju da bude korisnička.</string>
+    <string name="unsupport_other_su_msg">Detektovan \"su\" binary koji nije Magisk-ov. Molimo uklonite konkurentno korensko rešenje i/ili reinstalirajte Magisk.</string>
+    <string name="unsupport_external_storage_msg">Magisk je instaliran na eksterno skladište. Molimo pomerite apl. u interno skladište.</string>
+    <string name="unsupport_nonroot_stub_msg">Skrivena Magisk aplikacija ne može nastaviti sa radom jer je koren izgubljen. Molimo povratite originalni APK.</string>
+    <string name="unsupport_nonroot_stub_title">@string/settings_restore_app_title</string>
+    <string name="external_rw_permission_denied">Dozvolite permisiju za skladište da biste omogućili ovu funkcionalnost</string>
+    <string name="post_notifications_denied">Dozvolite permisiju za notifikacije da biste omogućili ovu funkcionalnost</string>
+    <string name="install_unknown_denied">Dozvolite "instaliranje nepoznatih aplikacija" da biste omogućili ovu funkcionalnost</string>
+    <string name="add_shortcut_title">Dodaj prečicu na početni ekran</string>
+    <string name="add_shortcut_msg">Nakon skrivanja aplikacije, njeno ime i ikonicu ćete teško prepoznati. Želite li dodati lepu prečicu na početni ekran?</string>
+    <string name="app_not_found">Nije pronađena aplikacija za ovu akciju</string>
+    <string name="reboot_apply_change">Ponovo pokreni da primeniš izmene</string>
+    <string name="restore_app_confirmation">Ovo će vratiti skrivenu aplikaciju na originalnu. Da li stvarno to želite?</string>
+
+</resources>

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

@@ -3,7 +3,7 @@
     <!--Sections-->
     <string name="modules">מודולים</string>
     <string name="superuser">משתמש על</string>
-    <string name="logs">יומני רישום</string>
+    <string name="logs">Log</string>
     <string name="settings">הגדרות</string>
     <string name="install">התקנה</string>
     <string name="section_home">בית</string>
@@ -12,10 +12,10 @@
 
     <!--Home-->
     <string name="no_connection">אין חיבור זמין</string>
-    <string name="app_changelog">יומן שינויים</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_app_title">יישום</string>
@@ -23,28 +23,28 @@
     <string name="home_support_title">תמיכה בנו</string>
     <string name="home_follow_title">עקבו אחרינו</string>
     <string name="home_item_source">מקור</string>
-    <string name="home_support_content">Magisk היה ותמיד יהיה בעל קוד מקור פתוח. עם זאת באפשרותך להראות לנו שאכפת לך על ידי שליחת תרומה קטנה.</string>
+    <string name="home_support_content">Magisk היה ותמיד יהיה בקוד פתוח. עם זאת באפשרותך להראות לנו שאכפת לך על ידי שליחת תרומה קטנה.</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הנתונים שלך עשויים להיות מוצפנים אם לא הוצפנו כבר!</string>
+    <string name="uninstall_magisk_msg">כל המודולים יושבתו/יוסרו!\nגישת Root תושבת!\nהנתונים שלך עשויים להיות מוצפנים אם לא הוצפנו כבר!</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="recovery_mode">מצב Recovery</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">ההתקן שלך ייאלץ אתחול לחריץ הלא פעיל הנוכחי שלך לאחר הפעלה מחדש!\nיש להשתמש באפשרות זו רק לאחר ביצוע OTA בלבד.\nלהמשיך?</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="patch_file_msg">בחירת קובץ גולמי (*.img) או ODIN tarfile (*.tar) או payload.bin (*.bin)</string>
     <string name="reboot_delay_toast">מאתחל בעוד 5 שניות…</string>
     <string name="flash_screen_title">התקנה</string>
 
@@ -67,22 +67,22 @@
     <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">Log עבור %1$s מופעל</string>
+    <string name="su_snack_log_off">Log עבור %1$s מושבת</string>
     <string name="su_revoke_title">להסיר?</string>
     <string name="su_revoke_msg">נא לאשר שלילת הרשאות עבור %1$s?</string>
-    <string name="toast">הרמת כוסית</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">יומני רישום Magisk ריקים, זה מוזר</string>
-    <string name="menuSaveLog">שמירת יומן רישום</string>
-    <string name="menuClearLog">ניקוי יומן רישום כעת</string>
-    <string name="logs_cleared">יומני רישום נוקו בהצלחה</string>
+    <string name="log_data_none">אין Log, יש לנסות להשתמש יותר ביישומי הRoot שלך</string>
+    <string name="log_data_magisk_none">Log Magisk ריק, זה מוזר</string>
+    <string name="menuSaveLog">שמירת Log</string>
+    <string name="menuClearLog">ניקוי Log כעת</string>
+    <string name="logs_cleared">Log נוקה בהצלחה</string>
     <string name="pid">PID: %1$d</string>
     <string name="target_uid">יעד UID: %1$d</string>
     <string name="target_pid">מציב ns יעד PID: %s</string>
@@ -100,15 +100,15 @@
     <!--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_recovery">אתחול למצב 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_state_restore">שיחזור</string>
     <string name="module_action_install_external">התקנה מהאחסון</string>
     <string name="update_available">עדכונים זמינים</string>
     <string name="suspend_text_riru">מודול מושעה כי %1$s מופעל</string>
@@ -129,7 +129,7 @@
     <string name="settings_hide_app_title">הסתרת היישום Magisk</string>
     <string name="settings_hide_app_summary">התקנת יישום מתווך עם מזהה חבילה אקראי ותווית שם מותאמת אישית</string>
     <string name="settings_restore_app_title">שיחזור היישום Magisk</string>
-    <string name="settings_restore_app_summary">ביטול הסתרת היישום ושחזור אל ה-APK המקורי</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>
@@ -144,9 +144,9 @@
     <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">מארחים חסרי מערכת</string>
-    <string name="settings_hosts_summary">מארחים חסרי מערכת תומכים ביישומים חוסמי פרסומות</string>
-    <string name="settings_hosts_toast">הוספת מודול מארחים חסרי מערכת</string>
+    <string name="settings_hosts_title">hosts חסרי מערכת</string>
+    <string name="settings_hosts_summary">hosts חסרי מערכת תומכים ביישומים חוסמי פרסומות</string>
+    <string name="settings_hosts_toast">הוספת מודול hosts חסרי מערכת</string>
     <string name="settings_app_name_hint">שם חדש</string>
     <string name="settings_app_name_helper">היישום יארז מחדש בשם זה</string>
     <string name="settings_app_name_error">פורמט לא חוקי</string>
@@ -181,16 +181,16 @@
     <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="owner_only_summary">לבעלים בלבד ישנה גישת Root</string>
+    <string name="owner_manage_summary">הבעלים בלבד יכול לנהל גישת Root ולקבל הנחיות לבקשה</string>
+    <string name="user_independent_summary">לכל משתמש יש כללי Root נפרדים משלו</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="global_summary">כלל חיבורי הRoot משתמשים במרחב שם הגלובלי</string>
+    <string name="requester_summary">חיבורי הRoot יירשו את מרחב השם של המבקש</string>
+    <string name="isolate_summary">לכל חיבור Root יהיה מרחב שם מבודד</string>
 
     <!--Notifications-->
     <string name="update_channel">עדכוני Magisk</string>
@@ -225,7 +225,7 @@
     <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="env_full_fix_msg">ההתקן שלך זקוק לצריבה מחדש של Magisk כדי לעבוד כראוי. נא להתקין מחדש את Magisk בתוך היישום, מצב הRecovery אינו יכול לקבל מידע נכון על ההתקן.</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>
@@ -233,7 +233,7 @@
     <string name="unsupport_system_app_msg">הפעלת יישום זה כיישום מערכת אינה נתמך. נא להשיב את היישום כיישום משתמש.</string>
     <string name="unsupport_other_su_msg">התגלתה פקודת \"su\" שאינה שייכת ליישום Magisk נא להסיר את הפקודה שאינה נתמכת.</string>
     <string name="unsupport_external_storage_msg">Magisk מותקן באחסון החיצוני. נא להעביר את היישום לאחסון הפנימי.</string>
-    <string name="unsupport_nonroot_stub_msg">היישום אינו יכול להמשיך לעבוד במצב הנסתר מכיוון שגישת השורש אבדה. נא לשחזר אותו חזרה ל-APK המקורי.</string>
+    <string name="unsupport_nonroot_stub_msg">היישום אינו יכול להמשיך לעבוד במצב הנסתר מכיוון שגישת הRoot אבדה. נא לשחזר אותו חזרה ל-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>

app/core/src/main/res/values-pt-rBR/strings.xml

@@ -54,7 +54,7 @@
     <string name="deny">Negar</string>
     <string name="prompt">Perguntar</string>
     <string name="grant">Permitir</string>
-    <string name="su_warning">Permite acesso total ao seu aparelho.\nNão permita se você não tiver certeza do que está fazendo!</string>
+    <string name="su_warning">Permite acesso total ao seu dispositivo.\nNão permita se você não tiver certeza do que está fazendo!</string>
     <string name="forever">Sempre</string>
     <string name="once">Uma vez</string>
     <string name="tenmin">10 mins</string>
@@ -63,19 +63,19 @@
     <string name="sixtymin">60 mins</string>
     <string name="su_allow_toast">%1$s foi permitido o acesso de SuperUsuário</string>
     <string name="su_deny_toast">%1$s foi negado o acesso de SuperUsuário</string>
-    <string name="su_snack_grant">Os acessos de SuperUsuário de %1$s foram concedidos</string>
+    <string name="su_snack_grant">Os acessos de SuperUsuário de %1$s foram permitidos</string>
     <string name="su_snack_deny">Os acessos de SuperUsuário de %1$s foram negados</string>
     <string name="su_snack_notif_on">As notificações de %1$s foram ativadas</string>
     <string name="su_snack_notif_off">As notificações de %1$s foram desativadas</string>
     <string name="su_snack_log_on">Os registros de %1$s foram ativados</string>
     <string name="su_snack_log_off">Os registros de %1$s foram desativados</string>
     <string name="su_revoke_title">Revogar?</string>
-    <string name="su_revoke_msg">Confirmar a remoção do acesso de SuperUsuário de %1$s?</string>
+    <string name="su_revoke_msg">Confirme para revogar os acessos de SuperUsuário de %1$s</string>
     <string name="toast">Notificação (Pop-up)</string>
     <string name="none">Nenhum</string>
     <string name="superuser_toggle_notification">Notificações</string>
     <string name="superuser_toggle_revoke">Revogar</string>
-    <string name="superuser_policy_none">Nenhum app solicitou permissão de SuperUsuário ainda</string>
+    <string name="superuser_policy_none">Nenhum app solicitou permissão de SuperUsuário ainda.</string>
 
     <!--Logs-->
     <string name="log_data_none">Não há registros. Tente usar mais seus apps root.</string>
@@ -135,6 +135,7 @@
     <string name="settings_update_channel_title">Canal de atualização</string>
     <string name="settings_update_stable">Estável</string>
     <string name="settings_update_beta">Beta</string>
+    <string name="settings_update_debug">Debug</string>
     <string name="settings_update_custom">Personalizado</string>
     <string name="settings_update_custom_msg">Insira um URL de canal personalizado</string>
     <string name="settings_zygisk_summary">Executa partes do Magisk no Zygote</string>
@@ -235,7 +236,7 @@
     <string name="unsupport_nonroot_stub_title">@string/settings_restore_app_title</string>
     <string name="external_rw_permission_denied">Conceda permissão de armazenamento para ativar esta funcionalidade</string>
     <string name="post_notifications_denied">Conceda permissão às notificações para ativar esta funcionalidade</string>
-    <string name="install_unknown_denied">Permita a opção "Instalar apps de fontes desconhecidas" para ativar esta funcionalidade</string>
+    <string name="install_unknown_denied">Permita a opção \"Instalar apps de fontes desconhecidas\" para ativar esta funcionalidade</string>
     <string name="add_shortcut_title">Adicionar atalho à tela inicial</string>
     <string name="add_shortcut_msg">Após ocultar o app do Magisk, seu nome e ícone ficarão difíceis de reconhecer. Deseja adicionar um atalho na tela inicial?</string>
     <string name="app_not_found">Nenhum app encontrado para realizar esta ação</string>

app/core/src/main/res/values-pt-rPT/strings.xml

@@ -3,7 +3,7 @@
     <!--Sections-->
     <string name="modules">Módulos</string>
     <string name="superuser">SuperUsuário</string>
-    <string name="logs">Registros</string>
+    <string name="logs">Registos</string>
     <string name="settings">Configurações</string>
     <string name="install">Instalar</string>
     <string name="section_home">Início</string>
@@ -11,50 +11,50 @@
     <string name="denylist">Lista de negação</string>
 
     <!--Home-->
-    <string name="no_connection">Nenhuma conexão disponível</string>
-    <string name="app_changelog">Registro de alterações</string>
-    <string name="loading">Carregando…</string>
+    <string name="no_connection">Nenhuma ligação disponível</string>
+    <string name="app_changelog">Registo de alterações</string>
+    <string name="loading">A carregar…</string>
     <string name="update">Atualizar</string>
     <string name="not_available">Não disponível</string>
     <string name="hide">Ocultar</string>
     <string name="home_package">Pacote</string>
     <string name="home_app_title">App</string>
-    <string name="home_notice_content">Baixe o Magisk SOMENTE pela página oficial do GitHub. Arquivos de fontes desconhecidas podem ser maliciosos!</string>
+    <string name="home_notice_content">Descarregue o Magisk APENAS na página oficial do GitHub. Os ficheiros de fontes desconhecidas podem ser maliciosos!</string>
     <string name="home_support_title">Apoie-nos</string>
     <string name="home_follow_title">Siga-nos</string>
     <string name="home_item_source">Fonte</string>
-    <string name="home_support_content">Magisk sempre foi e sempre será, gratuito e de código aberto. No entanto, você pode nos ajudar enviando uma pequena doação.</string>
+    <string name="home_support_content">Magisk sempre foi e sempre será, gratuito e de código aberto. No entanto, você pode ajudar-nos enviando uma pequena doação.</string>
     <string name="home_installed_version">Instalado</string>
     <string name="home_latest_version">Recente</string>
     <string name="invalid_update_channel">Canal de atualização inválido</string>
     <string name="uninstall_magisk_title">Desinstalar Magisk</string>
-    <string name="uninstall_magisk_msg">Todos os módulos serão desativados/removidos!\nO root será removido!\nSeus dados não criptografados devido ao uso do Magisk, serão re-criptografados!</string>
+    <string name="uninstall_magisk_msg">Todos os módulos serão desativados/removidos!\nO root será removido!\nOs seus dados não encriptados devido à utilização do Magisk, serão re-encriptados!</string>
 
     <!--Install-->
-    <string name="keep_force_encryption">Manter criptografia forçada</string>
+    <string name="keep_force_encryption">Manter encriptação forçada</string>
     <string name="keep_dm_verity">Manter AVB 2.0/dm-verity</string>
     <string name="recovery_mode">Modo Recovery</string>
     <string name="install_options_title">Opções</string>
     <string name="install_method_title">Método</string>
     <string name="install_next">Próximo</string>
     <string name="install_start">Vamos lá</string>
-    <string name="manager_download_install">Toque para baixar e instalar</string>
+    <string name="manager_download_install">Toque para descarregar e instalar</string>
     <string name="direct_install">Instalação direta (recomendada)</string>
     <string name="install_inactive_slot">Instalar no slot inativo (após o OTA)</string>
-    <string name="install_inactive_slot_msg">Seu dispositivo será FORÇADO a inicializar no slot inativo atual após uma reinicialização!\nSó use esta opção após a conclusão do OTA.\nDeseja continuar?</string>
+    <string name="install_inactive_slot_msg">O seu dispositivo será FORÇADO a inicializar no slot inativo atual após um reinício!\nSó use esta opção após a conclusão do OTA.\nDeseja continuar?</string>
     <string name="setup_title">Configuração adicional</string>
-    <string name="select_patch_file">Selecione e corrija um arquivo</string>
-    <string name="patch_file_msg">Selecione um arquivo imagem (*.img) ou um arquivo tar (*.tar) ou um arquivo payload.bin (*.bin)</string>
-    <string name="reboot_delay_toast">Reiniciando em 5 segundos…</string>
+    <string name="select_patch_file">Selecione e corrija um ficheiro</string>
+    <string name="patch_file_msg">Selecione um ficheiro de imagem (*.img) ou um ficheiro tar (*.tar) ou um ficheiro payload.bin (*.bin)</string>
+    <string name="reboot_delay_toast">A reiniciar em 5 segundos…</string>
     <string name="flash_screen_title">Instalação</string>
 
     <!--Superuser-->
     <string name="su_request_title">Solicitação de SuperUsuário</string>
-    <string name="touch_filtered_warning">Como um app está ocultando uma solicitação de SuperUsuário, o Magisk não pode verificar sua resposta.</string>
+    <string name="touch_filtered_warning">Como um app está a ocultar um pedido de SuperUsuário, o Magisk não consegue verificar a sua resposta.</string>
     <string name="deny">Negar</string>
     <string name="prompt">Perguntar</string>
     <string name="grant">Permitir</string>
-    <string name="su_warning">Permite acesso total ao seu aparelho.\nNão permita se você não tiver certeza do que está fazendo!</string>
+    <string name="su_warning">Permite o acesso total ao seu dispositivo.\nNão o permita se não tiver a certeza do que está a fazer!</string>
     <string name="forever">Sempre</string>
     <string name="once">Uma vez</string>
     <string name="tenmin">10 mins</string>
@@ -63,26 +63,26 @@
     <string name="sixtymin">60 mins</string>
     <string name="su_allow_toast">%1$s foi permitido o acesso de SuperUsuário</string>
     <string name="su_deny_toast">%1$s foi negado o acesso de SuperUsuário</string>
-    <string name="su_snack_grant">Os acessos de SuperUsuário de %1$s foram concedidos</string>
+    <string name="su_snack_grant">Os acessos de SuperUsuário de %1$s foram permitidos</string>
     <string name="su_snack_deny">Os acessos de SuperUsuário de %1$s foram negados</string>
     <string name="su_snack_notif_on">As notificações de %1$s foram ativadas</string>
     <string name="su_snack_notif_off">As notificações de %1$s foram desativadas</string>
-    <string name="su_snack_log_on">Os registros de %1$s foram ativados</string>
-    <string name="su_snack_log_off">Os registros de %1$s foram desativados</string>
+    <string name="su_snack_log_on">Os registos de %1$s foram ativados</string>
+    <string name="su_snack_log_off">Os registos de %1$s foram desativados</string>
     <string name="su_revoke_title">Revogar?</string>
-    <string name="su_revoke_msg">Confirmar a remoção do acesso de SuperUsuário de %1$s?</string>
+    <string name="su_revoke_msg">Confirme para revogar os acessos de SuperUsuário de %1$s</string>
     <string name="toast">Notificação (Pop-up)</string>
     <string name="none">Nenhum</string>
     <string name="superuser_toggle_notification">Notificações</string>
     <string name="superuser_toggle_revoke">Revogar</string>
-    <string name="superuser_policy_none">Nenhum app solicitou permissão de SuperUsuário ainda</string>
+    <string name="superuser_policy_none">Nenhum app solicitou permissão de SuperUsuário ainda.</string>
 
     <!--Logs-->
-    <string name="log_data_none">Não há registros. Tente usar mais seus apps root.</string>
-    <string name="log_data_magisk_none">Os registros do Magisk estão vazios, isso é estranho.</string>
-    <string name="menuSaveLog">Salvar registros</string>
-    <string name="menuClearLog">Limpar registros agora</string>
-    <string name="logs_cleared">Registros limpo com sucesso</string>
+    <string name="log_data_none">Não há registos. Tente utilizar mais seus apps root.</string>
+    <string name="log_data_magisk_none">Os registos do Magisk estão vazios, isto é estranho.</string>
+    <string name="menuSaveLog">Salvar registos</string>
+    <string name="menuClearLog">Limpar registos agora</string>
+    <string name="logs_cleared">Registos limpo com sucesso</string>
     <string name="pid">PID: %1$d</string>
     <string name="target_uid">Alvo UID: %1$d</string>
     <string name="target_pid">Alvo PID: %s</string>
@@ -118,12 +118,12 @@
 
     <!--Settings-->
     <string name="settings_dark_mode_title">Modo do tema</string>
-    <string name="settings_dark_mode_message">Selecione o modo mais adequado para você!</string>
+    <string name="settings_dark_mode_message">Selecione o modo mais adequado para si!</string>
     <string name="settings_dark_mode_light">Sempre claro</string>
     <string name="settings_dark_mode_system">Seguir sistema</string>
     <string name="settings_dark_mode_dark">Sempre escuro</string>
-    <string name="settings_download_path_title">Caminho para baixar</string>
-    <string name="settings_download_path_message">Os arquivos serão salvos em %1$s</string>
+    <string name="settings_download_path_title">Caminho para descarregar</string>
+    <string name="settings_download_path_message">Os ficheiros serão salvos em %1$s</string>
     <string name="settings_hide_app_title">Ocultar app do Magisk</string>
     <string name="settings_hide_app_summary">Instala o app oculto com ID aleatório e nome personalizado</string>
     <string name="settings_restore_app_title">Restaurar app do Magisk</string>
@@ -135,8 +135,9 @@
     <string name="settings_update_channel_title">Canal de atualização</string>
     <string name="settings_update_stable">Estável</string>
     <string name="settings_update_beta">Beta</string>
+    <string name="settings_update_debug">Debug</string>
     <string name="settings_update_custom">Personalizado</string>
-    <string name="settings_update_custom_msg">Insira um URL de canal personalizado</string>
+    <string name="settings_update_custom_msg">Introduza um URL de canal personalizado</string>
     <string name="settings_zygisk_summary">Executa partes do Magisk no Zygote</string>
     <string name="settings_denylist_title">Aplicar lista de negação</string>
     <string name="settings_denylist_summary">Os processos na lista de negação terão todas as modificações do Magisk revertidas</string>
@@ -167,35 +168,35 @@
     <string name="settings_su_tapjack_title">Proteção contra atividades sobrepostas</string>
     <string name="settings_su_tapjack_summary">A caixa de diálogo do SuperUsuário não responderá à entrada enquanto estiver oculta por qualquer outra janela ou sobreposição</string>
     <string name="settings_su_auth_title">Autenticação de usuário</string>
-    <string name="settings_su_auth_summary">Solicite autenticação de usuário durante solicitações de SuperUsuário</string>
+    <string name="settings_su_auth_summary">Solicite autenticação de usuário durante pedidos de SuperUsuário</string>
     <string name="settings_su_auth_insecure">Nenhum método de autenticação está configurado no dispositivo</string>
     <string name="settings_customization">Personalizações</string>
-    <string name="setting_add_shortcut_summary">Adicione um atalho na tela inicial, caso o nome e o ícone sejam difíceis de reconhecer logo após ocultar o app.</string>
+    <string name="setting_add_shortcut_summary">Adicione um atalho no ecrã inicial, caso o nome e o ícone sejam difíceis de reconhecer logo após ocultar o app.</string>
     <string name="settings_doh_title">DNS sobre HTTPS</string>
     <string name="settings_doh_description">Solução alternativa para envenenamento de DNS em alguns países</string>
     <string name="settings_random_name_title">Randomizar nome de saída</string>
-    <string name="settings_random_name_description">Randomize o nome do arquivo de saída de imagens corrigidas e arquivos tar (*.tar) para evitar a detecção</string>
+    <string name="settings_random_name_description">Randomize o nome do ficheiro de saída de imagens corrigidas e ficheiros tar (*.tar) para evitar a deteção</string>
     <string name="multiuser_mode">Modo multiusuário</string>
     <string name="settings_owner_only">Somente proprietário do dispositivo</string>
-    <string name="settings_owner_manage">Gerenciado pelo proprietário do dispositivo</string>
+    <string name="settings_owner_manage">Gerido pelo proprietário do dispositivo</string>
     <string name="settings_user_independent">Independente do usuário</string>
     <string name="owner_only_summary">Somente o proprietário tem acesso root</string>
-    <string name="owner_manage_summary">Somente o proprietário pode gerenciar o acesso root e receber pedidos de solicitação</string>
+    <string name="owner_manage_summary">Somente o proprietário pode gerir o acesso root e receber pedidos de solicitação</string>
     <string name="user_independent_summary">Cada usuário tem suas próprias regras de root separadas</string>
     <string name="mount_namespace_mode">Montar namespace</string>
     <string name="settings_ns_global">Global</string>
     <string name="settings_ns_requester">Herdado</string>
     <string name="settings_ns_isolate">Individual</string>
-    <string name="global_summary">Todas as sessões root usam o namespace de montagem global</string>
-    <string name="requester_summary">As sessões root herdarão o namespace do solicitante</string>
-    <string name="isolate_summary">Cada sessão root terá seu próprio namespace individual</string>
+    <string name="global_summary">Todas as sessões root utilizam o namespace de montagem global</string>
+    <string name="requester_summary">As sessões root herdarão o namespace do requerente</string>
+    <string name="isolate_summary">Cada sessão root terá o seu próprio namespace individual</string>
 
     <!--Notifications-->
     <string name="update_channel">Atualizações do Magisk</string>
     <string name="progress_channel">Notificações de progresso</string>
     <string name="updated_channel">Atualização concluída</string>
     <string name="download_complete">Download concluído</string>
-    <string name="download_file_error">Erro ao baixar arquivo</string>
+    <string name="download_file_error">Erro ao descarregar ficheiro</string>
     <string name="magisk_update_title">Atualização do Magisk disponível!</string>
     <string name="updated_title">Magisk atualizado</string>
     <string name="updated_text">Toque para abrir o app</string>
@@ -209,37 +210,37 @@
     <string name="close">Fechar</string>
     <string name="release_notes">Notas da atualização</string>
     <string name="flashing">Flashando…</string>
-    <string name="running">Executando…</string>
+    <string name="running">A executar…</string>
     <string name="done">Concluído!</string>
     <string name="done_action">Ação de execução de %1$s concluída</string>
     <string name="failure">Falhou!</string>
-    <string name="hide_app_title">Ocultando o app do Magisk…</string>
+    <string name="hide_app_title">A ocultar o app do Magisk…</string>
     <string name="open_link_failed_toast">Nenhum app encontrado para abrir o link</string>
     <string name="complete_uninstall">Desinstalação completa</string>
     <string name="restore_img">Restaurar imagens</string>
-    <string name="restore_img_msg">Restaurando…</string>
+    <string name="restore_img_msg">A restaurar…</string>
     <string name="restore_done">Restauração concluída!</string>
     <string name="restore_fail">O backup original não existe!</string>
     <string name="setup_fail">Falha na instalação</string>
     <string name="env_fix_title">Configuração adicional exigida</string>
     <string name="env_fix_msg">Seu dispositivo exige uma configuração adicional para o Magisk funcionar corretamente. Deseja continuar e reiniciar?</string>
-    <string name="env_full_fix_msg">Seu dispositivo precisa refazer o flash do Magisk para funcionar corretamente. Por favor, reinstale o Magisk no app, o modo Recovery não pode obter as devidas informações do dispositivo.</string>
-    <string name="setup_msg">Executando a configuração do ambiente…</string>
+    <string name="env_full_fix_msg">O seu dispositivo precisa de refazer o flash do Magisk para funcionar corretamente. Por favor, reinstale o Magisk no app, o modo Recovery não consegue obter as devidas informações do dispositivo.</string>
+    <string name="setup_msg">A executar a configuração do ambiente…</string>
     <string name="unsupport_magisk_title">Versão do Magisk não suportada</string>
-    <string name="unsupport_magisk_msg">Esta versão do app não suporta a versão do Magisk inferior a %1$s.\n\nO app irá se comportar como se nenhum Magisk estivesse sido instalado. Por favor, atualize o Magisk assim que possível.</string>
+    <string name="unsupport_magisk_msg">Esta versão do app não suporta versões do Magisk inferiores a %1$s.\n\nO app irá comportar-se como se nenhum Magisk estivesse instalado. Por favor, atualize o Magisk assim que possível.</string>
     <string name="unsupport_general_title">Estado anormal</string>
     <string name="unsupport_system_app_msg">Não há suporte para executar este app como um app do sistema. Por favor, reverta o app para um app de usuário.</string>
     <string name="unsupport_other_su_msg">Não foi possível detectar o binário \"su\" do Magisk. Por favor, remova qualquer outro root concorrente e/ou reinstale o Magisk.</string>
     <string name="unsupport_external_storage_msg">O app do Magisk está instalado no armazenamento externo. Por favor, mova o app para o armazenamento interno.</string>
-    <string name="unsupport_nonroot_stub_msg">O app oculto do Magisk não pode continuar funcionando porque o root foi perdido. Por favor, restaure o APK original.</string>
+    <string name="unsupport_nonroot_stub_msg">O app oculto do Magisk não pode continuar a funcionar porque o root foi perdido. Por favor, restaure o APK original.</string>
     <string name="unsupport_nonroot_stub_title">@string/settings_restore_app_title</string>
     <string name="external_rw_permission_denied">Conceda permissão de armazenamento para ativar esta funcionalidade</string>
     <string name="post_notifications_denied">Conceda permissão às notificações para ativar esta funcionalidade</string>
-    <string name="install_unknown_denied">Permita a opção "Instalar apps de fontes desconhecidas" para ativar esta funcionalidade</string>
-    <string name="add_shortcut_title">Adicionar atalho à tela inicial</string>
-    <string name="add_shortcut_msg">Após ocultar o app do Magisk, seu nome e ícone ficarão difíceis de reconhecer. Deseja adicionar um atalho na tela inicial?</string>
+    <string name="install_unknown_denied">Permita a opção \"Instalar apps de fontes desconhecidas\" para ativar esta funcionalidade</string>
+    <string name="add_shortcut_title">Adicionar atalho ao ecrã inicial</string>
+    <string name="add_shortcut_msg">Após ocultar o app do Magisk, o seu nome e ícone serão difíceis de reconhecer. Deseja adicionar um atalho no ecrã inicial?</string>
     <string name="app_not_found">Nenhum app encontrado para realizar esta ação</string>
-    <string name="reboot_apply_change">Reinicie para aplicar as mudanças</string>
+    <string name="reboot_apply_change">Reinicie para aplicar as alterações</string>
     <string name="restore_app_confirmation">Isso irá restaurar o app oculto do Magisk de volta para o app original. Deseja realmente fazer isso?</string>
 
 </resources>

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

@@ -1,99 +1,58 @@
 <resources>
-    <!--Universal-->
+    <!--Author: Radoš Milićev (https://github.com/rammba)-->
 
-    <!--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 +63,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-ur/strings.xml

@@ -0,0 +1,234 @@
+<resources>
+
+    <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>
+
+    <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">صرف آفیشل گٹ ہب پیج سے Magisk ڈاؤن لوڈ کریں۔ نامعلوم ذرائع سے فائلیں نقصان دہ ہو سکتی ہیں!</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 ہمیشہ مفت اور اوپن سورس رہے گا۔ تاہم، آپ عطیہ کر کے ہمیں اپنی دیکھ بھال کا اظہار کر سکتے ہیں۔</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روٹ ہٹا دیا جائے گا!\nMagisk کے استعمال کے ذریعے غیر اینکرپٹ کی گئی کوئی بھی اندرونی اسٹوریج دوبارہ اینکرپٹ ہو جائے گی!</string>
+
+    <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">ریبوٹ کے بعد آپ کا آلہ زبردستی موجودہ غیر فعال سلاٹ میں بوٹ ہو جائے گا!\nیہ آپشن صرف OTA مکمل ہونے کے بعد استعمال کریں۔\nجاری رکھیں؟</string>
+    <string name="setup_title">اضافی سیٹ اپ</string>
+    <string name="select_patch_file">پیچ فائل منتخب اور پیچ کریں</string>
+    <string name="patch_file_msg">ایک خام امیج (*.img) یا ایک ODIN ٹار فائل (*.tar) یا ایک payload.bin (*.bin) منتخب کریں</string>
+    <string name="reboot_delay_toast">5 سیکنڈ میں ریبوٹ ہو رہا ہے…</string>
+    <string name="flash_screen_title">انسٹالیشن</string>
+
+    <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>
+    <string name="su_warning">اپنے آلے تک مکمل رسائی کی اجازت دیں۔\nاگر آپ کو یقین نہیں ہے تو منع کریں!</string>
+    <string name="forever">ہمیشہ کے لیے</string>
+    <string name="once">ایک بار</string>
+    <string name="tenmin">10 منٹ</string>
+    <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_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>
+
+    <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">ماؤنٹ این ایس ٹارگٹ PID: %s</string>
+    <string name="selinux_context">SELinux سیاق و سباق: %s</string>
+    <string name="supp_group">اضافی گروپ: %s</string>
+
+    <string name="show_system_app">سسٹم ایپس دکھائیں</string>
+    <string name="show_os_app">OS ایپس دکھائیں</string>
+    <string name="hide_filter_hint">نام سے فلٹر کریں</string>
+    <string name="hide_search">تلاش کریں</string>
+
+    <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">%2$s کی جانب سے %1$s</string>
+    <string name="module_state_remove">ہٹائیں</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>
+
+    <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">ایک رینڈم پیکیج 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">zygote ڈیمن میں Magisk کے کچھ حصے چلائیں</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">سسٹم لیس ہوسٹس</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">HTTPS پر DNS</string>
+    <string name="settings_doh_description">بعض ممالک میں 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="isolate_summary">ہر روٹ سیشن کی اپنی آئسولیٹڈ نیم اسپیس ہوگی</string>
+    <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>
+    <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="done">ہو گیا!</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_full_fix_msg">Magisk کو صحیح طریقے سے کام کرنے کے لیے آپ کے آلے کو دوبارہ فلیش کرنے کی ضرورت ہے۔ براہ کرم ایپ کے اندر Magisk کو دوبارہ انسٹال کریں، ریکوری موڈ درست ڈیوائس کی معلومات حاصل نہیں کر سکتا۔</string>
+    <string name="env_fix_title">اضافی سیٹ اپ درکار ہے</string>
+    <string name="env_fix_msg">Magisk کو صحیح طریقے سے کام کرنے کے لیے آپ کے آلے کو اضافی سیٹ اپ کی ضرورت ہے۔ کیا آپ جاری رکھنا چاہتے ہیں اور ریبوٹ کرنا چاہتے ہیں؟</string>
+    <string name="setup_msg">ماحول کا سیٹ اپ چل رہا ہے…</string>
+    <string name="unsupport_magisk_title">Magisk کا غیر تعاون یافتہ ورژن</string>
+    <string name="unsupport_magisk_msg">ایپ کا یہ ورژن %1$s سے کم Magisk ورژنز کو سپورٹ نہیں کرتا ہے۔\n\nایپ ایسے برتاؤ کرے گی جیسے کوئی Magisk انسٹال نہیں ہے، براہ کرم جلد از جلد Magisk کو اپ گریڈ کریں۔</string>
+    <string name="unsupport_general_title">غیر معمولی حالت</string>
+    <string name="unsupport_system_app_msg">سسٹم ایپ کے طور پر اس ایپ کو چلانا تعاون یافتہ نہیں ہے۔ براہ کرم ایپ کو صارف ایپ میں واپس کریں۔</string>
+    <string name="unsupport_other_su_msg">Magisk کے علاوہ کسی اور "su" بائنری کا پتہ چلا ہے۔ براہ کرم کسی بھی مسابقتی روٹ حل کو ہٹا دیں اور/یا 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-zh-rCN/strings.xml

@@ -54,6 +54,7 @@
     <string name="touch_filtered_warning">由于某个应用遮挡了超级用户请求界面，因此 Magisk 无法验证您的回应</string>
     <string name="deny">拒绝</string>
     <string name="prompt">提示</string>
+    <string name="restrict">受限</string>
     <string name="grant">允许</string>
     <string name="su_warning">将授予对该设备的最高权限。\n如果不确定，请拒绝！</string>
     <string name="forever">永久</string>
@@ -173,6 +174,8 @@
     <string name="settings_su_auth_title">身份验证</string>
     <string name="settings_su_auth_summary">对超级用户请求验证身份</string>
     <string name="settings_su_auth_insecure">设备未配置验证方式</string>
+    <string name="settings_su_restrict_title">限制超级用户权能</string>
+    <string name="settings_su_restrict_summary">默认限制新的超级用户应用。警告，这会破坏大多数应用，不建议启用。</string>
     <string name="settings_customization">个性化</string>
     <string name="setting_add_shortcut_summary">在隐藏后难以识别名称和图标的情况下，添加快捷方式到桌面</string>
     <string name="settings_doh_title">安全 DNS（DoH）</string>

app/core/src/main/res/values/arrays.xml

@@ -63,9 +63,7 @@
     <string-array name="update_channel">
         <item>@string/settings_update_stable</item>
         <item>@string/settings_update_beta</item>
+        <item>@string/settings_update_debug</item>
         <item>@string/settings_update_custom</item>
-        <item>Canary</item>
-        <item>Debug</item>
     </string-array>
-
 </resources>

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

@@ -19,41 +19,41 @@
     <string name="hide">Hide</string>
     <string name="home_package">Package</string>
     <string name="home_app_title">App</string>
-
     <string name="home_notice_content">Download Magisk ONLY from the official GitHub page. Files from unknown sources can be malicious!</string>
     <string name="home_support_title">Support Us</string>
     <string name="home_follow_title">Follow Us</string>
     <string name="home_item_source">Source</string>
-    <string name="home_support_content">Magisk is, and always will be, free, and open source. You can however show us that you care by making a donation.</string>
+    <string name="home_support_content">Magisk is, and always will be, free, and open source. However, you can show us that you care by making a donation.</string>
     <string name="home_installed_version">Installed</string>
     <string name="home_latest_version">Latest</string>
-    <string name="invalid_update_channel">Invalid Update Channel</string>
+    <string name="invalid_update_channel">Invalid update channel</string>
     <string name="uninstall_magisk_title">Uninstall Magisk</string>
     <string name="uninstall_magisk_msg">All modules will be disabled/removed!\nRoot will be removed!\nAny internal storage unencrypted through the use of Magisk will be re-encrypted!</string>
 
     <!--Install-->
     <string name="keep_force_encryption">Preserve force encryption</string>
     <string name="keep_dm_verity">Preserve AVB 2.0/dm-verity</string>
-    <string name="recovery_mode">Recovery Mode</string>
+    <string name="recovery_mode">Recovery mode</string>
     <string name="install_options_title">Options</string>
     <string name="install_method_title">Method</string>
     <string name="install_next">Next</string>
     <string name="install_start">Let\'s go</string>
     <string name="manager_download_install">Press to download and install</string>
-    <string name="direct_install">Direct Install (Recommended)</string>
-    <string name="install_inactive_slot">Install to Inactive Slot (After OTA)</string>
+    <string name="direct_install">Direct install (Recommended)</string>
+    <string name="install_inactive_slot">Install to inactive slot (After OTA)</string>
     <string name="install_inactive_slot_msg">Your device will be FORCED to boot to the current inactive slot after a reboot!\nOnly use this option after OTA is done.\nContinue?</string>
-    <string name="setup_title">Additional Setup</string>
-    <string name="select_patch_file">Select and Patch a File</string>
+    <string name="setup_title">Additional setup</string>
+    <string name="select_patch_file">Select and patch a file</string>
     <string name="patch_file_msg">Select a raw image (*.img) or an ODIN tarfile (*.tar) or a payload.bin (*.bin)</string>
     <string name="reboot_delay_toast">Rebooting in 5 seconds…</string>
     <string name="flash_screen_title">Installation</string>
 
     <!--Superuser-->
-    <string name="su_request_title">Superuser Request</string>
-    <string name="touch_filtered_warning">Because an app is obscuring a Superuser request, Magisk can\'t verify your response</string>
+    <string name="su_request_title">Superuser request</string>
+    <string name="touch_filtered_warning">Because an app is obscuring a Superuser request, Magisk can\'t verify your response.</string>
     <string name="deny">Deny</string>
     <string name="prompt">Prompt</string>
+    <string name="restrict">Restrict</string>
     <string name="grant">Grant</string>
     <string name="su_warning">Grants full access to your device.\nDeny if you\'re not sure!</string>
     <string name="forever">Forever</string>
@@ -74,25 +74,22 @@
     <string name="su_revoke_msg">Confirm to revoke %1$s Superuser rights</string>
     <string name="toast">Toast</string>
     <string name="none">None</string>
-
     <string name="superuser_toggle_notification">Notifications</string>
     <string name="superuser_toggle_revoke">Revoke</string>
     <string name="superuser_policy_none">No apps have asked for Superuser permission yet.</string>
 
     <!--Logs-->
-    <string name="log_data_none">You\'re log-free, try using your root apps more</string>
-    <string name="log_data_magisk_none">Magisk logs are empty, that\'s weird</string>
+    <string name="log_data_none">You\'re log-free. Try using your root apps more.</string>
+    <string name="log_data_magisk_none">Magisk logs are empty, that\'s weird.</string>
     <string name="menuSaveLog">Save log</string>
     <string name="menuClearLog">Clear log now</string>
     <string name="logs_cleared">Log successfully cleared</string>
     <string name="pid">PID: %1$d</string>
     <string name="target_uid">Target UID: %1$d</string>
-    <string name="target_pid">Mount ns target PID: %s</string>
+    <string name="target_pid">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">Show system apps</string>
     <string name="show_os_app">Show OS apps</string>
@@ -112,20 +109,20 @@
     <string name="module_action">Action</string>
     <string name="module_state_restore">Restore</string>
     <string name="module_action_install_external">Install from storage</string>
-    <string name="update_available">Update Available</string>
+    <string name="update_available">Update available</string>
     <string name="suspend_text_riru">Module suspended because %1$s is enabled</string>
-    <string name="suspend_text_zygisk">Module suspended because %1$s is not enabled</string>
+    <string name="suspend_text_zygisk">Module suspended because %1$s isn\'t enabled</string>
     <string name="zygisk_module_unloaded">Zygisk module not loaded due to incompatibility</string>
     <string name="module_empty">No module installed</string>
     <string name="confirm_install">Install module %1$s?</string>
-    <string name="confirm_install_title">Install Confirmation</string>
+    <string name="confirm_install_title">Install confirmation</string>
 
     <!--Settings-->
-    <string name="settings_dark_mode_title">Theme Mode</string>
+    <string name="settings_dark_mode_title">Theme mode</string>
     <string name="settings_dark_mode_message">Select mode which best suits your style!</string>
-    <string name="settings_dark_mode_light">Always Light</string>
-    <string name="settings_dark_mode_system">Follow System</string>
-    <string name="settings_dark_mode_dark">Always Dark</string>
+    <string name="settings_dark_mode_light">Always light</string>
+    <string name="settings_dark_mode_system">Follow system</string>
+    <string name="settings_dark_mode_dark">Always dark</string>
     <string name="settings_download_path_title">Download path</string>
     <string name="settings_download_path_message">Files will be saved to %1$s</string>
     <string name="settings_hide_app_title">Hide the Magisk app</string>
@@ -133,15 +130,16 @@
     <string name="settings_restore_app_title">Restore the Magisk app</string>
     <string name="settings_restore_app_summary">Unhide the app and restore the original APK</string>
     <string name="language">Language</string>
-    <string name="system_default">(System Default)</string>
-    <string name="settings_check_update_title">Check Updates</string>
+    <string name="system_default">(System default)</string>
+    <string name="settings_check_update_title">Check for updates</string>
     <string name="settings_check_update_summary">Periodically check for updates in the background</string>
-    <string name="settings_update_channel_title">Update Channel</string>
+    <string name="settings_update_channel_title">Update channel</string>
     <string name="settings_update_stable">Stable</string>
     <string name="settings_update_beta">Beta</string>
+    <string name="settings_update_debug">Debug</string>
     <string name="settings_update_custom">Custom</string>
     <string name="settings_update_custom_msg">Insert a custom channel URL</string>
-    <string name="settings_zygisk_summary">Run parts of Magisk in the zygote daemon</string>
+    <string name="settings_zygisk_summary">Run parts of Magisk in the Zygote daemon</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_config_title">Configure DenyList</string>
@@ -162,48 +160,48 @@
     <string name="settings_su_request_30">30 seconds</string>
     <string name="settings_su_request_45">45 seconds</string>
     <string name="settings_su_request_60">60 seconds</string>
-    <string name="superuser_access">Superuser Access</string>
-    <string name="auto_response">Automatic Response</string>
-    <string name="request_timeout">Request Timeout</string>
-    <string name="superuser_notification">Superuser Notification</string>
+    <string name="superuser_access">Superuser access</string>
+    <string name="auto_response">Automatic response</string>
+    <string name="request_timeout">Request timeout</string>
+    <string name="superuser_notification">Superuser notification</string>
     <string name="settings_su_reauth_title">Reauthenticate after upgrade</string>
     <string name="settings_su_reauth_summary">Ask for Superuser permissions again after upgrading apps</string>
-    <string name="settings_su_tapjack_title">Tapjacking Protection</string>
-    <string name="settings_su_tapjack_summary">The Superuser prompt dialog will not respond to input while obscured by any other window or overlay</string>
-    <string name="settings_su_auth_title">User Authentication</string>
+    <string name="settings_su_tapjack_title">Tapjacking protection</string>
+    <string name="settings_su_tapjack_summary">The Superuser prompt dialog won\'t respond to input while obscured by any other window or overlay</string>
+    <string name="settings_su_auth_title">User authentication</string>
     <string name="settings_su_auth_summary">Ask for user authentication during Superuser requests</string>
     <string name="settings_su_auth_insecure">No authentication method is configured on the device</string>
+    <string name="settings_su_restrict_title">Restrict root capabilities</string>
+    <string name="settings_su_restrict_summary">Will restrict new superuser apps by default. Warning, this will break most apps, do not enable it.</string>
     <string name="settings_customization">Customization</string>
     <string name="setting_add_shortcut_summary">Add a pretty shortcut to the home screen in case the name and icon are difficult to recognize after hiding the app</string>
     <string name="settings_doh_title">DNS over HTTPS</string>
     <string name="settings_doh_description">Workaround DNS poisoning in some nations</string>
     <string name="settings_random_name_title">Randomize output name</string>
     <string name="settings_random_name_description">Randomize the output file name of patched images and tar files to prevent detection</string>
-
-    <string name="multiuser_mode">Multiuser Mode</string>
-    <string name="settings_owner_only">Device Owner Only</string>
-    <string name="settings_owner_manage">Device Owner Managed</string>
-    <string name="settings_user_independent">User-Independent</string>
+    <string name="multiuser_mode">Multiuser mode</string>
+    <string name="settings_owner_only">Device owner only</string>
+    <string name="settings_owner_manage">Device owner managed</string>
+    <string name="settings_user_independent">User-independent</string>
     <string name="owner_only_summary">Only owner has root access</string>
     <string name="owner_manage_summary">Only owner can manage root access and receive request prompts</string>
     <string name="user_independent_summary">Each user has their own separate root rules</string>
-
-    <string name="mount_namespace_mode">Mount Namespace Mode</string>
-    <string name="settings_ns_global">Global Namespace</string>
-    <string name="settings_ns_requester">Inherit Namespace</string>
-    <string name="settings_ns_isolate">Isolated Namespace</string>
+    <string name="mount_namespace_mode">Mount namespace mode</string>
+    <string name="settings_ns_global">Global namespace</string>
+    <string name="settings_ns_requester">Inherit namespace</string>
+    <string name="settings_ns_isolate">Isolated namespace</string>
     <string name="global_summary">All root sessions use the global mount namespace</string>
     <string name="requester_summary">Root sessions will inherit their requester\'s namespace</string>
     <string name="isolate_summary">Each root session will have its own isolated namespace</string>
 
     <!--Notifications-->
-    <string name="update_channel">Magisk Updates</string>
-    <string name="progress_channel">Progress Notifications</string>
-    <string name="updated_channel">Update Complete</string>
+    <string name="update_channel">Magisk updates</string>
+    <string name="progress_channel">Progress notifications</string>
+    <string name="updated_channel">Update complete</string>
     <string name="download_complete">Download complete</string>
     <string name="download_file_error">Error downloading file</string>
-    <string name="magisk_update_title">Magisk Update Available!</string>
-    <string name="updated_title">Magisk Updated</string>
+    <string name="magisk_update_title">Magisk update available!</string>
+    <string name="updated_title">Magisk updated</string>
     <string name="updated_text">Tap to open app</string>
 
     <!--Toasts, Dialogs-->
@@ -221,27 +219,27 @@
     <string name="failure">Failed!</string>
     <string name="hide_app_title">Hiding the Magisk app…</string>
     <string name="open_link_failed_toast">No app found to open the link</string>
-    <string name="complete_uninstall">Complete Uninstall</string>
-    <string name="restore_img">Restore Images</string>
+    <string name="complete_uninstall">Complete uninstall</string>
+    <string name="restore_img">Restore images</string>
     <string name="restore_img_msg">Restoring…</string>
     <string name="restore_done">Restoration done!</string>
-    <string name="restore_fail">Stock backup does not exist!</string>
+    <string name="restore_fail">Stock backup doesn\'t exist!</string>
     <string name="setup_fail">Setup failed</string>
-    <string name="env_fix_title">Requires Additional Setup</string>
+    <string name="env_fix_title">Requires additional setup</string>
     <string name="env_fix_msg">Your device needs additional setup for Magisk to work properly. Do you want to proceed and reboot?</string>
-    <string name="env_full_fix_msg">Your device needs reflash Magisk to work properly. Please reinstall Magisk within app, recovery mode cannot get correct device info.</string>
+    <string name="env_full_fix_msg">Your device needs reflash Magisk to work properly. Please reinstall Magisk within app, Recovery mode cannot get correct device info.</string>
     <string name="setup_msg">Running environment setup…</string>
-    <string name="unsupport_magisk_title">Unsupported Magisk Version</string>
-    <string name="unsupport_magisk_msg">This version of the app does not support Magisk versions lower than %1$s.\n\nThe app will behave as if no Magisk is installed, please upgrade Magisk as soon as possible.</string>
-    <string name="unsupport_general_title">Abnormal State</string>
-    <string name="unsupport_system_app_msg">Running this app as a system app is not supported. Please revert the app to a user app.</string>
+    <string name="unsupport_magisk_title">Unsupported Magisk version</string>
+    <string name="unsupport_magisk_msg">This version of the app doesn\'t support Magisk versions lower than %1$s.\n\nThe app will behave as if no Magisk is installed. Please update Magisk as soon as possible.</string>
+    <string name="unsupport_general_title">Abnormal state</string>
+    <string name="unsupport_system_app_msg">Running this app as a system app isn\'t supported. Please revert the app to a user app.</string>
     <string name="unsupport_other_su_msg">A \"su\" binary not from Magisk has been detected. Please remove any competing root solution and/or reinstall Magisk.</string>
     <string name="unsupport_external_storage_msg">Magisk is installed to external storage. Please move the app to internal storage.</string>
     <string name="unsupport_nonroot_stub_msg">The hidden Magisk app cannot continue to work because root was lost. Please restore the original APK.</string>
     <string name="unsupport_nonroot_stub_title">@string/settings_restore_app_title</string>
     <string name="external_rw_permission_denied">Grant storage permission to enable this functionality</string>
     <string name="post_notifications_denied">Grant notifications permission to enable this functionality</string>
-    <string name="install_unknown_denied">Allow "install unknown apps" to enable this functionality</string>
+    <string name="install_unknown_denied">Allow \"Install unknown apps\" to enable this functionality</string>
     <string name="add_shortcut_title">Add shortcut to home screen</string>
     <string name="add_shortcut_msg">After hiding this app, its name and icon might become difficult to recognize. Do you want to add a pretty shortcut to the home screen?</string>
     <string name="app_not_found">No app found to handle this action</string>

app/gradle.properties

@@ -30,5 +30,4 @@ android.nonFinalResIds=false
 
 # Magisk
 magisk.stubVersion=40
-magisk.versionCode=28104
-magisk.ondkVersion=r29.1
+magisk.versionCode=30100

app/gradle/libs.versions.toml

@@ -1,17 +1,16 @@
 [versions]
-kotlin = "2.1.20"
-android = "8.9.1"
-ksp = "2.1.20-1.0.31"
+kotlin = "2.1.21"
+android = "8.11.0"
+ksp = "2.1.21-2.0.1"
 rikka = "1.3.0"
-navigation = "2.8.4"
+navigation = "2.9.0"
 libsu = "6.0.0"
-moshi = "1.15.1"
 okhttp = "4.12.0"
-retrofit = "2.11.0"
-room = "2.6.1"
+retrofit = "3.0.0"
+room = "2.7.2"
 
 [libraries]
-bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version = "1.80" }
+bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version = "1.81" }
 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" }
@@ -20,18 +19,16 @@ markwon-core = { module = "io.noties.markwon:core", version = "4.6.2" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttp" }
 okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
-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 = "7.1.0.202411261347-r" }
 
 # AndroidX
-activity = { module = "androidx.activity:activity", version = "1.10.0" }
-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
-core-ktx = { module = "androidx.core:core-ktx", version = "1.15.0" }
+activity = { module = "androidx.activity:activity", version = "1.10.1" }
+appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
+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.8" }
 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" }
@@ -40,10 +37,10 @@ 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" }
+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" }
@@ -65,5 +62,6 @@ android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref
 ksp-plugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
 navigation-safe-args-plugin = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "navigation" }
 lsparanoid-plugin = { module = "org.lsposed.lsparanoid:gradle-plugin", version = "0.6.0" }
+moshi-plugin = { module = "dev.zacsweers.moshix:dev.zacsweers.moshix.gradle.plugin", version = "0.30.0" }
 
 [plugins]

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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

app/gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

app/gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

app/settings.gradle.kts

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

app/stub/build.gradle.kts

@@ -13,24 +13,28 @@ android {
     namespace = "com.topjohnwu.magisk"
 
     val canary = !Config.version.contains(".")
-
-    val url = if (canary) null
-    else "https://github.com/topjohnwu/Magisk/releases/download/v${Config.version}/Magisk-v${Config.version}.apk"
+    val base = "https://github.com/topjohnwu/Magisk/releases/download/"
+    val url = base + "v${Config.version}/Magisk-v${Config.version}.apk"
+    val canaryUrl = base + "canary-${Config.versionCode}/"
 
     defaultConfig {
         applicationId = "com.topjohnwu.magisk"
         versionCode = 1
         versionName = "1.0"
-        buildConfigField("String", "APK_URL", url?.let { "\"$it\"" } ?: "null" )
+        buildConfigField("String", "APK_URL", "\"$url\"")
         buildConfigField("int", "STUB_VERSION", Config.stubVersion)
     }
 
     buildTypes {
         release {
+            if (canary) buildConfigField("String", "APK_URL", "\"${canaryUrl}app-release.apk\"")
             proguardFiles("proguard-rules.pro")
             isMinifyEnabled = true
             isShrinkResources = false
         }
+        debug {
+            if (canary) buildConfigField("String", "APK_URL", "\"${canaryUrl}app-debug.apk\"")
+        }
     }
 
     buildFeatures {
@@ -41,5 +45,5 @@ android {
 setupStubApk()
 
 dependencies {
-    implementation(project(":app:shared"))
+    implementation(project(":shared"))
 }

app/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java

@@ -27,8 +27,6 @@ import com.topjohnwu.magisk.net.Networking;
 import com.topjohnwu.magisk.net.Request;
 import com.topjohnwu.magisk.utils.APKInstall;
 
-import org.json.JSONException;
-
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -48,13 +46,8 @@ import javax.crypto.spec.SecretKeySpec;
 public class DownloadActivity extends Activity {
 
     private static final String APP_NAME = "Magisk";
-    private static final String JSON_URL = BuildConfig.DEBUG ?
-            "https://topjohnwu.github.io/magisk-files/debug.json" :
-            "https://topjohnwu.github.io/magisk-files/canary.json";
 
-    private String apkLink = BuildConfig.APK_URL;
     private Context themed;
-    private ProgressDialog dialog;
     private boolean dynLoad;
 
     @Override
@@ -75,11 +68,7 @@ public class DownloadActivity extends Activity {
         ProviderInstaller.install(this);
 
         if (Networking.checkNetworkStatus(this)) {
-            if (BuildConfig.APK_URL == null) {
-                fetchCanary();
-            } else {
-                showDialog();
-            }
+            showDialog();
         } else {
             new AlertDialog.Builder(themed)
                     .setCancelable(false)
@@ -115,23 +104,10 @@ public class DownloadActivity extends Activity {
                 .show();
     }
 
-    private void fetchCanary() {
-        dialog = ProgressDialog.show(themed, "", "", true);
-        request(JSON_URL).getAsJSONObject(json -> {
-            dialog.dismiss();
-            try {
-                apkLink = json.getJSONObject("magisk").getString("link");
-                showDialog();
-            } catch (JSONException e) {
-                error(e);
-            }
-        });
-    }
-
     private void dlAPK() {
-        dialog = ProgressDialog.show(themed, getString(dling), getString(dling) + " " + APP_NAME, true);
+        ProgressDialog.show(themed, getString(dling), getString(dling) + " " + APP_NAME, true);
         // Download and upgrade the app
-        var request = request(apkLink).setExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        var request = request(BuildConfig.APK_URL).setExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         if (dynLoad) {
             request.getAsFile(StubApk.current(this), file -> StubApk.restartProcess(this));
         } else {

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-b+sr+Latn/strings.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Author: Radoš Milićev (https://github.com/rammba)-->
+<resources>
+    <string name="upgrade_msg">Ažurirajte Magisk da biste završili postavljanje. Preuzmi i instaliraj?</string>
+    <string name="no_internet_msg">Molimo povežite se na internet! Neophodno je ažuriranje Magisk-a.</string>
+    <string name="dling">Preuzimanje</string>
+    <string name="relaunch_app">Molimo pokrenite aplikaciju ponovo</string>
+</resources>

app/stub/src/main/res/values-pt-rPT/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="upgrade_msg">Atualize para o Magisk completo para finalizar a configuração. Deseja baixar e instalar?</string>
-    <string name="no_internet_msg">Por favor, conecte-se à internet! É necessário atualizar para o Magisk completo.</string>
-    <string name="dling">Baixando</string>
+    <string name="upgrade_msg">Atualize para o Magisk completo para finalizar a configuração. Deseja descarregar e instalar?</string>
+    <string name="no_internet_msg">Por favor, ligue-se à internet! É necessário atualizar para o Magisk completo.</string>
+    <string name="dling">A descarregar</string>
     <string name="relaunch_app">Por favor, reinicie o app manualmente.</string>
 </resources>

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

@@ -1 +1,8 @@
-<resources></resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--Author: Radoš Milićev (https://github.com/rammba)-->
+<resources>
+    <string name="upgrade_msg">Ажурирајте Magisk да бисте завршили постављање. Преузми и инсталирај?</string>
+    <string name="no_internet_msg">Молимо повежите се на интернет! Неопходно је ажурирање Magisk-а.</string>
+    <string name="dling">Преузимање</string>
+    <string name="relaunch_app">Молимо покрените апликацију поново</string>
+</resources>

build.gradle.kts

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

build.py

@@ -67,9 +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"}
+ondk_version = "r28.5"
 
 # Global vars
 config = {}
@@ -160,6 +162,15 @@ def clean_elf():
     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):
     os.chdir("native")
     cmds.append("NDK_PROJECT_PATH=.")
@@ -175,13 +186,6 @@ 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):
     cmds = []
@@ -203,6 +207,7 @@ def build_cpp_src(targets: set):
 
     if cmds:
         run_ndk_build(cmds)
+        collect_ndk_build()
 
     cmds.clear()
 
@@ -215,6 +220,7 @@ def build_cpp_src(targets: set):
     if cmds:
         cmds.append("B_CRT0=1")
         run_ndk_build(cmds)
+        collect_ndk_build()
 
     if clean:
         clean_elf()
@@ -285,15 +291,7 @@ def write_if_diff(file_name: Path, text: str):
 
 
 def dump_flag_header():
-    flag_txt = textwrap.dedent(
-        """\
-        #pragma once
-        #define quote(s)            #s
-        #define str(s)              quote(s)
-        #define MAGISK_FULL_VER     MAGISK_VERSION "(" str(MAGISK_VER_CODE) ")"
-        #define NAME_WITH_VER(name) str(name) " " MAGISK_FULL_VER
-        """
-    )
+    flag_txt = "#pragma once\n"
     flag_txt += f'#define MAGISK_VERSION      "{config["version"]}"\n'
     flag_txt += f'#define MAGISK_VER_CODE     {config["versionCode"]}\n'
     flag_txt += f"#define MAGISK_DEBUG        {0 if args.release else 1}\n"
@@ -307,16 +305,27 @@ def dump_flag_header():
     write_if_diff(native_gen_path / "flags.rs", rust_flag_txt)
 
 
-def build_native():
+def ensure_toolchain():
     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"')
 
+    if sccache := shutil.which("sccache"):
+        os.environ["RUSTC_WRAPPER"] = sccache
+        os.environ["NDK_CCACHE"] = sccache
+        os.environ["CARGO_INCREMENTAL"] = "0"
+    if ccache := shutil.which("ccache"):
+        os.environ["NDK_CCACHE"] = ccache
+
+
+def build_native():
+    ensure_toolchain()
+
     if "targets" not in vars(args) or not args.targets:
         targets = default_targets
     else:
@@ -326,13 +335,6 @@ def build_native():
 
     header("* Building: " + " ".join(targets))
 
-    if sccache := shutil.which("sccache"):
-        os.environ["RUSTC_WRAPPER"] = sccache
-        os.environ["NDK_CCACHE"] = sccache
-        os.environ["CARGO_INCREMENTAL"] = "0"
-    if ccache := shutil.which("ccache"):
-        os.environ["NDK_CCACHE"] = ccache
-
     dump_flag_header()
     build_rust_src(targets)
     build_cpp_src(targets)
@@ -378,16 +380,19 @@ def find_jdk():
 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!")
 
@@ -396,7 +401,7 @@ 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)
     return target
@@ -404,7 +409,7 @@ def build_apk(module: str):
 
 def build_app():
     header("* Building the Magisk app")
-    apk = build_apk(":app:apk")
+    apk = build_apk(":apk")
 
     build_type = "release" if args.release else "debug"
 
@@ -423,7 +428,7 @@ def build_app():
 
 def build_stub():
     header("* Building the stub app")
-    apk = build_apk(":app:stub")
+    apk = build_apk(":stub")
     header(f"Output: {apk}")
 
 
@@ -434,7 +439,7 @@ def build_test():
     args.release = True
     try:
         header("* Building the test app")
-        source = build_apk(":app:test")
+        source = build_apk(":test")
         target = source.parent / "test.apk"
         mv(source, target)
         header(f"Output: {target}")
@@ -472,12 +477,15 @@ 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():
@@ -491,8 +499,39 @@ 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():
+    ensure_toolchain()
     args.force_out = True
+    set_archs(default_archs)
+
     os.chdir(Path("native", "src"))
     cmds = ["clippy", "--no-deps", "--target"]
     for triple in build_abis.values():
@@ -512,10 +551,9 @@ def cargo_cli():
 
 def setup_ndk():
     ensure_paths()
-    ndk_ver = config["ondkVersion"]
-    url = f"https://github.com/topjohnwu/ondk/releases/download/{ndk_ver}/ondk-{ndk_ver}-{os_name}.tar.xz"
+    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)
@@ -601,11 +639,11 @@ def push_files(script):
 def setup_avd():
     header("* Setting up emulator")
 
-    push_files(Path("scripts", "avd_magisk.sh"))
+    push_files(Path("scripts", "live_setup.sh"))
 
-    proc = execv([adb_path, "shell", "sh", "/data/local/tmp/avd_magisk.sh"])
+    proc = execv([adb_path, "shell", "sh", "/data/local/tmp/live_setup.sh"])
     if proc.returncode != 0:
-        error("avd_magisk.sh failed!")
+        error("live_setup.sh failed!")
 
 
 def patch_avd_file():
@@ -614,7 +652,7 @@ def patch_avd_file():
 
     header(f"* Patching {input.name}")
 
-    push_files(Path("scripts", "avd_patch.sh"))
+    push_files(Path("scripts", "host_patch.sh"))
 
     proc = execv([adb_path, "push", input, "/data/local/tmp"])
     if proc.returncode != 0:
@@ -623,9 +661,9 @@ def patch_avd_file():
     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])
+    proc = execv([adb_path, "shell", "sh", "/data/local/tmp/host_patch.sh", src_file])
     if proc.returncode != 0:
-        error("avd_patch.sh failed!")
+        error("host_patch.sh failed!")
 
     proc = execv([adb_path, "pull", out_file, output])
     if proc.returncode != 0:
@@ -663,7 +701,7 @@ def ensure_paths():
         ndk_path / "toolchains" / "llvm" / "prebuilt" / f"{os_name}-x86_64" / "bin"
     )
     adb_path = sdk_path / "platform-tools" / "adb"
-    gradlew = Path.cwd() / "gradlew"
+    gradlew = Path.cwd() / "app" / "gradlew"
 
 
 # We allow using several functionality with only ADB
@@ -694,6 +732,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"])
 
@@ -708,8 +752,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
 
@@ -725,12 +770,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():
@@ -801,12 +843,16 @@ def parse_args():
         "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)

docs/changes.md

@@ -1,5 +1,21 @@
 # Magisk Changelog
 
+### v30.0
+
+- [General] Various minor bug fixes
+- [Core] Migrate module implementation to Rust
+- [Core] Improve Magisk specific files injection logic
+- [MagiskBoot] Migrate compression code to Rust
+
+### 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
+- [Core] 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

docs/faq.md

@@ -16,9 +16,17 @@ The following details should ensure that modules are properly disabled:
 
 Magisk no longer handles root hiding. There are plenty of Magisk/Zygisk modules available that specifically provide these functionalities, please search around 😉
 
-### Q: After I hidden the Magisk app, the app icon is broken.
+### Q: Magisk App shows Magisk Installed = N/A after an update but magisk su is still working.
 
-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.
+If upgrading with App hidden (ie. you took the 'Hide the Magisk app' option), the stub app (for hiding Magisk) may remain while a full Magisk app is also installed. This creates a conflict and the full app fails to see or access root... Uninstalling and reinstalling the full app can fix this, but not if a hidden app (stub) still exists.
+
+The solution is to check for a hidden stub app and remove it. It may not show up normally in your launcher homescreen any longer, but should be visible from general settings, Apps. The hidden app will be named 'Settings' (default) or whatever you named it during the hiding process. Note that it is possible to have multiple obfuscated apps present. Uninstall any iterations of the hidden app you find and try opening the full app again. If necessary, uninstall it and reinstall the full app matching the binaries installed. Typing magisk -c in a terminal emulator app will show the version and version code for Magisk binaries installed (despite Installed = N/A showing).
+
+Additionally, if a 'second space', eg. Workspace, Parallel Space etc, or another sandboxed environment, eg. a Multiple User additional profile, Island app or similar, is set up, check that no iterations of Magisk (either hidden or full apps) are running within these environments.
+
+### Q: After I take the 'Hide the Magisk app' option the app icon is broken.
+
+When hiding the Magisk app, it will install a "stub" APK that has nothing in it. The only functionality this stub app has is to download the full Magisk app APK data into its internal storage and dynamically load it. Due to the fact that the stub 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.
 

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,6 @@
 # Release Notes
 
+- [v29.0](29000.md)
 - [v28.1](28100.md)
 - [v28.0](28000.md)
 - [v27.0](27000.md)

native/.gitignore

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

native/build.gradle.kts

@@ -1,32 +0,0 @@
-plugins {
-    id("com.android.library")
-}
-
-setupCommon()
-
-android {
-    namespace = "com.topjohnwu.magisk.binary"
-
-    externalNativeBuild {
-        ndkBuild {
-            path("src/Android.mk")
-        }
-    }
-
-    sourceSets.getByName("main") {
-        manifest.srcFile("src/AndroidManifest.xml")
-    }
-
-    defaultConfig {
-        externalNativeBuild {
-            ndkBuild {
-                // Pass arguments to ndk-build.
-                arguments(
-                    "B_MAGISK=1", "B_INIT=1", "B_BOOT=1", "B_POLICY=1",
-                    "B_PRELOAD=1", "B_PROP=1", "B_CRT0=1"
-                )
-                abiFilters("armeabi-v7a", "arm64-v8a", "x86", "x86_64", "riscv64")
-            }
-        }
-    }
-}

native/src/Android.mk

@@ -85,13 +85,11 @@ LOCAL_STATIC_LIBRARIES := \
     libbase \
     liblzma \
     liblz4 \
-    libzopfli \
     libboot-rs
 
 LOCAL_SRC_FILES := \
     boot/main.cpp \
     boot/bootimg.cpp \
-    boot/compress.cpp \
     boot/format.cpp \
     boot/boot-rs.cpp
 
@@ -99,7 +97,7 @@ LOCAL_LDFLAGS := -static
 
 ifdef B_CRT0
 LOCAL_STATIC_LIBRARIES += crt0
-LOCAL_LDFLAGS += -lm
+LOCAL_LDFLAGS += -lm -Wl,--defsym=vfprintf=musl_vfprintf
 endif
 
 include $(BUILD_EXECUTABLE)

native/src/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<!-- This file exists only to make Android Studio happy -->
-<manifest/>

native/src/Cargo.lock

@@ -3,10 +3,16 @@
 version = 4
 
 [[package]]
-name = "anstyle"
-version = "1.0.10"
+name = "adler2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "anstyle"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 
 [[package]]
 name = "argh"
@@ -67,9 +73,9 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
 [[package]]
 name = "base64ct"
-version = "1.7.3"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
+checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
 
 [[package]]
 name = "bit-set"
@@ -87,19 +93,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
 
 [[package]]
-name = "block-buffer"
-version = "0.11.0-rc.3"
+name = "bitflags"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fd016a0ddc7cb13661bf5576073ce07330a693f8608a1320b4e20561cc12cdc"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+
+[[package]]
+name = "block-buffer"
+version = "0.11.0-rc.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a229bfd78e4827c91b9b95784f69492c1b77c1ab75a45a8a037b139215086f94"
 dependencies = [
  "hybrid-array",
 ]
 
 [[package]]
-name = "bytemuck"
-version = "1.22.0"
+name = "bumpalo"
+version = "3.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540"
+checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee"
+
+[[package]]
+name = "bytemuck"
+version = "1.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -122,34 +140,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
-name = "cc"
-version = "1.2.19"
+name = "bzip2"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362"
+checksum = "49ecfb22d906f800d4fe833b6282cf4dc1c298f5057ca0b5445e5c209735ca47"
+dependencies = [
+ "bzip2-sys",
+ "libbz2-rs-sys",
+]
+
+[[package]]
+name = "bzip2-sys"
+version = "0.1.13+1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "956a5e21988b87f372569b66183b78babf23ebc2e744b733e4350a752c4dafac"
 dependencies = [
  "shlex",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
 [[package]]
 name = "clap"
-version = "4.5.35"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
+checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.35"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
+checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -158,9 +196,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "codespan-reporting"
@@ -208,10 +246,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "crypto-bigint"
-version = "0.6.1"
+name = "crc32fast"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96272c2ff28b807e09250b180ad1fb7889a3258f7455759b5c3c58b719467130"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crypto-bigint"
+version = "0.7.0-pre.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edaae5fb9dac79a07260e0b2006799ff4f1d342ab243fd7d0892215113b27904"
 dependencies = [
  "hybrid-array",
  "num-traits",
@@ -223,22 +270,21 @@ dependencies = [
 
 [[package]]
 name = "crypto-common"
-version = "0.2.0-rc.1"
+version = "0.2.0-rc.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0b8ce8218c97789f16356e7896b3714f26c2ee1079b79c0b7ae7064bb9089fa"
+checksum = "8a23fa214dea9efd4dacee5a5614646b30216ae0f05d4bb51bafb50e9da1c5be"
 dependencies = [
- "getrandom",
  "hybrid-array",
- "rand_core",
 ]
 
 [[package]]
 name = "crypto-primes"
-version = "0.6.2"
+version = "0.7.0-pre.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2acbaf157961745008b5a80ee1cc974150691304fe9177edf69747142bfd9878"
+checksum = "ae744b9f528151f8c440cf67498f24d2d1ac0ab536b5ce7b1f87a7a5961bd1c1"
 dependencies = [
  "crypto-bigint",
+ "libm",
  "rand_core",
 ]
 
@@ -290,9 +336,9 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.8.0-rc.1"
+version = "0.8.0-rc.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82db698b33305f0134faf590b9d1259dc171b5481ac41d5c8146c3b3ee7d4319"
+checksum = "0c2e6107818886eff6b71fba7a2da3dd11025ebb80f0c9b94ff961168ef629f2"
 dependencies = [
  "const-oid",
  "der_derive",
@@ -303,9 +349,9 @@ dependencies = [
 
 [[package]]
 name = "der_derive"
-version = "0.8.0-rc.1"
+version = "0.8.0-rc.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "211bea8bb45f5f61bc857104606913ef8ac8b5ec698143aa2aa96a7ffdc94991"
+checksum = "d184a65ac0a9db9e66e0d629bea86d0402198b2a5cc01c9c16de7a6537f0ac4f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -323,9 +369,9 @@ dependencies = [
 
 [[package]]
 name = "digest"
-version = "0.11.0-pre.9"
+version = "0.11.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2e3d6615d99707295a9673e889bf363a04b2a466bd320c65a72536f7577379"
+checksum = "460dd7f37e4950526b54a5a6b1f41b6c8e763c58eb9a8fc8fc05ba5c2f44ca7b"
 dependencies = [
  "block-buffer",
  "const-oid",
@@ -335,9 +381,9 @@ dependencies = [
 
 [[package]]
 name = "ecdsa"
-version = "0.17.0-pre.9"
+version = "0.17.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e62f2041a28c40b8884b79fbd19bc7457d76c6397767831e9ff4029fc0473a9"
+checksum = "6ca18d8009d96ffc2a8b771c7432338233ffcfa05e4ca410ed77900a2a335a0b"
 dependencies = [
  "der",
  "digest",
@@ -345,20 +391,20 @@ dependencies = [
  "rfc6979",
  "signature",
  "spki",
+ "zeroize",
 ]
 
 [[package]]
 name = "elliptic-curve"
-version = "0.14.0-rc.1"
+version = "0.14.0-rc.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc43715037532dc2d061e5c97e81b684c28993d52a4fa4eb7d2ce2826d78f2f2"
+checksum = "541598dba361b5ba0321caad955ba99ae82a604f4047c4f2743724996abf62f4"
 dependencies = [
  "base16ct",
  "crypto-bigint",
  "digest",
  "ff",
  "group",
- "hkdf",
  "hybrid-array",
  "pem-rfc7468",
  "pkcs8",
@@ -376,9 +422,9 @@ checksum = "784a4df722dc6267a04af36895398f59d21d07dce47232adf31ec0ff2fa45e67"
 
 [[package]]
 name = "ff"
-version = "0.13.1"
+version = "0.14.0-pre.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393"
+checksum = "d42dd26f5790eda47c1a2158ea4120e32c35ddc9a7743c98a292accc01b54ef3"
 dependencies = [
  "rand_core",
  "subtle",
@@ -390,6 +436,17 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe"
 
+[[package]]
+name = "flate2"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+dependencies = [
+ "crc32fast",
+ "libz-rs-sys",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "foldhash"
 version = "0.1.5"
@@ -398,49 +455,41 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
  "libc",
+ "r-efi",
  "wasi",
 ]
 
 [[package]]
 name = "group"
-version = "0.13.0"
+version = "0.14.0-pre.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+checksum = "1ff6a0b2dd4b981b1ae9e3e6830ab146771f3660d31d57bafd9018805a91b0f1"
 dependencies = [
  "ff",
  "rand_core",
  "subtle",
 ]
 
-[[package]]
-name = "hkdf"
-version = "0.13.0-pre.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00176ff81091018d42ff82e8324f8e5adb0b7e0468d1358f653972562dbff031"
-dependencies = [
- "hmac",
-]
-
 [[package]]
 name = "hmac"
-version = "0.13.0-pre.4"
+version = "0.13.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4b1fb14e4df79f9406b434b60acef9f45c26c50062cccf1346c6103b8c47d58"
+checksum = "8dc6a2fcc35ab09136c6df2cdf9ca49790701420a3a6b5db0987dddbabc79b21"
 dependencies = [
  "digest",
 ]
 
 [[package]]
 name = "hybrid-array"
-version = "0.2.3"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2d35805454dc9f8662a98d6d61886ffe26bd465f5960e0e55345c70d5c0d2a9"
+checksum = "891d15931895091dea5c47afa5b3c9a01ba634b311919fd4d41388fa0e3d76af"
 dependencies = [
  "typenum",
  "zeroize",
@@ -451,21 +500,24 @@ name = "libbz2-rs-sys"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0864a00c8d019e36216b69c2c4ce50b83b7bd966add3cf5ba554ec44f8bebcf5"
-dependencies = [
- "libc",
-]
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+
+[[package]]
+name = "libm"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "libz-rs-sys"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a"
+checksum = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221"
 dependencies = [
  "zlib-rs",
 ]
@@ -476,6 +528,29 @@ version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
+[[package]]
+name = "lz4"
+version = "1.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a20b523e860d03443e98350ceaac5e71c6ba89aea7d960769ec3ce37f4de5af4"
+dependencies = [
+ "lz4-sys",
+]
+
+[[package]]
+name = "lz4-sys"
+version = "1.11.1+lz4-1.10.0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "lzma-sys"
+version = "0.1.20"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "magisk"
 version = "0.0.0"
@@ -499,16 +574,16 @@ version = "0.0.0"
 dependencies = [
  "argh",
  "base",
- "block-buffer",
  "bytemuck",
  "byteorder",
+ "bzip2",
  "cxx",
  "cxx-gen",
  "der",
  "digest",
  "fdt",
- "libbz2-rs-sys",
- "libz-rs-sys",
+ "flate2",
+ "lz4",
  "num-traits",
  "p256",
  "p384",
@@ -516,11 +591,12 @@ dependencies = [
  "pb-rs",
  "quick-protobuf",
  "rsa",
- "sec1",
  "sha1",
  "sha2",
  "size",
  "x509-cert",
+ "xz2",
+ "zopfli",
 ]
 
 [[package]]
@@ -555,6 +631,15 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -587,33 +672,35 @@ dependencies = [
 
 [[package]]
 name = "p256"
-version = "0.14.0-pre.2"
+version = "0.14.0-pre.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71f3fd64a9cad9c26ed7f734b152196d5e56376b9957c832bcca0de48a708080"
+checksum = "b42c06f1f28ff328cb76c95cb7aebd6734a8333b98bdac393bdc124d16561dcb"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
+ "primefield",
  "primeorder",
  "sha2",
 ]
 
 [[package]]
 name = "p384"
-version = "0.14.0-pre.2"
+version = "0.14.0-pre.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e19554fe6ee269c860a0f231cbba714e5cbef26a927c75d8e30ac9040a4b32e"
+checksum = "0c7594e57ef1ce505538e5a8e3485a21b930e99701bb65c8ede899a3a8213174"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
+ "primefield",
  "primeorder",
  "sha2",
 ]
 
 [[package]]
 name = "p521"
-version = "0.14.0-pre.2"
+version = "0.14.0-pre.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957df9b5e6a7542f6430ec5187a4cb66d8498946c38b23fd14562bce6e32e6de"
+checksum = "9396e2414ace7de7e0f3d544a5a07f129e39b28b2f08a35b3b7febdea36fd8e9"
 dependencies = [
  "base16ct",
  "ecdsa",
@@ -635,18 +722,18 @@ dependencies = [
 
 [[package]]
 name = "pem-rfc7468"
-version = "1.0.0-rc.2"
+version = "1.0.0-rc.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dfbfa5c6f0906884269722c5478e72fd4d6c0e24fe600332c6d62359567ce1"
+checksum = "a8e58fab693c712c0d4e88f8eb3087b6521d060bcaf76aeb20cb192d809115ba"
 dependencies = [
  "base64ct",
 ]
 
 [[package]]
 name = "pkcs1"
-version = "0.8.0-rc.1"
+version = "0.8.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226eb25e2c46c166ce498ac0f606ac623142d640064879ff445938accddff1e2"
+checksum = "24e16d93c725fa250577ffdec06ebbff4cae3625b0e2881ac43a5427797ee8d3"
 dependencies = [
  "der",
  "pkcs8",
@@ -655,34 +742,47 @@ dependencies = [
 
 [[package]]
 name = "pkcs8"
-version = "0.11.0-rc.2"
+version = "0.11.0-rc.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f22636de7c995e997ed3d8d2949b7414d4faba3efa7312a6c0e75d875a14bdd4"
+checksum = "3f1843d4345dfe1a55e487db747a04c01af50415b03e937410e0a41d8cc24ec7"
 dependencies = [
  "der",
  "spki",
 ]
 
 [[package]]
-name = "primefield"
-version = "0.14.0-pre.0"
+name = "pkg-config"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3f2ce0fa9cccdaf216230d151ce51a15298aef50ad76081a830128ecbc6428a"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "primefield"
+version = "0.14.0-pre.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bbeb92947a0d0d4b0cab5e2e6749acc44c81461eb3b1aff4dbb7acd0eb9f0ab"
+dependencies = [
+ "crypto-bigint",
+ "ff",
+ "rand_core",
+ "subtle",
+ "zeroize",
+]
 
 [[package]]
 name = "primeorder"
-version = "0.14.0-pre.2"
+version = "0.14.0-pre.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794117b388378d55629f78f61e64e182baa200bf59c1a8205e0c46508ce5873"
+checksum = "979936340c6e8b108ad132b395a1682f02a0b179080ed3380320c2c888728429"
 dependencies = [
  "elliptic-curve",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -705,19 +805,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "rand_core"
-version = "0.6.4"
+name = "r-efi"
+version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
  "getrandom",
 ]
 
 [[package]]
 name = "rfc6979"
-version = "0.5.0-pre.4"
+version = "0.5.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "871ee76a3eee98b0f805e5d1caf26929f4565073c580c053a55f886fc15dea49"
+checksum = "f53f124bf3ec90be84ae97d7f52175ba938898525554c13c9017eb8f0a604146"
 dependencies = [
  "hmac",
  "subtle",
@@ -725,9 +831,9 @@ dependencies = [
 
 [[package]]
 name = "rsa"
-version = "0.10.0-pre.4"
+version = "0.10.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e82e90f434676d49758cab5b3ff2cc1fd8f12bf7d79b70c6088bc5a4e7c63270"
+checksum = "f30f0ad781aea19fe741d7a901b2ad8b4271ac3516e7045b8ecff74e201968fe"
 dependencies = [
  "const-oid",
  "crypto-bigint",
@@ -751,15 +857,15 @@ checksum = "a157657054ffe556d8858504af8a672a054a6e0bd9e8ee531059100c0fa11bb2"
 
 [[package]]
 name = "rustversion"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
 
 [[package]]
 name = "sec1"
-version = "0.8.0-rc.3"
+version = "0.8.0-rc.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1988446eff153796413a73669dfaa4caa3f5ce8b25fac89e3821a39c611772e"
+checksum = "e4855dd9b15e8e469fad23529698f7f7b7a6b250a81c88b1f9d7efe1abca7717"
 dependencies = [
  "base16ct",
  "der",
@@ -801,9 +907,9 @@ dependencies = [
 
 [[package]]
 name = "sha1"
-version = "0.11.0-pre.4"
+version = "0.11.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9540978cef7a8498211c1b1c14e5ce920fe5bd524ea84f4a3d72d4602515ae93"
+checksum = "6f9318facddf9ac32a33527066936837e189b3f23ced6edc1603720ead5e2b3d"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -812,9 +918,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.11.0-pre.4"
+version = "0.11.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "540c0893cce56cdbcfebcec191ec8e0f470dd1889b6e7a0b503e310a94a168f5"
+checksum = "aa1d2e6b3cc4e43a8258a9a3b17aa5dfd2cc5186c7024bba8a64aa65b2c71a59"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -829,14 +935,20 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signature"
-version = "2.3.0-pre.4"
+version = "3.0.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "054d71959c7051b9042c26af337f05cc930575ed2604d7d3ced3158383e59734"
+checksum = "b8852cecbd17ba45978bbbe43061ebe36a2ae376058c5c172e09f72888f8f7de"
 dependencies = [
  "digest",
  "rand_core",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "size"
 version = "0.5.0"
@@ -845,9 +957,9 @@ checksum = "1b6709c7b6754dca1311b3c73e79fcce40dd414c782c66d88e8823030093b02b"
 
 [[package]]
 name = "spki"
-version = "0.8.0-rc.1"
+version = "0.8.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ac66481418fd7afdc584adcf3be9aa572cf6c2858814494dc2a01755f050bc"
+checksum = "c2f0e2bdca9b00f5be6dd3bb6647d50fd0f24a508a95f78e3bb2fe98d0403c85"
 dependencies = [
  "base64ct",
  "der",
@@ -867,9 +979,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "f6397daf94fa90f058bd0fd88429dd9e5738999cca8d701813c80723add80462"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -952,9 +1064,12 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.14.2+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
 
 [[package]]
 name = "winapi-util"
@@ -1039,10 +1154,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
-name = "x509-cert"
-version = "0.3.0-pre.0"
+name = "wit-bindgen-rt"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2db382aa43c1fb5c419a960f72c3847ab0f383f635fc2e25f0bd6c5fb94371d1"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "x509-cert"
+version = "0.3.0-rc.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5c645061d1dc562a65edda59c7f688f35403a4615adfc07460437442d6e8383"
 dependencies = [
  "const-oid",
  "der",
@@ -1050,6 +1174,15 @@ dependencies = [
  "tls_codec",
 ]
 
+[[package]]
+name = "xz2"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
+dependencies = [
+ "lzma-sys",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.8.1"
@@ -1072,6 +1205,18 @@ dependencies = [
 
 [[package]]
 name = "zlib-rs"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8"
+checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a"
+
+[[package]]
+name = "zopfli"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "log",
+ "simd-adler32",
+]

native/src/Cargo.toml

@@ -10,44 +10,45 @@ edition = "2024"
 [workspace.dependencies]
 cxx = { path = "external/cxx-rs" }
 cxx-gen = { path = "external/cxx-rs/gen/lib" }
-libc = "0.2.171"
-cfg-if = "1.0.0"
+libc = "0.2.172"
+cfg-if = "1.0.1"
 num-traits = "0.2.19"
 num-derive = "0.4.2"
 thiserror = "2.0.12"
 byteorder = "1.5.0"
 size = "0.5.0"
-bytemuck = "1.22.0"
+bytemuck = "1.23.1"
 fdt = "0.1.5"
 const_format = "0.2.34"
 bit-set = "0.8.0"
-syn = "2.0.100"
+syn = "2.0.102"
 quote = "1.0.40"
-proc-macro2 = "1.0.94"
+proc-macro2 = "1.0.95"
 argh = { version = "0.1.13", default-features = false }
-libz-rs-sys = { version = "0.5.0", features = ["export-symbols"] }
-libbz2-rs-sys = { version = "0.1.3" }
 pb-rs = { version = "0.10.0", default-features = false }
 quick-protobuf = "0.8.1"
+flate2 = { version = "1.1.2", default-features = false }
+bzip2 = { version = "0.5.2", default-features = false }
+zopfli = "0.8.2"
+lz4 = "1.28.1"
+xz2 = "0.1.7"
 
 # Rust crypto crates are tied together
-sha1 = "=0.11.0-pre.4"
-sha2 = "=0.11.0-pre.4"
-digest = "=0.11.0-pre.9"
-p256 = "0.14.0-pre.2"
-p384 = "0.14.0-pre.2"
-p521 = "0.14.0-pre.2"
-rsa = "0.10.0-pre.4"
-x509-cert = "0.3.0-pre.0"
-der = "0.8.0-rc.1"
-
-# Pin version to prevent cargo update breaking builds
-block-buffer = "=0.11.0-rc.3"
-sec1 = "=0.8.0-rc.3"
+sha1 = "0.11.0-rc.0"
+sha2 = "0.11.0-rc.0"
+digest = "0.11.0-rc.0"
+p256 = "0.14.0-pre.5"
+p384 = "0.14.0-pre.5"
+p521 = "0.14.0-pre.5"
+rsa = "0.10.0-rc.0"
+x509-cert = "0.3.0-rc.0"
+der = "0.8.0-rc.4"
 
 [patch.crates-io]
 pb-rs = { git = "https://github.com/tafia/quick-protobuf.git" }
 quick-protobuf = { git = "https://github.com/tafia/quick-protobuf.git" }
+lz4-sys = { path = "external/lz4-sys" }
+lzma-sys = { path = "external/lzma-sys" }
 
 [profile.dev]
 opt-level = "z"

native/src/base/Android.mk

@@ -18,7 +18,6 @@ LOCAL_SRC_FILES := \
     files.cpp \
     misc.cpp \
     logging.cpp \
-    stream.cpp \
     base-rs.cpp \
     ../external/cxx-rs/src/cxx.cc
 include $(BUILD_STATIC_LIBRARY)

native/src/base/cstr.rs

@@ -1,7 +1,7 @@
 use cxx::{ExternType, type_id};
 use libc::c_char;
 use std::borrow::Borrow;
-use std::cmp::min;
+use std::cmp::{Ordering, min};
 use std::ffi::{CStr, FromBytesWithNulError, OsStr};
 use std::fmt::{Debug, Display, Formatter, Write};
 use std::ops::Deref;
@@ -68,7 +68,7 @@ pub mod buf {
 
 // Trait definitions
 
-pub trait Utf8CStrBuf: Write + AsRef<Utf8CStr> + Deref<Target = Utf8CStr> {
+pub trait Utf8CStrBuf: Display + Write + AsRef<Utf8CStr> + Deref<Target = Utf8CStr> {
     // The length of the string without the terminating null character.
     // assert_true(len <= capacity - 1)
     fn len(&self) -> usize;
@@ -467,6 +467,17 @@ macro_rules! impl_cstr_misc {
                 self.as_bytes_with_nul() == other.as_ref().as_bytes_with_nul()
             }
         }
+        impl<$($g)*> Eq for $t {}
+        impl<$($g)*> PartialOrd for $t {
+            fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+                Some(self.cmp(other))
+            }
+        }
+        impl<$($g)*> Ord for $t {
+            fn cmp(&self, other: &Self) -> Ordering {
+                self.as_str().cmp(other.as_str())
+            }
+        }
     )*}
 }
 

native/src/base/files.cpp

@@ -1,10 +1,8 @@
 #include <sys/mman.h>
 #include <sys/sendfile.h>
-#include <sys/sysmacros.h>
 #include <linux/fs.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <libgen.h>
 
 #include <base.hpp>
 
@@ -143,7 +141,7 @@ string resolve_preinit_dir(const char *base_dir) {
     if (access((dir + "/unencrypted").data(), F_OK) == 0) {
         dir += "/unencrypted/magisk";
     } else if (access((dir + "/adb").data(), F_OK) == 0) {
-        dir += "/adb/modules";
+        dir += "/adb";
     } else if (access((dir + "/watchdog").data(), F_OK) == 0) {
         dir += "/watchdog/magisk";
     } else {

native/src/base/files.rs

@@ -182,6 +182,10 @@ impl FileAttr {
     pub fn is_socket(&self) -> bool {
         self.is(libc::S_IFSOCK)
     }
+
+    pub fn is_whiteout(&self) -> bool {
+        self.is_char_device() && self.st.st_rdev == 0
+    }
 }
 
 const XATTR_NAME_SELINUX: &CStr = c"security.selinux";
@@ -261,6 +265,11 @@ impl Utf8CStr {
 
         let mut path = cstr::buf::default();
         let mut components = self.split('/').filter(|s| !s.is_empty());
+
+        if self.starts_with('/') {
+            path.append_path("/");
+        }
+
         loop {
             let Some(s) = components.next() else {
                 break;
@@ -316,12 +325,12 @@ impl Utf8CStr {
 
     pub fn set_attr<'a>(&'a self, attr: &'a FileAttr) -> OsResult<'a, ()> {
         unsafe {
-            if !attr.is_symlink() {
-                libc::chmod(self.as_ptr(), (attr.st.st_mode & 0o777).as_()).check_os_err(
-                    "chmod",
-                    Some(self),
-                    None,
-                )?;
+            if !attr.is_symlink() && libc::chmod(self.as_ptr(), (attr.st.st_mode & 0o777).as_()) < 0
+            {
+                let self_attr = self.get_attr()?;
+                if !self_attr.is_symlink() {
+                    return Err(OsError::last_os_error("chmod", Some(self), None));
+                }
             }
             libc::lchown(self.as_ptr(), attr.st.st_uid, attr.st.st_gid).check_os_err(
                 "lchown",
@@ -574,7 +583,7 @@ impl<S: Utf8CStrBuf + Sized> FsPathBuilder for S {
     }
 
     fn append_path_fmt<T: Display>(&mut self, name: T) -> &mut Self {
-        self.write_fmt(format_args!("/{}", name)).ok();
+        self.write_fmt(format_args!("/{name}")).ok();
         self
     }
 }
@@ -586,7 +595,7 @@ impl FsPathBuilder for dyn Utf8CStrBuf + '_ {
     }
 
     fn append_path_fmt<T: Display>(&mut self, name: T) -> &mut Self {
-        self.write_fmt(format_args!("/{}", name)).ok();
+        self.write_fmt(format_args!("/{name}")).ok();
         self
     }
 }
@@ -837,7 +846,7 @@ fn parse_mount_info_line(line: &str) -> Option<MountInfo> {
 
 pub fn parse_mount_info(pid: &str) -> Vec<MountInfo> {
     let mut res = vec![];
-    let mut path = format!("/proc/{}/mountinfo", pid);
+    let mut path = format!("/proc/{pid}/mountinfo");
     if let Ok(file) = Utf8CStr::from_string(&mut path).open(O_RDONLY | O_CLOEXEC) {
         BufReader::new(file).foreach_lines(|line| {
             parse_mount_info_line(line)

native/src/base/include/stream.hpp

@@ -1,129 +0,0 @@
-#pragma once
-
-#include <sys/uio.h>
-#include <cstdio>
-#include <memory>
-
-#include "../files.hpp"
-
-#define ENABLE_IOV 0
-
-struct out_stream {
-    virtual bool write(const void *buf, size_t len) = 0;
-#if ENABLE_IOV
-    virtual ssize_t writev(const iovec *iov, int iovcnt);
-#endif
-    virtual ~out_stream() = default;
-};
-
-using out_strm_ptr = std::unique_ptr<out_stream>;
-
-// Delegates all operations to base stream
-class filter_out_stream : public out_stream {
-public:
-    filter_out_stream(out_strm_ptr &&base) : base(std::move(base)) {}
-    bool write(const void *buf, size_t len) override;
-protected:
-    out_strm_ptr base;
-};
-
-// Buffered output stream, writing in chunks
-class chunk_out_stream : public filter_out_stream {
-public:
-    chunk_out_stream(out_strm_ptr &&base, size_t buf_sz, size_t chunk_sz)
-    : filter_out_stream(std::move(base)), chunk_sz(chunk_sz), data(buf_sz) {}
-
-    chunk_out_stream(out_strm_ptr &&base, size_t buf_sz = 4096)
-    : chunk_out_stream(std::move(base), buf_sz, buf_sz) {}
-
-    bool write(const void *buf, size_t len) final;
-
-protected:
-    // Classes inheriting this class has to call finalize() in its destructor
-    void finalize();
-    virtual bool write_chunk(const void *buf, size_t len, bool final);
-
-    size_t chunk_sz;
-
-private:
-    size_t buf_off = 0;
-    heap_data data;
-};
-
-struct in_stream {
-    virtual ssize_t read(void *buf, size_t len) = 0;
-    ssize_t readFully(void *buf, size_t len);
-#if ENABLE_IOV
-    virtual ssize_t readv(const iovec *iov, int iovcnt);
-#endif
-    virtual ~in_stream() = default;
-};
-
-// A stream is something that is writable and readable
-struct stream : public out_stream, public in_stream {};
-
-using stream_ptr = std::unique_ptr<stream>;
-
-// Byte stream that dynamically allocates memory
-class byte_stream : public stream {
-public:
-    byte_stream(heap_data &data) : _data(data) {}
-
-    ssize_t read(void *buf, size_t len) override;
-    bool write(const void *buf, size_t len) override;
-
-private:
-    heap_data &_data;
-    size_t _pos = 0;
-    size_t _cap = 0;
-
-    void resize(size_t new_sz, bool zero = false);
-};
-
-class rust_vec_stream : public stream {
-public:
-    rust_vec_stream(rust::Vec<uint8_t> &data) : _data(data) {}
-
-    ssize_t read(void *buf, size_t len) override;
-    bool write(const void *buf, size_t len) override;
-
-private:
-    rust::Vec<uint8_t> &_data;
-    size_t _pos = 0;
-
-    void ensure_size(size_t sz, bool zero = false);
-};
-
-class file_stream : public stream {
-public:
-    bool write(const void *buf, size_t len) final;
-protected:
-    virtual ssize_t do_write(const void *buf, size_t len) = 0;
-};
-
-// File stream but does not close the file descriptor at any time
-class fd_stream : public file_stream {
-public:
-    fd_stream(int fd) : fd(fd) {}
-    ssize_t read(void *buf, size_t len) override;
-#if ENABLE_IOV
-    ssize_t readv(const iovec *iov, int iovcnt) override;
-    ssize_t writev(const iovec *iov, int iovcnt) override;
-#endif
-protected:
-    ssize_t do_write(const void *buf, size_t len) override;
-private:
-    int fd;
-};
-
-/* ****************************************
- * Bridge between stream class and C stdio
- * ****************************************/
-
-// stream_ptr -> sFILE
-sFILE make_stream_fp(stream_ptr &&strm);
-
-template <class T, class... Args>
-sFILE make_stream_fp(Args &&... args) {
-    return make_stream_fp(stream_ptr(new T(std::forward<Args>(args)...)));
-}

native/src/base/lib.rs

@@ -1,6 +1,4 @@
 #![allow(clippy::missing_safety_doc)]
-#![feature(format_args_nl)]
-#![feature(io_error_more)]
 
 pub use const_format;
 pub use libc;
@@ -58,7 +56,6 @@ pub mod ffi {
         fn set_log_level_state_cxx(level: LogLevelCxx, enabled: bool);
         fn exit_on_error(b: bool);
         fn cmdline_logging();
-        fn resize_vec(vec: &mut Vec<u8>, size: usize);
     }
 
     #[namespace = "rust"]
@@ -80,12 +77,3 @@ fn set_log_level_state_cxx(level: ffi::LogLevelCxx, enabled: bool) {
         set_log_level_state(level, enabled)
     }
 }
-
-fn resize_vec(vec: &mut Vec<u8>, size: usize) {
-    if size > vec.len() {
-        vec.reserve(size - vec.len());
-    }
-    unsafe {
-        vec.set_len(size);
-    }
-}

native/src/base/logging.cpp

@@ -1,5 +1,4 @@
 #include <cstdio>
-#include <cstdlib>
 
 #include <android/log.h>
 

native/src/base/logging.rs

@@ -1,5 +1,4 @@
 use std::fmt;
-use std::fmt::Arguments;
 use std::io::{Write, stderr, stdout};
 use std::process::exit;
 
@@ -102,10 +101,6 @@ pub fn log_with_formatter<F: FnOnce(Formatter) -> fmt::Result>(level: LogLevel,
     });
 }
 
-pub fn log_with_args(level: LogLevel, args: Arguments) {
-    log_with_formatter(level, |w| w.write_fmt(args));
-}
-
 pub fn cmdline_logging() {
     fn cmdline_write(level: LogLevel, msg: &Utf8CStr) {
         if matches!(level, LogLevel::Info) {
@@ -124,24 +119,31 @@ pub fn cmdline_logging() {
     }
 }
 
+#[macro_export]
+macro_rules! log_with_args {
+    ($level:expr, $($args:tt)+) => {
+        $crate::log_with_formatter($level, |w| writeln!(w, $($args)+))
+    }
+}
+
 #[macro_export]
 macro_rules! error {
     ($($args:tt)+) => {
-        $crate::log_with_args($crate::LogLevel::Error, format_args_nl!($($args)+))
+        $crate::log_with_formatter($crate::LogLevel::Error, |w| writeln!(w, $($args)+))
     }
 }
 
 #[macro_export]
 macro_rules! warn {
     ($($args:tt)+) => {
-        $crate::log_with_args($crate::LogLevel::Warn, format_args_nl!($($args)+))
+        $crate::log_with_formatter($crate::LogLevel::Warn, |w| writeln!(w, $($args)+))
     }
 }
 
 #[macro_export]
 macro_rules! info {
     ($($args:tt)+) => {
-        $crate::log_with_args($crate::LogLevel::Info, format_args_nl!($($args)+))
+        $crate::log_with_formatter($crate::LogLevel::Info, |w| writeln!(w, $($args)+))
     }
 }
 
@@ -149,7 +151,7 @@ macro_rules! info {
 #[macro_export]
 macro_rules! debug {
     ($($args:tt)+) => {
-        $crate::log_with_args($crate::LogLevel::Debug, format_args_nl!($($args)+))
+        $crate::log_with_formatter($crate::LogLevel::Debug, |w| writeln!(w, $($args)+))
     }
 }
 

native/src/base/misc.cpp

@@ -1,9 +1,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/prctl.h>
-#include <sys/sysmacros.h>
 #include <fcntl.h>
-#include <pwd.h>
 #include <unistd.h>
 #include <syscall.h>
 #include <random>
@@ -186,6 +184,10 @@ int parse_int(string_view s) {
     return parse_num<int, 10>(s);
 }
 
+uint32_t parse_uint32_hex(string_view s) {
+    return parse_num<uint32_t, 16>(s);
+}
+
 int switch_mnt_ns(int pid) {
     int ret = -1;
     int fd = syscall(__NR_pidfd_open, pid, 0);

native/src/base/misc.hpp

@@ -147,17 +147,12 @@ struct byte_data : public byte_view {
     rust::Vec<size_t> patch(byte_view from, byte_view to);
 };
 
-class byte_stream;
-
 struct heap_data : public byte_data {
     ALLOW_MOVE_ONLY(heap_data)
 
     heap_data() = default;
     explicit heap_data(size_t sz) : byte_data(calloc(sz, 1), sz) {}
     ~heap_data() { free(_buf); }
-
-    // byte_stream needs to reallocate the internal buffer
-    friend byte_stream;
 };
 
 struct owned_fd {
@@ -180,6 +175,7 @@ rust::Vec<size_t> mut_u8_patch(
         rust::Slice<const uint8_t> from,
         rust::Slice<const uint8_t> to);
 
+uint32_t parse_uint32_hex(std::string_view s);
 int parse_int(std::string_view s);
 
 using thread_entry = void *(*)(void *);

native/src/base/misc.rs

@@ -99,7 +99,7 @@ impl<T> EarlyExitExt<T> for Result<T, EarlyExit> {
                     exit(0)
                 }
                 Err(_) => {
-                    eprintln!("{}", output);
+                    eprintln!("{output}");
                     print_help_msg();
                     exit(1)
                 }
@@ -169,3 +169,61 @@ impl<T: Default> Default for AtomicArc<T> {
         Self::new(Default::default())
     }
 }
+
+pub struct Chunker {
+    chunk: Box<[u8]>,
+    chunk_size: usize,
+    pos: usize,
+}
+
+impl Chunker {
+    pub fn new(chunk_size: usize) -> Self {
+        Chunker {
+            // SAFETY: all bytes will be initialized before it is used, tracked by self.pos
+            chunk: unsafe { Box::new_uninit_slice(chunk_size).assume_init() },
+            chunk_size,
+            pos: 0,
+        }
+    }
+
+    pub fn set_chunk_size(&mut self, chunk_size: usize) {
+        self.chunk_size = chunk_size;
+        self.pos = 0;
+        if self.chunk.len() < chunk_size {
+            self.chunk = unsafe { Box::new_uninit_slice(chunk_size).assume_init() };
+        }
+    }
+
+    // Returns (remaining buf, Option<Chunk>)
+    pub fn add_data<'a, 'b: 'a>(&'a mut self, mut buf: &'b [u8]) -> (&'b [u8], Option<&'a [u8]>) {
+        let mut chunk = None;
+        if self.pos > 0 {
+            // Try to fill the chunk
+            let len = std::cmp::min(self.chunk_size - self.pos, buf.len());
+            self.chunk[self.pos..self.pos + len].copy_from_slice(&buf[..len]);
+            self.pos += len;
+            // If the chunk is filled, consume it
+            if self.pos == self.chunk_size {
+                chunk = Some(&self.chunk[..self.chunk_size]);
+                self.pos = 0;
+            }
+            buf = &buf[len..];
+        } else if buf.len() >= self.chunk_size {
+            // Directly consume a chunk from buf
+            chunk = Some(&buf[..self.chunk_size]);
+            buf = &buf[self.chunk_size..];
+        } else {
+            // Copy buf into chunk
+            self.chunk[self.pos..self.pos + buf.len()].copy_from_slice(buf);
+            self.pos += buf.len();
+            return (&[], None);
+        }
+        (buf, chunk)
+    }
+
+    pub fn get_available(&mut self) -> &[u8] {
+        let chunk = &self.chunk[..self.pos];
+        self.pos = 0;
+        chunk
+    }
+}

native/src/base/mount.rs

@@ -3,13 +3,14 @@ use libc::c_ulong;
 use std::ptr;
 
 impl Utf8CStr {
-    pub fn bind_mount_to<'a>(&'a self, path: &'a Utf8CStr) -> OsResult<'a, ()> {
+    pub fn bind_mount_to<'a>(&'a self, path: &'a Utf8CStr, rec: bool) -> OsResult<'a, ()> {
+        let flag = if rec { libc::MS_REC } else { 0 };
         unsafe {
             libc::mount(
                 self.as_ptr(),
                 path.as_ptr(),
                 ptr::null(),
-                libc::MS_BIND,
+                libc::MS_BIND | flag,
                 ptr::null(),
             )
             .check_os_err("bind_mount", Some(self), Some(path))

native/src/base/result.rs

@@ -24,7 +24,7 @@ pub type LoggedResult<T> = Result<T, LoggedError>;
 #[macro_export]
 macro_rules! log_err {
     ($($args:tt)+) => {{
-        $crate::log_with_args($crate::LogLevel::Error, format_args_nl!($($args)+));
+        $crate::error!($($args)+);
         $crate::LoggedError::default()
     }};
 }
@@ -148,12 +148,9 @@ impl<T, E: Display> Loggable<T> for Result<T, E> {
             Ok(v) => Ok(v),
             Err(e) => {
                 if let Some(caller) = caller {
-                    log_with_args(
-                        level,
-                        format_args_nl!("[{}:{}] {:#}", caller.file(), caller.line(), e),
-                    );
+                    log_with_args!(level, "[{}:{}] {:#}", caller.file(), caller.line(), e);
                 } else {
-                    log_with_args(level, format_args_nl!("{:#}", e));
+                    log_with_args!(level, "{:#}", e);
                 }
                 Err(LoggedError::default())
             }
@@ -174,7 +171,7 @@ impl<T, E: Display> Loggable<T> for Result<T, E> {
                         write!(w, "[{}:{}] ", caller.file(), caller.line())?;
                     }
                     f(w)?;
-                    writeln!(w, ": {:#}", e)
+                    writeln!(w, ": {e:#}")
                 });
                 Err(LoggedError::default())
             }
@@ -186,7 +183,7 @@ impl<T, E: Display> Loggable<T> for Result<T, E> {
 impl<T: Display> From<T> for LoggedError {
     #[cfg(not(debug_assertions))]
     fn from(e: T) -> Self {
-        log_with_args(LogLevel::Error, format_args_nl!("{:#}", e));
+        log_with_args!(LogLevel::Error, "{:#}", e);
         LoggedError::default()
     }
 
@@ -194,9 +191,12 @@ impl<T: Display> From<T> for LoggedError {
     #[cfg(debug_assertions)]
     fn from(e: T) -> Self {
         let caller = Location::caller();
-        log_with_args(
+        log_with_args!(
             LogLevel::Error,
-            format_args_nl!("[{}:{}] {:#}", caller.file(), caller.line(), e),
+            "[{}:{}] {:#}",
+            caller.file(),
+            caller.line(),
+            e
         );
         LoggedError::default()
     }
@@ -366,7 +366,7 @@ impl Display for OsError<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let error = self.as_io_error();
         if self.name.is_empty() {
-            write!(f, "{:#}", error)
+            write!(f, "{error:#}")
         } else {
             match (self.arg1.ok(), self.arg2.ok()) {
                 (Some(arg1), Some(arg2)) => {

native/src/base/stream.cpp

@@ -1,201 +0,0 @@
-#include <unistd.h>
-#include <cstddef>
-
-#include <base.hpp>
-#include <stream.hpp>
-
-using namespace std;
-
-static int strm_read(void *v, char *buf, int len) {
-    auto strm = static_cast<stream *>(v);
-    return strm->read(buf, len);
-}
-
-static int strm_write(void *v, const char *buf, int len) {
-    auto strm = static_cast<stream *>(v);
-    if (!strm->write(buf, len))
-        return -1;
-    return len;
-}
-
-static int strm_close(void *v) {
-    auto strm = static_cast<stream *>(v);
-    delete strm;
-    return 0;
-}
-
-sFILE make_stream_fp(stream_ptr &&strm) {
-    auto fp = make_file(funopen(strm.release(), strm_read, strm_write, nullptr, strm_close));
-    setbuf(fp.get(), nullptr);
-    return fp;
-}
-
-ssize_t in_stream::readFully(void *buf, size_t len) {
-    size_t read_sz = 0;
-    ssize_t ret;
-    do {
-        ret = read((byte *) buf + read_sz, len - read_sz);
-        if (ret < 0) {
-            if (errno == EINTR)
-                continue;
-            return ret;
-        }
-        read_sz += ret;
-    } while (read_sz != len && ret != 0);
-    return read_sz;
-}
-
-bool filter_out_stream::write(const void *buf, size_t len) {
-    return base->write(buf, len);
-}
-
-bool chunk_out_stream::write(const void *_in, size_t len) {
-    auto in = static_cast<const uint8_t *>(_in);
-    while (len) {
-        if (buf_off + len >= chunk_sz) {
-            // Enough input for a chunk
-            const uint8_t *src;
-            if (buf_off) {
-                src = data.buf();
-                auto copy = chunk_sz - buf_off;
-                memcpy(data.buf() + buf_off, in, copy);
-                in += copy;
-                len -= copy;
-                buf_off = 0;
-            } else {
-                src = in;
-                in += chunk_sz;
-                len -= chunk_sz;
-            }
-            if (!write_chunk(src, chunk_sz, false))
-                return false;
-        } else {
-            // Buffer internally
-            memcpy(data.buf() + buf_off, in, len);
-            buf_off += len;
-            break;
-        }
-    }
-    return true;
-}
-
-bool chunk_out_stream::write_chunk(const void *buf, size_t len, bool) {
-    return base->write(buf, len);
-}
-
-void chunk_out_stream::finalize() {
-    if (buf_off) {
-        if (!write_chunk(data.buf(), buf_off, true)) {
-            LOGE("Error in finalize, file truncated\n");
-        }
-        buf_off = 0;
-    }
-}
-
-ssize_t byte_stream::read(void *buf, size_t len) {
-    len = std::min((size_t) len, _data._sz- _pos);
-    memcpy(buf, _data.buf() + _pos, len);
-    _pos += len;
-    return len;
-}
-
-bool byte_stream::write(const void *buf, size_t len) {
-    resize(_pos + len);
-    memcpy(_data.buf() + _pos, buf, len);
-    _pos += len;
-    _data._sz= std::max(_data.sz(), _pos);
-    return true;
-}
-
-void byte_stream::resize(size_t new_sz, bool zero) {
-    bool resize = false;
-    size_t old_cap = _cap;
-    while (new_sz > _cap) {
-        _cap = _cap ? (_cap << 1) - (_cap >> 1) : 1 << 12;
-        resize = true;
-    }
-    if (resize) {
-        _data._buf = static_cast<uint8_t *>(::realloc(_data._buf, _cap));
-        if (zero)
-            memset(_data.buf() + old_cap, 0, _cap - old_cap);
-    }
-}
-
-ssize_t rust_vec_stream::read(void *buf, size_t len) {
-    len = std::min<size_t>(len, _data.size() - _pos);
-    memcpy(buf, _data.data() + _pos, len);
-    _pos += len;
-    return len;
-}
-
-bool rust_vec_stream::write(const void *buf, size_t len) {
-    ensure_size(_pos + len);
-    memcpy(_data.data() + _pos, buf, len);
-    _pos += len;
-    return true;
-}
-
-void rust_vec_stream::ensure_size(size_t sz, bool zero) {
-    size_t old_sz = _data.size();
-    if (sz > old_sz) {
-        resize_vec(_data, sz);
-        if (zero)
-            memset(_data.data() + old_sz, 0, sz - old_sz);
-    }
-}
-
-ssize_t fd_stream::read(void *buf, size_t len) {
-    return ::read(fd, buf, len);
-}
-
-ssize_t fd_stream::do_write(const void *buf, size_t len) {
-    return ::write(fd, buf, len);
-}
-
-bool file_stream::write(const void *buf, size_t len) {
-    size_t write_sz = 0;
-    ssize_t ret;
-    do {
-        ret = do_write((byte *) buf + write_sz, len - write_sz);
-        if (ret < 0) {
-            if (errno == EINTR)
-                continue;
-            return false;
-        }
-        write_sz += ret;
-    } while (write_sz != len && ret != 0);
-    return true;
-}
-
-#if ENABLE_IOV
-
-ssize_t in_stream::readv(const iovec *iov, int iovcnt) {
-    size_t read_sz = 0;
-    for (int i = 0; i < iovcnt; ++i) {
-        auto ret = readFully(iov[i].iov_base, iov[i].iov_len);
-        if (ret < 0)
-            return ret;
-        read_sz += ret;
-    }
-    return read_sz;
-}
-
-ssize_t out_stream::writev(const iovec *iov, int iovcnt) {
-    size_t write_sz = 0;
-    for (int i = 0; i < iovcnt; ++i) {
-        if (!write(iov[i].iov_base, iov[i].iov_len))
-            return write_sz;
-        write_sz += iov[i].iov_len;
-    }
-    return write_sz;
-}
-
-ssize_t fd_stream::readv(const iovec *iov, int iovcnt) {
-    return ::readv(fd, iov, iovcnt);
-}
-
-ssize_t fd_stream::writev(const iovec *iov, int iovcnt) {
-    return ::writev(fd, iov, iovcnt);
-}
-
-#endif // ENABLE_IOV

native/src/boot/Cargo.toml

@@ -30,9 +30,8 @@ der = { workspace = true, features = ["derive", "pem"] }
 fdt = { workspace = true }
 bytemuck = { workspace = true, features = ["derive", "min_const_generics"] }
 num-traits = { workspace = true }
-libz-rs-sys = { workspace = true }
-libbz2-rs-sys = { workspace = true }
-
-# Pin version to prevent cargo update break builds
-block-buffer = { workspace = true }
-sec1 = { workspace = true }
+flate2 = { workspace = true, features = ["zlib-rs"] }
+bzip2 = { workspace = true, features = ["libbz2-rs-sys"] }
+lz4 = { workspace = true }
+xz2 = { workspace = true }
+zopfli = { workspace = true, features = ["gzip"] }

native/src/boot/bootimg.cpp

@@ -8,7 +8,6 @@
 #include "boot-rs.hpp"
 #include "bootimg.hpp"
 #include "magiskboot.hpp"
-#include "compress.hpp"
 
 using namespace std;
 
@@ -16,17 +15,13 @@ using namespace std;
 #define SHA256_DIGEST_SIZE 32
 #define SHA_DIGEST_SIZE 20
 
-static void decompress(format_t type, int fd, const void *in, size_t size) {
-    auto ptr = get_decoder(type, make_unique<fd_stream>(fd));
-    ptr->write(in, size);
+static void decompress(FileFormat type, int fd, const void *in, size_t size) {
+    decompress_bytes(type, byte_view { in, size }, fd);
 }
 
-static off_t compress(format_t type, int fd, const void *in, size_t size) {
+static off_t compress_len(FileFormat type, byte_view in, int fd) {
     auto prev = lseek(fd, 0, SEEK_CUR);
-    {
-        auto strm = get_encoder(type, make_unique<fd_stream>(fd));
-        strm->write(in, size);
-    }
+    compress_bytes(type, in, fd);
     auto now = lseek(fd, 0, SEEK_CUR);
     return now - prev;
 }
@@ -48,6 +43,11 @@ static size_t restore(int fd, const char *filename) {
     return size;
 }
 
+static bool check_env(const char *name) {
+    const char *val = getenv(name);
+    return val != nullptr && val == "true"sv;
+}
+
 void dyn_img_hdr::print() const {
     uint32_t ver = header_version();
     fprintf(stderr, "%-*s [%u]\n", PADDING, "HEADER_VER", ver);
@@ -149,29 +149,30 @@ void dyn_img_hdr::load_hdr_file() {
     });
 }
 
-boot_img::boot_img(const char *image) : map(image) {
+boot_img::boot_img(const char *image) :
+map(image), k_fmt(FileFormat::UNKNOWN), r_fmt(FileFormat::UNKNOWN), e_fmt(FileFormat::UNKNOWN) {
     fprintf(stderr, "Parsing boot image: [%s]\n", image);
     for (const uint8_t *addr = map.buf(); addr < map.buf() + map.sz(); ++addr) {
-        format_t fmt = check_fmt(addr, map.sz());
+        FileFormat fmt = check_fmt(addr, map.sz());
         switch (fmt) {
-        case CHROMEOS:
+        case FileFormat::CHROMEOS:
             // chromeos require external signing
             flags[CHROMEOS_FLAG] = true;
             addr += 65535;
             break;
-        case DHTB:
+        case FileFormat::DHTB:
             flags[DHTB_FLAG] = true;
             flags[SEANDROID_FLAG] = true;
             fprintf(stderr, "DHTB_HDR\n");
             addr += sizeof(dhtb_hdr) - 1;
             break;
-        case BLOB:
+        case FileFormat::BLOB:
             flags[BLOB_FLAG] = true;
             fprintf(stderr, "TEGRA_BLOB\n");
             addr += sizeof(blob_hdr) - 1;
             break;
-        case AOSP:
-        case AOSP_VENDOR:
+        case FileFormat::AOSP:
+        case FileFormat::AOSP_VENDOR:
             if (parse_image(addr, fmt))
                 return;
             // fallthrough
@@ -257,9 +258,9 @@ static int find_dtb_offset(const uint8_t *buf, unsigned sz) {
     return -1;
 }
 
-static format_t check_fmt_lg(const uint8_t *buf, unsigned sz) {
-    format_t fmt = check_fmt(buf, sz);
-    if (fmt == LZ4_LEGACY) {
+static FileFormat check_fmt_lg(const uint8_t *buf, unsigned sz) {
+    FileFormat fmt = check_fmt(buf, sz);
+    if (fmt == FileFormat::LZ4_LEGACY) {
         // We need to check if it is LZ4_LG
         uint32_t off = 4;
         uint32_t block_sz;
@@ -267,7 +268,7 @@ static format_t check_fmt_lg(const uint8_t *buf, unsigned sz) {
             memcpy(&block_sz, buf + off, sizeof(block_sz));
             off += sizeof(block_sz);
             if (off + block_sz > sz)
-                return LZ4_LG;
+                return FileFormat::LZ4_LG;
             off += block_sz;
         }
     }
@@ -276,8 +277,8 @@ static format_t check_fmt_lg(const uint8_t *buf, unsigned sz) {
 
 #define CMD_MATCH(s) BUFFER_MATCH(h->cmdline, s)
 
-pair<const uint8_t *, dyn_img_hdr *> boot_img::create_hdr(const uint8_t *addr, format_t type) {
-    if (type == AOSP_VENDOR) {
+pair<const uint8_t *, dyn_img_hdr *> boot_img::create_hdr(const uint8_t *addr, FileFormat type) {
+    if (type == FileFormat::AOSP_VENDOR) {
         fprintf(stderr, "VENDOR_BOOT_HDR\n");
         auto h = reinterpret_cast<const boot_img_hdr_vnd_v3*>(addr);
         switch (h->header_version) {
@@ -377,7 +378,7 @@ off += hdr->name##_size();              \
 off = align_to(off, hdr->page_size());  \
 assert_off();
 
-bool boot_img::parse_image(const uint8_t *p, format_t type) {
+bool boot_img::parse_image(const uint8_t *p, FileFormat type) {
     auto [base_addr, hdr] = create_hdr(p, type);
     if (hdr == nullptr) {
         fprintf(stderr, "Invalid boot image header!\n");
@@ -419,7 +420,7 @@ bool boot_img::parse_image(const uint8_t *p, format_t type) {
         }
 
         k_fmt = check_fmt_lg(kernel, hdr->kernel_size());
-        if (k_fmt == MTK) {
+        if (k_fmt == FileFormat::MTK) {
             fprintf(stderr, "MTK_KERNEL_HDR\n");
             flags[MTK_KERNEL] = true;
             k_hdr = reinterpret_cast<const mtk_hdr *>(kernel);
@@ -429,14 +430,14 @@ bool boot_img::parse_image(const uint8_t *p, format_t type) {
             hdr->kernel_size() -= sizeof(mtk_hdr);
             k_fmt = check_fmt_lg(kernel, hdr->kernel_size());
         }
-        if (k_fmt == ZIMAGE) {
+        if (k_fmt == FileFormat::ZIMAGE) {
             z_hdr = reinterpret_cast<const zimage_hdr *>(kernel);
 
             const uint8_t* found_pos = 0;
-            
+
             for (const uint8_t* search_pos = kernel + 0x28; search_pos < kernel + hdr->kernel_size(); search_pos++) {
                 //                                  ^^^^^^ +0x28 to search after zimage header and magic
-                if (check_fmt_lg(search_pos, hdr->kernel_size() - (search_pos - kernel)) != UNKNOWN) {
+                if (check_fmt_lg(search_pos, hdr->kernel_size() - (search_pos - kernel)) != FileFormat::UNKNOWN) {
                     found_pos = search_pos;
                     search_pos = kernel + hdr->kernel_size();
                 }
@@ -488,7 +489,7 @@ bool boot_img::parse_image(const uint8_t *p, format_t type) {
                     reinterpret_cast<table_entry *>(vendor_ramdisk_table),
                     hdr->vendor_ramdisk_table_entry_num());
             for (auto &it : table) {
-                format_t fmt = check_fmt_lg(ramdisk + it.ramdisk_offset, it.ramdisk_size);
+                FileFormat fmt = check_fmt_lg(ramdisk + it.ramdisk_offset, it.ramdisk_size);
                 fprintf(stderr,
                         "%-*s name=[%s] type=[%s] size=[%u] fmt=[%s]\n", PADDING, "VND_RAMDISK",
                         it.ramdisk_name, vendor_ramdisk_type(it.ramdisk_type),
@@ -496,7 +497,7 @@ bool boot_img::parse_image(const uint8_t *p, format_t type) {
             }
         } else {
             r_fmt = check_fmt_lg(ramdisk, size);
-            if (r_fmt == MTK) {
+            if (r_fmt == FileFormat::MTK) {
                 fprintf(stderr, "MTK_RAMDISK_HDR\n");
                 flags[MTK_RAMDISK] = true;
                 r_hdr = reinterpret_cast<const mtk_hdr *>(ramdisk);
@@ -555,8 +556,8 @@ bool boot_img::verify(const char *cert) const {
 int split_image_dtb(const char *filename, bool skip_decomp) {
     mmap_data img(filename);
 
-    if (int off = find_dtb_offset(img.buf(), img.sz()); off > 0) {
-        format_t fmt = check_fmt_lg(img.buf(), img.sz());
+    if (size_t off = find_dtb_offset(img.buf(), img.sz()); off > 0) {
+        FileFormat fmt = check_fmt_lg(img.buf(), img.sz());
         if (!skip_decomp && COMPRESSED(fmt)) {
             int fd = creat(KERNEL_FILE, 0644);
             decompress(fmt, fd, img.buf(), off);
@@ -609,7 +610,7 @@ int unpack(const char *image, bool skip_decomp, bool hdr) {
                 ssprintf(file_name, sizeof(file_name), "%s.cpio", it.ramdisk_name);
             }
             owned_fd fd = xopenat(dirfd, file_name, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644);
-            format_t fmt = check_fmt_lg(boot.ramdisk + it.ramdisk_offset, it.ramdisk_size);
+            FileFormat fmt = check_fmt_lg(boot.ramdisk + it.ramdisk_offset, it.ramdisk_size);
             if (!skip_decomp && COMPRESSED(fmt)) {
                 decompress(fmt, fd, boot.ramdisk + it.ramdisk_offset, it.ramdisk_size);
             } else {
@@ -719,8 +720,8 @@ void repack(const char *src_img, const char *out_img, bool skip_comp) {
         mmap_data m(KERNEL_FILE);
         if (!skip_comp && !COMPRESSED_ANY(check_fmt(m.buf(), m.sz())) && COMPRESSED(boot.k_fmt)) {
             // Always use zopfli for zImage compression
-            auto fmt = (boot.flags[ZIMAGE_KERNEL] && boot.k_fmt == GZIP) ? ZOPFLI : boot.k_fmt;
-            hdr->kernel_size() = compress(fmt, fd, m.buf(), m.sz());
+            auto fmt = (boot.flags[ZIMAGE_KERNEL] && boot.k_fmt == FileFormat::GZIP) ? FileFormat::ZOPFLI : boot.k_fmt;
+            hdr->kernel_size() = compress_len(fmt, m, fd);
         } else {
             hdr->kernel_size() = xwrite(fd, m.buf(), m.sz());
         }
@@ -783,10 +784,10 @@ void repack(const char *src_img, const char *out_img, bool skip_comp) {
                 ssprintf(file_name, sizeof(file_name), "%s.cpio", it.ramdisk_name);
             }
             mmap_data m(dirfd, file_name);
-            format_t fmt = check_fmt_lg(boot.ramdisk + it.ramdisk_offset, it.ramdisk_size);
+            FileFormat fmt = check_fmt_lg(boot.ramdisk + it.ramdisk_offset, it.ramdisk_size);
             it.ramdisk_offset = ramdisk_offset;
             if (!skip_comp && !COMPRESSED_ANY(check_fmt(m.buf(), m.sz())) && COMPRESSED(fmt)) {
-                it.ramdisk_size = compress(fmt, fd, m.buf(), m.sz());
+                it.ramdisk_size = compress_len(fmt, m, fd);
             } else {
                 it.ramdisk_size = xwrite(fd, m.buf(), m.sz());
             }
@@ -798,15 +799,15 @@ void repack(const char *src_img, const char *out_img, bool skip_comp) {
     } else if (access(RAMDISK_FILE, R_OK) == 0) {
         mmap_data m(RAMDISK_FILE);
         auto r_fmt = boot.r_fmt;
-        if (!skip_comp && !hdr->is_vendor() && hdr->header_version() == 4 && r_fmt != LZ4_LEGACY) {
+        if (!skip_comp && !hdr->is_vendor() && hdr->header_version() == 4 && r_fmt != FileFormat::LZ4_LEGACY) {
             // A v4 boot image ramdisk will have to be merged with other vendor ramdisks,
             // and they have to use the exact same compression method. v4 GKIs are required to
             // use lz4 (legacy), so hardcode the format here.
-            fprintf(stderr, "RAMDISK_FMT: [%s] -> [%s]\n", fmt2name[r_fmt], fmt2name[LZ4_LEGACY]);
-            r_fmt = LZ4_LEGACY;
+            fprintf(stderr, "RAMDISK_FMT: [%s] -> [%s]\n", fmt2name[r_fmt], fmt2name[FileFormat::LZ4_LEGACY]);
+            r_fmt = FileFormat::LZ4_LEGACY;
         }
         if (!skip_comp && !COMPRESSED_ANY(check_fmt(m.buf(), m.sz())) && COMPRESSED(r_fmt)) {
-            hdr->ramdisk_size() = compress(r_fmt, fd, m.buf(), m.sz());
+            hdr->ramdisk_size() = compress_len(r_fmt, m, fd);
         } else {
             hdr->ramdisk_size() = xwrite(fd, m.buf(), m.sz());
         }
@@ -825,7 +826,7 @@ void repack(const char *src_img, const char *out_img, bool skip_comp) {
     if (access(EXTRA_FILE, R_OK) == 0) {
         mmap_data m(EXTRA_FILE);
         if (!skip_comp && !COMPRESSED_ANY(check_fmt(m.buf(), m.sz())) && COMPRESSED(boot.e_fmt)) {
-            hdr->extra_size() = compress(boot.e_fmt, fd, m.buf(), m.sz());
+            hdr->extra_size() = compress_len(boot.e_fmt, m, fd);
         } else {
             hdr->extra_size() = xwrite(fd, m.buf(), m.sz());
         }

native/src/boot/bootimg.hpp

@@ -610,9 +610,9 @@ struct boot_img {
     std::bitset<BOOT_FLAGS_MAX> flags;
 
     // The format of kernel, ramdisk and extra
-    format_t k_fmt = UNKNOWN;
-    format_t r_fmt = UNKNOWN;
-    format_t e_fmt = UNKNOWN;
+    FileFormat k_fmt;
+    FileFormat r_fmt;
+    FileFormat e_fmt;
 
     /*************************************************************
      * Following pointers points within the read-only mmap region
@@ -672,8 +672,8 @@ struct boot_img {
     boot_img(const char *);
     ~boot_img();
 
-    bool parse_image(const uint8_t *addr, format_t type);
-    std::pair<const uint8_t *, dyn_img_hdr *> create_hdr(const uint8_t *addr, format_t type);
+    bool parse_image(const uint8_t *addr, FileFormat type);
+    std::pair<const uint8_t *, dyn_img_hdr *> create_hdr(const uint8_t *addr, FileFormat type);
 
     // Rust FFI
     rust::Slice<const uint8_t> get_payload() const { return payload; }