From 48a2776f9c84081e14a434975099f9a0d3cb65cd Mon Sep 17 00:00:00 2001
From: arm64v8a <48624112+arm64v8a@users.noreply.github.com>
Date: Thu, 16 Mar 2023 14:37:12 +0900
Subject: [PATCH] update data

---
 .../sagernet/fmt/hysteria/HysteriaFmt.kt      |  2 +-
 .../sagernet/fmt/wireguard/WireGuardFmt.kt    |  4 +-
 .../java/moe/matsuri/nb4a/SingBoxOptions.java | 75 +++----------------
 3 files changed, 13 insertions(+), 68 deletions(-)

diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/hysteria/HysteriaFmt.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/hysteria/HysteriaFmt.kt
index f4de1ac..a355af5 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/fmt/hysteria/HysteriaFmt.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/fmt/hysteria/HysteriaFmt.kt
@@ -211,7 +211,7 @@ fun buildSingBoxOutboundHysteriaBean(bean: HysteriaBean): SingBoxOptions.Outboun
         obfs = bean.obfuscation
         disable_mtu_discovery = bean.disableMtuDiscovery
         when (bean.authPayloadType) {
-            HysteriaBean.TYPE_BASE64 -> auth = Util.b64Decode(bean.authPayload).toList()
+            HysteriaBean.TYPE_BASE64 -> auth = bean.authPayload
             HysteriaBean.TYPE_STRING -> auth_str = bean.authPayload
         }
         if (bean.streamReceiveWindow > 0) {
diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/wireguard/WireGuardFmt.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/wireguard/WireGuardFmt.kt
index 57526eb..8e83886 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/fmt/wireguard/WireGuardFmt.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/fmt/wireguard/WireGuardFmt.kt
@@ -2,8 +2,8 @@ package io.nekohasekai.sagernet.fmt.wireguard
 
 import moe.matsuri.nb4a.SingBoxOptions
 
-fun buildSingBoxOutboundWireguardBean(bean: WireGuardBean): SingBoxOptions.Outbound_WireGuardOptions_Fix {
-    return SingBoxOptions.Outbound_WireGuardOptions_Fix().apply {
+fun buildSingBoxOutboundWireguardBean(bean: WireGuardBean): SingBoxOptions.Outbound_WireGuardOptions {
+    return SingBoxOptions.Outbound_WireGuardOptions().apply {
         type = "wireguard"
         server = bean.serverAddress
         server_port = bean.serverPort
diff --git a/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java b/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java
index a57466c..f01d461 100644
--- a/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java
+++ b/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java
@@ -40,66 +40,6 @@ public class SingBoxOptions {
         public ExperimentalOptions experimental;
     }
 
-    public static class Outbound_WireGuardOptions_Fix extends Outbound {
-
-        // Generate note: nested type DialerOptions
-        public String detour;
-
-        public String bind_interface;
-
-        public String inet4_bind_address;
-
-        public String inet6_bind_address;
-
-        public String protect_path;
-
-        public Integer routing_mark;
-
-        public Boolean reuse_addr;
-
-        public Long connect_timeout;
-
-        public Boolean tcp_fast_open;
-
-        public Boolean udp_fragment;
-
-
-        public String domain_strategy;
-
-        public Long fallback_delay;
-
-        // End of public DialerOptions ;
-
-        // Generate note: nested type ServerOptions
-        public String server;
-
-        public Integer server_port;
-
-        // End of public ServerOptions ;
-
-        public Boolean system_interface;
-
-        public String interface_name;
-
-        // Generate note: Listable
-        public List<String> local_address;
-
-        public String private_key;
-
-        public String peer_public_key;
-
-        public String pre_shared_key;
-
-        public String reserved; // fixed, can fill a base64 str
-
-        public Integer workers;
-
-        public Integer mtu;
-
-        public String network;
-
-    }
-
     // paste generate output here
 
     public static class ClashAPIOptions extends SingBoxOption {
@@ -475,7 +415,8 @@ public class SingBoxOptions {
 
         public String name;
 
-        public List<Byte> auth;
+        // Generate note: Base64 String
+        public String auth;
 
         public String auth_str;
 
@@ -529,7 +470,8 @@ public class SingBoxOptions {
 
         public String obfs;
 
-        public List<Byte> auth;
+        // Generate note: Base64 String
+        public String auth;
 
         public String auth_str;
 
@@ -2349,7 +2291,8 @@ public class SingBoxOptions {
 
         public String pre_shared_key;
 
-        public List<Integer> reserved;
+        // Generate note: Base64 String
+        public String reserved;
 
         public Integer workers;
 
@@ -3408,7 +3351,8 @@ public class SingBoxOptions {
 
         public String pre_shared_key;
 
-        public List<Integer> reserved;
+        // Generate note: Base64 String
+        public String reserved;
 
         public Integer workers;
 
@@ -3465,7 +3409,8 @@ public class SingBoxOptions {
 
         public String obfs;
 
-        public List<Byte> auth;
+        // Generate note: Base64 String
+        public String auth;
 
         public String auth_str;