From 041f4802bf3bbd234dd1c7de93129c050d0a7408 Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Wed, 13 Aug 2025 03:06:52 +0800
Subject: [PATCH 1/7] app: auto measure width

---
 .../magisk/databinding/RecyclerViewItems.kt   |  4 ---
 .../magisk/databinding/RvItemAdapter.kt       |  4 ---
 .../topjohnwu/magisk/ui/flash/ConsoleItem.kt  | 28 +------------------
 .../com/topjohnwu/magisk/ui/log/LogRvItem.kt  | 18 +-----------
 .../src/main/res/layout/item_console_md2.xml  |  2 +-
 .../src/main/res/layout/item_log_textview.xml |  2 +-
 6 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RecyclerViewItems.kt b/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RecyclerViewItems.kt
index 7b26f832d0919..f2d64f987562a 100644
--- a/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RecyclerViewItems.kt
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RecyclerViewItems.kt
@@ -16,10 +16,6 @@ interface ItemWrapper<E> {
     val item: E
 }
 
-interface ViewAwareItem {
-    fun onBind(binding: ViewDataBinding, recyclerView: RecyclerView)
-}
-
 interface DiffItem<T : Any> {
 
     fun itemSameAs(other: T): Boolean {
diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RvItemAdapter.kt b/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RvItemAdapter.kt
index 97ad66892e000..64c9017cecabc 100644
--- a/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RvItemAdapter.kt
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RvItemAdapter.kt
@@ -52,10 +52,6 @@ class RvItemAdapter<T: RvItem>(
         }
         holder.binding.lifecycleOwner = lifecycleOwner
         holder.binding.executePendingBindings()
-        recyclerView?.let {
-            if (item is ViewAwareItem)
-                item.onBind(holder.binding, it)
-        }
     }
 
     override fun getItemCount() = items.size
diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/ConsoleItem.kt b/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/ConsoleItem.kt
index d0639d2d4fdc3..a0c3c95bf6a15 100644
--- a/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/ConsoleItem.kt
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/ConsoleItem.kt
@@ -1,38 +1,12 @@
 package com.topjohnwu.magisk.ui.flash
 
-import android.view.View
-import android.widget.TextView
-import androidx.core.view.updateLayoutParams
-import androidx.databinding.ViewDataBinding
-import androidx.recyclerview.widget.RecyclerView
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.DiffItem
 import com.topjohnwu.magisk.databinding.ItemWrapper
 import com.topjohnwu.magisk.databinding.RvItem
-import com.topjohnwu.magisk.databinding.ViewAwareItem
-import kotlin.math.max
 
 class ConsoleItem(
     override val item: String
-) : RvItem(), ViewAwareItem, DiffItem<ConsoleItem>, ItemWrapper<String> {
+) : RvItem(), DiffItem<ConsoleItem>, ItemWrapper<String> {
     override val layoutRes = R.layout.item_console_md2
-
-    private var parentWidth = -1
-
-    override fun onBind(binding: ViewDataBinding, recyclerView: RecyclerView) {
-        if (parentWidth < 0)
-            parentWidth = (recyclerView.parent as View).width
-
-        val view = binding.root as TextView
-        view.measure(0, 0)
-
-        // We want our recyclerView at least as wide as screen
-        val desiredWidth = max(view.measuredWidth, parentWidth)
-
-        view.updateLayoutParams { width = desiredWidth }
-
-        if (recyclerView.width < desiredWidth) {
-            recyclerView.requestLayout()
-        }
-    }
 }
diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/ui/log/LogRvItem.kt b/app/apk/src/main/java/com/topjohnwu/magisk/ui/log/LogRvItem.kt
index 21bffb382fa19..abf25fc2f590b 100644
--- a/app/apk/src/main/java/com/topjohnwu/magisk/ui/log/LogRvItem.kt
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/ui/log/LogRvItem.kt
@@ -1,28 +1,12 @@
 package com.topjohnwu.magisk.ui.log
 
-import androidx.databinding.ViewDataBinding
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.textview.MaterialTextView
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.DiffItem
 import com.topjohnwu.magisk.databinding.ItemWrapper
 import com.topjohnwu.magisk.databinding.ObservableRvItem
-import com.topjohnwu.magisk.databinding.ViewAwareItem
 
 class LogRvItem(
     override val item: String
-) : ObservableRvItem(), DiffItem<LogRvItem>, ItemWrapper<String>, ViewAwareItem {
-
+) : ObservableRvItem(), DiffItem<LogRvItem>, ItemWrapper<String> {
     override val layoutRes = R.layout.item_log_textview
-
-    override fun onBind(binding: ViewDataBinding, recyclerView: RecyclerView) {
-        val view = binding.root as MaterialTextView
-        view.measure(0, 0)
-        val desiredWidth = view.measuredWidth
-        val layoutParams = view.layoutParams
-        layoutParams.width = desiredWidth
-        if (recyclerView.width < desiredWidth) {
-            recyclerView.requestLayout()
-        }
-    }
 }
diff --git a/app/apk/src/main/res/layout/item_console_md2.xml b/app/apk/src/main/res/layout/item_console_md2.xml
index f86c3d83b377f..fd8ed0bf1d705 100644
--- a/app/apk/src/main/res/layout/item_console_md2.xml
+++ b/app/apk/src/main/res/layout/item_console_md2.xml
@@ -11,7 +11,7 @@
     </data>
 
     <TextView
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fontFamily="monospace"
         android:text="@{item.item}"
diff --git a/app/apk/src/main/res/layout/item_log_textview.xml b/app/apk/src/main/res/layout/item_log_textview.xml
index fa84705285962..797624ac27147 100644
--- a/app/apk/src/main/res/layout/item_log_textview.xml
+++ b/app/apk/src/main/res/layout/item_log_textview.xml
@@ -11,7 +11,7 @@
 
 
     <com.google.android.material.textview.MaterialTextView
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fontFamily="monospace"
         android:textAppearance="@style/AppearanceFoundation.Caption"

From 130e094d4c93d963276920e3408e42fc0ab114b0 Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Mon, 29 Sep 2025 14:40:27 +0800
Subject: [PATCH 2/7] app: support download image and patch 1/2

---
 .../topjohnwu/magisk/dialog/DownloadDialog.kt |  59 +++
 .../magisk/ui/flash/FlashFragment.kt          |   7 +
 .../magisk/ui/flash/FlashViewModel.kt         |   8 +
 .../magisk/ui/install/InstallViewModel.kt     |   5 +
 .../main/res/layout/fragment_install_md2.xml  |  10 +-
 app/buildSrc/build.gradle.kts                 |   1 +
 app/core/build.gradle.kts                     |  20 +
 app/core/proguard-rules.pro                   |   3 +
 .../java/com/topjohnwu/magisk/core/Const.kt   |   1 +
 .../magisk/core/tasks/MagiskInstaller.kt      |  64 +++
 .../magisk/core/utils/MediaStoreUtils.kt      |   2 +
 app/core/src/main/proto/update_metadata.proto | 445 ++++++++++++++++++
 app/core/src/main/res/values/strings.xml      |   3 +
 app/gradle/libs.versions.toml                 |   5 +
 14 files changed, 632 insertions(+), 1 deletion(-)
 create mode 100644 app/apk/src/main/java/com/topjohnwu/magisk/dialog/DownloadDialog.kt
 create mode 100644 app/core/src/main/proto/update_metadata.proto

diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/dialog/DownloadDialog.kt b/app/apk/src/main/java/com/topjohnwu/magisk/dialog/DownloadDialog.kt
new file mode 100644
index 0000000000000..d8d48f6f27d91
--- /dev/null
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/dialog/DownloadDialog.kt
@@ -0,0 +1,59 @@
+package com.topjohnwu.magisk.dialog
+
+import android.net.Uri
+import android.text.InputType
+import android.widget.EditText
+import androidx.core.net.toUri
+import com.topjohnwu.magisk.core.R
+import com.topjohnwu.magisk.events.DialogBuilder
+import com.topjohnwu.magisk.view.MagiskDialog
+
+class DownloadDialog(private val callback: (Uri) -> Unit) : DialogBuilder {
+
+    override fun build(dialog: MagiskDialog) {
+        val editText = EditText(dialog.context).apply {
+            inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_URI
+            hint = context.getString(R.string.download_dialog_msg)
+            requestFocus()
+        }
+
+        dialog.apply {
+            setTitle(R.string.download_dialog_title)
+            setView(editText)
+            setButton(MagiskDialog.ButtonType.POSITIVE) {
+                text = android.R.string.ok
+                onClick {
+                    val url = editText.text.toString().trim()
+                    isValidUrl(url)?.let {
+                        doNotDismiss = false
+                        callback(it)
+                    } ?: run {
+                        doNotDismiss = true
+                        editText.error = context.getString(R.string.download_dialog_title)
+                    }
+                }
+            }
+            setButton(MagiskDialog.ButtonType.NEGATIVE) {
+                text = android.R.string.cancel
+            }
+            setCancelable(true)
+        }
+    }
+
+    private fun isValidUrl(url: String): Uri? {
+        if (url.isEmpty()) {
+            return null
+        }
+        val uri = url.toUri()
+        if (!uri.scheme.equals("https", ignoreCase = true)) {
+            return null
+        }
+        if (uri.host.isNullOrEmpty()) {
+            return null
+        }
+        if (uri.path.isNullOrEmpty()) {
+            return null
+        }
+        return uri
+    }
+}
diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/FlashFragment.kt b/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/FlashFragment.kt
index 7231a9b9fda32..fd694cfe40ef1 100644
--- a/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/FlashFragment.kt
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/FlashFragment.kt
@@ -127,6 +127,13 @@ class FlashFragment : BaseFragment<FragmentFlashMd2Binding>(), MenuProvider {
             additionalData = uri
         )
 
+        // Downloading is understood as downloading file then patch */
+
+        fun download(uri: Uri) = MainDirections.actionFlashFragment(
+            action = Const.Value.DOWNLOAD,
+            additionalData = uri
+        )
+
         /* Uninstalling is understood as removing magisk entirely */
 
         fun uninstall() = MainDirections.actionFlashFragment(
diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt b/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
index 56704d869c579..661f40dea84d0 100644
--- a/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk.ui.flash
 
+import android.os.Build
 import android.view.MenuItem
 import androidx.databinding.Bindable
 import androidx.databinding.ObservableArrayList
@@ -80,6 +81,13 @@ class FlashViewModel : BaseViewModel() {
                     showReboot = false
                     MagiskInstaller.Patch(uri, outItems, logItems).exec()
                 }
+                Const.Value.DOWNLOAD -> {
+                    if (uri == null || Build.VERSION.SDK_INT < 29) {
+                        return@launch
+                    }
+                    showReboot = false
+                    MagiskInstaller.Download(uri.toString(), outItems, logItems).exec()
+                }
                 else -> {
                     back()
                     return@launch
diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt b/app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
index 6508ce4e16428..b6a64dffd3470 100644
--- a/app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
@@ -21,6 +21,7 @@ import com.topjohnwu.magisk.core.base.ContentResultCallback
 import com.topjohnwu.magisk.core.ktx.toast
 import com.topjohnwu.magisk.core.repository.NetworkService
 import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.magisk.dialog.DownloadDialog
 import com.topjohnwu.magisk.dialog.SecondSlotWarningDialog
 import com.topjohnwu.magisk.events.GetContentEvent
 import com.topjohnwu.magisk.ui.flash.FlashFragment
@@ -54,6 +55,9 @@ class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel()
                 R.id.method_patch -> {
                     GetContentEvent("*/*", UriCallback()).publish()
                 }
+                R.id.method_download -> {
+                    DownloadDialog { url -> uri.value = url }.show()
+                }
                 R.id.method_inactive_slot -> {
                     SecondSlotWarningDialog().show()
                 }
@@ -92,6 +96,7 @@ class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel()
     fun install() {
         when (method) {
             R.id.method_patch -> FlashFragment.patch(data.value!!).navigate(true)
+            R.id.method_download -> FlashFragment.download(data.value!!).navigate(true)
             R.id.method_direct -> FlashFragment.flash(false).navigate(true)
             R.id.method_inactive_slot -> FlashFragment.flash(true).navigate(true)
             else -> error("Unknown value")
diff --git a/app/apk/src/main/res/layout/fragment_install_md2.xml b/app/apk/src/main/res/layout/fragment_install_md2.xml
index 7a7364379b650..5305a87a2e8a2 100644
--- a/app/apk/src/main/res/layout/fragment_install_md2.xml
+++ b/app/apk/src/main/res/layout/fragment_install_md2.xml
@@ -161,7 +161,7 @@
                         <Button
                             style="@style/WidgetFoundation.Button.Text"
                             gone="@{viewModel.step != 1}"
-                            isEnabled="@{viewModel.method == @id/method_patch ? viewModel.data != null : viewModel.method != -1}"
+                            isEnabled="@{(viewModel.method == @id/method_patch || viewModel.method == @id/method_download) ? viewModel.data != null : viewModel.method != -1}"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:onClick="@{() -> viewModel.install()}"
@@ -190,6 +190,14 @@
                             android:layout_height="wrap_content"
                             android:text="@string/select_patch_file" />
 
+                        <RadioButton
+                            android:id="@+id/method_download"
+                            style="@style/WidgetFoundation.RadioButton"
+                            android:layout_width="match_parent"
+                            gone="@{android.os.Build.VERSION.SDK_INT &lt; 29}"
+                            android:layout_height="wrap_content"
+                            android:text="@string/download_patch_file" />
+
                         <RadioButton
                             android:id="@+id/method_direct"
                             style="@style/WidgetFoundation.RadioButton"
diff --git a/app/buildSrc/build.gradle.kts b/app/buildSrc/build.gradle.kts
index 80cae809309d9..11790f05cca71 100644
--- a/app/buildSrc/build.gradle.kts
+++ b/app/buildSrc/build.gradle.kts
@@ -25,4 +25,5 @@ dependencies {
     implementation(libs.lsparanoid.plugin)
     implementation(libs.moshi.plugin)
     implementation(libs.jgit)
+    implementation(libs.protobuf.plugin)
 }
diff --git a/app/core/build.gradle.kts b/app/core/build.gradle.kts
index 3e47b9208045a..f339aa350edfd 100644
--- a/app/core/build.gradle.kts
+++ b/app/core/build.gradle.kts
@@ -1,8 +1,11 @@
+import com.google.protobuf.gradle.id
+
 plugins {
     id("com.android.library")
     kotlin("plugin.parcelize")
     id("dev.zacsweers.moshix")
     id("com.google.devtools.ksp")
+    id("com.google.protobuf")
 }
 
 setupCoreLib()
@@ -11,6 +14,21 @@ ksp {
     arg("room.generateKotlin", "true")
 }
 
+protobuf {
+    protoc {
+        artifact = libs.protobuf.protoc.get().toString()
+    }
+    generateProtoTasks {
+        ofNonTest().forEach { task ->
+            task.builtins {
+                id("java") {
+                    option("lite")
+                }
+            }
+        }
+    }
+}
+
 android {
     namespace = "com.topjohnwu.magisk.core"
 
@@ -40,6 +58,8 @@ dependencies {
     api(libs.markwon.core)
     implementation(libs.bcpkix)
     implementation(libs.commons.compress)
+    implementation(libs.xz)
+    implementation(libs.protobuf.javalite)
 
     api(libs.libsu.core)
     api(libs.libsu.service)
diff --git a/app/core/proguard-rules.pro b/app/core/proguard-rules.pro
index 9fde52bc6400c..dbf637451a4ea 100644
--- a/app/core/proguard-rules.pro
+++ b/app/core/proguard-rules.pro
@@ -28,6 +28,9 @@
   public void d(**);
 }
 
+# Protobuf
+-shrinkunusedprotofields
+
 # With R8 full mode generic signatures are stripped for classes that are not
 # kept. Suspend functions are wrapped in continuations where the type argument
 # is used.
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/Const.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/Const.kt
index e6f432d29188e..db39684a8f42c 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/Const.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/Const.kt
@@ -56,6 +56,7 @@ object Const {
     object Value {
         const val FLASH_ZIP = "flash"
         const val PATCH_FILE = "patch"
+        const val DOWNLOAD = "download"
         const val FLASH_MAGISK = "magisk"
         const val FLASH_INACTIVE_SLOT = "slot"
         const val UNINSTALL = "uninstall"
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
index 4468d3a9c038c..94e0034c71c8c 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
@@ -1,11 +1,13 @@
 package com.topjohnwu.magisk.core.tasks
 
 import android.net.Uri
+import android.os.FileUtils
 import android.os.Process
 import android.system.ErrnoException
 import android.system.Os
 import android.system.OsConstants
 import android.system.OsConstants.O_WRONLY
+import androidx.annotation.RequiresApi
 import androidx.annotation.WorkerThread
 import androidx.core.os.postDelayed
 import com.topjohnwu.magisk.StubApk
@@ -21,6 +23,7 @@ import com.topjohnwu.magisk.core.ktx.writeTo
 import com.topjohnwu.magisk.core.utils.DummyList
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.openFd
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
 import com.topjohnwu.magisk.core.utils.RootUtils
 import com.topjohnwu.superuser.Shell
@@ -39,6 +42,8 @@ import org.apache.commons.compress.archivers.zip.ZipFile
 import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorInputStream
 import timber.log.Timber
 import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
 import java.io.FilterInputStream
 import java.io.IOException
 import java.io.InputStream
@@ -530,6 +535,53 @@ abstract class MagiskInstallImpl protected constructor(
         return true
     }
 
+    @RequiresApi(29)
+    private fun processUrl(url: String): Boolean {
+        // Download image from url
+        try {
+            srcBoot = installDir.getChildFile("boot.img")
+            //todo
+        } catch (e: IOException) {
+            console.add("! Error: " + e.message)
+            Timber.e(e)
+            return false
+        }
+
+        // Patch file
+        if (!patchBoot()) {
+            return false
+        }
+
+        // Output file
+        val outFile = MediaStoreUtils.getFile("$destName.img")
+        try {
+            val newBoot = installDir.getChildFile("new-boot.img")
+            outFile.uri.openFd().use { out ->
+                FileInputStream(newBoot).use { input ->
+                    FileUtils.copy(input, FileOutputStream(out.fileDescriptor))
+                }
+            }
+            newBoot.delete()
+
+            console.add("")
+            console.add("****************************")
+            console.add(" Output file is written to ")
+            console.add(" $outFile ")
+            console.add("****************************")
+        } catch (e: IOException) {
+            console.add("! Failed to output to $outFile")
+            outFile.delete()
+            Timber.e(e)
+            return false
+        }
+
+        // Fix up binaries
+        srcBoot.delete()
+        "cp_readlink $installDir".sh()
+
+        return true
+    }
+
     private fun patchBoot(): Boolean {
         val newBoot = installDir.getChildFile("new-boot.img")
         if (!useRootDir) {
@@ -581,6 +633,9 @@ abstract class MagiskInstallImpl protected constructor(
 
     protected suspend fun patchFile(file: Uri) = extractFiles() && processFile(file)
 
+    @RequiresApi(29)
+    protected suspend fun patchFile(url: String) = extractFiles() && processUrl(url)
+
     protected suspend fun direct() = findImage() && extractFiles() && patchBoot() && flashBoot()
 
     protected suspend fun secondSlot() =
@@ -648,6 +703,15 @@ class MagiskInstaller {
         override suspend fun operations() = patchFile(uri)
     }
 
+    @RequiresApi(29)
+    class Download(
+        private val url: String,
+        console: MutableList<String>,
+        logs: MutableList<String>
+    ) : ConsoleInstaller(console, logs) {
+        override suspend fun operations() = patchFile(url)
+    }
+
     class SecondSlot(
         console: MutableList<String>,
         logs: MutableList<String>
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/utils/MediaStoreUtils.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/utils/MediaStoreUtils.kt
index 5a63547bc2f03..1c25736c651fc 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/utils/MediaStoreUtils.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/utils/MediaStoreUtils.kt
@@ -98,6 +98,8 @@ object MediaStoreUtils {
 
     fun Uri.outputStream() = cr.openOutputStream(this, "rwt") ?: throw FileNotFoundException()
 
+    fun Uri.openFd() = cr.openFileDescriptor(this, "rwt") ?: throw FileNotFoundException()
+
     val Uri.displayName: String get() {
         if (scheme == "file") {
             // Simple uri wrapper over file, directly get file name
diff --git a/app/core/src/main/proto/update_metadata.proto b/app/core/src/main/proto/update_metadata.proto
new file mode 100644
index 0000000000000..6d16da40e5372
--- /dev/null
+++ b/app/core/src/main/proto/update_metadata.proto
@@ -0,0 +1,445 @@
+//
+// Copyright (C) 2010 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Update file format: An update file contains all the operations needed
+// to update a system to a specific version. It can be a full payload which
+// can update from any version, or a delta payload which can only update
+// from a specific version.
+// The update format is represented by this struct pseudocode:
+// struct delta_update_file {
+//   char magic[4] = "CrAU";
+//   uint64 file_format_version;  // payload major version
+//   uint64 manifest_size;  // Size of protobuf DeltaArchiveManifest
+//
+//   // Only present if format_version >= 2:
+//   uint32 metadata_signature_size;
+//
+//   // The DeltaArchiveManifest protobuf serialized, not compressed.
+//   char manifest[manifest_size];
+//
+//   // The signature of the metadata (from the beginning of the payload up to
+//   // this location, not including the signature itself). This is a serialized
+//   // Signatures message.
+//   char metadata_signature_message[metadata_signature_size];
+//
+//   // Data blobs for files, no specific format. The specific offset
+//   // and length of each data blob is recorded in the DeltaArchiveManifest.
+//   struct {
+//     char data[];
+//   } blobs[];
+//
+//   // The signature of the entire payload, everything up to this location,
+//   // except that metadata_signature_message is skipped to simplify signing
+//   // process. These two are not signed:
+//   uint64 payload_signatures_message_size;
+//   // This is a serialized Signatures message.
+//   char payload_signatures_message[payload_signatures_message_size];
+//
+// };
+
+// The DeltaArchiveManifest protobuf is an ordered list of InstallOperation
+// objects. These objects are stored in a linear array in the
+// DeltaArchiveManifest. Each operation is applied in order by the client.
+
+// The DeltaArchiveManifest also contains the initial and final
+// checksums for the device.
+
+// The client will perform each InstallOperation in order, beginning even
+// before the entire delta file is downloaded (but after at least the
+// protobuf is downloaded). The types of operations are explained:
+// - REPLACE: Replace the dst_extents on the drive with the attached data,
+//   zero padding out to block size.
+// - REPLACE_BZ: bzip2-uncompress the attached data and write it into
+//   dst_extents on the drive, zero padding to block size.
+// - MOVE: Copy the data in src_extents to dst_extents. Extents may overlap,
+//   so it may be desirable to read all src_extents data into memory before
+//   writing it out. (deprecated)
+// - SOURCE_COPY: Copy the data in src_extents in the old partition to
+//   dst_extents in the new partition. There's no overlapping of data because
+//   the extents are in different partitions.
+// - BSDIFF: Read src_length bytes from src_extents into memory, perform
+//   bspatch with attached data, write new data to dst_extents, zero padding
+//   to block size. (deprecated)
+// - SOURCE_BSDIFF: Read the data in src_extents in the old partition, perform
+//   bspatch with the attached data and write the new data to dst_extents in the
+//   new partition.
+// - ZERO: Write zeros to the destination dst_extents.
+// - DISCARD: Discard the destination dst_extents blocks on the physical medium.
+//   the data read from those blocks is undefined.
+// - REPLACE_XZ: Replace the dst_extents with the contents of the attached
+//   xz file after decompression. The xz file should only use crc32 or no crc at
+//   all to be compatible with xz-embedded.
+// - PUFFDIFF: Read the data in src_extents in the old partition, perform
+//   puffpatch with the attached data and write the new data to dst_extents in
+//   the new partition.
+//
+// The operations allowed in the payload (supported by the client) depend on the
+// major and minor version. See InstallOperation.Type below for details.
+
+syntax = "proto2";
+
+package chromeos_update_engine;
+
+// Data is packed into blocks on disk, always starting from the beginning
+// of the block. If a file's data is too large for one block, it overflows
+// into another block, which may or may not be the following block on the
+// physical partition. An ordered list of extents is another
+// representation of an ordered list of blocks. For example, a file stored
+// in blocks 9, 10, 11, 2, 18, 12 (in that order) would be stored in
+// extents { {9, 3}, {2, 1}, {18, 1}, {12, 1} } (in that order).
+// In general, files are stored sequentially on disk, so it's more efficient
+// to use extents to encode the block lists (this is effectively
+// run-length encoding).
+// A sentinel value (kuint64max) as the start block denotes a sparse-hole
+// in a file whose block-length is specified by num_blocks.
+
+message Extent {
+  optional uint64 start_block = 1;
+  optional uint64 num_blocks = 2;
+}
+
+// Signatures: Updates may be signed by the OS vendor. The client verifies
+// an update's signature by hashing the entire download. The section of the
+// download that contains the signature is at the end of the file, so when
+// signing a file, only the part up to the signature part is signed.
+// Then, the client looks inside the download's Signatures message for a
+// Signature message that it knows how to handle. Generally, a client will
+// only know how to handle one type of signature, but an update may contain
+// many signatures to support many different types of client. Then client
+// selects a Signature message and uses that, along with a known public key,
+// to verify the download. The public key is expected to be part of the
+// client.
+
+message Signatures {
+  message Signature {
+    optional uint32 version = 1 [deprecated = true];
+    optional bytes data = 2;
+
+    // The DER encoded signature size of EC keys is nondeterministic for
+    // different input of sha256 hash. However, we need the size of the
+    // serialized signatures protobuf string to be fixed before signing;
+    // because this size is part of the content to be signed. Therefore, we
+    // always pad the signature data to the maximum possible signature size of
+    // a given key. And the payload verifier will truncate the signature to
+    // its correct size based on the value of |unpadded_signature_size|.
+    optional fixed32 unpadded_signature_size = 3;
+  }
+  repeated Signature signatures = 1;
+}
+
+message PartitionInfo {
+  optional uint64 size = 1;
+  optional bytes hash = 2;
+}
+
+message InstallOperation {
+  enum Type {
+    REPLACE = 0;     // Replace destination extents w/ attached data.
+    REPLACE_BZ = 1;  // Replace destination extents w/ attached bzipped data.
+    MOVE = 2 [deprecated = true];    // Move source extents to target extents.
+    BSDIFF = 3 [deprecated = true];  // The data is a bsdiff binary diff.
+
+    // On minor version 2 or newer, these operations are supported:
+    SOURCE_COPY = 4;    // Copy from source to target partition
+    SOURCE_BSDIFF = 5;  // Like BSDIFF, but read from source partition
+
+    // On minor version 3 or newer and on major version 2 or newer, these
+    // operations are supported:
+    REPLACE_XZ = 8;  // Replace destination extents w/ attached xz data.
+
+    // On minor version 4 or newer, these operations are supported:
+    ZERO = 6;     // Write zeros in the destination.
+    DISCARD = 7;  // Discard the destination blocks, reading as undefined.
+    BROTLI_BSDIFF = 10;  // Like SOURCE_BSDIFF, but compressed with brotli.
+
+    // On minor version 5 or newer, these operations are supported:
+    PUFFDIFF = 9;  // The data is in puffdiff format.
+
+    // On minor version 8 or newer, these operations are supported:
+    ZUCCHINI = 11;
+
+    // On minor version 9 or newer, these operations are supported:
+    LZ4DIFF_BSDIFF = 12;
+    LZ4DIFF_PUFFDIFF = 13;
+  }
+  required Type type = 1;
+
+  // Only minor version 6 or newer support 64 bits |data_offset| and
+  // |data_length|, older client will read them as uint32.
+  // The offset into the delta file (after the protobuf)
+  // where the data (if any) is stored
+  optional uint64 data_offset = 2;
+  // The length of the data in the delta file
+  optional uint64 data_length = 3;
+
+  // Ordered list of extents that are read from (if any) and written to.
+  repeated Extent src_extents = 4;
+  // Byte length of src, equal to the number of blocks in src_extents *
+  // block_size. It is used for BSDIFF and SOURCE_BSDIFF, because we need to
+  // pass that external program the number of bytes to read from the blocks we
+  // pass it.  This is not used in any other operation.
+  optional uint64 src_length = 5;
+
+  repeated Extent dst_extents = 6;
+  // Byte length of dst, equal to the number of blocks in dst_extents *
+  // block_size. Used for BSDIFF and SOURCE_BSDIFF, but not in any other
+  // operation.
+  optional uint64 dst_length = 7;
+
+  // Optional SHA 256 hash of the blob associated with this operation.
+  // This is used as a primary validation for http-based downloads and
+  // as a defense-in-depth validation for https-based downloads. If
+  // the operation doesn't refer to any blob, this field will have
+  // zero bytes.
+  optional bytes data_sha256_hash = 8;
+
+  // Indicates the SHA 256 hash of the source data referenced in src_extents at
+  // the time of applying the operation. If present, the update_engine daemon
+  // MUST read and verify the source data before applying the operation.
+  optional bytes src_sha256_hash = 9;
+}
+
+// Hints to VAB snapshot to skip writing some blocks if these blocks are
+// identical to the ones on the source image. The src & dst extents for each
+// CowMergeOperation should be contiguous, and they're a subset of an OTA
+// InstallOperation.
+// During merge time, we need to follow the pre-computed sequence to avoid
+// read after write, similar to the inplace update schema.
+message CowMergeOperation {
+  enum Type {
+    COW_COPY = 0;     // identical blocks
+    COW_XOR = 1;      // used when src/dst blocks are highly similar
+    COW_REPLACE = 2;  // Raw replace operation
+  }
+  optional Type type = 1;
+
+  optional Extent src_extent = 2;
+  optional Extent dst_extent = 3;
+  // For COW_XOR, source location might be unaligned, so this field is in range
+  // [0, block_size), representing how much should the src_extent shift toward
+  // larger block number. If this field is non-zero, then src_extent will
+  // include 1 extra block in the end, as the merge op actually references the
+  // first |src_offset| bytes of that extra block. For example, if |dst_extent|
+  // is [10, 15], |src_offset| is 500, then src_extent might look like [25, 31].
+  // Note that |src_extent| contains 1 extra block than the |dst_extent|.
+  optional uint32 src_offset = 4;
+}
+
+// Describes the update to apply to a single partition.
+message PartitionUpdate {
+  // A platform-specific name to identify the partition set being updated. For
+  // example, in Chrome OS this could be "ROOT" or "KERNEL".
+  required string partition_name = 1;
+
+  // Whether this partition carries a filesystem with post-install program that
+  // must be run to finalize the update process. See also |postinstall_path| and
+  // |filesystem_type|.
+  optional bool run_postinstall = 2;
+
+  // The path of the executable program to run during the post-install step,
+  // relative to the root of this filesystem. If not set, the default "postinst"
+  // will be used. This setting is only used when |run_postinstall| is set and
+  // true.
+  optional string postinstall_path = 3;
+
+  // The filesystem type as passed to the mount(2) syscall when mounting the new
+  // filesystem to run the post-install program. If not set, a fixed list of
+  // filesystems will be attempted. This setting is only used if
+  // |run_postinstall| is set and true.
+  optional string filesystem_type = 4;
+
+  // If present, a list of signatures of the new_partition_info.hash signed with
+  // different keys. If the update_engine daemon requires vendor-signed images
+  // and has its public key installed, one of the signatures should be valid
+  // for /postinstall to run.
+  repeated Signatures.Signature new_partition_signature = 5;
+
+  optional PartitionInfo old_partition_info = 6;
+  optional PartitionInfo new_partition_info = 7;
+
+  // The list of operations to be performed to apply this PartitionUpdate. The
+  // associated operation blobs (in operations[i].data_offset, data_length)
+  // should be stored contiguously and in the same order.
+  repeated InstallOperation operations = 8;
+
+  // Whether a failure in the postinstall step for this partition should be
+  // ignored.
+  optional bool postinstall_optional = 9;
+
+  // On minor version 6 or newer, these fields are supported:
+
+  // The extent for data covered by verity hash tree.
+  optional Extent hash_tree_data_extent = 10;
+
+  // The extent to store verity hash tree.
+  optional Extent hash_tree_extent = 11;
+
+  // The hash algorithm used in verity hash tree.
+  optional string hash_tree_algorithm = 12;
+
+  // The salt used for verity hash tree.
+  optional bytes hash_tree_salt = 13;
+
+  // The extent for data covered by FEC.
+  optional Extent fec_data_extent = 14;
+
+  // The extent to store FEC.
+  optional Extent fec_extent = 15;
+
+  // The number of FEC roots.
+  optional uint32 fec_roots = 16 [default = 2];
+
+  // Per-partition version used for downgrade detection, added
+  // as an effort to support partial updates. For most partitions,
+  // this is the build timestamp.
+  optional string version = 17;
+
+  // A sorted list of CowMergeOperation. When writing cow, we can choose to
+  // skip writing the raw bytes for these extents. During snapshot merge, the
+  // bytes will read from the source partitions instead.
+  repeated CowMergeOperation merge_operations = 18;
+
+  // Estimated size for COW image. This is used by libsnapshot
+  // as a hint. If set to 0, libsnapshot should use alternative
+  // methods for estimating size.
+  optional uint64 estimate_cow_size = 19;
+
+  // Information about the cow used by Cow Writer to specify
+  // number of cow operations to be written
+  optional uint64 estimate_op_count_max = 20;
+}
+
+message DynamicPartitionGroup {
+  // Name of the group.
+  required string name = 1;
+
+  // Maximum size of the group. The sum of sizes of all partitions in the group
+  // must not exceed the maximum size of the group.
+  optional uint64 size = 2;
+
+  // A list of partitions that belong to the group.
+  repeated string partition_names = 3;
+}
+
+message VABCFeatureSet {
+  optional bool threaded = 1;
+  optional bool batch_writes = 2;
+}
+
+// Metadata related to all dynamic partitions.
+message DynamicPartitionMetadata {
+  // All updatable groups present in |partitions| of this DeltaArchiveManifest.
+  // - If an updatable group is on the device but not in the manifest, it is
+  //   not updated. Hence, the group will not be resized, and partitions cannot
+  //   be added to or removed from the group.
+  // - If an updatable group is in the manifest but not on the device, the group
+  //   is added to the device.
+  repeated DynamicPartitionGroup groups = 1;
+
+  // Whether dynamic partitions have snapshots during the update. If this is
+  // set to true, the update_engine daemon creates snapshots for all dynamic
+  // partitions if possible. If this is unset, the update_engine daemon MUST
+  // NOT create snapshots for dynamic partitions.
+  optional bool snapshot_enabled = 2;
+
+  // If this is set to false, update_engine should not use VABC regardless. If
+  // this is set to true, update_engine may choose to use VABC if device
+  // supports it, but not guaranteed.
+  // VABC stands for Virtual AB Compression
+  optional bool vabc_enabled = 3;
+
+  // The compression algorithm used by VABC. Available ones are "gz", "brotli".
+  // See system/core/fs_mgr/libsnapshot/cow_writer.cpp for available options,
+  // as this parameter is ultimated forwarded to libsnapshot's CowWriter
+  optional string vabc_compression_param = 4;
+
+  // COW version used by VABC. The represents the major version in the COW
+  // header
+  optional uint32 cow_version = 5;
+
+  // A collection of knobs to tune Virtual AB Compression
+  optional VABCFeatureSet vabc_feature_set = 6;
+
+  // Max bytes to be compressed at once during ota. Options: 4k, 8k, 16k, 32k,
+  // 64k, 128k
+  optional uint64 compression_factor = 7;
+}
+
+// Definition has been duplicated from
+// $ANDROID_BUILD_TOP/build/tools/releasetools/ota_metadata.proto. Keep in sync.
+message ApexInfo {
+  optional string package_name = 1;
+  optional int64 version = 2;
+  optional bool is_compressed = 3;
+  optional int64 decompressed_size = 4;
+}
+
+// Definition has been duplicated from
+// $ANDROID_BUILD_TOP/build/tools/releasetools/ota_metadata.proto. Keep in sync.
+message ApexMetadata {
+  repeated ApexInfo apex_info = 1;
+}
+
+message DeltaArchiveManifest {
+  // Only present in major version = 1. List of install operations for the
+  // kernel and rootfs partitions. For major version = 2 see the |partitions|
+  // field.
+  reserved 1, 2;
+
+  // (At time of writing) usually 4096
+  optional uint32 block_size = 3 [default = 4096];
+
+  // If signatures are present, the offset into the blobs, generally
+  // tacked onto the end of the file, and the length. We use an offset
+  // rather than a bool to allow for more flexibility in future file formats.
+  // If either is absent, it means signatures aren't supported in this
+  // file.
+  optional uint64 signatures_offset = 4;
+  optional uint64 signatures_size = 5;
+
+  // Fields deprecated in major version 2.
+  reserved 6,7,8,9,10,11;
+
+  // The minor version, also referred as "delta version", of the payload.
+  // Minor version 0 is full payload, everything else is delta payload.
+  optional uint32 minor_version = 12 [default = 0];
+
+  // Only present in major version >= 2. List of partitions that will be
+  // updated, in the order they will be updated. This field replaces the
+  // |install_operations|, |kernel_install_operations| and the
+  // |{old,new}_{kernel,rootfs}_info| fields used in major version = 1. This
+  // array can have more than two partitions if needed, and they are identified
+  // by the partition name.
+  repeated PartitionUpdate partitions = 13;
+
+  // The maximum timestamp of the OS allowed to apply this payload.
+  // Can be used to prevent downgrading the OS.
+  optional int64 max_timestamp = 14;
+
+  // Metadata related to all dynamic partitions.
+  optional DynamicPartitionMetadata dynamic_partition_metadata = 15;
+
+  // If the payload only updates a subset of partitions on the device.
+  optional bool partial_update = 16;
+
+  // Information on compressed APEX to figure out how much space is required for
+  // their decompression
+  repeated ApexInfo apex_info = 17;
+
+  // Security patch level of the device, usually in the format of
+  // yyyy-mm-dd
+  optional string security_patch_level = 18;
+}
diff --git a/app/core/src/main/res/values/strings.xml b/app/core/src/main/res/values/strings.xml
index 19c56810c3b6e..96354408eb7d5 100644
--- a/app/core/src/main/res/values/strings.xml
+++ b/app/core/src/main/res/values/strings.xml
@@ -45,6 +45,9 @@
     <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="download_patch_file">Download and patch a file</string>
+    <string name="download_dialog_title">Enter image URL</string>
+    <string name="download_dialog_msg">Full OTA image or factory image</string>
     <string name="reboot_delay_toast">Rebooting in 5 seconds…</string>
     <string name="flash_screen_title">Installation</string>
 
diff --git a/app/gradle/libs.versions.toml b/app/gradle/libs.versions.toml
index 1947d50f48ad1..08974e1a4ad2f 100644
--- a/app/gradle/libs.versions.toml
+++ b/app/gradle/libs.versions.toml
@@ -8,6 +8,7 @@ libsu = "6.0.0"
 okhttp = "5.3.2"
 retrofit = "3.0.0"
 room = "2.8.4"
+protobuf = "4.31.1"
 
 [libraries]
 bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version = "1.83" }
@@ -21,6 +22,9 @@ okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", ver
 okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
 timber = { module = "com.jakewharton.timber:timber", version = "5.0.1" }
 jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version = "7.1.0.202411261347-r" }
+protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "protobuf" }
+protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
+xz = { module = "org.tukaani:xz", version = "1.10" }
 
 # AndroidX
 activity = { module = "androidx.activity:activity", version = "1.12.2" }
@@ -64,5 +68,6 @@ ksp-plugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.
 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.34.2" }
+protobuf-plugin = { module = "com.google.protobuf:protobuf-gradle-plugin", version = "0.9.5" }
 
 [plugins]

From e4bb1917e144079a9cec14b26a74dd93408e3f20 Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Mon, 29 Sep 2025 22:30:13 +0800
Subject: [PATCH 3/7] app: support download image and patch 2/2

---
 .../magisk/core/tasks/ExtractImage.kt         | 156 +++++++++++
 .../magisk/core/tasks/MagiskInstaller.kt      |   2 +-
 .../topjohnwu/magisk/core/tasks/Payload.kt    | 177 +++++++++++++
 .../magisk/core/utils/HttpFileChannel.java    | 244 ++++++++++++++++++
 4 files changed, 578 insertions(+), 1 deletion(-)
 create mode 100644 app/core/src/main/java/com/topjohnwu/magisk/core/tasks/ExtractImage.kt
 create mode 100644 app/core/src/main/java/com/topjohnwu/magisk/core/tasks/Payload.kt
 create mode 100644 app/core/src/main/java/com/topjohnwu/magisk/core/utils/HttpFileChannel.java

diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/ExtractImage.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/ExtractImage.kt
new file mode 100644
index 0000000000000..59fc1a5edf992
--- /dev/null
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/ExtractImage.kt
@@ -0,0 +1,156 @@
+package com.topjohnwu.magisk.core.tasks
+
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.utils.HttpFileChannel
+import okio.buffer
+import okio.inflate
+import okio.sink
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
+import org.apache.commons.compress.archivers.zip.ZipFile
+import org.apache.commons.compress.archivers.zip.ZipMethod
+import java.io.File
+import java.io.IOException
+import java.nio.channels.FileChannel
+import java.nio.file.StandardOpenOption
+
+class ExtractImage(
+    private val url: String,
+    private val console: MutableList<String>,
+    private val logs: MutableList<String>,
+) {
+    @Throws(IOException::class)
+    fun start(outFile: File) {
+        logs.add("Downloading from: $url")
+
+        val channel = HttpFileChannel(ServiceLocator.okhttp, url)
+        ZipFile.builder()
+            .setSeekableByteChannel(channel)
+            .setIgnoreLocalFileHeader(true)
+            .get().use { zipFile ->
+                val payload = zipFile.getEntry("payload.bin")
+                if (payload != null) {
+                    console.add("- Processing as OTA package")
+
+                    zipFile.getEntry("META-INF/com/android/metadata")?.let { entry ->
+                        zipFile.getInputStream(entry).use {
+                            val meta = it.bufferedReader().readText()
+                            logs.add(meta)
+
+                            console.add("- OTA metadata:")
+                            meta.lines().forEach { line ->
+                                if (line.startsWith("post-")) {
+                                    console.add("  ${line.substringAfter('-')}")
+                                }
+                            }
+                        }
+                    }
+                    zipFile.getRawInputStream(payload)
+                    extractFromOTAPackage(payload, channel, outFile)
+                } else {
+                    extractFromFactoryImage(zipFile, channel, outFile)
+                }
+            }
+    }
+
+    @Throws(IOException::class)
+    private fun extractFromOTAPackage(
+        payload: ZipArchiveEntry,
+        channel: HttpFileChannel,
+        outFile: File,
+    ) {
+        if (payload.method != ZipMethod.STORED.code) {
+            throw IOException("payload.bin is compressed, expected STORED method")
+        }
+
+        channel.slice(payload.dataOffset, payload.size).use { payloadChannel ->
+            Payload(payloadChannel).extract(outFile, { console.add(it) }, { logs.add(it) })
+        }
+    }
+
+    @Throws(IOException::class)
+    private fun extractFromFactoryImage(zipFile: ZipFile, channel: HttpFileChannel, outFile: File) {
+        console.add("- Processing as factory image package")
+
+        findBootImageZipEntry(zipFile)?.let { entry ->
+            return extractImageFile(zipFile, entry, channel, outFile)
+        }
+
+        val imageZipEntry = zipFile.entries.asSequence().find { entry ->
+            val fileName = entry.name.substringAfterLast('/')
+            fileName.startsWith("image-") && fileName.endsWith(".zip")
+        }
+        if (imageZipEntry != null) {
+            zipFile.getRawInputStream(imageZipEntry)
+            return extractFromInnerImageZip(imageZipEntry, channel, outFile)
+        }
+
+        throw IOException("inner image ZIP not found in factory image package")
+    }
+
+    private fun findBootImageZipEntry(zipFile: ZipFile): ZipArchiveEntry? {
+        return zipFile.entries.asSequence().find { it.name == "init_boot.img" }
+            ?: zipFile.entries.asSequence().find { it.name == "boot.img" }
+    }
+
+    @Throws(IOException::class)
+    private fun extractFromInnerImageZip(
+        entry: ZipArchiveEntry,
+        channel: HttpFileChannel,
+        outFile: File
+    ) {
+        logs.add("Found inner image ZIP: ${entry.name}")
+
+        if (entry.method != ZipMethod.STORED.code) {
+            throw IOException("image ZIP is compressed, expected STORED method")
+        }
+
+        channel.slice(entry.dataOffset, entry.size).use { innerZipChannel ->
+            ZipFile.builder()
+                .setSeekableByteChannel(innerZipChannel)
+                .setIgnoreLocalFileHeader(true)
+                .get().use { innerZipFile ->
+                    val targetEntry = findBootImageZipEntry(innerZipFile)
+                        ?: throw IOException("boot image not found in inner image ZIP")
+                    return extractImageFile(innerZipFile, targetEntry, innerZipChannel, outFile)
+                }
+        }
+    }
+
+    @Throws(IOException::class)
+    private fun extractImageFile(
+        zipFile: ZipFile,
+        entry: ZipArchiveEntry,
+        channel: HttpFileChannel,
+        outFile: File,
+    ) {
+        console.add("- Found boot image entry: ${entry.name} (${entry.size} bytes)")
+        console.add("- Downloading")
+
+        zipFile.getRawInputStream(entry)
+        when (entry.method) {
+            ZipMethod.STORED.code -> {
+                FileChannel.open(
+                    outFile.toPath(),
+                    StandardOpenOption.CREATE,
+                    StandardOpenOption.WRITE,
+                    StandardOpenOption.READ,
+                    StandardOpenOption.TRUNCATE_EXISTING
+                ).use { fileChannel ->
+                    val mapped = fileChannel.map(FileChannel.MapMode.READ_WRITE, 0, entry.size)
+                    val sourceChannel = channel.slice(entry.dataOffset, entry.size)
+                    sourceChannel.read(mapped)
+                }
+            }
+
+            ZipMethod.DEFLATED.code -> {
+                channel.streamRead(entry.dataOffset, entry.size).inflate().use { source ->
+                    outFile.sink().buffer().use { sink ->
+                        sink.writeAll(source)
+                    }
+                }
+            }
+
+            else -> throw IOException("unsupported method: ${entry.method}")
+        }
+    }
+}
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
index 94e0034c71c8c..23d59640bcb03 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
@@ -540,7 +540,7 @@ abstract class MagiskInstallImpl protected constructor(
         // Download image from url
         try {
             srcBoot = installDir.getChildFile("boot.img")
-            //todo
+            ExtractImage(url, console, logs).start(srcBoot)
         } catch (e: IOException) {
             console.add("! Error: " + e.message)
             Timber.e(e)
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/Payload.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/Payload.kt
new file mode 100644
index 0000000000000..e6e8d415665ba
--- /dev/null
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/Payload.kt
@@ -0,0 +1,177 @@
+package com.topjohnwu.magisk.core.tasks
+
+import chromeos_update_engine.UpdateMetadata.DeltaArchiveManifest
+import chromeos_update_engine.UpdateMetadata.InstallOperation
+import chromeos_update_engine.UpdateMetadata.PartitionUpdate
+import com.topjohnwu.magisk.core.utils.HttpFileChannel
+import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream
+import org.apache.commons.compress.compressors.xz.XZCompressorInputStream
+import java.io.File
+import java.io.IOException
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.channels.FileChannel
+import java.nio.file.StandardOpenOption
+import java.security.MessageDigest
+
+class Payload(private val channel: HttpFileChannel) {
+    private val manifest: DeltaArchiveManifest
+    private var dataBase = 0L
+
+    init {
+        manifest = readPayloadHeader()
+    }
+
+    @Throws(IOException::class)
+    fun extract(outputFile: File, console: (String) -> Unit, logger: (String) -> Unit) {
+        val partition = findPartition()
+        console("- Found partition ${partition.partitionName}")
+
+        val actualHash = extractPartition(outputFile, partition, console)
+
+        if (!partition.newPartitionInfo.hasHash()) {
+            logger("Hash verification skipped")
+            return
+        }
+
+        fun toHex(bytes: ByteArray) = bytes.joinToString("") { "%02x".format(it) }
+
+        val expectedHash = partition.newPartitionInfo.hash.toByteArray()
+        if (!expectedHash.contentEquals(actualHash)) {
+            throw IOException(
+                "Hash mismatch, expected ${toHex(expectedHash)}, but got ${toHex(actualHash)}"
+            )
+        }
+        logger("Hash verification passed")
+    }
+
+    @Throws(IOException::class)
+    private fun readPayloadHeader(): DeltaArchiveManifest {
+        // Read magic
+        val magicBuffer = ByteBuffer.allocate(4)
+        channel.read(magicBuffer)
+        magicBuffer.flip()
+        val magic = String(magicBuffer.array())
+        if (magic != "CrAU") {
+            throw IOException("Invalid payload: invalid magic")
+        }
+
+        // Read version
+        val versionBuffer = ByteBuffer.allocate(8).order(ByteOrder.BIG_ENDIAN)
+        channel.read(versionBuffer)
+        versionBuffer.flip()
+        val version = versionBuffer.long
+        if (version != 2L) {
+            throw IOException("Invalid payload: unsupported version: $version")
+        }
+
+        // Read manifest length
+        val manifestLenBuffer = ByteBuffer.allocate(8).order(ByteOrder.BIG_ENDIAN)
+        channel.read(manifestLenBuffer)
+        manifestLenBuffer.flip()
+        val manifestLen = manifestLenBuffer.long.toInt()
+        if (manifestLen == 0) {
+            throw IOException("Invalid payload: manifest length is zero")
+        }
+
+        // Read manifest signature length
+        val manifestSigLenBuffer = ByteBuffer.allocate(4).order(ByteOrder.BIG_ENDIAN)
+        channel.read(manifestSigLenBuffer)
+        manifestSigLenBuffer.flip()
+        val manifestSigLen = manifestSigLenBuffer.int
+        if (manifestSigLen == 0) {
+            throw IOException("Invalid payload: manifest signature length is zero")
+        }
+
+        // Read manifest
+        val manifestBuffer = ByteBuffer.allocate(manifestLen)
+        channel.read(manifestBuffer)
+        manifestBuffer.flip()
+        val manifest = DeltaArchiveManifest.parseFrom(manifestBuffer.array())
+
+        // Skip manifest signature
+        channel.position(channel.position() + manifestSigLen)
+
+        dataBase = channel.position()
+
+        return manifest
+    }
+
+    @Throws(IOException::class)
+    private fun findPartition(): PartitionUpdate {
+        return manifest.partitionsList.find { it.partitionName == "init_boot" }
+            ?: manifest.partitionsList.find { it.partitionName == "boot" }
+            ?: throw IOException("boot partition not found in payload")
+    }
+
+    @Throws(IOException::class)
+    private fun extractPartition(
+        outputFile: File,
+        partition: PartitionUpdate,
+        console: (String) -> Unit,
+    ): ByteArray {
+        FileChannel.open(
+            outputFile.toPath(),
+            StandardOpenOption.CREATE,
+            StandardOpenOption.WRITE,
+            StandardOpenOption.READ,
+            StandardOpenOption.TRUNCATE_EXISTING
+        ).use { outChannel ->
+            val size = partition.newPartitionInfo.size
+            outChannel.write(ByteBuffer.allocate(1), size - 1)
+
+            val count = partition.operationsCount
+            partition.operationsList.forEachIndexed { index, operation ->
+                if (index % 5 == 0 || index == count - 1) {
+                    console("- Downloading ${index + 1}/$count")
+                }
+                processOperation(outChannel, operation)
+            }
+
+            val digest = MessageDigest.getInstance("SHA-256")
+            val buffer = outChannel.map(FileChannel.MapMode.READ_WRITE, 0, size)
+            digest.update(buffer)
+            return digest.digest()
+        }
+    }
+
+    @Throws(IOException::class)
+    private fun processOperation(outChannel: FileChannel, operation: InstallOperation) {
+        val dataType = operation.getType()
+        if (dataType == InstallOperation.Type.ZERO) {
+            return
+        }
+
+        val dataBuffer = ByteBuffer.allocate(operation.getDataLength().toInt())
+        channel.read(dataBuffer, dataBase + operation.getDataOffset())
+        dataBuffer.flip()
+
+        val dstExtent = operation.getDstExtents(0)
+        val outOffset = dstExtent.getStartBlock() * manifest.getBlockSize()
+
+        when (dataType) {
+            InstallOperation.Type.REPLACE -> {
+                outChannel.write(dataBuffer, outOffset)
+            }
+
+            InstallOperation.Type.REPLACE_BZ, InstallOperation.Type.REPLACE_XZ -> {
+                val inputStream = dataBuffer.array().inputStream()
+                if (dataType == InstallOperation.Type.REPLACE_BZ) {
+                    BZip2CompressorInputStream(inputStream)
+                } else {
+                    XZCompressorInputStream(inputStream)
+                }.use { decompressor ->
+                    val bytes = ByteArray(8192)
+                    var bytesRead: Int
+                    var bytesWritten = 0
+                    while (decompressor.read(bytes).also { bytesRead = it } != -1) {
+                        val buffer = ByteBuffer.wrap(bytes, 0, bytesRead)
+                        bytesWritten += outChannel.write(buffer, outOffset + bytesWritten)
+                    }
+                }
+            }
+
+            else -> throw IOException("Unsupported operation type: $dataType")
+        }
+    }
+}
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/utils/HttpFileChannel.java b/app/core/src/main/java/com/topjohnwu/magisk/core/utils/HttpFileChannel.java
new file mode 100644
index 0000000000000..9cc9a0a308909
--- /dev/null
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/utils/HttpFileChannel.java
@@ -0,0 +1,244 @@
+package com.topjohnwu.magisk.core.utils;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.NonWritableChannelException;
+import java.nio.channels.SeekableByteChannel;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okio.BufferedSource;
+
+public class HttpFileChannel implements SeekableByteChannel {
+    private static final int RANDOM_READ_CACHE_SIZE = 16 * 1024;
+    private static final int SEQ_READ_CACHE_SIZE = 1024 * 1024;
+    private static final int SEQ_READ_THRESHOLD = 1024;
+    private static final int DIRECT_READ_THRESHOLD = 512 * 1024;
+
+    private final OkHttpClient client;
+    private final String url;
+    private final long startOffset;
+    private final long size;
+
+    private long position = 0;
+    private boolean open = true;
+
+    private byte[] cache = null;
+    private long cacheStart = -1;
+
+    public HttpFileChannel(OkHttpClient client, String url, long startOffset, long size) {
+        this.client = client;
+        this.url = url;
+        this.startOffset = startOffset;
+        this.size = size;
+    }
+
+    public HttpFileChannel(OkHttpClient client, String url) throws IOException {
+        this(client, url, 0, fetchTotalSize(client, url));
+    }
+
+    private static long fetchTotalSize(OkHttpClient client, String url) throws IOException {
+        var request = new Request.Builder().url(url).head().build();
+        try (var response = client.newCall(request).execute()) {
+            if (!response.isSuccessful()) {
+                throw new IOException("Failed to connect to URL: " + response);
+            }
+            var contentLength = response.header("Content-Length");
+            if (contentLength == null) {
+                throw new IOException("Could not determine file size.");
+            }
+            var acceptRanges = response.header("Accept-Ranges");
+            if (acceptRanges == null || !acceptRanges.equalsIgnoreCase("bytes")) {
+                throw new IOException("Server does not support byte ranges: " + response);
+            }
+            return Long.parseLong(contentLength);
+        }
+    }
+
+    public HttpFileChannel slice(long offset, long sliceSize) {
+        if (offset == 0 && sliceSize == size) {
+            return this;
+        }
+        if (offset < 0 || sliceSize <= 0 || offset + sliceSize >= size) {
+            throw new IllegalArgumentException("Invalid slice parameters");
+        }
+        return new HttpFileChannel(client, url, startOffset + offset, sliceSize);
+    }
+
+    @Override
+    public int read(ByteBuffer dst) throws IOException {
+        var bytesRead = read(dst, position);
+        position += bytesRead;
+        return bytesRead;
+    }
+
+    public int read(ByteBuffer dst, long position) throws IOException {
+        if (!open) throw new ClosedChannelException();
+        if (position < 0) {
+            throw new IllegalArgumentException("Position out of bounds: " + position);
+        }
+        if (position >= size) return -1;
+
+        int requestSize = dst.remaining();
+        if (requestSize == 0) return 0;
+
+        if (requestSize > DIRECT_READ_THRESHOLD) {
+            return handleLargeRead(dst, position);
+        }
+
+        int totalBytesRead = 0;
+        if (isCacheHit(position, 1)) {
+            int bytesFromCache = readFromCache(dst, position);
+            totalBytesRead += bytesFromCache;
+            position += bytesFromCache;
+        }
+
+        if (dst.hasRemaining() && position < size) {
+            loadCache(position, requestSize);
+            if (isCacheHit(position, dst.remaining())) {
+                totalBytesRead += readFromCache(dst, position);
+            } else {
+                totalBytesRead += readDirectly(dst, position);
+            }
+        }
+
+        return totalBytesRead;
+    }
+
+    private int handleLargeRead(ByteBuffer dst, long position) throws IOException {
+        int bytesFromCache = 0;
+        if (isCacheHit(position, 1)) {
+            bytesFromCache = readFromCache(dst, position);
+            position += bytesFromCache;
+        }
+
+        if (dst.hasRemaining() && position < size) {
+            int directBytesRead = readDirectly(dst, position);
+            return bytesFromCache + directBytesRead;
+        } else {
+            return bytesFromCache;
+        }
+    }
+
+    private void loadCache(long requestPos, int requestSize) throws IOException {
+        int cacheSize;
+        long cacheStart;
+
+        var lastCacheEnd = cache != null ? this.cacheStart + cache.length : -1;
+        if (requestSize > SEQ_READ_THRESHOLD || lastCacheEnd == requestPos) {
+            cacheSize = SEQ_READ_CACHE_SIZE;
+            cacheStart = requestPos;
+        } else {
+            cacheSize = RANDOM_READ_CACHE_SIZE;
+            cacheStart = Math.max(0, requestPos - cacheSize / 2);
+        }
+
+        loadCacheAt(cacheStart, cacheSize);
+    }
+
+    private void loadCacheAt(long cacheStart, int cacheSize) throws IOException {
+        long maxEnd = Math.min(cacheStart + cacheSize, size);
+        cacheStart = Math.max(0, maxEnd - cacheSize);
+
+        var buffer = ByteBuffer.allocate((int) (maxEnd - cacheStart));
+        var bytesRead = readDirectly(buffer, cacheStart);
+        if (bytesRead != buffer.capacity()) {
+            throw new IOException("Failed to fill cache.");
+        }
+
+        cache = buffer.array();
+        this.cacheStart = cacheStart;
+
+    }
+
+    private boolean isCacheHit(long pos, int bytesToRead) {
+        if (cache == null) return false;
+        long cacheEnd = cacheStart + cache.length;
+        long readEnd = Math.min(pos + bytesToRead, size);
+        return pos >= cacheStart && readEnd <= cacheEnd;
+    }
+
+    private int readFromCache(ByteBuffer dst, long position) {
+        long relativePos = position - cacheStart;
+        int available = (int) Math.min(dst.remaining(), cache.length - relativePos);
+
+        dst.put(cache, (int) relativePos, available);
+
+        return available;
+    }
+
+    private int readDirectly(ByteBuffer dst, long position) throws IOException {
+        try (var source = streamRead(position, dst.remaining());
+             var channel = Channels.newChannel(source.inputStream())) {
+            int totalBytesRead = 0;
+            while (true) {
+                int bytesRead = channel.read(dst);
+                if (bytesRead <= 0) {
+                    break;
+                }
+                totalBytesRead += bytesRead;
+            }
+
+            return totalBytesRead;
+        }
+    }
+
+    public BufferedSource streamRead(long position, long length) throws IOException {
+        long endPosition = Math.min(position + length, size) + startOffset;
+
+        var request = new Request.Builder()
+                .url(url)
+                .header("Range", "bytes=" + (startOffset + position) + "-" + (endPosition - 1))
+                .build();
+
+        var response = client.newCall(request).execute();
+        if (response.code() != 206) {
+            response.close();
+            throw new IOException("Unexpected response code " + response.code());
+        }
+        return response.body().source();
+    }
+
+    @Override
+    public long position() {
+        return position;
+    }
+
+    @Override
+    public SeekableByteChannel position(long newPosition) throws IOException {
+        if (!open) throw new ClosedChannelException();
+        if (newPosition < 0) {
+            throw new IllegalArgumentException("Position out of bounds: " + newPosition);
+        }
+        position = newPosition;
+        return this;
+    }
+
+    @Override
+    public long size() {
+        return size;
+    }
+
+    @Override
+    public boolean isOpen() {
+        return open;
+    }
+
+    @Override
+    public void close() {
+        open = false;
+        cache = null;
+    }
+
+    @Override
+    public int write(ByteBuffer src) {
+        throw new NonWritableChannelException();
+    }
+
+    @Override
+    public SeekableByteChannel truncate(long size) {
+        throw new NonWritableChannelException();
+    }
+}

From 118f86a8ec665bfc24334afe2c8629528d27d400 Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Tue, 30 Sep 2025 02:54:48 +0800
Subject: [PATCH 4/7] app: add local file supports for HttpFileChannel

---
 .../magisk/core/tasks/ExtractImage.kt         |  45 ++++---
 .../magisk/core/tasks/MagiskInstaller.kt      | 124 ++----------------
 .../topjohnwu/magisk/core/tasks/Payload.kt    |   4 +-
 ...ileChannel.java => DataSourceChannel.java} |  53 +++++---
 .../magisk/core/utils/MediaStoreUtils.kt      |   3 +-
 5 files changed, 79 insertions(+), 150 deletions(-)
 rename app/core/src/main/java/com/topjohnwu/magisk/core/utils/{HttpFileChannel.java => DataSourceChannel.java} (79%)

diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/ExtractImage.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/ExtractImage.kt
index 59fc1a5edf992..ba803b91ec7e4 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/ExtractImage.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/ExtractImage.kt
@@ -1,28 +1,24 @@
 package com.topjohnwu.magisk.core.tasks
 
-import com.topjohnwu.magisk.core.di.ServiceLocator
-import com.topjohnwu.magisk.core.utils.HttpFileChannel
-import okio.buffer
-import okio.inflate
-import okio.sink
+import com.topjohnwu.magisk.core.utils.DataSourceChannel
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
 import org.apache.commons.compress.archivers.zip.ZipFile
 import org.apache.commons.compress.archivers.zip.ZipMethod
 import java.io.File
+import java.io.FileOutputStream
 import java.io.IOException
 import java.nio.channels.FileChannel
 import java.nio.file.StandardOpenOption
+import java.util.zip.Inflater
+import java.util.zip.InflaterInputStream
 
 class ExtractImage(
-    private val url: String,
+    private val outFile: File,
     private val console: MutableList<String>,
     private val logs: MutableList<String>,
 ) {
     @Throws(IOException::class)
-    fun start(outFile: File) {
-        logs.add("Downloading from: $url")
-
-        val channel = HttpFileChannel(ServiceLocator.okhttp, url)
+    fun consume(channel: DataSourceChannel) {
         ZipFile.builder()
             .setSeekableByteChannel(channel)
             .setIgnoreLocalFileHeader(true)
@@ -55,7 +51,7 @@ class ExtractImage(
     @Throws(IOException::class)
     private fun extractFromOTAPackage(
         payload: ZipArchiveEntry,
-        channel: HttpFileChannel,
+        channel: DataSourceChannel,
         outFile: File,
     ) {
         if (payload.method != ZipMethod.STORED.code) {
@@ -68,7 +64,11 @@ class ExtractImage(
     }
 
     @Throws(IOException::class)
-    private fun extractFromFactoryImage(zipFile: ZipFile, channel: HttpFileChannel, outFile: File) {
+    private fun extractFromFactoryImage(
+        zipFile: ZipFile,
+        channel: DataSourceChannel,
+        outFile: File
+    ) {
         console.add("- Processing as factory image package")
 
         findBootImageZipEntry(zipFile)?.let { entry ->
@@ -88,14 +88,17 @@ class ExtractImage(
     }
 
     private fun findBootImageZipEntry(zipFile: ZipFile): ZipArchiveEntry? {
-        return zipFile.entries.asSequence().find { it.name == "init_boot.img" }
-            ?: zipFile.entries.asSequence().find { it.name == "boot.img" }
+        return zipFile.entries.asSequence().find {
+            it.name.substringAfterLast('/') == "init_boot.img"
+        } ?: zipFile.entries.asSequence().find {
+            it.name.substringAfterLast('/') == "boot.img"
+        }
     }
 
     @Throws(IOException::class)
     private fun extractFromInnerImageZip(
         entry: ZipArchiveEntry,
-        channel: HttpFileChannel,
+        channel: DataSourceChannel,
         outFile: File
     ) {
         logs.add("Found inner image ZIP: ${entry.name}")
@@ -120,7 +123,7 @@ class ExtractImage(
     private fun extractImageFile(
         zipFile: ZipFile,
         entry: ZipArchiveEntry,
-        channel: HttpFileChannel,
+        channel: DataSourceChannel,
         outFile: File,
     ) {
         console.add("- Found boot image entry: ${entry.name} (${entry.size} bytes)")
@@ -143,9 +146,13 @@ class ExtractImage(
             }
 
             ZipMethod.DEFLATED.code -> {
-                channel.streamRead(entry.dataOffset, entry.size).inflate().use { source ->
-                    outFile.sink().buffer().use { sink ->
-                        sink.writeAll(source)
+                InflaterInputStream(
+                    channel.streamRead(entry.dataOffset, entry.size),
+                    Inflater(true),
+                    16 * 1024
+                ).use { input ->
+                    FileOutputStream(outFile).use { out ->
+                        input.copyTo(out)
                     }
                 }
             }
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
index 23d59640bcb03..94520390536a1 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
@@ -3,10 +3,7 @@ package com.topjohnwu.magisk.core.tasks
 import android.net.Uri
 import android.os.FileUtils
 import android.os.Process
-import android.system.ErrnoException
 import android.system.Os
-import android.system.OsConstants
-import android.system.OsConstants.O_WRONLY
 import androidx.annotation.RequiresApi
 import androidx.annotation.WorkerThread
 import androidx.core.os.postDelayed
@@ -20,6 +17,7 @@ import com.topjohnwu.magisk.core.di.ServiceLocator
 import com.topjohnwu.magisk.core.isRunningAsStub
 import com.topjohnwu.magisk.core.ktx.copyAll
 import com.topjohnwu.magisk.core.ktx.writeTo
+import com.topjohnwu.magisk.core.utils.DataSourceChannel
 import com.topjohnwu.magisk.core.utils.DummyList
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
@@ -36,8 +34,6 @@ import kotlinx.coroutines.withContext
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
-import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream
 import org.apache.commons.compress.archivers.zip.ZipFile
 import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorInputStream
 import timber.log.Timber
@@ -329,108 +325,6 @@ abstract class MagiskInstallImpl protected constructor(
         }
     }
 
-    @Throws(IOException::class)
-    private suspend fun processZip(zipIn: ZipArchiveInputStream): ExtendedFile {
-        console.add("- Processing zip file")
-        val boot = installDir.getChildFile("boot.img")
-        val initBoot = installDir.getChildFile("init_boot.img")
-        var entry: ZipArchiveEntry
-        while (true) {
-            entry = zipIn.nextEntry ?: break
-            if (entry.isDirectory) continue
-            when (entry.name.substringAfterLast('/')) {
-                "payload.bin" -> {
-                    try {
-                        return processPayload(zipIn)
-                    } catch (e: IOException) {
-                        // No boot image in payload.bin, continue to find boot images
-                    }
-                }
-                "init_boot.img" -> {
-                    console.add("- Extracting init_boot.img")
-                    zipIn.copyAndCloseOut(initBoot.newOutputStream())
-                    return initBoot
-                }
-                "boot.img" -> {
-                    console.add("- Extracting boot.img")
-                    zipIn.copyAndCloseOut(boot.newOutputStream())
-                    // Don't return here since there might be an init_boot.img
-                }
-            }
-        }
-        if (boot.exists()) {
-            return boot
-        } else {
-            throw NoBootException()
-        }
-    }
-
-    @Throws(IOException::class)
-    private fun processPayload(input: InputStream): ExtendedFile {
-        var fifo: File? = null
-        try {
-            console.add("- Processing payload.bin")
-            fifo = File.createTempFile("payload-fifo-", null, installDir)
-            fifo.delete()
-            Os.mkfifo(fifo.path, 420 /* 0644 */)
-
-            // Enqueue the shell command first, or the subsequent FIFO open will block
-            val future = arrayOf(
-                "cd $installDir",
-                "./magiskboot extract $fifo",
-                "cd /"
-            ).eq()
-
-            val fd = Os.open(fifo.path, O_WRONLY, 0)
-            try {
-                val bufSize = 1024 * 1024
-                val buf = ByteBuffer.allocate(bufSize)
-                buf.position(input.read(buf.array()).coerceAtLeast(0)).flip()
-                while (buf.hasRemaining()) {
-                    try {
-                        Os.write(fd, buf)
-                    } catch (e: ErrnoException) {
-                        if (e.errno != OsConstants.EPIPE)
-                            throw e
-                        // If SIGPIPE, then the other side is closed, we're done
-                        break
-                    }
-                    if (!buf.hasRemaining()) {
-                        buf.limit(bufSize)
-                        buf.position(input.read(buf.array()).coerceAtLeast(0)).flip()
-                    }
-                }
-            } finally {
-                Os.close(fd)
-            }
-
-            val success = try { future.get().isSuccess } catch (e: Exception) { false }
-            if (!success) {
-                console.add("! Error while extracting payload.bin")
-                throw IOException()
-            }
-            val boot = installDir.getChildFile("boot.img")
-            val initBoot = installDir.getChildFile("init_boot.img")
-            return when {
-                initBoot.exists() -> {
-                    console.add("-- Extract init_boot.img")
-                    initBoot
-                }
-                boot.exists() -> {
-                    console.add("-- Extract boot.img")
-                    boot
-                }
-                else -> {
-                    throw NoBootException()
-                }
-            }
-        } catch (e: ErrnoException) {
-            throw IOException(e)
-        } finally {
-            fifo?.delete()
-        }
-    }
-
     private suspend fun processFile(uri: Uri): Boolean {
         val outStream: OutputStream
         val outFile: MediaStoreUtils.UriFile
@@ -470,18 +364,21 @@ abstract class MagiskInstallImpl protected constructor(
                     // raw image
                     outFile = MediaStoreUtils.getFile("$destName.img")
                     outStream = outFile.uri.outputStream()
+                    val channel = FileInputStream(uri.openFd("r").fileDescriptor).channel
+                    val boot = installDir.getChildFile("boot.img")
 
                     try {
                         if (magic.contentEquals("CrAU".toByteArray())) {
-                            processPayload(src)
+                            DataSourceChannel(channel).use { source ->
+                                Payload(source).extract(boot, { console.add(it) }, { logs.add(it) })
+                            }
                         } else if (magic.contentEquals("PK\u0003\u0004".toByteArray())) {
-                            processZip(ZipArchiveInputStream(src))
+                            ExtractImage(boot, console, logs).consume(DataSourceChannel(channel))
                         } else {
                             console.add("- Copying image to cache")
-                            installDir.getChildFile("boot.img").also {
-                                src.copyAndCloseOut(it.newOutputStream())
-                            }
+                            src.copyAndCloseOut(boot.newOutputStream())
                         }
+                        boot
                     } catch (e: IOException) {
                         outStream.close()
                         outFile.delete()
@@ -540,7 +437,8 @@ abstract class MagiskInstallImpl protected constructor(
         // Download image from url
         try {
             srcBoot = installDir.getChildFile("boot.img")
-            ExtractImage(url, console, logs).start(srcBoot)
+            ExtractImage(srcBoot, console, logs)
+                .consume(DataSourceChannel(ServiceLocator.okhttp, url))
         } catch (e: IOException) {
             console.add("! Error: " + e.message)
             Timber.e(e)
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/Payload.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/Payload.kt
index e6e8d415665ba..9b0bfd3e89fa1 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/Payload.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/Payload.kt
@@ -3,7 +3,7 @@ package com.topjohnwu.magisk.core.tasks
 import chromeos_update_engine.UpdateMetadata.DeltaArchiveManifest
 import chromeos_update_engine.UpdateMetadata.InstallOperation
 import chromeos_update_engine.UpdateMetadata.PartitionUpdate
-import com.topjohnwu.magisk.core.utils.HttpFileChannel
+import com.topjohnwu.magisk.core.utils.DataSourceChannel
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream
 import org.apache.commons.compress.compressors.xz.XZCompressorInputStream
 import java.io.File
@@ -14,7 +14,7 @@ import java.nio.channels.FileChannel
 import java.nio.file.StandardOpenOption
 import java.security.MessageDigest
 
-class Payload(private val channel: HttpFileChannel) {
+class Payload(private val channel: DataSourceChannel) {
     private val manifest: DeltaArchiveManifest
     private var dataBase = 0L
 
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/utils/HttpFileChannel.java b/app/core/src/main/java/com/topjohnwu/magisk/core/utils/DataSourceChannel.java
similarity index 79%
rename from app/core/src/main/java/com/topjohnwu/magisk/core/utils/HttpFileChannel.java
rename to app/core/src/main/java/com/topjohnwu/magisk/core/utils/DataSourceChannel.java
index 9cc9a0a308909..7f53a22885fdd 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/utils/HttpFileChannel.java
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/utils/DataSourceChannel.java
@@ -1,17 +1,20 @@
 package com.topjohnwu.magisk.core.utils;
 
+import org.apache.commons.io.input.BoundedInputStream;
+
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.ClosedChannelException;
+import java.nio.channels.FileChannel;
 import java.nio.channels.NonWritableChannelException;
 import java.nio.channels.SeekableByteChannel;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okio.BufferedSource;
 
-public class HttpFileChannel implements SeekableByteChannel {
+public class DataSourceChannel implements SeekableByteChannel {
     private static final int RANDOM_READ_CACHE_SIZE = 16 * 1024;
     private static final int SEQ_READ_CACHE_SIZE = 1024 * 1024;
     private static final int SEQ_READ_THRESHOLD = 1024;
@@ -19,6 +22,7 @@ public class HttpFileChannel implements SeekableByteChannel {
 
     private final OkHttpClient client;
     private final String url;
+    private final FileChannel fileChannel;
     private final long startOffset;
     private final long size;
 
@@ -28,15 +32,21 @@ public class HttpFileChannel implements SeekableByteChannel {
     private byte[] cache = null;
     private long cacheStart = -1;
 
-    public HttpFileChannel(OkHttpClient client, String url, long startOffset, long size) {
+    private DataSourceChannel(OkHttpClient client, String url, FileChannel fileChannel,
+                              long startOffset, long size) {
         this.client = client;
         this.url = url;
+        this.fileChannel = fileChannel;
         this.startOffset = startOffset;
         this.size = size;
     }
 
-    public HttpFileChannel(OkHttpClient client, String url) throws IOException {
-        this(client, url, 0, fetchTotalSize(client, url));
+    public DataSourceChannel(FileChannel fileChannel) throws IOException {
+        this(null, null, fileChannel, 0, fileChannel.size());
+    }
+
+    public DataSourceChannel(OkHttpClient client, String url) throws IOException {
+        this(client, url, null, 0, fetchTotalSize(client, url));
     }
 
     private static long fetchTotalSize(OkHttpClient client, String url) throws IOException {
@@ -57,14 +67,14 @@ private static long fetchTotalSize(OkHttpClient client, String url) throws IOExc
         }
     }
 
-    public HttpFileChannel slice(long offset, long sliceSize) {
+    public DataSourceChannel slice(long offset, long sliceSize) {
         if (offset == 0 && sliceSize == size) {
             return this;
         }
         if (offset < 0 || sliceSize <= 0 || offset + sliceSize >= size) {
             throw new IllegalArgumentException("Invalid slice parameters");
         }
-        return new HttpFileChannel(client, url, startOffset + offset, sliceSize);
+        return new DataSourceChannel(client, url, fileChannel, startOffset + offset, sliceSize);
     }
 
     @Override
@@ -170,8 +180,7 @@ private int readFromCache(ByteBuffer dst, long position) {
     }
 
     private int readDirectly(ByteBuffer dst, long position) throws IOException {
-        try (var source = streamRead(position, dst.remaining());
-             var channel = Channels.newChannel(source.inputStream())) {
+        try (var channel = Channels.newChannel(streamRead(position, dst.remaining()))) {
             int totalBytesRead = 0;
             while (true) {
                 int bytesRead = channel.read(dst);
@@ -185,12 +194,23 @@ private int readDirectly(ByteBuffer dst, long position) throws IOException {
         }
     }
 
-    public BufferedSource streamRead(long position, long length) throws IOException {
+    public InputStream streamRead(long position, long length) throws IOException {
         long endPosition = Math.min(position + length, size) + startOffset;
+        var startPosition = startOffset + position;
+        var readLength = endPosition - startPosition;
+
+        if (fileChannel != null) {
+            fileChannel.position(startPosition);
+            return BoundedInputStream.builder()
+                    .setInputStream(Channels.newInputStream(fileChannel))
+                    .setMaxCount(readLength)
+                    .setPropagateClose(false)
+                    .get();
+        }
 
         var request = new Request.Builder()
                 .url(url)
-                .header("Range", "bytes=" + (startOffset + position) + "-" + (endPosition - 1))
+                .header("Range", "bytes=" + startPosition + "-" + (endPosition - 1))
                 .build();
 
         var response = client.newCall(request).execute();
@@ -198,7 +218,7 @@ public BufferedSource streamRead(long position, long length) throws IOException
             response.close();
             throw new IOException("Unexpected response code " + response.code());
         }
-        return response.body().source();
+        return response.body().byteStream();
     }
 
     @Override
@@ -207,7 +227,7 @@ public long position() {
     }
 
     @Override
-    public SeekableByteChannel position(long newPosition) throws IOException {
+    public DataSourceChannel position(long newPosition) throws IOException {
         if (!open) throw new ClosedChannelException();
         if (newPosition < 0) {
             throw new IllegalArgumentException("Position out of bounds: " + newPosition);
@@ -227,9 +247,12 @@ public boolean isOpen() {
     }
 
     @Override
-    public void close() {
+    public void close() throws IOException {
         open = false;
         cache = null;
+        if (fileChannel != null) {
+            fileChannel.close();
+        }
     }
 
     @Override
@@ -238,7 +261,7 @@ public int write(ByteBuffer src) {
     }
 
     @Override
-    public SeekableByteChannel truncate(long size) {
+    public DataSourceChannel truncate(long size) {
         throw new NonWritableChannelException();
     }
 }
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/utils/MediaStoreUtils.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/utils/MediaStoreUtils.kt
index 1c25736c651fc..3e6f92539a08d 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/utils/MediaStoreUtils.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/utils/MediaStoreUtils.kt
@@ -98,7 +98,8 @@ object MediaStoreUtils {
 
     fun Uri.outputStream() = cr.openOutputStream(this, "rwt") ?: throw FileNotFoundException()
 
-    fun Uri.openFd() = cr.openFileDescriptor(this, "rwt") ?: throw FileNotFoundException()
+    fun Uri.openFd(mode: String = "rwt") = cr.openFileDescriptor(this, mode)
+        ?: throw FileNotFoundException()
 
     val Uri.displayName: String get() {
         if (scheme == "file") {

From 8e80b2acea5735655d253026504601023c7e9f15 Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Tue, 30 Sep 2025 14:50:31 +0800
Subject: [PATCH 5/7] app: use userspace copy

---
 .../com/topjohnwu/magisk/ui/flash/FlashViewModel.kt   |  4 +---
 app/apk/src/main/res/layout/fragment_install_md2.xml  |  1 -
 .../topjohnwu/magisk/core/tasks/MagiskInstaller.kt    | 11 +++--------
 .../topjohnwu/magisk/core/utils/MediaStoreUtils.kt    |  3 +--
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt b/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
index 661f40dea84d0..53abaff8262be 100644
--- a/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
@@ -82,9 +82,7 @@ class FlashViewModel : BaseViewModel() {
                     MagiskInstaller.Patch(uri, outItems, logItems).exec()
                 }
                 Const.Value.DOWNLOAD -> {
-                    if (uri == null || Build.VERSION.SDK_INT < 29) {
-                        return@launch
-                    }
+                    uri ?: return@launch
                     showReboot = false
                     MagiskInstaller.Download(uri.toString(), outItems, logItems).exec()
                 }
diff --git a/app/apk/src/main/res/layout/fragment_install_md2.xml b/app/apk/src/main/res/layout/fragment_install_md2.xml
index 5305a87a2e8a2..0999f025d7d38 100644
--- a/app/apk/src/main/res/layout/fragment_install_md2.xml
+++ b/app/apk/src/main/res/layout/fragment_install_md2.xml
@@ -194,7 +194,6 @@
                             android:id="@+id/method_download"
                             style="@style/WidgetFoundation.RadioButton"
                             android:layout_width="match_parent"
-                            gone="@{android.os.Build.VERSION.SDK_INT &lt; 29}"
                             android:layout_height="wrap_content"
                             android:text="@string/download_patch_file" />
 
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
index 94520390536a1..a3e55807198ff 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
@@ -1,10 +1,8 @@
 package com.topjohnwu.magisk.core.tasks
 
 import android.net.Uri
-import android.os.FileUtils
 import android.os.Process
 import android.system.Os
-import androidx.annotation.RequiresApi
 import androidx.annotation.WorkerThread
 import androidx.core.os.postDelayed
 import com.topjohnwu.magisk.StubApk
@@ -364,7 +362,7 @@ abstract class MagiskInstallImpl protected constructor(
                     // raw image
                     outFile = MediaStoreUtils.getFile("$destName.img")
                     outStream = outFile.uri.outputStream()
-                    val channel = FileInputStream(uri.openFd("r").fileDescriptor).channel
+                    val channel = FileInputStream(uri.openFd().fileDescriptor).channel
                     val boot = installDir.getChildFile("boot.img")
 
                     try {
@@ -432,7 +430,6 @@ abstract class MagiskInstallImpl protected constructor(
         return true
     }
 
-    @RequiresApi(29)
     private fun processUrl(url: String): Boolean {
         // Download image from url
         try {
@@ -454,9 +451,9 @@ abstract class MagiskInstallImpl protected constructor(
         val outFile = MediaStoreUtils.getFile("$destName.img")
         try {
             val newBoot = installDir.getChildFile("new-boot.img")
-            outFile.uri.openFd().use { out ->
+            outFile.uri.outputStream().use { out ->
                 FileInputStream(newBoot).use { input ->
-                    FileUtils.copy(input, FileOutputStream(out.fileDescriptor))
+                    input.copyTo(out)
                 }
             }
             newBoot.delete()
@@ -531,7 +528,6 @@ abstract class MagiskInstallImpl protected constructor(
 
     protected suspend fun patchFile(file: Uri) = extractFiles() && processFile(file)
 
-    @RequiresApi(29)
     protected suspend fun patchFile(url: String) = extractFiles() && processUrl(url)
 
     protected suspend fun direct() = findImage() && extractFiles() && patchBoot() && flashBoot()
@@ -601,7 +597,6 @@ class MagiskInstaller {
         override suspend fun operations() = patchFile(uri)
     }
 
-    @RequiresApi(29)
     class Download(
         private val url: String,
         console: MutableList<String>,
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/utils/MediaStoreUtils.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/utils/MediaStoreUtils.kt
index 3e6f92539a08d..fc69e990ce73c 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/utils/MediaStoreUtils.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/utils/MediaStoreUtils.kt
@@ -98,8 +98,7 @@ object MediaStoreUtils {
 
     fun Uri.outputStream() = cr.openOutputStream(this, "rwt") ?: throw FileNotFoundException()
 
-    fun Uri.openFd(mode: String = "rwt") = cr.openFileDescriptor(this, mode)
-        ?: throw FileNotFoundException()
+    fun Uri.openFd() = cr.openFileDescriptor(this, "r") ?: throw FileNotFoundException()
 
     val Uri.displayName: String get() {
         if (scheme == "file") {

From e10d8b390b417e2ac813673fed6e9a21014d754d Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Wed, 13 Aug 2025 19:18:13 +0800
Subject: [PATCH 6/7] app: update zh-rCN translation

---
 app/core/src/main/res/values-zh-rCN/strings.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/core/src/main/res/values-zh-rCN/strings.xml b/app/core/src/main/res/values-zh-rCN/strings.xml
index eee017f27560d..0aecb43ef018d 100644
--- a/app/core/src/main/res/values-zh-rCN/strings.xml
+++ b/app/core/src/main/res/values-zh-rCN/strings.xml
@@ -19,7 +19,6 @@
     <string name="hide">不再显示</string>
     <string name="home_package">包名</string>
     <string name="home_app_title">App</string>
-
     <string name="home_notice_content">仅从官方 GitHub 页面下载 Magisk。未知来源的文件可能具有恶意行为！</string>
     <string name="home_support_title">支持开发</string>
     <string name="home_follow_title">关注我们</string>
@@ -44,8 +43,11 @@
     <string name="install_inactive_slot">安装到未使用的槽位（OTA 后）</string>
     <string name="install_inactive_slot_msg">将在重启后强制切换到另一个槽位！注意只能在 OTA 更新完成后的重启之前使用。</string>
     <string name="setup_title">修复安装</string>
-    <string name="select_patch_file">选择并修补一个文件</string>
+    <string name="select_patch_file">选择并修补文件</string>
     <string name="patch_file_msg">选择一个原始映像文件（*.img）、Odin 包（*.tar）或 payload.bin（*.bin）</string>
+    <string name="download_patch_file">下载并修补映像</string>
+    <string name="download_dialog_title">输入映像链接</string>
+    <string name="download_dialog_msg">完整 OTA 映像或者出厂映像</string>
     <string name="reboot_delay_toast">设备将在 5 秒后重启</string>
     <string name="flash_screen_title">安装</string>
 
@@ -75,7 +77,6 @@
     <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>
@@ -92,8 +93,6 @@
     <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>
@@ -140,6 +139,7 @@
     <string name="settings_update_channel_title">更新通道</string>
     <string name="settings_update_stable">稳定版</string>
     <string name="settings_update_beta">测试版</string>
+    <string name="settings_update_debug">调试版</string>
     <string name="settings_update_custom">自定义通道</string>
     <string name="settings_update_custom_msg">自定义通道网址</string>
     <string name="settings_zygisk_summary">在 Zygote 中运行 Magisk</string>
@@ -181,8 +181,7 @@
     <string name="settings_doh_title">安全 DNS（DoH）</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="settings_random_name_description">随机修补映像和 tar 文件的文件名以防止检测</string>
     <string name="multiuser_mode">多用户模式</string>
     <string name="settings_owner_only">仅设备所有者</string>
     <string name="settings_owner_manage">由设备所有者管理</string>
@@ -190,7 +189,6 @@
     <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>

From b3f58670d3f5a76c34d9ebc6d8dc7deb4697fd09 Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Thu, 14 Aug 2025 16:26:50 +0800
Subject: [PATCH 7/7] app: delete unused files

---
 app/buildSrc/src/main/java/AddCommentTask.kt |  3 ++-
 app/buildSrc/src/main/java/Setup.kt          | 11 +++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/buildSrc/src/main/java/AddCommentTask.kt b/app/buildSrc/src/main/java/AddCommentTask.kt
index c5af1ab4b64a6..05a5ee2da7803 100644
--- a/app/buildSrc/src/main/java/AddCommentTask.kt
+++ b/app/buildSrc/src/main/java/AddCommentTask.kt
@@ -60,6 +60,7 @@ abstract class AddCommentTask: DefaultTask() {
             it.get(IncrementalPackager.APP_METADATA_ENTRY_PATH)?.delete()
             it.get(IncrementalPackager.VERSION_CONTROL_INFO_ENTRY_PATH)?.delete()
             it.get(JarFile.MANIFEST_NAME)?.delete()
+            it.get("assets/PublicSuffixDatabase.list")?.delete()
         }
 
         outFile
@@ -74,4 +75,4 @@ abstract class AddCommentTask: DefaultTask() {
         val entry = keyStore.getEntry(keyAlias!!, KeyStore.PasswordProtection(keyPwdArray))
         return entry as KeyStore.PrivateKeyEntry
     }
-}
\ No newline at end of file
+}
diff --git a/app/buildSrc/src/main/java/Setup.kt b/app/buildSrc/src/main/java/Setup.kt
index c5aaebdec05e1..7ee9caf17b9c4 100644
--- a/app/buildSrc/src/main/java/Setup.kt
+++ b/app/buildSrc/src/main/java/Setup.kt
@@ -68,24 +68,19 @@ fun Project.setupCommon() {
                     "/META-INF/*",
                     "/META-INF/androidx/**",
                     "/META-INF/versions/**",
+                    "/META-INF/native-image/**",
                     "/org/bouncycastle/**",
                     "/org/apache/commons/**",
                     "/kotlin/**",
-                    "/kotlinx/**",
-                    "/okhttp3/**",
                     "/*.txt",
-                    "/*.bin",
                     "/*.json",
+                    "**/*.bin",
+                    "**/*.proto",
                 )
             }
         }
     }
 
-    configurations.all {
-        exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk7")
-        exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
-    }
-
     tasks.withType<KotlinCompile> {
         compilerOptions {
             jvmTarget = JvmTarget.JVM_21