From cfb6776e8ffa977a0079b300f4823914d52ae831 Mon Sep 17 00:00:00 2001 From: fanymagnet Date: Thu, 7 May 2026 05:03:47 +0300 Subject: [PATCH] Get profile desc from server.address/port for vless (#5610) Co-authored-by: fanymagnet <> --- .../src/main/java/com/v2ray/ang/dto/V2rayConfig.kt | 14 +++++++------- .../src/main/java/com/v2ray/ang/fmt/CustomFmt.kt | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt index 73048279..7ecc26b4 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt @@ -344,19 +344,19 @@ data class V2rayConfig( if (protocol.equals(EConfigType.VMESS.name, true) || protocol.equals(EConfigType.VLESS.name, true) ) { - return settings?.vnext?.first()?.address + return settings?.vnext?.firstOrNull()?.address ?: settings?.address as? String } else if (protocol.equals(EConfigType.SHADOWSOCKS.name, true) || protocol.equals(EConfigType.SOCKS.name, true) || protocol.equals(EConfigType.HTTP.name, true) || protocol.equals(EConfigType.TROJAN.name, true) ) { - return settings?.servers?.first()?.address + return settings?.servers?.firstOrNull()?.address } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) { - return settings?.peers?.first()?.endpoint?.substringBeforeLast(":") + return settings?.peers?.firstOrNull()?.endpoint?.substringBeforeLast(":") } else if (protocol.equals(EConfigType.HYSTERIA2.name, true) || protocol.equals(EConfigType.HYSTERIA.name, true) ) { - return settings?.address as String? + return settings?.address as? String } return null } @@ -365,15 +365,15 @@ data class V2rayConfig( if (protocol.equals(EConfigType.VMESS.name, true) || protocol.equals(EConfigType.VLESS.name, true) ) { - return settings?.vnext?.first()?.port + return settings?.vnext?.firstOrNull()?.port ?: settings?.port } else if (protocol.equals(EConfigType.SHADOWSOCKS.name, true) || protocol.equals(EConfigType.SOCKS.name, true) || protocol.equals(EConfigType.HTTP.name, true) || protocol.equals(EConfigType.TROJAN.name, true) ) { - return settings?.servers?.first()?.port + return settings?.servers?.firstOrNull()?.port } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) { - return settings?.peers?.first()?.endpoint?.substringAfterLast(":")?.toInt() + return settings?.peers?.firstOrNull()?.endpoint?.substringAfterLast(":")?.toInt() } else if (protocol.equals(EConfigType.HYSTERIA2.name, true) || protocol.equals(EConfigType.HYSTERIA.name, true) ) { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt index 610500b4..e6d741ab 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt @@ -20,7 +20,7 @@ object CustomFmt : FmtBase() { config.remarks = fullConfig?.remarks ?: System.currentTimeMillis().toString() config.server = outbound?.getServerAddress() - config.serverPort = outbound?.getServerPort().toString() + config.serverPort = outbound?.getServerPort()?.toString() return config }