From a3e49dcc3d3e223c3a1f08c8f8677140abcf3111 Mon Sep 17 00:00:00 2001 From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Date: Sat, 30 Jan 2021 21:58:49 -0500 Subject: [PATCH] Fix the string list trim --- .../main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt index f15c209f8..ee626334e 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt @@ -458,12 +458,10 @@ object V2rayConfigUtil { rulesIP.outboundTag = tag rulesIP.ip = ArrayList() - userRule.trim().replace("\n", "") - .split(",") - .forEach { + userRule.split(",").map { it.trim() }.forEach { if (Utils.isIpAddress(it) || it.startsWith("geoip:")) { rulesIP.ip?.add(it) - } else if (it.isNotBlank() || it.isNotEmpty()) + } else if (it.isNotEmpty()) // if (Utils.isValidUrl(it) // || it.startsWith("geosite:") // || it.startsWith("regexp:") @@ -487,9 +485,8 @@ object V2rayConfigUtil { private fun userRule2Domian(userRule: String): ArrayList { val domain = ArrayList() - userRule.trim().replace("\n", "").split(",").forEach { - if ((it.startsWith("geosite:") || it.startsWith("domain:")) && - it.isNotBlank() && it.isNotEmpty()) { + userRule.split(",").map { it.trim() }.forEach { + if (it.startsWith("geosite:") || it.startsWith("domain:")) { domain.add(it) } }