android-apps-mirrors/definitely-not-v2ray-client-dont-use-it
0
0
Fork 0
mirror of https://github.com/2dust/v2rayNG.git synced 2025-06-28 12:19:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Bug fix

Browse source 
https://github.com/2dust/v2rayNG/issues/4555
This commit is contained in:
2dust 2025-04-30 08:31:51 +08:00
parent 2fdf684ee7
commit 9bedfe8a7b
8 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt
View file

@ -25,7 +25,7 @@ object Hysteria2Fmt : FmtBase() {
val config = ProfileItem.create(EConfigType.HYSTERIA2)
val uri = URI(Utils.fixIllegalUrl(str))
config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
config.server = uri.idnHost
config.serverPort = uri.port.toString()
config.password = uri.userInfo

2
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
View file

@ -36,7 +36,7 @@ object ShadowsocksFmt : FmtBase() {
if (uri.port <= 0) return null
if (uri.userInfo.isNullOrEmpty()) return null
config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
config.server = uri.idnHost
config.serverPort = uri.port.toString()

2
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt
View file

@ -23,7 +23,7 @@ object SocksFmt : FmtBase() {
if (uri.idnHost.isEmpty()) return null
if (uri.port <= 0) return null
config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
config.server = uri.idnHost
config.serverPort = uri.port.toString()

2
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt
View file

@ -23,7 +23,7 @@ object TrojanFmt : FmtBase() {
val config = ProfileItem.create(EConfigType.TROJAN)
val uri = URI(Utils.fixIllegalUrl(str))
config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
config.server = uri.idnHost
config.serverPort = uri.port.toString()
config.password = uri.userInfo

2
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt
View file

@ -26,7 +26,7 @@ object VlessFmt : FmtBase() {
if (uri.rawQuery.isNullOrEmpty()) return null
val queryParam = getQueryParam(uri)
config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
config.server = uri.idnHost
config.serverPort = uri.port.toString()
config.password = uri.userInfo

2
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
View file

@ -151,7 +151,7 @@ object VmessFmt : FmtBase() {
if (uri.rawQuery.isNullOrEmpty()) return null
val queryParam = getQueryParam(uri)
config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
config.server = uri.idnHost
config.serverPort = uri.port.toString()
config.password = uri.userInfo

2
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt
View file

@ -25,7 +25,7 @@ object WireguardFmt : FmtBase() {
if (uri.rawQuery.isNullOrEmpty()) return null
val queryParam = getQueryParam(uri)
config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
config.server = uri.idnHost
config.serverPort = uri.port.toString()

2
V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt
View file

@ -216,7 +216,7 @@ object SettingsManager {
* @return The ProfileItem.
*/
fun getServerViaRemarks(remarks: String?): ProfileItem? {
if (remarks == null) {
if (remarks.isNullOrEmpty()) {
return null
}
val serverList = decodeServerList()