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 18ea4560..f598805a 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
@@ -6,6 +6,7 @@ enum class NetworkType(val type: String) {
WS("ws"),
HTTP_UPGRADE("httpupgrade"),
SPLIT_HTTP("splithttp"),
+ XHTTP("xhttp"),
HTTP("http"),
H2("h2"),
//QUIC("quic"),
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 e378369e..e1bc13dd 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
@@ -206,7 +206,7 @@ data class V2rayConfig(
var kcpSettings: KcpSettingsBean? = null,
var wsSettings: WsSettingsBean? = null,
var httpupgradeSettings: HttpupgradeSettingsBean? = null,
- var splithttpSettings: SplithttpSettingsBean? = null,
+ var xhttpSettings: XhttpSettingsBean? = null,
var httpSettings: HttpSettingsBean? = null,
var tlsSettings: TlsSettingsBean? = null,
var quicSettings: QuicSettingBean? = null,
@@ -275,7 +275,7 @@ data class V2rayConfig(
val acceptProxyProtocol: Boolean? = null
)
- data class SplithttpSettingsBean(
+ data class XhttpSettingsBean(
var path: String? = null,
var host: String? = null,
val maxUploadSize: Int? = null,
@@ -396,12 +396,12 @@ data class V2rayConfig(
httpupgradeSettings = httpupgradeSetting
}
- "splithttp" -> {
- val splithttpSetting = SplithttpSettingsBean()
- splithttpSetting.host = host.orEmpty()
- sni = splithttpSetting.host
- splithttpSetting.path = path ?: "/"
- splithttpSettings = splithttpSetting
+ "splithttp","xhttp" -> {
+ val xhttpSetting = XhttpSettingsBean()
+ xhttpSetting.host = host.orEmpty()
+ sni = xhttpSetting.host
+ xhttpSetting.path = path ?: "/"
+ xhttpSettings = xhttpSetting
}
"h2", "http" -> {
@@ -581,12 +581,12 @@ data class V2rayConfig(
)
}
- "splithttp" -> {
- val splithttpSetting = streamSettings?.splithttpSettings ?: return null
+ "splithttp" ,"xhttp"-> {
+ val xhttpSettings = streamSettings?.xhttpSettings ?: return null
listOf(
"",
- splithttpSetting.host,
- splithttpSetting.path
+ xhttpSettings.host,
+ xhttpSettings.path
)
}
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 92e1d9c6..eb0a0c97 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
@@ -55,7 +55,7 @@ open class FmtBase {
config.seed.let { if (it.isNotNullEmpty()) dicQuery["seed"] = it.orEmpty() }
}
- NetworkType.WS, NetworkType.HTTP_UPGRADE, NetworkType.SPLIT_HTTP -> {
+ NetworkType.WS, NetworkType.HTTP_UPGRADE, NetworkType.SPLIT_HTTP, NetworkType.XHTTP -> {
config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.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 a55b59f2..4fca2c37 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
@@ -185,7 +185,7 @@ class ServerActivity : BaseActivity() {
"tcp" -> R.string.server_lab_request_host_http
"ws" -> R.string.server_lab_request_host_ws
"httpupgrade" -> R.string.server_lab_request_host_httpupgrade
- "splithttp" -> R.string.server_lab_request_host_splithttp
+ "splithttp","xhttp" -> R.string.server_lab_request_host_xhttp
"h2" -> R.string.server_lab_request_host_h2
//"quic" -> R.string.server_lab_request_host_quic
"grpc" -> R.string.server_lab_request_host_grpc
@@ -200,7 +200,7 @@ class ServerActivity : BaseActivity() {
"kcp" -> R.string.server_lab_path_kcp
"ws" -> R.string.server_lab_path_ws
"httpupgrade" -> R.string.server_lab_path_httpupgrade
- "splithttp" -> R.string.server_lab_path_splithttp
+ "splithttp","xhttp" -> R.string.server_lab_path_xhttp
"h2" -> R.string.server_lab_path_h2
//"quic" -> R.string.server_lab_path_quic
"grpc" -> R.string.server_lab_path_grpc
diff --git a/V2rayNG/app/src/main/res/values-ar/strings.xml b/V2rayNG/app/src/main/res/values-ar/strings.xml
index e4c3670e..45b7d054 100644
--- a/V2rayNG/app/src/main/res/values-ar/strings.xml
+++ b/V2rayNG/app/src/main/res/values-ar/strings.xml
@@ -56,14 +56,14 @@
http host
ws host
httpupgrade host
- splithttp host
+ xhttp host
h2 host
QUIC security
gRPC Authority
path
ws path
httpupgrade path
- splithttp path
+ xhttp path
h2 path
QUIC key
kcp seed
diff --git a/V2rayNG/app/src/main/res/values-bn/strings.xml b/V2rayNG/app/src/main/res/values-bn/strings.xml
index 890a8c69..0bcd6ace 100644
--- a/V2rayNG/app/src/main/res/values-bn/strings.xml
+++ b/V2rayNG/app/src/main/res/values-bn/strings.xml
@@ -55,14 +55,14 @@
http হোস্ট
ws হোস্ট
httpupgrade হোস্ট
- splithttp হোস্ট
+ xhttp হোস্ট
h2 হোস্ট
QUIC নিরাপত্তা
gRPC কর্তৃপক্ষ
পথ
ws পথ
httpupgrade পথ
- splithttp পথ
+ xhttp পথ
h2 পথ
QUIC কী
kcp বীজ
diff --git a/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml b/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml
index 358e591d..ed9ba6b2 100644
--- a/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml
+++ b/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml
@@ -55,14 +55,14 @@
هاست http
هاست ws
هاست httpupgrade
- هاست splithttp
+ هاست xhttp
هاست h2
ٱمنیت QUIC
اختیار gRPC
تور
تور ws
تور httpupgrade
- تور splithttp
+ تور xhttp
تور h2
کیلیت QUIC
سید kcp
diff --git a/V2rayNG/app/src/main/res/values-fa/strings.xml b/V2rayNG/app/src/main/res/values-fa/strings.xml
index 43763a30..183a119d 100644
--- a/V2rayNG/app/src/main/res/values-fa/strings.xml
+++ b/V2rayNG/app/src/main/res/values-fa/strings.xml
@@ -54,14 +54,14 @@
http host
ws host
httpupgrade host
- splithttp host
+ xhttp host
h2 host
QUIC security
gRPC Authority
path
ws path
httpupgrade path
- splithttp path
+ xhttp path
h2 path
QUIC key
kcp seed
diff --git a/V2rayNG/app/src/main/res/values-ru/strings.xml b/V2rayNG/app/src/main/res/values-ru/strings.xml
index cf3e153e..3eb5dccf 100644
--- a/V2rayNG/app/src/main/res/values-ru/strings.xml
+++ b/V2rayNG/app/src/main/res/values-ru/strings.xml
@@ -54,14 +54,14 @@
Узел HTTP
Узел WS
Узел HTTPUpgrade
- Узел SplitHTTP
+ Узел SplitHTTP
Узел H2
Шифрование QUIC
Полномочия gRPC
Путь
Путь WS
Путь HTTPUpgrade
- Путь SplitHTTP
+ Путь SplitHTTP
Путь H2
Ключ QUIC
Сид KCP
diff --git a/V2rayNG/app/src/main/res/values-vi/strings.xml b/V2rayNG/app/src/main/res/values-vi/strings.xml
index 73944fc5..f590f92a 100644
--- a/V2rayNG/app/src/main/res/values-vi/strings.xml
+++ b/V2rayNG/app/src/main/res/values-vi/strings.xml
@@ -54,14 +54,14 @@
http host
ws host
httpupgrade host
- splithttp host
+ xhttp host
h2 host
QUIC security
gRPC Authority
path
ws path
httpupgrade path
- splithttp path
+ xhttp path
h2 path
QUIC key
kcp seed
diff --git a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
index d4feabfe..5424fa2b 100644
--- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
@@ -54,14 +54,14 @@
http host
ws host
httpupgrade host
- splithttp host
+ xhttp host
h2 host
QUIC 加密方式
gRPC Authority
path
ws path
httpupgrade path
- splithttp path
+ xhttp path
h2 path
QUIC 加密密钥
kcp seed
diff --git a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
index 54bff2d2..a4f5778f 100644
--- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
@@ -54,14 +54,14 @@
http host
ws host
httpupgrade host
- splithttp host
+ xhttp host
h2 host
QUIC 加密方式
gRPC Authority
path
ws path
httpupgrade path
- splithttp path
+ xhttp path
h2 path
QUIC 加密金鑰
kcp seed
diff --git a/V2rayNG/app/src/main/res/values/arrays.xml b/V2rayNG/app/src/main/res/values/arrays.xml
index f7232b77..2f4d58d6 100644
--- a/V2rayNG/app/src/main/res/values/arrays.xml
+++ b/V2rayNG/app/src/main/res/values/arrays.xml
@@ -26,6 +26,7 @@
- kcp
- ws
- httpupgrade
+ - xhttp
- splithttp
- h2
- grpc
diff --git a/V2rayNG/app/src/main/res/values/strings.xml b/V2rayNG/app/src/main/res/values/strings.xml
index 720c4c59..78bf0f75 100644
--- a/V2rayNG/app/src/main/res/values/strings.xml
+++ b/V2rayNG/app/src/main/res/values/strings.xml
@@ -55,14 +55,14 @@
http host
ws host
httpupgrade host
- splithttp host
+ xhttp host
h2 host
QUIC security
gRPC Authority
path
ws path
httpupgrade path
- splithttp path
+ xhttp path
h2 path
QUIC key
kcp seed