From 5370f815ec13efe301e6e4531d243ca25b50987b Mon Sep 17 00:00:00 2001 From: purofle Date: Wed, 1 Nov 2023 22:52:33 +0800 Subject: [PATCH] style: Make the code more beautiful --- .../sagernet/fmt/v2ray/StandardV2RayBean.java | 6 ++--- .../sagernet/fmt/v2ray/V2RayFmt.kt | 24 ++++++++++++++----- .../profile/StandardV2RaySettingsActivity.kt | 8 ++++--- app/src/main/res/values-zh-rCN/strings.xml | 2 ++ app/src/main/res/values/arrays.xml | 2 +- app/src/main/res/values/strings.xml | 2 ++ 6 files changed, 31 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/StandardV2RayBean.java b/app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/StandardV2RayBean.java index 41f8eeb..0c90705 100644 --- a/app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/StandardV2RayBean.java +++ b/app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/StandardV2RayBean.java @@ -14,7 +14,7 @@ public abstract class StandardV2RayBean extends AbstractBean { //////// End of VMess & VLESS //////// - // "V2Ray Transport" tcp/http/ws/quic/grpc/httpupgrade + // "V2Ray Transport" tcp/http/ws/quic/grpc/httpUpgrade public String type; public String host; @@ -133,7 +133,7 @@ public abstract class StandardV2RayBean extends AbstractBean { case "grpc": { output.writeString(path); } - case "httpupgrade": { + case "httpUpgrade": { output.writeString(host); output.writeString(path); @@ -185,7 +185,7 @@ public abstract class StandardV2RayBean extends AbstractBean { case "grpc": { path = input.readString(); } - case "httpupgrade": { + case "httpUpgrade": { host = input.readString(); path = input.readString(); } diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/V2RayFmt.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/V2RayFmt.kt index d5cb15f..ae0339d 100644 --- a/app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/V2RayFmt.kt +++ b/app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/V2RayFmt.kt @@ -5,7 +5,19 @@ import com.google.gson.Gson import io.nekohasekai.sagernet.fmt.http.HttpBean import io.nekohasekai.sagernet.fmt.trojan.TrojanBean import io.nekohasekai.sagernet.ktx.* -import moe.matsuri.nb4a.SingBoxOptions.* +import moe.matsuri.nb4a.SingBoxOptions.Outbound +import moe.matsuri.nb4a.SingBoxOptions.OutboundRealityOptions +import moe.matsuri.nb4a.SingBoxOptions.OutboundTLSOptions +import moe.matsuri.nb4a.SingBoxOptions.OutboundUTLSOptions +import moe.matsuri.nb4a.SingBoxOptions.Outbound_HTTPOptions +import moe.matsuri.nb4a.SingBoxOptions.Outbound_TrojanOptions +import moe.matsuri.nb4a.SingBoxOptions.Outbound_VLESSOptions +import moe.matsuri.nb4a.SingBoxOptions.Outbound_VMessOptions +import moe.matsuri.nb4a.SingBoxOptions.V2RayTransportOptions +import moe.matsuri.nb4a.SingBoxOptions.V2RayTransportOptions_GRPCOptions +import moe.matsuri.nb4a.SingBoxOptions.V2RayTransportOptions_HTTPOptions +import moe.matsuri.nb4a.SingBoxOptions.V2RayTransportOptions_HTTPUpgradeOptions +import moe.matsuri.nb4a.SingBoxOptions.V2RayTransportOptions_WebsocketOptions import moe.matsuri.nb4a.utils.NGUtil import moe.matsuri.nb4a.utils.listByLineOrComma import okhttp3.HttpUrl @@ -117,7 +129,7 @@ fun parseV2Ray(link: String): StandardV2RayBean { } } - "httpupgrade" -> { + "httpUpgrade" -> { url.queryParameter("path")?.let { bean.path = it } @@ -225,7 +237,7 @@ fun StandardV2RayBean.parseDuckSoft(url: HttpUrl) { } } - "httpupgrade" -> { + "httpUpgrade" -> { url.queryParameter("host")?.let { host = it } @@ -454,7 +466,7 @@ fun StandardV2RayBean.toUriVMessVLESSTrojan(isTrojan: Boolean): String { when (type) { "tcp" -> {} - "ws", "http", "httpupgrade" -> { + "ws", "http", "httpUpgrade" -> { if (host.isNotBlank()) { builder.addQueryParameter("host", host) } @@ -583,9 +595,9 @@ fun buildSingBoxOutboundStreamSettings(bean: StandardV2RayBean): V2RayTransportO } } - "httpupgrade" -> { + "httpUpgrade" -> { return V2RayTransportOptions_HTTPUpgradeOptions().apply { - type = "httpupgrade" + type = "httpUpgrade" host = bean.host path = bean.path } diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/profile/StandardV2RaySettingsActivity.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/profile/StandardV2RaySettingsActivity.kt index ca9a14a..66ab389 100644 --- a/app/src/main/java/io/nekohasekai/sagernet/ui/profile/StandardV2RaySettingsActivity.kt +++ b/app/src/main/java/io/nekohasekai/sagernet/ui/profile/StandardV2RaySettingsActivity.kt @@ -166,13 +166,15 @@ abstract class StandardV2RaySettingsActivity : ProfileSettingsActivity { path.preference.setTitle(R.string.grpc_service_name) path.preference.isVisible = true } - "httpupgrade" -> { - host.preference.setTitle("HTTPUpgrade Host") - path.preference.setTitle("HTTPUpgrade Path") + + "httpUpgrade" -> { + host.preference.setTitle(R.string.http_upgrade_host) + path.preference.setTitle(R.string.http_upgrade_path) host.preference.isVisible = true path.preference.isVisible = true } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0a7b942..dcc140c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -485,4 +485,6 @@ 禁用TLS记录的自适应调整大小 如果启用，将始终使用最大可能的TLS记录大小。当禁用时，TLS记录的大小可能会进行调整以尝试提高延迟。 ECH 配置 + HTTPUpgrade 主机 + HTTPUpgrade 端口 \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 92b812d..ac09d22 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -263,7 +263,7 @@ http quic grpc - httpupgrade + httpUpgrade diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 18b36a1..76cb3cf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -526,5 +526,7 @@ Anyone can write advanced plugins, which can control NekoBox. please download an Disables adaptive sizing of TLS records ECH Config If enable, the largest possible TLS record size is always used. When disable, the size of TLS records may be adjusted in an attempt to improve latency. + HTTPUpgrade Host + HTTPUpgrade Path \ No newline at end of file