From bfdb706b60ac1a3a38dc8a895143a21973d7b399 Mon Sep 17 00:00:00 2001
From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com>
Date: Mon, 28 Apr 2025 16:05:59 +0800
Subject: [PATCH] Add kernel version and patch tool version log information -
 Should fix the 5.10 bug where you can't swipe write

Signed-off-by: ShirkNeko 109797057+ShirkNeko@users.noreply.github.com
---
 manager/app/src/main/assets/5_10-mkbootfs       | Bin 0 -> 12112 bytes
 .../main/assets/{mkbootfs => 5_15+-mkbootfs}    | Bin
 .../java/com/sukisu/ultra/flash/KernelFlash.kt  |  14 +++++++++++---
 .../app/src/main/res/values-zh-rCN/strings.xml  |   2 ++
 manager/app/src/main/res/values/strings.xml     |   2 ++
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 manager/app/src/main/assets/5_10-mkbootfs
 rename manager/app/src/main/assets/{mkbootfs => 5_15+-mkbootfs} (100%)

diff --git a/manager/app/src/main/assets/5_10-mkbootfs b/manager/app/src/main/assets/5_10-mkbootfs
new file mode 100644
index 0000000000000000000000000000000000000000..2af1167a9035fdc05b591080b5a9d5780d3ce5d0
GIT binary patch
literal 12112
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

literal 0
HcmV?d00001

diff --git a/manager/app/src/main/assets/mkbootfs b/manager/app/src/main/assets/5_15+-mkbootfs
similarity index 100%
rename from manager/app/src/main/assets/mkbootfs
rename to manager/app/src/main/assets/5_15+-mkbootfs
diff --git a/manager/app/src/main/java/com/sukisu/ultra/flash/KernelFlash.kt b/manager/app/src/main/java/com/sukisu/ultra/flash/KernelFlash.kt
index 343c265f..63088a99 100644
--- a/manager/app/src/main/java/com/sukisu/ultra/flash/KernelFlash.kt
+++ b/manager/app/src/main/java/com/sukisu/ultra/flash/KernelFlash.kt
@@ -196,9 +196,17 @@ class HorizonKernelWorker(
     }
 
     private fun patch() {
-        val mkbootfsPath = "${context.filesDir.absolutePath}/mkbootfs"
-        AssetsUtil.exportFiles(context, "mkbootfs", mkbootfsPath)
-        runCommand(false, "sed -i '/chmod -R 755 tools bin;/i cp -f $mkbootfsPath \$AKHOME/tools;' $binaryPath")
+        val kernelVersion = runCommandGetOutput(true, "cat /proc/version")
+        val versionRegex = """\d+\.\d+\.\d+""".toRegex()
+        val version = versionRegex.find(kernelVersion)?.value ?: ""
+        val toolName = when {
+            version.startsWith("5.10.") -> "5_10"
+            else -> "5_15+"
+        }
+        val toolPath = "${context.filesDir.absolutePath}/mkbootfs"
+        AssetsUtil.exportFiles(context, "$toolName-mkbootfs", toolPath)
+        state.addLog("${context.getString(R.string.kernel_version_log, version)} ${context.getString(R.string.tool_version_log, toolName)}")
+        runCommand(false, "sed -i '/chmod -R 755 tools bin;/i cp -f $toolPath \$AKHOME/tools;' $binaryPath")
     }
 
     private fun flash() {
diff --git a/manager/app/src/main/res/values-zh-rCN/strings.xml b/manager/app/src/main/res/values-zh-rCN/strings.xml
index 6f9e2c8b..0fce62e9 100644
--- a/manager/app/src/main/res/values-zh-rCN/strings.xml
+++ b/manager/app/src/main/res/values-zh-rCN/strings.xml
@@ -295,4 +295,6 @@
     <!-- lkm/gki install -->
     <string name="Lkm_install_methods">LKM修补/安装</string>
     <string name="GKI_install_methods">GKI安装</string>
+    <string name="kernel_version_log">内核版本：%1$s</string>
+    <string name="tool_version_log">使用修补工具：%1$s</string>
 </resources>
diff --git a/manager/app/src/main/res/values/strings.xml b/manager/app/src/main/res/values/strings.xml
index 382f6b9a..ac575ee8 100644
--- a/manager/app/src/main/res/values/strings.xml
+++ b/manager/app/src/main/res/values/strings.xml
@@ -299,4 +299,6 @@
     <!-- lkm/gki install -->
     <string name="Lkm_install_methods">LKM repair/installation</string>
     <string name="GKI_install_methods">GKI installation</string>
+    <string name="kernel_version_log">Kernel version：%1$s</string>
+    <string name="tool_version_log">Using the patching tool：%1$s</string>
 </resources>