From cc9ea9a81a98075fbc1b402b9be787b9a081f017 Mon Sep 17 00:00:00 2001
From: armv9 <48624112+arm64v8a@users.noreply.github.com>
Date: Sun, 23 Feb 2025 16:52:47 +0900
Subject: [PATCH] Remove redundant ECH options

---
 .../java/io/nekohasekai/sagernet/fmt/v2ray/V2RayFmt.kt   | 2 --
 .../sagernet/ui/profile/StandardV2RaySettingsActivity.kt | 2 --
 app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java   | 8 --------
 app/src/main/res/values-zh-rCN/strings.xml               | 3 ---
 app/src/main/res/values/strings.xml                      | 6 ------
 app/src/main/res/xml/standard_v2ray_preferences.xml      | 9 ---------
 6 files changed, 30 deletions(-)

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 eea3698..79f80bc 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
@@ -622,8 +622,6 @@ fun buildSingBoxOutboundTLS(bean: StandardV2RayBean): OutboundTLSOptions? {
         if (bean.enableECH) {
             ech = OutboundECHOptions().apply {
                 enabled = true
-                pq_signature_schemes_enabled = bean.enablePqSignature
-                dynamic_record_sizing_disabled = bean.disabledDRS
                 if (bean.echConfig.isNotBlank()) {
                     config = bean.echConfig.lines()
                 }
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 a31f2de..90d5066 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
@@ -45,8 +45,6 @@ abstract class StandardV2RaySettingsActivity : ProfileSettingsActivity<StandardV
     private val realityShortId = pbm.add(PreferenceBinding(Type.Text, "realityShortId"))
 
     private val enableECH = pbm.add(PreferenceBinding(Type.Bool, "enableECH"))
-    private val enablePqSignature = pbm.add(PreferenceBinding(Type.Bool, "enablePqSignature"))
-    private val disabledDRS = pbm.add(PreferenceBinding(Type.Bool, "disabledDRS"))
     private val echConfig = pbm.add(PreferenceBinding(Type.Text, "echConfig"))
 
     override fun StandardV2RayBean.init() {
diff --git a/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java b/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java
index 2e609f2..0b98da0 100644
--- a/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java
+++ b/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java
@@ -1879,10 +1879,6 @@ public class SingBoxOptions {
 
         public Boolean enabled;
 
-        public Boolean pq_signature_schemes_enabled;
-
-        public Boolean dynamic_record_sizing_disabled;
-
         // Generate note: Listable
         public List<String> key;
 
@@ -1894,10 +1890,6 @@ public class SingBoxOptions {
 
         public Boolean enabled;
 
-        public Boolean pq_signature_schemes_enabled;
-
-        public Boolean dynamic_record_sizing_disabled;
-
         // Generate note: Listable
         public List<String> config;
 
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 45768ca..18098e8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -482,9 +482,6 @@
     <string name="enable_ech">启用 ECH 技术支持</string>
     <string name="enable_ech_sum">启用 ECH</string>
     <string name="ech_settings">ECH 设置</string>
-    <string name="pq_signature_schemes_enabled">启用对后量子对等证书签名方案支持</string>
-    <string name="dynamic_record_sizing_disabled">禁用TLS记录的自适应调整大小</string>
-    <string name="dynamic_record_sizing_sum">如果启用，将始终使用最大可能的TLS记录大小。当禁用时，TLS记录的大小可能会进行调整以尝试改善延迟。</string>
     <string name="ech_config">ECH 配置</string>
     <string name="http_upgrade_host">HTTPUpgrade 主机</string>
     <string name="http_upgrade_path">HTTPUpgrade 路径</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c9e09ed..ff5f33e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -560,13 +560,7 @@
     <string name="enable_ech">Enable ECH</string>
     <string name="enable_ech_sum">Enable Encrypted Client Hello</string>
     <string name="ech_settings">ECH Settings</string>
-    <string name="pq_signature_schemes_enabled">Enable post-quantum peer certificate signature
-        supports</string>
-    <string name="dynamic_record_sizing_disabled">Disables adaptive sizing of TLS records</string>
     <string name="ech_config">ECH Config</string>
-    <string name="dynamic_record_sizing_sum">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.</string>
     <string name="http_upgrade_host">HTTPUpgrade Host</string>
     <string name="http_upgrade_path">HTTPUpgrade Path</string>
     <string name="update_current_subscription">Update current Group\'s subscription</string>
diff --git a/app/src/main/res/xml/standard_v2ray_preferences.xml b/app/src/main/res/xml/standard_v2ray_preferences.xml
index 0f4d6f6..5717c75 100644
--- a/app/src/main/res/xml/standard_v2ray_preferences.xml
+++ b/app/src/main/res/xml/standard_v2ray_preferences.xml
@@ -151,15 +151,6 @@
     <PreferenceCategory
         app:key="serverECHCategory"
         app:title="@string/ech_settings">
-        <SwitchPreference
-            app:icon="@drawable/ic_baseline_security_24"
-            app:key="enablePqSignature"
-            app:title="@string/pq_signature_schemes_enabled" />
-        <SwitchPreference
-            app:icon="@drawable/ic_baseline_security_24"
-            app:key="disabledDRS"
-            app:summary="@string/dynamic_record_sizing_sum"
-            app:title="@string/dynamic_record_sizing_disabled" />
         <EditTextPreference
             app:icon="@drawable/ic_baseline_texture_24"
             app:key="echConfig"