From 3f778a1ea239d2f6780acab734776ffe76cd242d Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 28 Jun 2025 10:02:25 +0800
Subject: [PATCH] Optimize the source of tls sni

---
 .../com/v2ray/ang/handler/V2rayConfigManager.kt   | 14 +++++++++++---
 .../com/v2ray/ang/service/V2RayServiceManager.kt  |  2 +-
 .../app/src/main/java/com/v2ray/ang/util/Utils.kt | 15 +++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt
index fc77271e..f53697bb 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt
@@ -97,7 +97,7 @@ object V2rayConfigManager {
         val result = ConfigResult(false)
 
         val address = config.server ?: return result
-        if (!Utils.isIpAddress(address)) {
+        if (!Utils.isPureIpAddress(address)) {
             if (!Utils.isValidUrl(address)) {
                 Log.w(AppConfig.TAG, "$address is an invalid ip or domain")
                 return result
@@ -154,7 +154,7 @@ object V2rayConfigManager {
         val result = ConfigResult(false)
 
         val address = config.server ?: return result
-        if (!Utils.isIpAddress(address)) {
+        if (!Utils.isPureIpAddress(address)) {
             if (!Utils.isValidUrl(address)) {
                 Log.w(AppConfig.TAG, "$address is an invalid ip or domain")
                 return result
@@ -1052,7 +1052,15 @@ object V2rayConfigManager {
     fun populateTlsSettings(streamSettings: StreamSettingsBean, profileItem: ProfileItem, sniExt: String?) {
         val streamSecurity = profileItem.security.orEmpty()
         val allowInsecure = profileItem.insecure == true
-        val sni = if (profileItem.sni.isNullOrEmpty()) sniExt else profileItem.sni
+        val sni = if (profileItem.sni.isNullOrEmpty()) {
+            when {
+                sniExt.isNotNullEmpty() && Utils.isDomainName(sniExt) -> sniExt
+                profileItem.server.isNotNullEmpty() && Utils.isDomainName(profileItem.server) -> profileItem.server
+                else -> sniExt
+            }
+        } else {
+            profileItem.sni
+        }
         val fingerprint = profileItem.fingerPrint
         val alpns = profileItem.alpn
         val publicKey = profileItem.publicKey
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt
index 659158a5..4f42ca23 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt
@@ -102,7 +102,7 @@ object V2RayServiceManager {
         val config = MmkvManager.decodeServerConfig(guid) ?: return
         if (config.configType != EConfigType.CUSTOM
             && !Utils.isValidUrl(config.server)
-            && !Utils.isIpAddress(config.server)
+            && !Utils.isPureIpAddress(config.server.orEmpty())
         ) return
 //        val result = V2rayConfigUtil.getV2rayConfig(context, guid)
 //        if (!result.status) return
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt
index 6a61afe5..148ce4ec 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt
@@ -198,6 +198,21 @@ object Utils {
         return isIpv4Address(value) || isIpv6Address(value)
     }
 
+    /**
+     * Check if a string is a valid domain name.
+     *
+     * A valid domain name must not be an IP address and must be a valid URL format.
+     *
+     * @param input The string to check.
+     * @return True if the string is a valid domain name, false otherwise.
+     */
+    fun isDomainName(input: String?): Boolean {
+        if (input.isNullOrEmpty()) return false
+
+        // Must not be an IP address and must be a valid URL format
+        return !isPureIpAddress(input) && isValidUrl(input)
+    }
+
     /**
      * Check if a string is a valid IPv4 address.
      *