stability: shrink chooser result payloads

Author: yhs0602

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

@@ -30,6 +30,7 @@ import com.kyhsgeekcode.disassembler.ui.TabKind
 import com.kyhsgeekcode.disassembler.ui.tabs.*
 import com.kyhsgeekcode.filechooser.model.FileItem
 import com.kyhsgeekcode.filechooser.model.FileItemApp
+import com.kyhsgeekcode.filechooser.NewFileChooserActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.Channel
@@ -117,6 +118,11 @@ 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)
@@ -130,16 +136,23 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     private fun onSelectFileItem(fileItem: FileItem) {
-        _file.value = fileItem.file ?: run {
+        val file = fileItem.file ?: run {
             Logger.e(TAG, "Failed to load fileItem: $fileItem")
             return@onSelectFileItem
         }
-        _nativeFile.value = if (fileItem is FileItemApp) {
-            fileItem.nativeFile
-        } else {
-            null
-        }
-        _projectType.value = fileItemTypeToProjectType(fileItem)
+        onSelectFilePayload(
+            SelectedFileIntentPayload(
+                filePath = file.absolutePath,
+                nativeFilePath = (fileItem as? FileItemApp)?.nativeFile?.absolutePath,
+                projectType = fileItemTypeToProjectType(fileItem)
+            )
+        )
+    }
+
+    private fun onSelectFilePayload(payload: SelectedFileIntentPayload) {
+        _file.value = File(payload.filePath)
+        _nativeFile.value = payload.nativeFilePath?.let(::File)
+        _projectType.value = payload.projectType
         _askCopy.value = true
     }
 
@@ -415,6 +428,33 @@ private inline fun <reified T : java.io.Serializable> Intent.serializableExtraCo
     }
 }
 
