Skip to content

Commit 83c7331

Browse files
2dustAnGgIt886
authored andcommitted
Refactor fun name
1 parent 8693ba8 commit 83c7331

File tree

8 files changed

+16
-14
lines changed

8 files changed

+16
-14
lines changed

app/src/main/kotlin/com/neko/v2ray/util/AngConfigManager.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ object AngConfigManager {
4040
return R.string.toast_none_data
4141
}
4242
val config = if (str.startsWith(EConfigType.VMESS.protocolScheme)) {
43-
VmessFmt.parseVmess(str)
43+
VmessFmt.parse(str)
4444
} else if (str.startsWith(EConfigType.SHADOWSOCKS.protocolScheme)) {
45-
ShadowsocksFmt.parseShadowsocks(str)
45+
ShadowsocksFmt.parse(str)
4646
} else if (str.startsWith(EConfigType.SOCKS.protocolScheme)) {
47-
SocksFmt.parseSocks(str)
47+
SocksFmt.parse(str)
4848
} else if (str.startsWith(EConfigType.TROJAN.protocolScheme)) {
49-
TrojanFmt.parseTrojan(str)
49+
TrojanFmt.parse(str)
5050
} else if (str.startsWith(EConfigType.VLESS.protocolScheme)) {
51-
VlessFmt.parseVless(str)
51+
VlessFmt.parse(str)
5252
} else if (str.startsWith(EConfigType.WIREGUARD.protocolScheme)) {
53-
WireguardFmt.parseWireguard(str)
53+
WireguardFmt.parse(str)
5454
} else if (str.startsWith(EConfigType.HYSTERIA2.protocolScheme)) {
55-
Hysteria2Fmt.parseHysteria2(str)
55+
Hysteria2Fmt.parse(str)
5656
} else {
5757
null
5858
}

app/src/main/kotlin/com/neko/v2ray/util/fmt/Hysteria2Fmt.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ package com.neko.v2ray.util.fmt
22

33
import android.text.TextUtils
44
import com.neko.v2ray.AppConfig
5+
import com.neko.v2ray.AppConfig.LOOPBACK
56
import com.neko.v2ray.dto.EConfigType
7+
import com.neko.v2ray.dto.Hysteria2Bean
68
import com.neko.v2ray.dto.ServerConfig
79
import com.neko.v2ray.dto.V2rayConfig
810
import com.neko.v2ray.extension.idnHost
@@ -12,7 +14,7 @@ import java.net.URI
1214

1315
object Hysteria2Fmt {
1416

15-
fun parseHysteria2(str: String): ServerConfig {
17+
fun parse(str: String): ServerConfig {
1618
var allowInsecure = settingsStorage?.decodeBool(AppConfig.PREF_ALLOW_INSECURE) ?: false
1719
val config = ServerConfig.create(EConfigType.HYSTERIA2)
1820

app/src/main/kotlin/com/neko/v2ray/util/fmt/ShadowsocksFmt.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.neko.v2ray.util.Utils
99
import java.net.URI
1010

1111
object ShadowsocksFmt {
12-
fun parseShadowsocks(str: String): ServerConfig? {
12+
fun parse(str: String): ServerConfig? {
1313
val config = ServerConfig.create(EConfigType.SHADOWSOCKS)
1414
if (!tryResolveResolveSip002(str, config)) {
1515
var result = str.replace(EConfigType.SHADOWSOCKS.protocolScheme, "")

app/src/main/kotlin/com/neko/v2ray/util/fmt/SocksFmt.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.neko.v2ray.dto.V2rayConfig
66
import com.neko.v2ray.util.Utils
77

88
object SocksFmt {
9-
fun parseSocks(str: String): ServerConfig? {
9+
fun parse(str: String): ServerConfig? {
1010
val config = ServerConfig.create(EConfigType.SOCKS)
1111
var result = str.replace(EConfigType.SOCKS.protocolScheme, "")
1212
val indexSplit = result.indexOf("#")

app/src/main/kotlin/com/neko/v2ray/util/fmt/TrojanFmt.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import java.net.URI
1212

1313
object TrojanFmt {
1414

15-
fun parseTrojan(str: String): ServerConfig {
15+
fun parse(str: String): ServerConfig {
1616
var allowInsecure = settingsStorage?.decodeBool(AppConfig.PREF_ALLOW_INSECURE) ?: false
1717
val config = ServerConfig.create(EConfigType.TROJAN)
1818

app/src/main/kotlin/com/neko/v2ray/util/fmt/VlessFmt.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import java.net.URI
1212

1313
object VlessFmt {
1414

15-
fun parseVless(str: String): ServerConfig? {
15+
fun parse(str: String): ServerConfig? {
1616
var allowInsecure = settingsStorage?.decodeBool(AppConfig.PREF_ALLOW_INSECURE) ?: false
1717
val config = ServerConfig.create(EConfigType.VLESS)
1818

app/src/main/kotlin/com/neko/v2ray/util/fmt/VmessFmt.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import java.net.URI
1515

1616
object VmessFmt {
1717

18-
fun parseVmess(str: String): ServerConfig? {
18+
fun parse(str: String): ServerConfig? {
1919
if (str.indexOf('?') > 0 && str.indexOf('&') > 0) {
2020
return parseVmessStd(str)
2121
}

app/src/main/kotlin/com/neko/v2ray/util/fmt/WireguardFmt.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.neko.v2ray.util.Utils
99
import java.net.URI
1010

1111
object WireguardFmt {
12-
fun parseWireguard(str: String): ServerConfig? {
12+
fun parse(str: String): ServerConfig? {
1313
val uri = URI(Utils.fixIllegalUrl(str))
1414
if (uri.rawQuery != null) {
1515
val config = ServerConfig.create(EConfigType.WIREGUARD)

0 commit comments

Comments
 (0)