diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/tuic/TuicBean.java b/app/src/main/java/io/nekohasekai/sagernet/fmt/tuic/TuicBean.java index 51322b8..007ef8f 100644 --- a/app/src/main/java/io/nekohasekai/sagernet/fmt/tuic/TuicBean.java +++ b/app/src/main/java/io/nekohasekai/sagernet/fmt/tuic/TuicBean.java @@ -21,6 +21,9 @@ public class TuicBean extends AbstractBean { public Boolean reduceRTT; public Integer mtu; public String sni; + + // TUIC zep + public Boolean fastConnect; public Boolean allowInsecure; @@ -45,7 +48,7 @@ public class TuicBean extends AbstractBean { if (fastConnect == null) fastConnect = false; if (allowInsecure == null) allowInsecure = false; if (customJSON == null) customJSON = ""; - if (protocolVersion == null) protocolVersion = 4; + if (protocolVersion == null) protocolVersion = 5; if (uuid == null) uuid = ""; } diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/tuic/TuicFmt.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/tuic/TuicFmt.kt index 65ba3be..b36c8e7 100644 --- a/app/src/main/java/io/nekohasekai/sagernet/fmt/tuic/TuicFmt.kt +++ b/app/src/main/java/io/nekohasekai/sagernet/fmt/tuic/TuicFmt.kt @@ -56,7 +56,8 @@ fun TuicBean.buildTuicConfigV5(port: Int, cacheFile: (() -> File)?): JSONObject } put("congestion_control", congestionController) put("disable_sni", disableSNI) - put("zero_rtt_handshake", disableSNI) + put("zero_rtt_handshake", reduceRTT) + if (allowInsecure) put("allow_insecure", true) }) put("local", JSONObject().apply { put("server", "127.0.0.1:$port") diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/profile/TuicSettingsActivity.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/profile/TuicSettingsActivity.kt index 431bc7e..c94a4a6 100644 --- a/app/src/main/java/io/nekohasekai/sagernet/ui/profile/TuicSettingsActivity.kt +++ b/app/src/main/java/io/nekohasekai/sagernet/ui/profile/TuicSettingsActivity.kt @@ -73,18 +73,15 @@ class TuicSettingsActivity : ProfileSettingsActivity() { val uuid = findPreference(Key.SERVER_USERNAME)!! val mtu = findPreference(Key.SERVER_MTU)!! val fastConnect = findPreference(Key.SERVER_FAST_CONNECT)!! - val allowInsecure = findPreference(Key.SERVER_ALLOW_INSECURE)!! fun updateVersion(v: Int) { if (v == 5) { uuid.isVisible = true mtu.isVisible = false fastConnect.isVisible = false - allowInsecure.isVisible = false } else { uuid.isVisible = false mtu.isVisible = true fastConnect.isVisible = true - allowInsecure.isVisible = true } } findPreference(Key.SERVER_PROTOCOL)!!.setOnPreferenceChangeListener { _, newValue -> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c009ac3..bc7ba9a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -465,7 +465,7 @@ 启用 selector (免重载切换节点) 前置代理 落地代理 - ShadowTLS 版本 + 协议版本 分享订阅 在通知中显示组名 重置连接 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index a0f2a81..119de5f 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -387,13 +387,8 @@ - v4 - v5 - - - - 4 5 + 4 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 034905a..75c6d77 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -506,7 +506,7 @@ Anyone can write advanced plugins, which can control NekoBox. please download an Front proxy Landing Proxy ShadowTLS - ShadowTLS Version + Protocol Version Share Subscription Show group name in in notification Reset Connections diff --git a/app/src/main/res/xml/shadowtls_preferences.xml b/app/src/main/res/xml/shadowtls_preferences.xml index 215c608..870b2c6 100644 --- a/app/src/main/res/xml/shadowtls_preferences.xml +++ b/app/src/main/res/xml/shadowtls_preferences.xml @@ -21,7 +21,7 @@ app:entryValues="@array/shadowtls_version_value" app:icon="@drawable/ic_baseline_update_24" app:key="version" - app:title="@string/shadowtls_version" + app:title="@string/protocol_version" app:useSimpleSummaryProvider="true" />