fix: Re-enable strip libs feature (#117)

Author: prateek-who

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ kotlin = "2.3.20"
 # CLI
 picocli = "4.7.7"
 arsclib = "9696ffecda"
-morphe-patcher = "1.4.2-dev.1" # TODO: Change to stable patcher
+morphe-patcher = "1.4.2"
 morphe-library = "1.3.0"
 
 # Compose Desktop

src/main/kotlin/app/morphe/gui/data/model/AppConfig.kt

@@ -7,8 +7,9 @@ package app.morphe.gui.data.model
 
 import app.morphe.engine.PatchEngine.Config.Companion.DEFAULT_KEYSTORE_ALIAS
 import app.morphe.engine.PatchEngine.Config.Companion.DEFAULT_KEYSTORE_PASSWORD
-import kotlinx.serialization.Serializable
 import app.morphe.gui.ui.theme.ThemePreference
+import app.morphe.gui.util.FileUtils.ANDROID_ARCHITECTURES
+import kotlinx.serialization.Serializable
 
 /**
  * Application configuration stored in config.json
@@ -36,7 +37,14 @@ data class AppConfig(
     val keystorePath: String? = null,
     val keystorePassword: String? = null,
     val keystoreAlias: String = DEFAULT_KEYSTORE_ALIAS,
-    val keystoreEntryPassword: String = DEFAULT_KEYSTORE_PASSWORD
+    val keystoreEntryPassword: String = DEFAULT_KEYSTORE_PASSWORD,
+    // User's global keep-list for strip libs. Defaults to all common modern arches
+    // (equivalent to no stripping). Stripping is only applied when the APK contains
+    // an arch NOT in this set. See PatchSelectionViewModel.computeStripLibsStatus.
+    val keepArchitectures: Set<String> = ANDROID_ARCHITECTURES,
+    // Persisted expand/collapse state for each section in the Settings dialog.
+    // Keyed by section title (e.g. "STRIP LIBS"). Missing key = section starts collapsed.
+    val collapsibleSectionStates: Map<String, Boolean> = emptyMap()
 ) {
     fun getThemePreference(): ThemePreference {
         return try {

src/main/kotlin/app/morphe/gui/data/repository/ConfigRepository.kt

@@ -127,6 +127,24 @@ class ConfigRepository {
         saveConfig(current.copy(useSimplifiedMode = enabled))
     }
 
+    /**
+     * Update the user's global keep-architectures list for strip libs.
+     */
+    suspend fun setKeepArchitectures(keep: Set<String>) {
+        val current = loadConfig()
+        saveConfig(current.copy(keepArchitectures = keep))
+    }
+
+    /**
+     * Persist the expand/collapse state of a Settings dialog section so it restores
+     * on next open instead of resetting to collapsed.
+     */
+    suspend fun setCollapsibleSectionExpanded(id: String, expanded: Boolean) {
+        val current = loadConfig()
+        val updated = current.collapsibleSectionStates + (id to expanded)
+        saveConfig(current.copy(collapsibleSectionStates = updated))
+    }
+
     /**
      * Update keystore path only (used for auto-remember on first creation).
      */

src/main/kotlin/app/morphe/gui/di/AppModule.kt

@@ -67,11 +67,34 @@ val appModule = module {
     }
     factory { params ->
         val psm = get<PatchSourceManager>()
-        PatchesViewModel(params.get(), params.get(), psm.getActiveRepositorySync(), get(), psm.getLocalFilePath(), psm)
+        PatchesViewModel(
+            params.get(),
+            params.get(),
+            psm.getActiveRepositorySync(),
+            get(),
+            psm.getLocalFilePath(),
+            psm
+        )
     }
     factory { params ->
         val psm = get<PatchSourceManager>()
-        PatchSelectionViewModel(params.get(), params.get(), params.get(), params.get(), params.get(), get(), psm.getActiveRepositorySync(), psm.getLocalFilePath())
+        PatchSelectionViewModel(
+            params.get(),
+            params.get(),
+            params.get(),
+            params.get(),
+            params.get(),
+            get(),
+            psm.getActiveRepositorySync(),
+            get(),
+            psm.getLocalFilePath()
+        )
+    }
+    factory { params ->
+        PatchingViewModel(
+            params.get(),
+            get(),
+            get()
+        )
     }
-    factory { params -> PatchingViewModel(params.get(), get(), get()) }
 }

