fix(app): write patched init_boot images to the configured download directory (#217)

* fix(app): write patched init_boot images to the configured download directory

The ABK LKM boot/init_boot patch flow (patchAbkLkmBootImage) wrote its
patched .img output to app-scoped external storage
(Android/data/<pkg>/files/Download/abk-patched), which is invisible to
file managers and unlike every other flow that writes to the user's
public downloadDirectory (Download/ABK).

Thread MainUiState.downloadDirectory through AbkRootPatchScreen into
patchAbkLkmBootImage and resolve the output dir via a priority chain:
public downloadDirectory/abk-patched -> app-scoped external -> internal
filesDir, mirroring DownloadUtils.resolveDownloadsRoot semantics. The
output-dir log line is emitted only in image-producing (non-flash) modes.

* fix(app): harden init_boot patch output fallback

* chore(app): drop redundant patch output comment

---------

Co-authored-by: fanziyun <186413865+fanziyun@users.noreply.github.com>

Author: fanziyun

app/src/main/java/com/abk/kernel/ui/screens/AbkRootPatchScreen.kt

@@ -121,7 +121,8 @@ fun AbkRootPatchScreen(
     backgroundUri: String?,
     backgroundImageEnabled: Boolean,
     onBack: () -> Unit,
-    onBackEnabledChange: (Boolean) -> Unit = {}
+    onBackEnabledChange: (Boolean) -> Unit = {},
+    downloadDirectory: String? = null
 ) {
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
@@ -377,7 +378,8 @@ fun AbkRootPatchScreen(
                     allowShell = allowShell,
                     enableAdb = enableAdb,
                     localModulePath = modulePath,
-                    onOutput = ::appendLog
+                    onOutput = ::appendLog,
+                    downloadDirectory = downloadDirectory
                 )
             }
             finishPatchResult(result)
@@ -409,7 +411,8 @@ fun AbkRootPatchScreen(
                     allowShell = allowShell,
                     enableAdb = enableAdb,
                     localModulePath = modulePath,
-                    onOutput = ::appendLog
+                    onOutput = ::appendLog,
+                    downloadDirectory = downloadDirectory
                 )
             }
             finishPatchResult(result)

app/src/main/java/com/abk/kernel/ui/screens/RuntimeScreens.kt

@@ -260,6 +260,7 @@ fun RuntimeHomeScreen(
                     runtimeVariant = state.abkRuntimeStatus?.manager?.variant.orEmpty(),
                     backgroundUri = state.customBackgroundUri,
                     backgroundImageEnabled = state.backgroundImageEnabled,
+                    downloadDirectory = state.downloadDirectory,
                     onBack = childPageBack::requestDismiss,
                     onBackEnabledChange = { managerPatchBackEnabled = it }
                 )

app/src/main/java/com/abk/kernel/utils/RootUtils.kt

@@ -21,6 +21,7 @@ import com.topjohnwu.superuser.CallbackList
 import com.topjohnwu.superuser.Shell
 import org.json.JSONObject
 import java.io.File
+import java.io.IOException
 import java.util.Collections
 import java.util.Properties
 import java.security.MessageDigest
@@ -476,7 +477,8 @@ object RootUtils {
         allowShell: Boolean = false,
         enableAdb: Boolean = false,
         localModulePath: String? = null,
-        onOutput: ((String) -> Unit)? = null
+        onOutput: ((String) -> Unit)? = null,
+        downloadDirectory: String? = null
     ): BootPatchResult {
         val sourceBoot = bootImagePath
             ?.takeIf { it.isNotBlank() }
@@ -511,10 +513,19 @@ object RootUtils {
                 stageBundledAbkLkmAsset(context, workDir, checkNotNull(asset))
             }
 
-            val outputDir = File(
-                context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS) ?: context.filesDir,
-                "abk-patched"
-            ).apply { mkdirs() }
+            val appScopedOutputCandidates = listOfNotNull(
+                context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
+                    ?.let { File(it, "abk-patched") },
+                File(context.filesDir, "abk-patched")
+            )
+            val outputDir = (if (flash) null else resolvePatchOutputDir(downloadDirectory))
+                ?: appScopedOutputCandidates.firstNotNullOfOrNull(::prepareWritableDirectory)
+                ?: throw IOException(
+                    tr(R.string.download_directory_create_failed, context.filesDir.absolutePath)
+                )
+            if (!flash) {
+                onOutput?.invoke(tr(R.string.ru_log_output_dir, outputDir.absolutePath))
+            }
             val moduleName = (asset?.let { "${it.variantId}-${it.kmi}" } ?: moduleFile.nameWithoutExtension)
                 .replace(Regex("""[^A-Za-z0-9._-]"""), "_")
             val outputName = "abk-${moduleName}-patched-${System.currentTimeMillis()}.img"