+internal data class SelectedFileIntentPayload(
+    val filePath: String,
+    val nativeFilePath: String?,
+    val projectType: String
+)
+
+internal fun selectedFileIntentPayload(intent: Intent): SelectedFileIntentPayload? {
+    return selectedFileIntentPayload(
+        filePath = intent.getStringExtra(NewFileChooserActivity.EXTRA_FILE_PATH),
+        nativeFilePath = intent.getStringExtra(NewFileChooserActivity.EXTRA_NATIVE_FILE_PATH),
+        projectType = intent.getStringExtra(NewFileChooserActivity.EXTRA_PROJECT_TYPE)
+    )
+}
+
+internal fun selectedFileIntentPayload(
+    filePath: String?,
+    nativeFilePath: String?,
+    projectType: String?
+): SelectedFileIntentPayload? {
+    val resolvedFilePath = filePath ?: return null
+    return SelectedFileIntentPayload(
+        filePath = resolvedFilePath,
+        nativeFilePath = nativeFilePath,
+        projectType = projectType ?: ProjectType.UNKNOWN
+    )
+}
+
 
 private fun createTabData(item: FileDrawerTreeItem): TabData {
     var title = "${item.caption} as ${item.type}"

app/src/main/java/com/kyhsgeekcode/filechooser/NewFileChooserActivity.kt

@@ -14,9 +14,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.kyhsgeekcode.disassembler.ProgressHandler
 import com.kyhsgeekcode.disassembler.databinding.ActivityNewFileChooserBinding
 import com.kyhsgeekcode.disassembler.preference.PowerUserModeSettings
+import com.kyhsgeekcode.disassembler.project.models.ProjectType
 import com.kyhsgeekcode.disassembler.showYesNoDialog
 import com.kyhsgeekcode.download
 import com.kyhsgeekcode.filechooser.model.FileItem
+import com.kyhsgeekcode.filechooser.model.FileItemApp
 import com.tingyik90.snackprogressbar.SnackProgressBar
 import com.tingyik90.snackprogressbar.SnackProgressBarManager
 import kotlinx.coroutines.CoroutineScope
@@ -31,6 +33,9 @@ import java.net.URL
 class NewFileChooserActivity : AppCompatActivity(), ProgressHandler {
     companion object {
         const val EXTRA_POWER_USER_MODE = "power_user_mode"
+        const val EXTRA_FILE_PATH = "selected_file_path"
+        const val EXTRA_NATIVE_FILE_PATH = "selected_native_file_path"
+        const val EXTRA_PROJECT_TYPE = "selected_project_type"
     }
 
     private var _binding: ActivityNewFileChooserBinding? = null
@@ -88,17 +93,17 @@ class NewFileChooserActivity : AppCompatActivity(), ProgressHandler {
     }
 
     fun openAsProject(item: FileItem) {
-        val resultIntent = Intent()
-        resultIntent.putExtra("fileItem", item)
-        resultIntent.putExtra("openProject", true)
+        val resultIntent = selectedFileResultIntent(item).apply {
+            putExtra("openProject", true)
+        }
         setResult(Activity.RESULT_OK, resultIntent)
         finish()
     }
 
     fun openRaw(item: FileItem) {
-        val resultIntent = Intent()
-        resultIntent.putExtra("fileItem", item)
-        resultIntent.putExtra("openProject", false)
+        val resultIntent = selectedFileResultIntent(item).apply {
+            putExtra("openProject", false)
+        }
         setResult(Activity.RESULT_OK, resultIntent)
         finish()
     }
@@ -224,4 +229,23 @@ class NewFileChooserActivity : AppCompatActivity(), ProgressHandler {
         return null
     }
 
+    private fun selectedFileResultIntent(item: FileItem): Intent {
+        val file = requireNotNull(item.file) { "Cannot return chooser result without a backing file" }
+        return Intent().apply {
+            putExtra(EXTRA_FILE_PATH, file.absolutePath)
+            putExtra(EXTRA_PROJECT_TYPE, projectTypeFor(item))
+            if (item is FileItemApp) {
+                putExtra(EXTRA_NATIVE_FILE_PATH, item.nativeFile.absolutePath)
+            }
+        }
+    }
+
+    private fun projectTypeFor(item: FileItem): String {
+        return if (item is FileItemApp) {
+            ProjectType.APK
+        } else {
+            ProjectType.UNKNOWN
+        }
+    }
+
 }

app/src/test/java/com/kyhsgeekcode/disassembler/FileSelectionIntentPayloadTest.kt

@@ -0,0 +1,34 @@
+package com.kyhsgeekcode.disassembler
+
+import com.kyhsgeekcode.disassembler.project.models.ProjectType
+import com.kyhsgeekcode.disassembler.viewmodel.selectedFileIntentPayload
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Test
+
+class FileSelectionIntentPayloadTest {
+    @Test
+    fun `selectedFileIntentPayload reads compact chooser extras`() {
+        val payload = selectedFileIntentPayload(
+            filePath = "/tmp/sample.apk",
+            nativeFilePath = "/tmp/lib",
+            projectType = ProjectType.APK
+        )
+
+        requireNotNull(payload)
+        assertEquals("/tmp/sample.apk", payload.filePath)
+        assertEquals("/tmp/lib", payload.nativeFilePath)
+        assertEquals(ProjectType.APK, payload.projectType)
+    }
+
+    @Test
+    fun `selectedFileIntentPayload returns null when chooser file path is missing`() {
+        assertNull(
+            selectedFileIntentPayload(
+                filePath = null,
+                nativeFilePath = null,
+                projectType = ProjectType.UNKNOWN
+            )
+        )
+    }
+}

docs/maintenance/implementation-log.ko.md

@@ -30,6 +30,7 @@
 | instrumentation test 기반 부재 | AndroidX instrumentation runner를 설정하고 `MainActivity`가 emulator에서 `RESUMED` 상태까지 올라오는 smoke test와 CI emulator job을 추가 | unit test만으로는 잡히지 않는 startup/regression을 GitHub Actions emulator에서 자동 확인할 수 있는 최소 기반을 만들었다 | `app/build.gradle`, `app/src/androidTest/java/com/kyhsgeekcode/disassembler/MainActivitySmokeTest.kt`, `.github/workflows/ci.yml` | 완료 |
 | PR 회귀를 잡는 instrumentation 범위 부족 | Compose UI test 의존성, import entry-point test tag, 회전 재생성 smoke test, standard/power-user mode UI 검증 테스트를 추가 | 현재 PR의 핵심 변경인 회전 재생성 경계와 `Select file`/`Advanced import` 노출 규칙을 emulator에서 직접 검증할 수 있게 했다 | `app/build.gradle`, `app/src/main/java/com/kyhsgeekcode/disassembler/ui/MainTab.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/ui/MainTestTags.kt`, `app/src/androidTest/java/com/kyhsgeekcode/disassembler/MainActivitySmokeTest.kt`, `app/src/androidTest/java/com/kyhsgeekcode/disassembler/MainActivityImportEntryPointStandardModeTest.kt`, `app/src/androidTest/java/com/kyhsgeekcode/disassembler/MainActivityImportEntryPointPowerUserModeTest.kt`, `app/src/androidTest/java/com/kyhsgeekcode/disassembler/PowerUserModePreferenceRule.kt` | 완료 |
 | 이슈 `#523`, `#442`, `#235` 대용량 파일/리스트 경계 | 큰 파일은 `ProjectDataStorage` 메모리 캐시에서 제외하고, 문자열 검색 결과는 5,000개로 상한을 두고 stable key로 렌더링하도록 바꿨다 | 150MB 같은 큰 파일을 한 번 열 때 캐시 맵이 오래 붙잡는 메모리 압박을 줄이고, 문자열 탭의 대형 리스트가 계속 불어나면서 Recycler/Lazy list가 불안정해지는 경로를 완화했다 | `app/src/main/java/com/kyhsgeekcode/disassembler/project/ProjectDataStorage.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/ui/components/TableView.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/ui/tabs/StringTab.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/project/ProjectDataStorageCachePolicyTest.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/ui/tabs/StringSearchResultAccumulatorTest.kt` | 완료 |
+| 이슈 `#235` binder payload 과대 가능성 | file chooser 결과가 `Serializable FileItem` 전체를 넘기지 않고 `filePath/nativeFilePath/projectType`만 넘기도록 축소 | chooser 결과 인텐트의 binder payload를 줄여 `TransactionTooLarge`류 상태 전송 압박을 완화하고, 결과 복원 경계도 pure helper 테스트로 고정했다 | `app/src/main/java/com/kyhsgeekcode/filechooser/NewFileChooserActivity.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/viewmodel/MainViewModel.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/FileSelectionIntentPayloadTest.kt` | 완료 |
 | 이슈 `#514`, `#543`, `#576` `.so`/ELF 아키텍처와 override autosetup | `x86_64`, `PPC64` ELF machine type을 64-bit disassembly mode로 매핑하고, binary overview에서 수동 설정을 적용하면 disassembly handle을 다시 열도록 바꿨다 | 일부 `.so`가 32-bit mode로 잘못 열리던 경로를 줄이고, `Override autosetup`이 값만 바꾸고 실제 disassembly는 안 바뀌던 문제를 수정했다 | `app/src/main/java/com/kyhsgeekcode/disassembler/models/Architecture.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/ui/tabs/BinaryOverviewTab.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/ui/tabs/BinaryTab.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/models/ArchitectureTest.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/ui/tabs/BinaryManualSetupConfigTest.kt` | 완료 |
 | 이슈 `#123`, `#720` 프로젝트 export와 details 저장 부재 | ZIP 생성기를 재귀 상대경로 방식으로 고치고, 프로젝트 overview에 SAF `CreateDocument` 기반 `Export project` 버튼을 추가했으며, binary detail 탭에는 `Save Details to file` 버튼을 구현했다 | 깨져 있던 project ZIP export 경로를 실제로 복구하고, 최신 Android 저장소 모델에 맞게 상세 정보 텍스트를 `.txt` 문서로 저장할 수 있게 했다 | `app/src/main/java/com/kyhsgeekcode/Util.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/exporting/ExportDocuments.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/project/ProjectManager.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/viewmodel/MainViewModel.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/ui/MainTab.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/ui/tabs/BinaryDetailTab.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/ProjectExportArchiveTest.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/exporting/BinaryDetailsExportTest.kt` | 완료 |
 | 이슈 `#129` `.ar` archive 지원 | 공용 archive extractor를 추가하고, Compose/legacy drawer의 archive 확장 경로를 ZIP 전용 구현에서 generic archive extractor로 교체했다 | archive 판정은 되는데 실제 확장은 ZIP만 되던 불일치를 제거해서 `.ar` 같은 지원 가능한 archive도 실제로 탐색 가능하게 만들었다 | `app/src/main/java/com/kyhsgeekcode/Util.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/ui/FileDrawerTree.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/FileDrawerListItem.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/FileDrawerListAdapter.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/ArchiveExtractionTest.kt` | 완료 |