src/main/kotlin/app/morphe/gui/ui/components/SettingsButton.kt

@@ -46,7 +46,8 @@ import app.morphe.gui.ui.theme.LocalThemeState
 fun SettingsButton(
     modifier: Modifier = Modifier,
     allowCacheClear: Boolean = true,
-    isPatching: Boolean = false
+    isPatching: Boolean = false,
+    onDismiss: () -> Unit = {}
 ) {
     val corners = LocalMorpheCorners.current
     val themeState = LocalThemeState.current
@@ -63,6 +64,8 @@ fun SettingsButton(
     var keystorePassword by remember { mutableStateOf<String?>(null) }
     var keystoreAlias by remember { mutableStateOf(DEFAULT_KEYSTORE_ALIAS) }
     var keystoreEntryPassword by remember { mutableStateOf(DEFAULT_KEYSTORE_PASSWORD) }
+    var keepArchitectures by remember { mutableStateOf<Set<String>>(emptySet()) }
+    var collapsibleSectionStates by remember { mutableStateOf<Map<String, Boolean>>(emptyMap()) }
 
     LaunchedEffect(showSettingsDialog) {
         if (showSettingsDialog) {
@@ -74,6 +77,8 @@ fun SettingsButton(
             keystorePassword = config.keystorePassword
             keystoreAlias = config.keystoreAlias
             keystoreEntryPassword = config.keystoreEntryPassword
+            keepArchitectures = config.keepArchitectures
+            collapsibleSectionStates = config.collapsibleSectionStates
         }
     }
 
@@ -118,7 +123,10 @@ fun SettingsButton(
             onExpertModeChange = { enabled ->
                 modeState.onChange(!enabled)
             },
-            onDismiss = { showSettingsDialog = false },
+            onDismiss = {
+                showSettingsDialog = false
+                onDismiss()
+            },
             allowCacheClear = allowCacheClear,
             isPatching = isPatching,
             patchSources = patchSources,
@@ -181,6 +189,16 @@ fun SettingsButton(
                         entryPassword = entryPwd
                     )
                 }
+            },
+            keepArchitectures = keepArchitectures,
+            onKeepArchitecturesChange = { updated ->
+                keepArchitectures = updated
+                scope.launch { configRepository.setKeepArchitectures(updated) }
+            },
+            collapsibleSectionStates = collapsibleSectionStates,
+            onCollapsibleSectionToggle = { id, expanded ->
+                collapsibleSectionStates = collapsibleSectionStates + (id to expanded)
+                scope.launch { configRepository.setCollapsibleSectionExpanded(id, expanded) }
             }
         )
     }

src/main/kotlin/app/morphe/gui/ui/components/SettingsDialog.kt