@@ -2266,6 +2277,18 @@ object RootUtils {
         return target
     }
 
+    internal fun resolvePatchOutputDir(downloadDirectory: String?): File? {
+        val root = prepareWritableDirectory(
+            File(DownloadDirectoryUtils.normalizeDirectoryPath(downloadDirectory))
+        ) ?: return null
+        return prepareWritableDirectory(File(root, "abk-patched"))
+    }
+
+    private fun prepareWritableDirectory(directory: File): File? {
+        if (!directory.exists() && !directory.mkdirs()) return null
+        return directory.takeIf { it.isDirectory && it.canWrite() }
+    }
+
     private fun buildBootPatchArgs(
         context: Context,
         bootImage: File?,

app/src/main/res/values-en/strings.xml

@@ -1224,6 +1224,7 @@
     <string name="ru_lkm_module_not_bundled">No bundled LKM module for %1$s / %2$s</string>
     <string name="ru_log_using_bundled_lkm">[ABK] Using APK-bundled LKM: %1$s · %2$s</string>
     <string name="ru_log_using_local_lkm">[ABK] Using local LKM: %1$s</string>
+    <string name="ru_log_output_dir">[ABK] Output directory: %1$s</string>
     <string name="ru_log_no_root_shell_local_patch">[ABK] Root shell unavailable; falling back to APK-bundled SukiSU-Ultra ksud to patch the local boot image only</string>
     <string name="ru_no_embedded_ksud">No runnable APK-bundled SukiSU-Ultra ksud found; without root you can only generate a patched image after selecting boot.img.</string>
     <string name="ru_install_requires_root">This installation method requires root permission.</string>

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

@@ -1223,6 +1223,7 @@
     <string name="ru_lkm_module_not_bundled">Нет встроенного LKM-модуля для %1$s / %2$s</string>
     <string name="ru_log_using_bundled_lkm">[ABK] Используется встроенный в APK LKM: %1$s · %2$s</string>
     <string name="ru_log_using_local_lkm">[ABK] Используется локальный LKM: %1$s</string>
+    <string name="ru_log_output_dir">[ABK] Каталог вывода: %1$s</string>
     <string name="ru_log_no_root_shell_local_patch">[ABK] Root shell недоступен — переходим на встроенный в APK SukiSU-Ultra ksud для патча только локального образа boot</string>
     <string name="ru_no_embedded_ksud">Исполняемый встроенный в APK SukiSU-Ultra ksud не найден; без root можно только сгенерировать пропатченный образ после выбора boot.img.</string>
     <string name="ru_install_requires_root">Этот способ установки требует прав root.</string>

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

@@ -1296,6 +1296,7 @@
     <string name="ru_lkm_module_not_bundled">未内置 %1$s / %2$s 的 LKM 模块</string>
     <string name="ru_log_using_bundled_lkm">[ABK] 使用 APK 内置 LKM: %1$s · %2$s</string>
     <string name="ru_log_using_local_lkm">[ABK] 使用本地 LKM: %1$s</string>
+    <string name="ru_log_output_dir">[ABK] 输出目录: %1$s</string>
     <string name="ru_log_no_root_shell_local_patch">[ABK] Root shell 不可用，改用 APK 内置 SukiSU-Ultra ksud 仅修补本地 boot 镜像</string>
     <string name="ru_no_embedded_ksud">未找到可执行的 APK 内置 SukiSU-Ultra ksud；无 Root 时只能在选择 boot.img 后生成 patched 镜像。</string>
     <string name="ru_install_requires_root">该安装方式需要 Root 权限。</string>