import: add power-user advanced mode

yhs0602 · yhs0602 · commit 863cdd3390ca · 2026-03-19T22:24:47.000+09:00
diff --git a/app/src/main/java/com/kyhsgeekcode/disassembler/importing/ImportEntryPointCatalog.kt b/app/src/main/java/com/kyhsgeekcode/disassembler/importing/ImportEntryPointCatalog.kt
@@ -0,0 +1,22 @@
+package com.kyhsgeekcode.disassembler.importing
+
+import com.kyhsgeekcode.disassembler.R
+
+sealed class ImportEntryPoint(val labelRes: Int) {
+    object SafImport : ImportEntryPoint(R.string.select_file)
+    object AdvancedImport : ImportEntryPoint(R.string.advanced_import)
+}
+
+interface ImportEntryPointCatalog {
+    fun visibleEntryPoints(powerUserMode: Boolean): List<ImportEntryPoint>
+}
+
+object DefaultImportEntryPointCatalog : ImportEntryPointCatalog {
+    override fun visibleEntryPoints(powerUserMode: Boolean): List<ImportEntryPoint> {
+        return if (powerUserMode) {
+            listOf(ImportEntryPoint.SafImport, ImportEntryPoint.AdvancedImport)
+        } else {
+            listOf(ImportEntryPoint.SafImport)
+        }
+    }
+}
diff --git a/app/src/main/java/com/kyhsgeekcode/disassembler/preference/PowerUserModeSettings.kt b/app/src/main/java/com/kyhsgeekcode/disassembler/preference/PowerUserModeSettings.kt
@@ -0,0 +1,13 @@
+package com.kyhsgeekcode.disassembler.preference
+
+import android.content.Context
+import com.kyhsgeekcode.disassembler.MainActivity
+
+object PowerUserModeSettings {
+    const val POWER_USER_IMPORT_MODE_KEY = "power_user_import_mode"
+
+    fun isEnabled(context: Context): Boolean {
+        return context.getSharedPreferences(MainActivity.SETTINGKEY, Context.MODE_PRIVATE)
+            .getBoolean(POWER_USER_IMPORT_MODE_KEY, false)
+    }
+}
diff --git a/app/src/main/java/com/kyhsgeekcode/disassembler/preference/SettingsFragment.kt b/app/src/main/java/com/kyhsgeekcode/disassembler/preference/SettingsFragment.kt
@@ -8,6 +8,7 @@ import android.os.Bundle
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreferenceCompat
 import com.kyhsgeekcode.disassembler.MainActivity
 import com.kyhsgeekcode.disassembler.R
 import com.kyhsgeekcode.disassembler.disasmtheme.ColorHelper
@@ -117,6 +118,7 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClic
                 false
             }
         lp.onPreferenceChangeListener = this
