rkp/v2rayNG
1
0 Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Remove quic

Browse Source
This commit is contained in:
2dust committed 2024-11-18 18:39:06 +08:00
1 parent 633ee63891
commit 834c1ba63d
6 files changed
+34 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt
+1 -1
View File
@@ -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 {
V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt
+15 -15
View File
@@ -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
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
+5 -5
View File
@@ -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() }
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
+8 -8
View File
@@ -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()
V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
+5 -5
View File
@@ -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
}
V2rayNG/app/src/main/res/values/arrays.xml
-1
View File
@@ -28,7 +28,6 @@
<item>httpupgrade</item>
<item>splithttp</item>
<item>h2</item>
<item>quic</item>
<item>grpc</item>
</string-array>