@@ -78,7 +78,11 @@ fun SettingsDialog(
     keystoreAlias: String = DEFAULT_KEYSTORE_ALIAS,
     keystoreEntryPassword: String = DEFAULT_KEYSTORE_PASSWORD,
     onKeystorePathChange: (String?) -> Unit = {},
-    onKeystoreCredentialsChange: (password: String?, alias: String, entryPassword: String) -> Unit = { _, _, _ -> }
+    onKeystoreCredentialsChange: (password: String?, alias: String, entryPassword: String) -> Unit = { _, _, _ -> },
+    keepArchitectures: Set<String> = emptySet(),
+    onKeepArchitecturesChange: (Set<String>) -> Unit = {},
+    collapsibleSectionStates: Map<String, Boolean> = emptyMap(),
+    onCollapsibleSectionToggle: (id: String, expanded: Boolean) -> Unit = { _, _ -> }
 ) {
     val corners = LocalMorpheCorners.current
     val mono = LocalMorpheFont.current
@@ -206,7 +210,22 @@ fun SettingsDialog(
                     mono = mono,
                     accentColor = accents.primary,
                     borderColor = borderColor,
-                    enabled = !isPatching
+                    enabled = !isPatching,
+                    expanded = collapsibleSectionStates["SIGNING"] == true,
+                    onExpandedChange = { onCollapsibleSectionToggle("SIGNING", it) }
+                )
+
+                SettingsDivider(borderColor)
+
+                // ── Strip Libs ──
+                StripLibsSection(
+                    keepArchitectures = keepArchitectures,
+                    onChange = onKeepArchitecturesChange,
+                    mono = mono,
+                    accentColor = accents.primary,
+                    enabled = !isPatching,
+                    expanded = collapsibleSectionStates["STRIP LIBS"] == true,
+                    onExpandedChange = { onCollapsibleSectionToggle("STRIP LIBS", it) }
                 )
 
                 SettingsDivider(borderColor)
@@ -225,7 +244,9 @@ fun SettingsDialog(
                     mono = mono,
                     accentColor = accents.primary,
                     borderColor = borderColor,
-                    enabled = !isPatching
+                    enabled = !isPatching,
+                    expanded = collapsibleSectionStates["PATCH SOURCES"] == true,
+                    onExpandedChange = { onCollapsibleSectionToggle("PATCH SOURCES", it) }
                 )
 
                 SettingsDivider(borderColor)
@@ -253,16 +274,6 @@ fun SettingsDialog(
 
                 Spacer(Modifier.height(6.dp))
 
-                ActionButton(
-                    label = "VIEW LICENSES",
-                    icon = Icons.Default.Description,
-                    mono = mono,
-                    borderColor = borderColor,
-                    onClick = { showLicensesDialog = true }
-                )
-
-                Spacer(Modifier.height(6.dp))
-
                 ActionButton(
                     label = "OPEN APP DATA",
                     icon = Icons.Default.FolderOpen,
@@ -282,6 +293,16 @@ fun SettingsDialog(
 
                 Spacer(Modifier.height(6.dp))
 
+                ActionButton(
+                    label = "VIEW LICENSES",
+                    icon = Icons.Default.Description,
+                    mono = mono,
+                    borderColor = borderColor,
+                    onClick = { showLicensesDialog = true }
+                )
+
+                Spacer(Modifier.height(6.dp))
+
                 // Clear cache
                 val cacheColor = when {
                     cacheCleared -> MorpheColors.Teal
@@ -518,11 +539,11 @@ private fun SectionLabel(
 private fun CollapsibleSection(
     title: String,
     mono: androidx.compose.ui.text.font.FontFamily,
-    initiallyExpanded: Boolean = false,
+    expanded: Boolean,
+    onExpandedChange: (Boolean) -> Unit,
     content: @Composable () -> Unit
 ) {
     val corners = LocalMorpheCorners.current
-    var expanded by remember { mutableStateOf(initiallyExpanded) }
     val rotationAngle by androidx.compose.animation.core.animateFloatAsState(
         targetValue = if (expanded) -90f else 0f,
         animationSpec = androidx.compose.animation.core.tween(200)
@@ -539,7 +560,7 @@ private fun CollapsibleSection(
                 if (isHovered) MaterialTheme.colorScheme.onSurface.copy(alpha = 0.04f)
                 else Color.Transparent
             )
-            .clickable { expanded = !expanded }
+            .clickable { onExpandedChange(!expanded) }
             .padding(horizontal = 8.dp, vertical = 6.dp),
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically
@@ -691,12 +712,19 @@ private fun PatchSourcesSection(
     mono: androidx.compose.ui.text.font.FontFamily,
     accentColor: Color,
     borderColor: Color,
-    enabled: Boolean = true
+    enabled: Boolean = true,
+    expanded: Boolean = false,
+    onExpandedChange: (Boolean) -> Unit = {}
 ) {
     val corners = LocalMorpheCorners.current
     val alpha = if (enabled) 1f else 0.4f
     Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
-        CollapsibleSection("PATCH SOURCES", mono) {
+        CollapsibleSection(
+            title = "PATCH SOURCES",
+            mono = mono,
+            expanded = expanded,
+            onExpandedChange = onExpandedChange
+        ) {
         Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
         Text(
             text = if (!enabled) "Disabled while patching" else "Select where patches are loaded from",
@@ -1211,6 +1239,65 @@ private fun EditPatchSourceDialog(
     )
 }
 
+// ── Strip Libs Section ──
+
+/**
+ * Architectures exposed in the strip libs settings. Each entry has the
+ * patcher-facing value (matching CpuArchitecture.arch) and a short display name.
+ * Only modern arches are listed — legacy mips/armeabi are intentionally omitted.
+ */
+private val STRIP_LIBS_ARCHS = listOf(
+    "arm64-v8a" to "ARM 64-bit (most modern phones)",
+    "armeabi-v7a" to "ARM 32-bit (older phones)",
+    "x86_64" to "Intel 64-bit (emulators / Chromebooks)",
+    "x86" to "Intel 32-bit (legacy emulators)"
+)
+
+@Composable
+private fun StripLibsSection(
+    keepArchitectures: Set<String>,
+    onChange: (Set<String>) -> Unit,
+    mono: androidx.compose.ui.text.font.FontFamily,
+    accentColor: Color,
+    enabled: Boolean = true,
+    expanded: Boolean = false,
+    onExpandedChange: (Boolean) -> Unit = {}
+) {
+    CollapsibleSection(
+        title = "STRIP LIBS",
+        mono = mono,
+        expanded = expanded,
+        onExpandedChange = onExpandedChange
+    ) {
+        Column(
+            verticalArrangement = Arrangement.spacedBy(10.dp)
+        ) {
+            Text(
+                text = "Uncheck architectures you don't need. When patching, the output APK will keep only the architectures present in the APK AND in this list. If none overlap, nothing is stripped to avoid broken APKs.",
+                fontSize = 11.sp,
+                fontFamily = mono,
+                color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f)
+            )
+            STRIP_LIBS_ARCHS.forEach { (arch, description) ->
+                val checked = arch in keepArchitectures
+                SettingToggleRow(
+                    label = arch,
+                    description = description,
+                    checked = checked,
+                    onCheckedChange = { keepIt ->
+                        val updated = if (keepIt) keepArchitectures + arch
+                                      else keepArchitectures - arch
+                        onChange(updated)
+                    },
+                    accentColor = accentColor,
+                    mono = mono,
+                    enabled = enabled
+                )
+            }
+        }
+    }
+}
+
 // ── Signing / Keystore Section ──
 
 @Composable
@@ -1224,7 +1311,9 @@ private fun SigningSection(
     mono: androidx.compose.ui.text.font.FontFamily,
     accentColor: Color,
     borderColor: Color,
-    enabled: Boolean = true
+    enabled: Boolean = true,
+    expanded: Boolean = false,
+    onExpandedChange: (Boolean) -> Unit = {}
 ) {
     val corners = LocalMorpheCorners.current
     val alpha = if (enabled) 1f else 0.4f
@@ -1241,7 +1330,12 @@ private fun SigningSection(
     val keystoreExists = keystoreFile?.exists() == true
 
     Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
-        CollapsibleSection("SIGNING", mono) {
+        CollapsibleSection(
+            title = "SIGNING",
+            mono = mono,
+            expanded = expanded,
+            onExpandedChange = onExpandedChange
+        ) {
         Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
         Text(
             text = if (!enabled) "Disabled while patching"