From 07ec5fb84aefd3cc40ed6df0cfd53b47abfa1988 Mon Sep 17 00:00:00 2001
From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com>
Date: Tue, 16 Feb 2021 22:00:02 +0800
Subject: [PATCH] Remove VMess.QUIC

---
 Netch/Servers/VMess/Form/VMessForm.cs |  7 +++----
 Netch/Servers/VMess/VMess.cs          |  5 -----
 Netch/Servers/VMess/VMessUtil.cs      | 10 +++++++++-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Netch/Servers/VMess/Form/VMessForm.cs b/Netch/Servers/VMess/Form/VMessForm.cs
index 34414d25..f065aed4 100644
--- a/Netch/Servers/VMess/Form/VMessForm.cs
+++ b/Netch/Servers/VMess/Form/VMessForm.cs
@@ -5,8 +5,6 @@ namespace Netch.Servers.VMess.Form
 {
     public class VMessForm : ServerForm
     {
-        protected override string TypeName { get; } = "VMess";
-
         public VMessForm(VMess server = default)
         {
             server ??= new VMess();
@@ -42,8 +40,8 @@ namespace Netch.Servers.VMess.Form
                 server.Path);
             CreateComboBox("QUICSecurity", "QUIC Security",
                 VMessGlobal.QUIC,
-                s => server.QUIC = s,
-                server.QUIC);
+                s => server.QUICSecure = s,
+                server.QUICSecure);
             CreateTextBox("QUICSecret", "QUIC Secret",
                 s => true,
                 s => server.QUICSecret = s,
@@ -63,5 +61,6 @@ namespace Netch.Servers.VMess.Form
                 s => server.TLSSecureType = s,
                 server.TLSSecureType);
         }
+        protected override string TypeName { get; } = "VMess";
     }
 }
\ No newline at end of file
diff --git a/Netch/Servers/VMess/VMess.cs b/Netch/Servers/VMess/VMess.cs
index 26dae0d8..d3c2db83 100644
--- a/Netch/Servers/VMess/VMess.cs
+++ b/Netch/Servers/VMess/VMess.cs
@@ -36,11 +36,6 @@ namespace Netch.Servers.VMess
         /// </summary>
         public virtual string FakeType { get; set; } = VMessGlobal.FakeTypes[0];
 
-        /// <summary>
-        ///     QUIC
-        /// </summary>
-        public string QUIC { get; set; } = VMessGlobal.QUIC[0];
-
         /// <summary>
         ///     伪装域名
         /// </summary>
diff --git a/Netch/Servers/VMess/VMessUtil.cs b/Netch/Servers/VMess/VMessUtil.cs
index f26cecdc..e2b2cb1c 100644
--- a/Netch/Servers/VMess/VMessUtil.cs
+++ b/Netch/Servers/VMess/VMessUtil.cs
@@ -20,7 +20,15 @@ namespace Netch.Servers.VMess
 
         public Server ParseJObject(in JObject j)
         {
-            return j.ToObject<VMess>();
+            // TODO Remove Migrate code
+            var server = j.ToObject<VMess>();
+            if (server == null)
+                return null;
+            string quic;
+            if ((quic = j.GetValue("QUIC")?.ToString()) != null)
+                server.QUICSecure = quic;
+
+            return server;
         }
 
         public void Edit(Server s)