From eebdc2980334e2881c70fe833fcdddbae09154c9 Mon Sep 17 00:00:00 2001
From: dyhkwong <50692134+dyhkwong@users.noreply.github.com>
Date: Tue, 14 May 2024 12:48:26 +0800
Subject: [PATCH] Update naiveproxy to v125.0.6422.35-1 and mieru to v3.0.1

---
 .github/workflows/release_mieru.yml                       | 2 +-
 .idea/codeStyles/Project.xml                              | 1 -
 app/src/main/java/io/nekohasekai/sagernet/Constants.kt    | 2 ++
 .../java/io/nekohasekai/sagernet/database/DataStore.kt    | 2 ++
 .../java/io/nekohasekai/sagernet/fmt/naive/NaiveBean.java | 8 +++++++-
 .../java/io/nekohasekai/sagernet/fmt/naive/NaiveFmt.kt    | 3 +++
 .../sagernet/ui/profile/NaiveSettingsActivity.kt          | 2 ++
 app/src/main/res/values-zh-rCN/strings.xml                | 3 ++-
 app/src/main/res/values/strings.xml                       | 1 +
 app/src/main/res/xml/naive_preferences.xml                | 4 ++++
 plugin/mieru/src/main/go/mieru                            | 2 +-
 plugin/naive/src/main/jni/naiveproxy                      | 2 +-
 sager.properties                                          | 8 ++++----
 13 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release_mieru.yml b/.github/workflows/release_mieru.yml
index 28cdda7c..df696e68 100644
--- a/.github/workflows/release_mieru.yml
+++ b/.github/workflows/release_mieru.yml
@@ -33,7 +33,7 @@ jobs:
         uses: actions/setup-go@v5
         if: steps.cache.outputs.cache-hit != 'true'
         with:
