fix: Interrupt split APK merger immediately on cancellation

Replace `withContext` with `runInterruptible` in `Merger.merge` so that blocking operations (loadApkDirectory, mergeModules, writeApk) are interrupted immediately via `Thread.interrupt()` when the patcher worker is canceled. Previously, `withContext` would wait for the blocking call to finish naturally before throwing `CancellationException`, leaving temporary `split-<timestamp>` directories on disk and causing them to accumulate when the user restarted patching.

Author: MarcaDian

app/src/main/java/app/morphe/manager/patcher/split/Merger.kt

@@ -8,11 +8,10 @@ import com.reandroid.app.AndroidManifest
 import com.reandroid.archive.ZipEntryMap
 import com.reandroid.arsc.chunk.xml.ResXmlElement
 import com.reandroid.arsc.container.SpecTypePair
-import com.reandroid.arsc.header.TableHeader
 import com.reandroid.arsc.model.ResourceEntry
 import com.reandroid.arsc.value.ValueType
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.runInterruptible
 import java.io.Closeable
 import java.io.File
 import java.io.FileNotFoundException
@@ -21,11 +20,12 @@ import java.nio.charset.CoderMalfunctionError
 import java.nio.file.Path
 import java.util.Locale
 
+const val TAG = "APKEditor"
+
 private class ApkEditorLogger(
     private val onProgress: ((String) -> Unit)? = null
 ) : APKLogger {
     private companion object {
-        const val TAG = "APKEditor"
         val MERGE_PATTERN = Regex("Merging\\s*:?\\s*(.+)", RegexOption.IGNORE_CASE)
     }
 
@@ -72,7 +72,7 @@ internal object Merger {
     ) {
         val closeables = mutableSetOf<Closeable>()
         try {
-            val merged = withContext(Dispatchers.Default) {
+            val merged = runInterruptible(Dispatchers.Default) {
                 try {
                     val logger = ApkEditorLogger(onProgress)
                     val bundle = ApkBundle().apply {
@@ -196,7 +196,7 @@ internal object Merger {
             applyExtractNativeLibs(merged)
 
             outputApk.parentFile?.mkdirs()
-            withContext(Dispatchers.IO) {
+            runInterruptible(Dispatchers.IO) {
                 onProgress?.invoke("Writing merged APK")
                 merged.writeApk(outputApk)
             }
@@ -227,18 +227,6 @@ internal object Merger {
         }
     }
 
-    private fun generateMergedModuleName(bundle: ApkBundle): String {
-        val moduleNames = bundle.listModuleNames().toSet()
-        val baseName = "merged"
-        var candidate = baseName
-        var index = 1
-        while (moduleNames.contains(candidate)) {
-            candidate = "${baseName}_$index"
-            index += 1
-        }
-        return candidate
-    }
-
     private fun buildMergeOrder(
         modules: List<ApkModule>,
         baseModule: ApkModule
@@ -309,9 +297,9 @@ internal object Merger {
             val path = resValue.valueAsString
             if (!path.isNullOrBlank()) {
                 zipEntryMap.remove(path)
-                Log.i("APKEditor", "Removed table entry $path")
+                Log.i(TAG, "Removed table entry $path")
             }
-            resEntry.setNull(true)
+            resEntry.isNull = true
             val specTypePair: SpecTypePair = resEntry.typeBlock.parentSpecTypePair
             specTypePair.removeNullEntries(resEntry.id)
         }
@@ -323,7 +311,7 @@ internal object Merger {
         } else {
             null
         }
-        Log.i("APKEditor", "Applying: extractNativeLibs=$value")
+        Log.i(TAG, "Applying: extractNativeLibs=$value")
         module.setExtractNativeLibs(value)
     }
 }

app/src/main/java/app/morphe/manager/patcher/split/SplitApkPreparer.kt

@@ -32,7 +32,7 @@ object SplitApkPreparer {
     suspend fun prepareIfNeeded(
         source: File,
         workspace: File,
-        logger: Logger = defaultLogger,
+        logger: Logger = DefaultLogger,
         stripNativeLibs: Boolean = false,
         skipUnneededSplits: Boolean = false,
         onProgress: ((String) -> Unit)? = null,
@@ -257,13 +257,8 @@ object SplitApkPreparer {
     }
 
     private fun deviceLocaleTokens(): Set<String> {
-        val locales = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            val list = Resources.getSystem().configuration.locales
-            (0 until list.size()).map { index -> list[index] }
-        } else {
-            listOf(Locale.getDefault())
-        }
-
+        val list = Resources.getSystem().configuration.locales
+        val locales = (0 until list.size()).map { index -> list[index] }
         return locales.flatMap { locale ->
             buildLocaleTokens(locale)
         }.map { it.lowercase(Locale.ROOT) }.toSet()
@@ -354,7 +349,7 @@ object SplitApkPreparer {
         }
     }
 
-    private object defaultLogger : Logger() {
+    private object DefaultLogger : Logger() {
         override fun log(level: LogLevel, message: String) {
             Log.d("SplitApkPreparer", "[${level.name}] $message")
         }