fix: allow to delete selected server

Author: whalechoi

app/src/main/kotlin/features/proxy/server/list/ProxyServerListMessages.kt

@@ -23,7 +23,6 @@ internal data class ProxyServerListMessages(
     val serviceStarted: String,
     val serviceStopped: String,
     val selectServerFirst: String,
-    val deleteSelectedBlocked: String,
     val latencyResultTemplate: String,
     val latencyFailed: String,
     val importResultTemplate: String,
@@ -52,7 +51,6 @@ internal fun proxyServerListMessages(): ProxyServerListMessages {
         serviceStarted = stringResource(R.string.proxy_server_list_service_started),
         serviceStopped = stringResource(R.string.proxy_server_list_service_stopped),
         selectServerFirst = stringResource(R.string.proxy_server_list_select_first),
-        deleteSelectedBlocked = stringResource(R.string.proxy_server_list_delete_selected_blocked),
         latencyResultTemplate = stringResource(R.string.proxy_server_list_latency_result),
         latencyFailed = stringResource(R.string.proxy_server_list_latency_failed),
         importResultTemplate = stringResource(R.string.proxy_server_list_import_result),

app/src/main/kotlin/features/proxy/server/list/ProxyServerListPage.kt

@@ -46,6 +46,7 @@ import top.yukonga.miuix.kmp.basic.MiuixScrollBehavior
 import top.yukonga.miuix.kmp.basic.Scaffold
 import ui.layout.pageContentPaddingWithCutout
 import ui.layout.pageListPadding
+import ui.text.formatTemplate
 
 private const val ProxyServerEditResultKey = "proxy-server-edit-result"
 
@@ -146,6 +147,54 @@ fun ProxyServerListPage(
         )
     }
 
+    fun deleteProxyServer(server: ProxyServerState) {
+        runProxyServiceOperation {
+            when (val stopResult = proxyServiceUseCase.stop(stateStore.state.value.runMode)) {
+                is ProxyServiceResult.Success -> {
+                    val remarks = server.server.getInfo().remarks
+                    var deleted = false
+                    var nextSelectedServerId = stateStore.state.value.selectedProxyServerId
+                    updateAppState { state ->
+                        val nextServers = state.proxyServers.filterNot { it.id == server.id }
+                        if (nextServers.size == state.proxyServers.size) {
+                            state.copy(
+                                proxyRunning = stopResult.proxyRunning,
+                                localProxyPort = stopResult.appState?.localProxyPort ?: state.localProxyPort,
+                            )
+                        } else {
+                            deleted = true
+                            val selectedProxyServerId = if (state.selectedProxyServerId == server.id) {
+                                nextServers.firstOrNull()?.id ?: state.selectedProxyServerId
+                            } else {
+                                state.selectedProxyServerId
+                            }
+                            nextSelectedServerId = selectedProxyServerId
+                            state.copy(
+                                proxyServers = nextServers,
+                                selectedProxyServerId = selectedProxyServerId,
+                                proxyRunning = stopResult.proxyRunning,
+                                localProxyPort = stopResult.appState?.localProxyPort ?: state.localProxyPort,
+                            )
+                        }
+                    }
+                    selectedServerId = nextSelectedServerId
+                    if (deleted) {
+                        tipNotifier.show(messages.deletedTemplate.formatTemplate("name" to remarks))
+                    }
+                }
+
+                ProxyServiceResult.MissingServer -> {
+                    tipNotifier.show(messages.selectServerFirst)
+                }
+
+                is ProxyServiceResult.Failed -> {
+                    updateAppState { state -> state.copy(proxyRunning = false) }
+                    tipNotifier.showError(stopResult.error, messages.serviceStopped)
+                }
+            }
+        }
+    }
+
     ProxyServerEditResultHandler(
         navigator = navigator,
         resultKey = ProxyServerEditResultKey,
@@ -273,6 +322,7 @@ fun ProxyServerListPage(
                 messages = messages,
                 resultKey = ProxyServerEditResultKey,
                 onSelectedServerIdChange = { selectedServerId = it },
+                onDeleteServer = ::deleteProxyServer,
             )
             ProxyServerListFloatingToolbar(
                 running = proxyRunning,

app/src/main/kotlin/features/proxy/server/list/ProxyServerListPager.kt

@@ -47,7 +47,6 @@ import ui.components.rememberReorderableLazyListContentPaddingWithoutTop
 import ui.components.rememberReorderableScrollThresholdPadding
 import ui.feedback.AndroidToastTipNotifier
 import ui.layout.pageScrollModifiers
-import ui.text.formatTemplate
 
 @Composable
 internal fun ProxyServerListPager(
@@ -71,6 +70,7 @@ internal fun ProxyServerListPager(
     messages: ProxyServerListMessages,
     resultKey: String,
     onSelectedServerIdChange: (Int) -> Unit,
+    onDeleteServer: (ProxyServerState) -> Unit,
 ) {
     val context = LocalContext.current
 
@@ -155,6 +155,7 @@ internal fun ProxyServerListPager(
                                 messages = messages,
                                 resultKey = resultKey,
                                 onSelectedServerIdChange = onSelectedServerIdChange,
+                                onDeleteServer = onDeleteServer,
                                 isDragging = isDragging,
                                 dragModifier = Modifier.longPressReorderDragHandle(
                                     scope = this,
@@ -200,6 +201,7 @@ private fun ProxyServerListItem(
     messages: ProxyServerListMessages,
     resultKey: String,
     onSelectedServerIdChange: (Int) -> Unit,
+    onDeleteServer: (ProxyServerState) -> Unit,
     isDragging: Boolean,
     modifier: Modifier = Modifier,
     dragModifier: Modifier,
@@ -258,26 +260,7 @@ private fun ProxyServerListItem(
             )
         },
         onDelete = {
-            var deleted = false
-            updateAppState { state ->
-                if (state.selectedProxyServerId == server.id) {
-                    state
-                } else {
-                    deleted = true
-                    state.copy(
-                        proxyServers = state.proxyServers.filterNot { it.id == server.id },
-                    )
-                }
-            }
-            scope.launch {
-                tipNotifier.show(
-                    if (deleted) {
-                        messages.deletedTemplate.formatTemplate("name" to server.server.getInfo().remarks)
-                    } else {
-                        messages.deleteSelectedBlocked
-                    },
-                )
-            }
+            onDeleteServer(server)
         },
     )
 }

app/src/main/kotlin/features/proxy/server/usecase/ProxyServerUseCases.kt

@@ -56,9 +56,11 @@ internal fun AppState.withImportedProxyServers(
             server = server,
         )
     }
+    val nextServers = importedServers + proxyServers
     return copy(
-        proxyServers = importedServers + proxyServers,
+        proxyServers = nextServers,
         nextProxyServerId = maxOf(nextProxyServerId, nextServerId),
+        selectedProxyServerId = selectedProxyServerIdOrFirstAvailable(nextServers),
     )
 }
 
@@ -97,6 +99,7 @@ internal fun AppState.withSavedProxyServer(
         state = copy(
             proxyServers = nextServers,
             nextProxyServerId = maxOf(nextProxyServerId, serverId + 1),
+            selectedProxyServerId = selectedProxyServerIdOrFirstAvailable(nextServers),
         ),
         existingGroupId = existingGroupId,
         wasExisting = wasExisting,
@@ -125,6 +128,7 @@ internal fun AppState.withUpdatedSubscriptionServers(
     val selectedServerId = when {
         nextServers.any { server -> server.id == selectedProxyServerId } -> selectedProxyServerId
         else -> proxyServers.firstOrNull { server -> server.groupId !in updatedGroupIds }?.id
+            ?: nextServers.firstOrNull()?.id
             ?: selectedProxyServerId
     }
     return copy(
@@ -253,6 +257,14 @@ internal fun createProxyServer(action: ProxyServerListAddAction): ProxyServer<*>
     }
 }
 
+private fun AppState.selectedProxyServerIdOrFirstAvailable(nextServers: List<ProxyServerState>): Int {
+    return if (nextServers.any { server -> server.id == selectedProxyServerId }) {
+        selectedProxyServerId
+    } else {
+        nextServers.firstOrNull()?.id ?: selectedProxyServerId
+    }
+}
+
 private fun String.latencySortKey(): Int {
     return latencyResultNumberRegex.find(this)?.value?.toIntOrNull() ?: Int.MAX_VALUE
 }

app/src/main/kotlin/features/proxy/server/usecase/ProxyServiceUseCase.kt

@@ -48,7 +48,7 @@ internal class ProxyServiceUseCase(
         )
     }
 
-    private suspend fun stop(runMode: Int): ProxyServiceResult {
+    suspend fun stop(runMode: Int): ProxyServiceResult {
         return runCatching { proxyEngine.stop(runMode) }.fold(
             onSuccess = { status -> ProxyServiceResult.Success(proxyRunning = status.running, appState = status.appState) },
             onFailure = { error -> ProxyServiceResult.Failed(error) },

app/src/main/res/values-zh-rCN/strings.xml

@@ -332,7 +332,6 @@
     <string name="proxy_server_list_service_started">代理服务已启动</string>
     <string name="proxy_server_list_service_stopped">代理服务已停止</string>
     <string name="proxy_server_list_select_first">请先选择一个代理节点</string>
-    <string name="proxy_server_list_delete_selected_blocked">不能删除当前选择的代理节点</string>
     <string name="proxy_server_list_latency_result">{name} 延迟 {latency}</string>
     <string name="proxy_server_list_latency_failed">失败</string>
     <string name="proxy_server_list_import_result">导入成功{serverCount}个代理节点</string>

app/src/main/res/values/strings.xml

@@ -332,7 +332,6 @@
     <string name="proxy_server_list_service_started">Proxy service started</string>
     <string name="proxy_server_list_service_stopped">Proxy service stopped</string>
     <string name="proxy_server_list_select_first">Select a proxy server first</string>
-    <string name="proxy_server_list_delete_selected_blocked">The selected proxy server cannot be deleted</string>
     <string name="proxy_server_list_latency_result">{name} latency {latency}</string>
     <string name="proxy_server_list_latency_failed">Failed</string>
     <string name="proxy_server_list_import_result">Imported {serverCount} proxy servers</string>

gradle/libs.versions.toml

@@ -11,7 +11,7 @@ kotlinx-serialization-json = "1.11.0"
 ksp = "2.3.9"
 ktor = "3.5.0"
 libsu = "6.0.0"
-miuix = "0.9.1"
+miuix = "0.9.2"
 reorderable = "3.1.0"
 snakeyaml-engine = "3.0.1"
 zxing-android-embedded = "4.3.0"