-          go-version: 1.22.2
+          go-version: 1.22.3
       - name: Native Build
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 8581ad5a..6dd46843 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,6 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="ENABLE_SECOND_REFORMAT" value="true" />
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
diff --git a/app/src/main/java/io/nekohasekai/sagernet/Constants.kt b/app/src/main/java/io/nekohasekai/sagernet/Constants.kt
index 261e875b..d338b7e1 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/Constants.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/Constants.kt
@@ -196,6 +196,8 @@ object Key {
     const val SERVER_PORTS = "serverPorts"
     const val SERVER_HOP_INTERVAL = "serverHopInterval"
 
+    const val SERVER_NAIVE_NO_POST_QUANTUM = "serverNaiveNoPostQuantum"
+
     const val BALANCER_TYPE = "balancerType"
     const val BALANCER_GROUP = "balancerGroup"
     const val BALANCER_STRATEGY = "balancerStrategy"
diff --git a/app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt b/app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt
index a83b0c4c..13716e92 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt
@@ -302,6 +302,8 @@ object DataStore : OnPreferenceDataStoreChangeListener {
     var serverMieruMuxLevel by profileCacheStore.stringToInt(Key.SERVER_MIERU_MUX_LEVEL)
     var serverWireGuardReserved by profileCacheStore.string(Key.SERVER_WIREGUARD_RESERVED)
 
+    var serverNaiveNoPostQuantum by profileCacheStore.boolean(Key.SERVER_NAIVE_NO_POST_QUANTUM)
+
     var balancerType by profileCacheStore.stringToInt(Key.BALANCER_TYPE)
     var balancerGroup by profileCacheStore.stringToLong(Key.BALANCER_GROUP)
     var balancerStrategy by profileCacheStore.string(Key.BALANCER_STRATEGY)
diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/naive/NaiveBean.java b/app/src/main/java/io/nekohasekai/sagernet/fmt/naive/NaiveBean.java
index e3a6b159..b072825b 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/fmt/naive/NaiveBean.java
+++ b/app/src/main/java/io/nekohasekai/sagernet/fmt/naive/NaiveBean.java
@@ -39,6 +39,7 @@ public class NaiveBean extends AbstractBean {
     public String password;
     public String extraHeaders;
     public Integer insecureConcurrency;
+    public Boolean noPostQuantum;
 
     @Override
     public void initializeDefaultValues() {
@@ -49,17 +50,19 @@ public class NaiveBean extends AbstractBean {
         if (password == null) password = "";
         if (extraHeaders == null) extraHeaders = "";
         if (insecureConcurrency == null) insecureConcurrency = 0;
+        if (noPostQuantum == null) noPostQuantum = false;
     }
 
     @Override
     public void serialize(ByteBufferOutput output) {
-        output.writeInt(3);
+        output.writeInt(4);
         super.serialize(output);
         output.writeString(proto);
         output.writeString(username);
         output.writeString(password);
         output.writeString(extraHeaders);
         output.writeInt(insecureConcurrency);
+        output.writeBoolean(noPostQuantum);
     }
 
     @Override
@@ -76,6 +79,9 @@ public class NaiveBean extends AbstractBean {
         if (version == 2) {
             input.readBoolean(); // uot, removed
         }
+        if (version >= 4) {
+            noPostQuantum = input.readBoolean();
+        }
     }
 
     @Override
diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/naive/NaiveFmt.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/naive/NaiveFmt.kt
index b6ecfa3e..7db0d241 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/fmt/naive/NaiveFmt.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/fmt/naive/NaiveFmt.kt
@@ -89,5 +89,8 @@ fun NaiveBean.buildNaiveConfig(port: Int): String {
         if (insecureConcurrency > 0) {
             it["insecure-concurrency"] = insecureConcurrency
         }
+        if (noPostQuantum) {
+            it["no-post-quantum"] = true
+        }
     }.toStringPretty()
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/profile/NaiveSettingsActivity.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/profile/NaiveSettingsActivity.kt
index defdba20..3e83549e 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/ui/profile/NaiveSettingsActivity.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/ui/profile/NaiveSettingsActivity.kt
@@ -41,6 +41,7 @@ class NaiveSettingsActivity : ProfileSettingsActivity<NaiveBean>() {
         DataStore.serverProtocol = proto
         DataStore.serverHeaders = extraHeaders
         DataStore.serverInsecureConcurrency = insecureConcurrency
+        DataStore.serverNaiveNoPostQuantum = noPostQuantum
     }
 
     override fun NaiveBean.serialize() {
@@ -52,6 +53,7 @@ class NaiveSettingsActivity : ProfileSettingsActivity<NaiveBean>() {
         proto = DataStore.serverProtocol
         extraHeaders = DataStore.serverHeaders.replace("\r\n", "\n")
         insecureConcurrency = DataStore.serverInsecureConcurrency
+        noPostQuantum = DataStore.serverNaiveNoPostQuantum
     }
 
     override fun PreferenceFragmentCompat.createPreferences(
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 62d77c83..379d990e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -215,7 +215,7 @@
     <string name="theme">主题颜色</string>
     <string name="donate">捐款</string>
     <string name="donate_info">世界很可爱 请给世界钱</string>
-    <string name="extra_headers">附加标头</string>
+    <string name="extra_headers">附加头</string>
     <string name="username">用户名</string>
     <string name="key_opt">密钥（可选）</string>
     <string name="group_diff">变化（%s）</string>
@@ -507,4 +507,5 @@
     <string name="hysteria2_provider">Hysteria 2 提供程序</string>
     <string name="nat_stun_server_hint">STUN 服务器</string>
     <string name="brook_udp_over_stream">UDP over stream</string>
+    <string name="naive_no_post_quantum">禁用后量子密钥协商</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f3a207d1..198c7074 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -529,5 +529,6 @@
     <string name="hysteria2_provider">Hysteria 2 provider</string>
     <string name="nat_stun_server_hint">STUN server</string>
     <string name="brook_udp_over_stream">UDP over stream</string>
+    <string name="naive_no_post_quantum">Disable post-quantum key agreement</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/naive_preferences.xml b/app/src/main/res/xml/naive_preferences.xml
index cfa704f5..0f21ea12 100644
--- a/app/src/main/res/xml/naive_preferences.xml
+++ b/app/src/main/res/xml/naive_preferences.xml
@@ -49,6 +49,10 @@
             app:key="serverInsecureConcurrency"
             app:title="@string/naive_insecure_concurrency"
             app:useSimpleSummaryProvider="true" />
+        <SwitchPreference
+            app:key="serverNaiveNoPostQuantum"
+            app:title="@string/naive_no_post_quantum"
+            app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
 
diff --git a/plugin/mieru/src/main/go/mieru b/plugin/mieru/src/main/go/mieru
index 2e2832c6..429b34a4 160000
--- a/plugin/mieru/src/main/go/mieru
+++ b/plugin/mieru/src/main/go/mieru
@@ -1 +1 @@
-Subproject commit 2e2832c6b13e83d7b4eb7406700c2ecc72e9e567
+Subproject commit 429b34a448db3b3aa5390c8ad3b83cb6d349c316
diff --git a/plugin/naive/src/main/jni/naiveproxy b/plugin/naive/src/main/jni/naiveproxy
index a08c4d35..0edc025e 160000
--- a/plugin/naive/src/main/jni/naiveproxy
+++ b/plugin/naive/src/main/jni/naiveproxy
@@ -1 +1 @@
-Subproject commit a08c4d354e5960c6c3c09d0ec8c1f87f00b3a43a
+Subproject commit 0edc025ec43a2152a2a76b2f1c45cd0d17f75e31
diff --git a/sager.properties b/sager.properties
index ce0d1383..7229bff6 100644
--- a/sager.properties
+++ b/sager.properties
@@ -2,8 +2,8 @@ PACKAGE_NAME=com.github.sagernet.sagernet
 VERSION_NAME=0.10.7
 VERSION_CODE=203
 
-NAIVE_VERSION_NAME=124.0.6367.54-3
-NAIVE_VERSION=47
+NAIVE_VERSION_NAME=125.0.6422.35-1
+NAIVE_VERSION=48
 
 BROOK_VERSION_NAME=20240606
 BROOK_VERSION=9
@@ -11,8 +11,8 @@ BROOK_VERSION=9
 HYSTERIA2_VERSION_NAME=2.4.3
 HYSTERIA2_VERSION=18
 
-MIERU_VERSION_NAME=3.0.0
-MIERU_VERSION=17
+MIERU_VERSION_NAME=3.0.1
+MIERU_VERSION=18
 
 SHADOWTLS_VERSION_NAME=0.2.25
 SHADOWTLS_VERSION=2