diff --git a/app/src/main/java/moe/fuqiuluo/shamrock/ui/fragment/DashboardFragment.kt b/app/src/main/java/moe/fuqiuluo/shamrock/ui/fragment/DashboardFragment.kt index d9eac95..c9072ec 100644 --- a/app/src/main/java/moe/fuqiuluo/shamrock/ui/fragment/DashboardFragment.kt +++ b/app/src/main/java/moe/fuqiuluo/shamrock/ui/fragment/DashboardFragment.kt @@ -257,7 +257,7 @@ private fun APIInfoCard( hint = "请输入被动地址", error = "输入的地址不合法", checker = { - it.startsWith("ws://") || it.startsWith("wss://") || it.isBlank() + true }, confirm = { if (it.startsWith("ws://") || it.startsWith("wss://") || it.isBlank()) { diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/config/ShamrockConfig.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/config/ShamrockConfig.kt index bebce44..07ca40c 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/config/ShamrockConfig.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/config/ShamrockConfig.kt @@ -52,13 +52,18 @@ internal object ShamrockConfig { it.port = wsPort } - Config.passiveWebSocket = intent.getStringExtra("ws_addr")?.split(",", "|", ",")?.filter { address -> + val newPassiveWebSocketList = intent.getStringExtra("ws_addr")?.split(",", "|", ",")?.filter { address -> Config.passiveWebSocket?.any { it.address == address } != true }?.map { ConnectionConfig(address = it) }?.toMutableList() + if (Config.passiveWebSocket == null) { + Config.passiveWebSocket = newPassiveWebSocketList + } else { + Config.passiveWebSocket?.addAll(newPassiveWebSocketList ?: emptyList()) + } putString( "key_store", intent.getStringExtra("key_store")) // 证书路径 putString( "ssl_pwd", intent.getStringExtra("ssl_pwd")) // 证书密码 diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/tools/Json.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/tools/Json.kt index d236d33..b37f1de 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/tools/Json.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/tools/Json.kt @@ -30,9 +30,9 @@ val GlobalJson = Json { val GlobalJson5 = Json5 { prettyPrint = true indentationWidth = 2 - useSingleQuotes = true - quoteMemberNames = true - encodeDefaults = true + //useSingleQuotes = true + //quoteMemberNames = true + //encodeDefaults = true } val String.asJson: JsonElement