stability: drop legacy serializable chooser fallback

Author: yhs0602

app/src/main/java/com/kyhsgeekcode/disassembler/viewmodel/MainViewModel.kt

@@ -119,36 +119,19 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
 
     fun onSelectIntent(intent: Intent) {
         Timber.d("onActivityResultOk")
-        _openAsProject.value = intent.getBooleanExtra("openProject", false)
-        val selectedFilePayload = selectedFileIntentPayload(intent)
-        if (selectedFilePayload != null) {
-            onSelectFilePayload(selectedFilePayload)
-            return
-        }
-        val fi = intent.serializableExtraCompat<FileItem>("fileItem")
-        if (fi != null) {
-            onSelectFileItem(fi)
-        } else {
-            val displayName = intent.getStringExtra("displayName")
-            val uri = intent.parcelableExtraCompat<Uri>("uri")
-                ?: intent.extras.parcelableExtraCompat(Intent.EXTRA_STREAM)
-                ?: return
-            onSelectUri(uri, displayName)
-        }
-    }
+        when (val selection = resolveIncomingSelection(intent)) {
+            is IncomingSelection.CompactFile -> {
+                _openAsProject.value = selection.openAsProject
+                onSelectFilePayload(selection.payload)
+            }
 
-    private fun onSelectFileItem(fileItem: FileItem) {
-        val file = fileItem.file ?: run {
-            Logger.e(TAG, "Failed to load fileItem: $fileItem")
-            return@onSelectFileItem
+            is IncomingSelection.UriSelection -> {
+                _openAsProject.value = selection.openAsProject
+                onSelectUri(selection.uri, selection.displayName)
+            }
+
+            null -> return
         }
-        onSelectFilePayload(
-            SelectedFileIntentPayload(
-                filePath = file.absolutePath,
-                nativeFilePath = (fileItem as? FileItemApp)?.nativeFile?.absolutePath,
-                projectType = fileItemTypeToProjectType(fileItem)
-            )
-        )
     }
 
     private fun onSelectFilePayload(payload: SelectedFileIntentPayload) {
@@ -515,21 +498,62 @@ private inline fun <reified T : Parcelable> Bundle?.parcelableExtraCompat(key: S
     }
 }
 
-private inline fun <reified T : java.io.Serializable> Intent.serializableExtraCompat(key: String): T? {
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        getSerializableExtra(key, T::class.java)
-    } else {
-        @Suppress("DEPRECATION")
-        getSerializableExtra(key) as? T
-    }
-}
-
 internal data class SelectedFileIntentPayload(
     val filePath: String,
     val nativeFilePath: String?,
     val projectType: String
 )
 
+internal sealed class IncomingSelection {
+    data class CompactFile(
+        val payload: SelectedFileIntentPayload,
+        val openAsProject: Boolean
+    ) : IncomingSelection()
+
+    data class UriSelection(
+        val uri: Uri,
+        val displayName: String?,
+        val openAsProject: Boolean
+    ) : IncomingSelection()
+}
+
+internal fun resolveIncomingSelection(intent: Intent): IncomingSelection? {
+    return resolveIncomingSelection(
+        openAsProject = intent.getBooleanExtra("openProject", false),
+        filePath = intent.getStringExtra(NewFileChooserActivity.EXTRA_FILE_PATH),
+        nativeFilePath = intent.getStringExtra(NewFileChooserActivity.EXTRA_NATIVE_FILE_PATH),
+        projectType = intent.getStringExtra(NewFileChooserActivity.EXTRA_PROJECT_TYPE),
+        uri = intent.parcelableExtraCompat("uri"),
+        extraStreamUri = intent.extras.parcelableExtraCompat(Intent.EXTRA_STREAM),
+        displayName = intent.getStringExtra("displayName")
+    )
+}
+
+internal fun resolveIncomingSelection(
+    openAsProject: Boolean,
+    filePath: String?,
+    nativeFilePath: String?,
+    projectType: String?,
+    uri: Uri?,
+    extraStreamUri: Uri?,
+    displayName: String?
+): IncomingSelection? {
+    val selectedFilePayload = selectedFileIntentPayload(
+        filePath = filePath,
+        nativeFilePath = nativeFilePath,
+        projectType = projectType
+    )
+    if (selectedFilePayload != null) {
+        return IncomingSelection.CompactFile(selectedFilePayload, openAsProject)
+    }
+    val incomingUri = uri ?: extraStreamUri ?: return null
+    return IncomingSelection.UriSelection(
+        uri = incomingUri,
+        displayName = displayName,
+        openAsProject = openAsProject
+    )
+}
+
 internal fun selectedFileIntentPayload(intent: Intent): SelectedFileIntentPayload? {
     return selectedFileIntentPayload(
         filePath = intent.getStringExtra(NewFileChooserActivity.EXTRA_FILE_PATH),

app/src/test/java/com/kyhsgeekcode/disassembler/viewmodel/IncomingSelectionTest.kt

@@ -0,0 +1,41 @@
+package com.kyhsgeekcode.disassembler.viewmodel
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Test
+
+class IncomingSelectionTest {
+    @Test
+    fun `resolveIncomingSelection prefers compact chooser payload`() {
+        val selection = resolveIncomingSelection(
+            openAsProject = true,
+            filePath = "/tmp/sample.apk",
+            nativeFilePath = "/tmp/lib",
+            projectType = "APK",
+            uri = null,
+            extraStreamUri = null,
+            displayName = null
+        )
+
+        require(selection is IncomingSelection.CompactFile)
+        assertEquals(true, selection.openAsProject)
+        assertEquals("/tmp/sample.apk", selection.payload.filePath)
+        assertEquals("/tmp/lib", selection.payload.nativeFilePath)
+        assertEquals("APK", selection.payload.projectType)
+    }
+
+    @Test
+    fun `resolveIncomingSelection ignores legacy serializable fileItem extras`() {
+        assertNull(
+            resolveIncomingSelection(
+                openAsProject = false,
+                filePath = null,
+                nativeFilePath = null,
+                projectType = null,
+                uri = null,
+                extraStreamUri = null,
+                displayName = null
+            )
+        )
+    }
+}