chore: TUIC udp_relay_mode

MatsuriDayo · Aug 28, 2023 · fe8248b · fe8248b
1 parent 556cf11
commit fe8248b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
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
@@ -42,7 +42,7 @@ fun parseTuic(url: String): TuicBean {
             if (it == "1") allowInsecure = true
         }
         link.queryParameter("disable_sni")?.let {
-            if (it == "1") disableSNI =true
+            if (it == "1") disableSNI = true
         }
     }
 }
@@ -70,7 +70,9 @@ fun buildSingBoxOutboundTuicBean(bean: TuicBean): SingBoxOptions.Outbound_TUICOp
         uuid = bean.uuid
         password = bean.token
         congestion_control = bean.congestionController
-        udp_relay_mode = bean.udpRelayMode
+        when (bean.udpRelayMode) {
+            "quic" -> udp_relay_mode = "quic"
+        }
         zero_rtt_handshake = bean.reduceRTT
         tls = SingBoxOptions.OutboundTLSOptions().apply {
             if (bean.sni.isNotBlank()) {

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -477,23 +477,11 @@
         <item>randomized</item>
     </string-array>
 
-    <string-array name="tuic_udp_relay_mode_entry">
-        <item>NATIVE</item>
-        <item>QUIC</item>
-    </string-array>
-
     <string-array name="tuic_udp_relay_mode_value">
         <item>native</item>
         <item>quic</item>
     </string-array>
 
-    <string-array name="tuic_congestion_controller_entry">
-        <item>CUBIC</item>
-        <item>NEW RENO</item>
-        <item>BBR</item>
-    </string-array>
-
-
     <string-array name="tuic_congestion_controller_value">
         <item>cubic</item>
         <item>new_reno</item>

diff --git a/app/src/main/res/xml/tuic_preferences.xml b/app/src/main/res/xml/tuic_preferences.xml
@@ -49,15 +49,15 @@
             app:useSimpleSummaryProvider="true" />
         <moe.matsuri.nb4a.ui.SimpleMenuPreference
             app:defaultValue="https"
-            app:entries="@array/tuic_udp_relay_mode_entry"
+            app:entries="@array/tuic_udp_relay_mode_value"
             app:entryValues="@array/tuic_udp_relay_mode_value"
             app:icon="@drawable/ic_baseline_add_road_24"
             app:key="serverUDPRelayMode"
             app:title="@string/tuic_udp_relay_mode"
             app:useSimpleSummaryProvider="true" />
         <moe.matsuri.nb4a.ui.SimpleMenuPreference
             app:defaultValue="https"
-            app:entries="@array/tuic_congestion_controller_entry"
+            app:entries="@array/tuic_congestion_controller_value"
             app:entryValues="@array/tuic_congestion_controller_value"
             app:icon="@drawable/ic_baseline_compare_arrows_24"
             app:key="serverCongestionController"