diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index 34cd94aa..14974e15 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -41,19 +41,19 @@ object AngConfigManager { } val config = if (str.startsWith(EConfigType.VMESS.protocolScheme)) { - VmessFmt.parseVmess(str) + VmessFmt.parse(str) } else if (str.startsWith(EConfigType.SHADOWSOCKS.protocolScheme)) { - ShadowsocksFmt.parseShadowsocks(str) + ShadowsocksFmt.parse(str) } else if (str.startsWith(EConfigType.SOCKS.protocolScheme)) { - SocksFmt.parseSocks(str) + SocksFmt.parse(str) } else if (str.startsWith(EConfigType.TROJAN.protocolScheme)) { - TrojanFmt.parseTrojan(str) + TrojanFmt.parse(str) } else if (str.startsWith(EConfigType.VLESS.protocolScheme)) { - VlessFmt.parseVless(str) + VlessFmt.parse(str) } else if (str.startsWith(EConfigType.WIREGUARD.protocolScheme)) { - WireguardFmt.parseWireguard(str) + WireguardFmt.parse(str) } else if (str.startsWith(EConfigType.HYSTERIA2.protocolScheme)) { - Hysteria2Fmt.parseHysteria2(str) + Hysteria2Fmt.parse(str) } else { null } diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/Hysteria2Fmt.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/Hysteria2Fmt.kt index 899ce782..cbb30fae 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/Hysteria2Fmt.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/Hysteria2Fmt.kt @@ -2,7 +2,9 @@ package com.v2ray.ang.util.fmt import android.text.TextUtils import com.v2ray.ang.AppConfig +import com.v2ray.ang.AppConfig.LOOPBACK import com.v2ray.ang.dto.EConfigType +import com.v2ray.ang.dto.Hysteria2Bean import com.v2ray.ang.dto.ServerConfig import com.v2ray.ang.dto.V2rayConfig import com.v2ray.ang.extension.idnHost @@ -12,7 +14,7 @@ import java.net.URI object Hysteria2Fmt { - fun parseHysteria2(str: String): ServerConfig { + fun parse(str: String): ServerConfig { var allowInsecure = settingsStorage?.decodeBool(AppConfig.PREF_ALLOW_INSECURE) ?: false val config = ServerConfig.create(EConfigType.HYSTERIA2) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/ShadowsocksFmt.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/ShadowsocksFmt.kt index 40e068ee..afd2d350 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/ShadowsocksFmt.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/ShadowsocksFmt.kt @@ -9,7 +9,7 @@ import com.v2ray.ang.util.Utils import java.net.URI object ShadowsocksFmt { - fun parseShadowsocks(str: String): ServerConfig? { + fun parse(str: String): ServerConfig? { val config = ServerConfig.create(EConfigType.SHADOWSOCKS) if (!tryResolveResolveSip002(str, config)) { var result = str.replace(EConfigType.SHADOWSOCKS.protocolScheme, "") diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/SocksFmt.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/SocksFmt.kt index 0148ec88..106541f8 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/SocksFmt.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/SocksFmt.kt @@ -6,7 +6,7 @@ import com.v2ray.ang.dto.V2rayConfig import com.v2ray.ang.util.Utils object SocksFmt { - fun parseSocks(str: String): ServerConfig? { + fun parse(str: String): ServerConfig? { val config = ServerConfig.create(EConfigType.SOCKS) var result = str.replace(EConfigType.SOCKS.protocolScheme, "") val indexSplit = result.indexOf("#") diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/TrojanFmt.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/TrojanFmt.kt index 9ebf8700..db3a2a34 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/TrojanFmt.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/TrojanFmt.kt @@ -12,7 +12,7 @@ import java.net.URI object TrojanFmt { - fun parseTrojan(str: String): ServerConfig { + fun parse(str: String): ServerConfig { var allowInsecure = settingsStorage?.decodeBool(AppConfig.PREF_ALLOW_INSECURE) ?: false val config = ServerConfig.create(EConfigType.TROJAN) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/VlessFmt.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/VlessFmt.kt index 46669c38..ea37d310 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/VlessFmt.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/VlessFmt.kt @@ -12,7 +12,7 @@ import java.net.URI object VlessFmt { - fun parseVless(str: String): ServerConfig? { + fun parse(str: String): ServerConfig? { var allowInsecure = settingsStorage?.decodeBool(AppConfig.PREF_ALLOW_INSECURE) ?: false val config = ServerConfig.create(EConfigType.VLESS) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/VmessFmt.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/VmessFmt.kt index 79052f93..eca35e85 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/VmessFmt.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/VmessFmt.kt @@ -15,7 +15,7 @@ import java.net.URI object VmessFmt { - fun parseVmess(str: String): ServerConfig? { + fun parse(str: String): ServerConfig? { if (str.indexOf('?') > 0 && str.indexOf('&') > 0) { return parseVmessStd(str) } diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt index 52edc42a..a198d3c8 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt @@ -9,7 +9,7 @@ import com.v2ray.ang.util.Utils import java.net.URI object WireguardFmt { - fun parseWireguard(str: String): ServerConfig? { + fun parse(str: String): ServerConfig? { val uri = URI(Utils.fixIllegalUrl(str)) if (uri.rawQuery != null) { val config = ServerConfig.create(EConfigType.WIREGUARD)