+        findPreference<SwitchPreferenceCompat>(PowerUserModeSettings.POWER_USER_IMPORT_MODE_KEY)
         val scrn = findPreference<Preference>("openscrn")
         scrn?.setOnPreferenceClickListener {
             LibsBuilder()
diff --git a/app/src/main/java/com/kyhsgeekcode/disassembler/ui/MainTab.kt b/app/src/main/java/com/kyhsgeekcode/disassembler/ui/MainTab.kt
@@ -2,6 +2,7 @@ package com.kyhsgeekcode.disassembler.ui
 
 import android.app.Activity
 import android.content.Intent
+import androidx.activity.compose.ManagedActivityResultLauncher
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Arrangement
@@ -14,20 +15,34 @@ import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
 import com.kyhsgeekcode.disassembler.R
+import com.kyhsgeekcode.disassembler.importing.DefaultImportEntryPointCatalog
+import com.kyhsgeekcode.disassembler.importing.ImportEntryPoint
+import com.kyhsgeekcode.disassembler.preference.PowerUserModeSettings
 import com.kyhsgeekcode.disassembler.viewmodel.MainViewModel
 import com.kyhsgeekcode.filechooser.NewFileChooserActivity
 
 @Composable
 fun ProjectOverview(viewModel: MainViewModel) {
     val context = LocalContext.current
+    val lifecycleOwner = context as? LifecycleOwner
+    var powerUserModeEnabled by remember {
+        mutableStateOf(PowerUserModeSettings.isEnabled(context))
+    }
 
-    val launcher = rememberLauncherForActivityResult(
+    val advancedImportLauncher = rememberLauncherForActivityResult(
         ActivityResultContracts.StartActivityForResult()
     ) {
         if (it.resultCode == Activity.RESULT_OK) {
@@ -37,8 +52,46 @@ fun ProjectOverview(viewModel: MainViewModel) {
             }
         }
     }
+    val safImportLauncher = rememberLauncherForActivityResult(
+        ActivityResultContracts.OpenDocument()
+    ) { selectedUri ->
+        if (selectedUri != null) {
+            try {
+                context.contentResolver.takePersistableUriPermission(
+                    selectedUri,
+                    Intent.FLAG_GRANT_READ_URI_PERMISSION
+                )
+            } catch (_: SecurityException) {
+            }
+            viewModel.onSelectIntent(
+                Intent().apply {
+                    putExtra("uri", selectedUri)
+                    putExtra("openProject", false)
+                }
+            )
+        }
+    }
 
     val askCopy = viewModel.askCopy.collectAsState()
+    val visibleEntryPoints = remember(powerUserModeEnabled) {
+        DefaultImportEntryPointCatalog.visibleEntryPoints(powerUserModeEnabled)
+    }
+
+    DisposableEffect(lifecycleOwner, context) {
+        if (lifecycleOwner == null) {
+            onDispose {}
+        } else {
+            val observer = object : DefaultLifecycleObserver {
+                override fun onResume(owner: LifecycleOwner) {
+                    powerUserModeEnabled = PowerUserModeSettings.isEnabled(context)
+                }
+            }
+            lifecycleOwner.lifecycle.addObserver(observer)
+            onDispose {
+                lifecycleOwner.lifecycle.removeObserver(observer)
+            }
+        }
+    }
 
     Column(
         Modifier
@@ -47,11 +100,20 @@ fun ProjectOverview(viewModel: MainViewModel) {
     ) {
         Text(text = stringResource(id = R.string.main_select_source_guide))
         Row(Modifier.fillMaxWidth()) {
-            Button(onClick = {
-                val j = Intent(context, NewFileChooserActivity::class.java)
-                launcher.launch(j)
-            }) {
-                Text(text = stringResource(id = R.string.select_file))
+            for (entryPoint in visibleEntryPoints) {
+                Button(
+                    modifier = Modifier.padding(end = 8.dp),
+                    onClick = {
+                        launchImportEntryPoint(
+                            entryPoint,
+                            context = context,
+                            safImportLauncher = safImportLauncher,
+                            advancedImportLauncher = advancedImportLauncher
+                        )
+                    }
+                ) {
+                    Text(text = stringResource(id = entryPoint.labelRes))
+                }
             }
         }
     }
@@ -89,3 +151,20 @@ fun ProjectOverview(viewModel: MainViewModel) {
         )
     }
 }
+
+private fun launchImportEntryPoint(
+    entryPoint: ImportEntryPoint,
+    context: android.content.Context,
+    safImportLauncher: ManagedActivityResultLauncher<Array<String>, android.net.Uri?>,
+    advancedImportLauncher: ManagedActivityResultLauncher<Intent, androidx.activity.result.ActivityResult>
+) {
+    when (entryPoint) {
+        ImportEntryPoint.SafImport -> safImportLauncher.launch(arrayOf("*/*"))
+        ImportEntryPoint.AdvancedImport -> {
+            val intent = Intent(context, NewFileChooserActivity::class.java).apply {
+                putExtra(NewFileChooserActivity.EXTRA_POWER_USER_MODE, true)
+            }
+            advancedImportLauncher.launch(intent)
+        }
+    }
+}
diff --git a/app/src/main/java/com/kyhsgeekcode/filechooser/NewFileChooserActivity.kt b/app/src/main/java/com/kyhsgeekcode/filechooser/NewFileChooserActivity.kt
@@ -28,8 +28,15 @@ import java.net.URL
 
 
 class NewFileChooserActivity : AppCompatActivity(), ProgressHandler {
+    companion object {
+        const val EXTRA_POWER_USER_MODE = "power_user_mode"
+    }
+
     private var _binding: ActivityNewFileChooserBinding? = null
     private val binding get() = _binding!!
+    private val powerUserMode by lazy {
+        intent?.getBooleanExtra(EXTRA_POWER_USER_MODE, false) ?: false
+    }
 
     private val snackProgressBarManager by lazy {
         SnackProgressBarManager(
@@ -66,7 +73,7 @@ class NewFileChooserActivity : AppCompatActivity(), ProgressHandler {
         super.onCreate(savedInstanceState)
         _binding = ActivityNewFileChooserBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        adapter = NewFileChooserAdapter(this)
+        adapter = NewFileChooserAdapter(this, powerUserMode)
         lifecycleScope.launch {
             adapter.tryAddRootItems()
         }
diff --git a/app/src/main/java/com/kyhsgeekcode/filechooser/NewFileChooserAdapter.kt b/app/src/main/java/com/kyhsgeekcode/filechooser/NewFileChooserAdapter.kt
@@ -18,7 +18,8 @@ import kotlin.collections.ArrayList
 
 class NewFileChooserAdapter(
     private
-    val parentActivity: NewFileChooserActivity
+    val parentActivity: NewFileChooserActivity,
+    private val powerUserMode: Boolean
 ) : RecyclerView.Adapter<NewFileChooserAdapter.ViewHolder>() {
     val TAG = "Adapter"
     private val values: MutableList<FileItem> = ArrayList()
@@ -165,11 +166,7 @@ class NewFileChooserAdapter(
     }
 
     suspend fun tryAddRootItems() {
-        val items: List<FileItem> = try {
-            FileItem.rootItem.listSubItems()
-        } catch (e: Exception) {
-            arrayListOf(FileItem(e.message ?: ""))
-        }
+        val items: List<FileItem> = FileItem.rootEntries(powerUserMode)
         values.addAll(items)
     }
 
@@ -252,7 +249,11 @@ class NewFileChooserAdapter(
         val lastItem = backStack.pop()
         currentParentItem = lastItem
         CoroutineScope(Dispatchers.Default).launch {
-            val items = listSubItemsCached(currentParentItem)
+            val items = if (currentParentItem == FileItem.rootItem) {
+                FileItem.rootEntries(powerUserMode)
+            } else {
+                listSubItemsCached(currentParentItem)
+            }
             addItemsToListSorted(items)
             withContext(Dispatchers.Main) {
                 notifyDataSetChanged()
diff --git a/app/src/main/java/com/kyhsgeekcode/filechooser/model/FileItem.kt b/app/src/main/java/com/kyhsgeekcode/filechooser/model/FileItem.kt
@@ -207,14 +207,22 @@ open class FileItem : Serializable {
     companion object {
         val rootItem = object : FileItem("Main") {
             override suspend fun listSubItems(publisher: (Int, Int) -> Unit): List<FileItem> {
-                return listOf(fileRoot, fileSdcard, apps, processes, others, zoo, hash)
+                return rootEntries(powerUserMode = true)
             }
 
             override fun canExpand(): Boolean = true
             override fun isRawAvailable(): Boolean = false
             override fun isProjectAble(): Boolean = false
         }
 
+        fun rootEntries(powerUserMode: Boolean): List<FileItem> {
+            return if (powerUserMode) {
+                listOf(fileRoot, fileSdcard, apps, processes, others, zoo, hash)
+            } else {
+                listOf(others)
+            }
+        }
+
         val fileRoot = FileItem(file = File("/"))
 
         val fileSdcard = FileItem(file = Environment.getExternalStorageDirectory())
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -54,6 +54,10 @@
     <string name="preview">preview</string>ㄴ
     <string name="main_select_source_guide">Select any file to disassemble, then open sub files from the drawer left.</string>
     <string name="select_file">Select file</string>
+    <string name="advanced_import">Advanced import</string>
+    <string name="power_user_features">Power-user features</string>
+    <string name="power_user_import_title">Enable power-user import options</string>
+    <string name="power_user_import_summary">Show advanced non-SAF import entry points such as root and direct filesystem browsing.</string>
     <string name="architecture">Architecture:</string>
     <string name="finish_setup">Finish Setup</string>
     <string name="override_autosetup">Override autosetup</string>
diff --git a/app/src/main/res/xml-v30/pref_settings.xml b/app/src/main/res/xml-v30/pref_settings.xml
@@ -20,6 +20,13 @@
         app:preference_selector="wheel"
         app:default_color="colorPrimary"/-->
     </PreferenceCategory>
+    <PreferenceCategory android:title="@string/power_user_features">
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="power_user_import_mode"
+            android:summary="@string/power_user_import_summary"
+            android:title="@string/power_user_import_title" />
+    </PreferenceCategory>
     <PreferenceCategory android:title="@string/app_info">
         <Preference
             android:fragment="com.kyhsgeekcode.disassembler.preference.DeveloperInfoFragment"
diff --git a/app/src/main/res/xml/pref_settings.xml b/app/src/main/res/xml/pref_settings.xml
@@ -20,6 +20,13 @@
         app:preference_selector="wheel"
         app:default_color="colorPrimary"/-->
     </PreferenceCategory>
+    <PreferenceCategory android:title="@string/power_user_features">
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="power_user_import_mode"
+            android:summary="@string/power_user_import_summary"
+            android:title="@string/power_user_import_title" />
+    </PreferenceCategory>
 <!--    <PreferenceCategory android:title="Security configuration">-->
 <!--        <Preference android:title="Manage this app\'s all storage access">-->
 <!--            <intent android:action="android.settings.MANAGE_ALL_FILES_ACCESS_PERMISSION" />-->
diff --git a/app/src/test/java/com/kyhsgeekcode/disassembler/importing/ImportEntryPointCatalogTest.kt b/app/src/test/java/com/kyhsgeekcode/disassembler/importing/ImportEntryPointCatalogTest.kt
@@ -0,0 +1,22 @@
+package com.kyhsgeekcode.disassembler.importing
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class ImportEntryPointCatalogTest {
+    @Test
+    fun `standard mode only exposes SAF import`() {
+        assertEquals(
+            listOf(ImportEntryPoint.SafImport),
+            DefaultImportEntryPointCatalog.visibleEntryPoints(powerUserMode = false)
+        )
+    }
+
+    @Test
+    fun `power user mode exposes SAF and advanced import`() {
+        assertEquals(
+            listOf(ImportEntryPoint.SafImport, ImportEntryPoint.AdvancedImport),
+            DefaultImportEntryPointCatalog.visibleEntryPoints(powerUserMode = true)
+        )
+    }
+}
diff --git a/docs/maintenance/implementation-log.ko.md b/docs/maintenance/implementation-log.ko.md
@@ -11,6 +11,7 @@
 | 저장소 정책 현대화 착수, 이슈 `#95` 대응 기반 | SAF 기반 선택 경로를 도입하고 `content://` 입력을 앱 내부 import 파일로 저장 | 외부 절대경로 전제를 줄이고, 재시작 이후에도 다시 열 수 있는 URI 권한 흐름을 시작했다 | `app/src/main/java/com/kyhsgeekcode/filechooser/NewFileChooserActivity.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/viewmodel/MainViewModel.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/PermissionUtils.kt` | 진행 중 |
 | broad storage 우회 경로 정리 | 더 이상 쓰지 않는 legacy picker 코드와 Android 11+의 `MANAGE_ALL_FILES_ACCESS` 유도 설정을 제거 | SAF 기반 경로를 기본 흐름으로 고정하고, 정책상 불리한 all-files access 진입점을 줄였다 | `app/src/main/java/com/kyhsgeekcode/disassembler/MainActivity.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/preference/SettingsFragment.kt`, `app/src/main/res/xml/pref_settings.xml`, `app/src/main/res/xml-v30/pref_settings.xml`, `app/src/main/res/values/array.xml` | 완료 |
 | 프로젝트 저장 모델 확장 | `sourceDescriptor`를 추가하고 새 프로젝트 생성 시 원본 유형을 함께 기록 | 기존 `sourceFilePath` 호환성은 유지하면서 이후 `Uri | file path | cache` 구분으로 넘어갈 발판을 만들었다 | `app/src/main/java/com/kyhsgeekcode/disassembler/project/models/ProjectModel.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/project/ProjectManager.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/viewmodel/MainViewModel.kt` | 완료 |
+| SAF와 파워유저 경로 분리 | 기본 import는 SAF 직행으로 두고, settings에서 power-user mode를 켰을 때만 `Advanced import`를 노출 | 기본 사용자 경로와 비정책적/고급 경로를 같은 UI에서 섞지 않고 분리했다 | `app/src/main/java/com/kyhsgeekcode/disassembler/importing/ImportEntryPointCatalog.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/preference/PowerUserModeSettings.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/ui/MainTab.kt`, `app/src/main/java/com/kyhsgeekcode/filechooser/NewFileChooserActivity.kt`, `app/src/main/java/com/kyhsgeekcode/filechooser/NewFileChooserAdapter.kt`, `app/src/main/java/com/kyhsgeekcode/filechooser/model/FileItem.kt`, `app/src/main/res/xml/pref_settings.xml`, `app/src/main/res/xml-v30/pref_settings.xml` | 완료 |
 | 구형 저장소 권한 정리 | `READ_EXTERNAL_STORAGE`, `WRITE_EXTERNAL_STORAGE`를 `maxSdkVersion=28`로 제한하고 `requestLegacyExternalStorage` 제거 | 최신 Android에서 불필요한 legacy 외부 저장소 모델 의존성을 줄였다 | `app/src/main/AndroidManifest.xml` | 완료 |
 | 패키징 경고 정리 | manifest의 `extractNativeLibs` 선언을 제거하고 Gradle `jniLibs.useLegacyPackaging = false`로 이동 | native packaging 관련 경고를 Gradle 구성 위치로 정리했다 | `app/build.gradle`, `app/src/main/AndroidManifest.xml` | 완료 |
 | 이슈 `#670` 앱 런처 미노출 | `MainActivity`에 `android:enabled="true"`를 명시 | 일부 기기/설정에서 런처 진입점이 빠지는 문제를 명시적으로 막았다 | `app/src/main/AndroidManifest.xml` | 완료 |
@@ -26,6 +27,7 @@
 | `./gradlew help` | 통과 | JDK 17 기준 |
 | `./gradlew testDebugUnitTest assembleDebug` | 통과 | JDK 17 기준 |
 | 문서 비식별화 점검 | 통과 | 새 문서에는 저장소 상대 경로만 기록 |
+| 파워유저 import entry-point 테스트 | 통과 | standard mode는 SAF only, power-user mode는 advanced import 추가 |
 
 ## 다음 웨이브 후보
 
