From 834c1ba63d8950fbda36fca64d8180aa2880613a Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 18 Nov 2024 18:39:06 +0800
Subject: [PATCH] Remove quic
---
.../java/com/v2ray/ang/dto/NetworkType.kt | 2 +-
.../java/com/v2ray/ang/dto/V2rayConfig.kt | 30 +++++++++----------
.../main/java/com/v2ray/ang/fmt/FmtBase.kt | 10 +++----
.../main/java/com/v2ray/ang/fmt/VmessFmt.kt | 16 +++++-----
.../java/com/v2ray/ang/ui/ServerActivity.kt | 10 +++----
V2rayNG/app/src/main/res/values/arrays.xml | 1 -
6 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt
index 5e4b5dbe..18ea4560 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt
@@ -8,7 +8,7 @@ enum class NetworkType(val type: String) {
SPLIT_HTTP("splithttp"),
HTTP("http"),
H2("h2"),
- QUIC("quic"),
+ //QUIC("quic"),
GRPC("grpc");
companion object {
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 9ea7b596..e378369e 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
@@ -413,13 +413,13 @@ data class V2rayConfig(
httpSettings = h2Setting
}
- "quic" -> {
- val quicsetting = QuicSettingBean()
- quicsetting.security = quicSecurity ?: "none"
- quicsetting.key = key.orEmpty()
- quicsetting.header.type = headerType ?: "none"
- quicSettings = quicsetting
- }
+// "quic" -> {
+// val quicsetting = QuicSettingBean()
+// quicsetting.security = quicSecurity ?: "none"
+// quicsetting.key = key.orEmpty()
+// quicsetting.header.type = headerType ?: "none"
+// quicSettings = quicsetting
+// }
"grpc" -> {
val grpcSetting = GrpcSettingsBean()
@@ -599,14 +599,14 @@ data class V2rayConfig(
)
}
- "quic" -> {
- val quicSetting = streamSettings?.quicSettings ?: return null
- listOf(
- quicSetting.header.type,
- quicSetting.security,
- quicSetting.key
- )
- }
+// "quic" -> {
+// val quicSetting = streamSettings?.quicSettings ?: return null
+// listOf(
+// quicSetting.header.type,
+// quicSetting.security,
+// quicSetting.key
+// )
+// }
"grpc" -> {
val grpcSetting = streamSettings?.grpcSettings ?: return null
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
index a73eb615..92e1d9c6 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
@@ -66,11 +66,11 @@ open class FmtBase {
config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
}
- NetworkType.QUIC -> {
- dicQuery["headerType"] = config.headerType?.ifEmpty { "none" }.orEmpty()
- config.quicSecurity.let { if (it.isNotNullEmpty()) dicQuery["quicSecurity"] = it.orEmpty() }
- config.quicKey.let { if (it.isNotNullEmpty()) dicQuery["key"] = it.orEmpty() }
- }
+// NetworkType.QUIC -> {
+// dicQuery["headerType"] = config.headerType?.ifEmpty { "none" }.orEmpty()
+// config.quicSecurity.let { if (it.isNotNullEmpty()) dicQuery["quicSecurity"] = it.orEmpty() }
+// config.quicKey.let { if (it.isNotNullEmpty()) dicQuery["key"] = it.orEmpty() }
+// }
NetworkType.GRPC -> {
config.mode.let { if (it.isNotNullEmpty()) dicQuery["mode"] = it.orEmpty() }
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
index a8fe469e..1fc7a66f 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
@@ -58,10 +58,10 @@ object VmessFmt : FmtBase() {
config.seed = vmessQRCode.path
}
- NetworkType.QUIC -> {
- config.quicSecurity = vmessQRCode.host
- config.quicKey = vmessQRCode.path
- }
+// NetworkType.QUIC -> {
+// config.quicSecurity = vmessQRCode.host
+// config.quicKey = vmessQRCode.path
+// }
NetworkType.GRPC -> {
config.mode = vmessQRCode.type
@@ -98,10 +98,10 @@ object VmessFmt : FmtBase() {
vmessQRCode.path = config.seed.orEmpty()
}
- NetworkType.QUIC -> {
- vmessQRCode.host = config.quicSecurity.orEmpty()
- vmessQRCode.path = config.quicKey.orEmpty()
- }
+// NetworkType.QUIC -> {
+// vmessQRCode.host = config.quicSecurity.orEmpty()
+// vmessQRCode.path = config.quicKey.orEmpty()
+// }
NetworkType.GRPC -> {
vmessQRCode.type = config.mode.orEmpty()
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
index 57f25648..a55b59f2 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
@@ -165,7 +165,7 @@ class ServerActivity : BaseActivity() {
et_request_host?.text = Utils.getEditable(
when (networks[position]) {
- "quic" -> config?.quicSecurity
+ //"quic" -> config?.quicSecurity
"grpc" -> config?.authority
else -> config?.host
}.orEmpty()
@@ -173,7 +173,7 @@ class ServerActivity : BaseActivity() {
et_path?.text = Utils.getEditable(
when (networks[position]) {
"kcp" -> config?.seed
- "quic" -> config?.quicKey
+ //"quic" -> config?.quicKey
"grpc" -> config?.serviceName
else -> config?.path
}.orEmpty()
@@ -187,7 +187,7 @@ class ServerActivity : BaseActivity() {
"httpupgrade" -> R.string.server_lab_request_host_httpupgrade
"splithttp" -> R.string.server_lab_request_host_splithttp
"h2" -> R.string.server_lab_request_host_h2
- "quic" -> R.string.server_lab_request_host_quic
+ //"quic" -> R.string.server_lab_request_host_quic
"grpc" -> R.string.server_lab_request_host_grpc
else -> R.string.server_lab_request_host
}
@@ -202,7 +202,7 @@ class ServerActivity : BaseActivity() {
"httpupgrade" -> R.string.server_lab_path_httpupgrade
"splithttp" -> R.string.server_lab_path_splithttp
"h2" -> R.string.server_lab_path_h2
- "quic" -> R.string.server_lab_path_quic
+ //"quic" -> R.string.server_lab_path_quic
"grpc" -> R.string.server_lab_path_grpc
else -> R.string.server_lab_path
}
@@ -544,7 +544,7 @@ class ServerActivity : BaseActivity() {
tcpTypes
}
- "kcp", "quic" -> {
+ "kcp" -> {
kcpAndQuicTypes
}
diff --git a/V2rayNG/app/src/main/res/values/arrays.xml b/V2rayNG/app/src/main/res/values/arrays.xml
index 76c89658..f7232b77 100644
--- a/V2rayNG/app/src/main/res/values/arrays.xml
+++ b/V2rayNG/app/src/main/res/values/arrays.xml
@@ -28,7 +28,6 @@
- httpupgrade
- splithttp
- h2
- - quic
- grpc