From 9f4127a588a040b52c479561ad526f7e5de1f9fd Mon Sep 17 00:00:00 2001 From: MUEDSA <7676275+muedsa@users.noreply.github.com> Date: Fri, 30 Dec 2022 17:07:45 +0800 Subject: [PATCH] only domain idn to ascii --- .../src/main/kotlin/com/v2ray/ang/util/Utils.kt | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt index f40449c9..48e9c488 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt @@ -431,19 +431,9 @@ object Utils { } fun idnToASCII(str: String): String { - var url = str - var prot = "" - if (url.startsWith(AppConfig.HTTPS_PROTOCOL)) { - url = url.substring(8) - prot = AppConfig.HTTPS_PROTOCOL - } else if (url.startsWith(AppConfig.HTTP_PROTOCOL)) { - url = url.substring(7) - prot = AppConfig.HTTP_PROTOCOL - } - url = prot + IDN.toASCII(url, IDN.ALLOW_UNASSIGNED) - if (url != str) return url else { - return str - } + val url = URL(str) + return URL(url.protocol, IDN.toASCII(url.host, IDN.ALLOW_UNASSIGNED), url.port, url.file) + .toExternalForm() } }