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 07ca40c..61ac6e2 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,18 +52,11 @@ internal object ShamrockConfig { it.port = wsPort } - val newPassiveWebSocketList = intent.getStringExtra("ws_addr")?.split(",", "|", ",")?.filter { address -> - Config.passiveWebSocket?.any { - it.address == address - } != true + Config.passiveWebSocket = intent.getStringExtra("ws_addr")?.split(",", "|", ",")?.filter { address -> + address.isNotBlank() && (address.startsWith("ws://") || address.startsWith("wss://")) }?.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")) // 证书密码