Repair joinToString with space problem

UWU-TEAM · Sep 28, 2024 · 2adbbe8 · 2adbbe8
1 parent dab99e6
commit 2adbbe8
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/app/src/main/kotlin/com/neko/v2ray/dto/V2rayConfig.kt b/app/src/main/kotlin/com/neko/v2ray/dto/V2rayConfig.kt
@@ -512,8 +512,8 @@ data class V2rayConfig(
                         val tcpSetting = streamSettings?.tcpSettings ?: return null
                         listOf(
                             tcpSetting.header.type,
-                            tcpSetting.header.request?.headers?.Host?.joinToString().orEmpty(),
-                            tcpSetting.header.request?.path?.joinToString().orEmpty()
+                            tcpSetting.header.request?.headers?.Host?.joinToString(",").orEmpty(),
+                            tcpSetting.header.request?.path?.joinToString(",").orEmpty()
                         )
                     }
 
@@ -557,7 +557,7 @@ data class V2rayConfig(
                         val h2Setting = streamSettings?.httpSettings ?: return null
                         listOf(
                             "",
-                            h2Setting.host.joinToString(),
+                            h2Setting.host.joinToString(","),
                             h2Setting.path
                         )
                     }

diff --git a/app/src/main/kotlin/com/neko/v2ray/ui/RoutingEditActivity.kt b/app/src/main/kotlin/com/neko/v2ray/ui/RoutingEditActivity.kt
@@ -93,10 +93,10 @@ class RoutingEditActivity : BaseActivity() {
 
     private fun bindingServer(rulesetItem: RulesetItem): Boolean {
         binding.etRemarks.text = Utils.getEditable(rulesetItem.remarks)
-        binding.etDomain.text = Utils.getEditable(rulesetItem.domain?.joinToString())
-        binding.etIp.text = Utils.getEditable(rulesetItem.ip?.joinToString())
+        binding.etDomain.text = Utils.getEditable(rulesetItem.domain?.joinToString(","))
+        binding.etIp.text = Utils.getEditable(rulesetItem.ip?.joinToString(","))
         binding.etPort.text = Utils.getEditable(rulesetItem.port)
-        binding.etProtocol.text = Utils.getEditable(rulesetItem.protocol?.joinToString())
+        binding.etProtocol.text = Utils.getEditable(rulesetItem.protocol?.joinToString(","))
         binding.etNetwork.text = Utils.getEditable(rulesetItem.network)
         val outbound = Utils.arrayFind(outbound_tag, rulesetItem.outboundTag)
         binding.spOutboundTag.setSelection(outbound)

diff --git a/app/src/main/kotlin/com/neko/v2ray/ui/ServerActivity.kt b/app/src/main/kotlin/com/neko/v2ray/ui/ServerActivity.kt
@@ -341,7 +341,7 @@ class ServerActivity : BaseActivity() {
                     Utils.getEditable("${WIREGUARD_LOCAL_ADDRESS_V4},${WIREGUARD_LOCAL_ADDRESS_V6}")
             } else {
                 val list = outbound.settings?.address as List<*>
-                et_local_address?.text = Utils.getEditable(list.joinToString())
+                et_local_address?.text = Utils.getEditable(list.joinToString(","))
             }
             if (outbound.settings?.mtu == null) {
                 et_local_mtu?.text = Utils.getEditable(WIREGUARD_LOCAL_MTU)
@@ -373,7 +373,7 @@ class ServerActivity : BaseActivity() {
                 tlsSetting.alpn?.let {
                     val alpnIndex = Utils.arrayFind(
                         alpns,
-                        Utils.removeWhiteSpace(tlsSetting.alpn.joinToString()).orEmpty()
+                        Utils.removeWhiteSpace(tlsSetting.alpn.joinToString(",")).orEmpty()
                     )
                     sp_stream_alpn?.setSelection(alpnIndex)
                 }

diff --git a/app/src/main/kotlin/com/neko/v2ray/util/fmt/Hysteria2Fmt.kt b/app/src/main/kotlin/com/neko/v2ray/util/fmt/Hysteria2Fmt.kt
@@ -54,7 +54,7 @@ object Hysteria2Fmt {
                 dicQuery["sni"] = tlsSetting.serverName
             }
             if (!tlsSetting.alpn.isNullOrEmpty() && tlsSetting.alpn.isNotEmpty()) {
-                dicQuery["alpn"] = Utils.removeWhiteSpace(tlsSetting.alpn.joinToString()).orEmpty()
+                dicQuery["alpn"] = Utils.removeWhiteSpace(tlsSetting.alpn.joinToString(",")).orEmpty()
             }
         }
 

diff --git a/app/src/main/kotlin/com/neko/v2ray/util/fmt/TrojanFmt.kt b/app/src/main/kotlin/com/neko/v2ray/util/fmt/TrojanFmt.kt
@@ -92,7 +92,7 @@ object TrojanFmt {
             }
             if (!tlsSetting.alpn.isNullOrEmpty() && tlsSetting.alpn.isNotEmpty()) {
                 dicQuery["alpn"] =
-                    Utils.removeWhiteSpace(tlsSetting.alpn.joinToString()).orEmpty()
+                    Utils.removeWhiteSpace(tlsSetting.alpn.joinToString(",")).orEmpty()
             }
             if (!TextUtils.isEmpty(tlsSetting.fingerprint)) {
                 dicQuery["fp"] = tlsSetting.fingerprint.orEmpty()

diff --git a/app/src/main/kotlin/com/neko/v2ray/util/fmt/VlessFmt.kt b/app/src/main/kotlin/com/neko/v2ray/util/fmt/VlessFmt.kt
@@ -83,7 +83,7 @@ object VlessFmt {
             }
             if (!tlsSetting.alpn.isNullOrEmpty() && tlsSetting.alpn.isNotEmpty()) {
                 dicQuery["alpn"] =
-                    Utils.removeWhiteSpace(tlsSetting.alpn.joinToString()).orEmpty()
+                    Utils.removeWhiteSpace(tlsSetting.alpn.joinToString(",")).orEmpty()
             }
             if (!TextUtils.isEmpty(tlsSetting.fingerprint)) {
                 dicQuery["fp"] = tlsSetting.fingerprint.orEmpty()

diff --git a/app/src/main/kotlin/com/neko/v2ray/util/fmt/VmessFmt.kt b/app/src/main/kotlin/com/neko/v2ray/util/fmt/VmessFmt.kt
@@ -93,7 +93,7 @@ object VmessFmt {
         vmessQRCode.tls = streamSetting.security
         vmessQRCode.sni = streamSetting.tlsSettings?.serverName.orEmpty()
         vmessQRCode.alpn =
-            Utils.removeWhiteSpace(streamSetting.tlsSettings?.alpn?.joinToString()).orEmpty()
+            Utils.removeWhiteSpace(streamSetting.tlsSettings?.alpn?.joinToString(",")).orEmpty()
         vmessQRCode.fp = streamSetting.tlsSettings?.fingerprint.orEmpty()
         outbound.getTransportSettingDetails()?.let { transportDetails ->
             vmessQRCode.type = transportDetails[0]

diff --git a/app/src/main/kotlin/com/neko/v2ray/util/fmt/WireguardFmt.kt b/app/src/main/kotlin/com/neko/v2ray/util/fmt/WireguardFmt.kt
@@ -81,12 +81,12 @@ object WireguardFmt {
             Utils.urlEncode(outbound.settings?.peers?.get(0)?.publicKey.toString())
         if (outbound.settings?.reserved != null) {
             dicQuery["reserved"] = Utils.urlEncode(
-                Utils.removeWhiteSpace(outbound.settings?.reserved?.joinToString())
+                Utils.removeWhiteSpace(outbound.settings?.reserved?.joinToString(","))
                     .toString()
             )
         }
         dicQuery["address"] = Utils.urlEncode(
-            Utils.removeWhiteSpace((outbound.settings?.address as List<*>).joinToString())
+            Utils.removeWhiteSpace((outbound.settings?.address as List<*>).joinToString(","))
                 .toString()
         )
         if (outbound.settings?.mtu != null) {