From 3d49fe033898e09d4f1c3065834dad4e0fb2cd19 Mon Sep 17 00:00:00 2001
From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com>
Date: Wed, 21 Oct 2020 22:07:58 +0800
Subject: [PATCH] Revert "feat: V2Ray TLS AllowInsecure Setting"

This reverts commit 591f8e5a5c44c0d8997b036299b72bd74280cc2b.
---
 Netch/Servers/VLESS/VLESSForm/VLESSForm.cs    | 17 +++--------------
 Netch/Servers/VMess/Form/VMessForm.cs         | 19 ++++---------------
 Netch/Servers/VMess/Utils/V2rayConfigUtils.cs |  4 ++--
 Netch/Servers/VMess/VMess.cs                  |  2 +-
 Netch/Servers/VMess/VMessUtil.cs              |  2 +-
 5 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/Netch/Servers/VLESS/VLESSForm/VLESSForm.cs b/Netch/Servers/VLESS/VLESSForm/VLESSForm.cs
index 2febb86f..375003e6 100644
--- a/Netch/Servers/VLESS/VLESSForm/VLESSForm.cs
+++ b/Netch/Servers/VLESS/VLESSForm/VLESSForm.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using Netch.Forms;
 
 namespace Netch.Servers.VLESS.VLESSForm
@@ -39,19 +38,9 @@ namespace Netch.Servers.VLESS.VLESSForm
                 s => true,
                 s => server.Path = s,
                 server.Path);
-            CreateComboBox("TLSSecure", "TLS Secure",
-                new List<string> {"", "true", "false"},
-                s =>
-                {
-                    server.TLSSecure = s switch
-                    {
-                        "" => null,
-                        "true" => true,
-                        "false" => false,
-                        _ => null
-                    };
-                },
-                server.TLSSecure?.ToString() ?? string.Empty);
+            CreateCheckBox("TLSSecure", "TLS Secure",
+                b => server.TLSSecure = b,
+                server.TLSSecure);
             CreateCheckBox("UseMux", "Use Mux",
                 b => server.UseMux = b,
                 server.UseMux);
diff --git a/Netch/Servers/VMess/Form/VMessForm.cs b/Netch/Servers/VMess/Form/VMessForm.cs
index 1b1012c7..f2dbdaed 100644
--- a/Netch/Servers/VMess/Form/VMessForm.cs
+++ b/Netch/Servers/VMess/Form/VMessForm.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Netch.Forms;
+using Netch.Forms;
 
 namespace Netch.Servers.VMess.Form
 {
@@ -48,22 +47,12 @@ namespace Netch.Servers.VMess.Form
                 s => true,
                 s => server.QUICSecret = s,
                 server.QUICSecret);
-            CreateComboBox("TLSSecure", "TLS Secure",
-                new List<string> {"", "true", "false"},
-                s =>
-                {
-                    server.TLSSecure = s switch
-                    {
-                        "" => null,
-                        "true" => true,
-                        "false" => false,
-                        _ => null
-                    };
-                },
-                server.TLSSecure?.ToString() ?? string.Empty);
             CreateCheckBox("UseMux", "Use Mux",
                 s => server.UseMux = s,
                 server.UseMux);
+            CreateCheckBox("TLSSecure", "TLS Secure",
+                s => server.TLSSecure = s,
+                server.TLSSecure);
         }
     }
 }
\ No newline at end of file
diff --git a/Netch/Servers/VMess/Utils/V2rayConfigUtils.cs b/Netch/Servers/VMess/Utils/V2rayConfigUtils.cs
index c7082e24..ad1bb215 100644
--- a/Netch/Servers/VMess/Utils/V2rayConfigUtils.cs
+++ b/Netch/Servers/VMess/Utils/V2rayConfigUtils.cs
@@ -238,7 +238,7 @@ namespace Netch.Servers.VMess.Utils
             {
                 streamSettings.network = server.TransferProtocol;
                 var host = server.Host;
-                if (server.TLSSecure ?? Global.Settings.V2RayConfig.AllowInsecure)
+                if (server.TLSSecure)
                 {
                     streamSettings.security = "tls";
 
@@ -318,7 +318,7 @@ namespace Netch.Servers.VMess.Utils
                                 type = server.FakeType
                             }
                         };
-                        if (server.TLSSecure ?? Global.Settings.V2RayConfig.AllowInsecure)
+                        if (server.TLSSecure)
                         {
                             streamSettings.tlsSettings.serverName = server.Hostname;
                         }
diff --git a/Netch/Servers/VMess/VMess.cs b/Netch/Servers/VMess/VMess.cs
index a76b89fc..4eeb4fd7 100644
--- a/Netch/Servers/VMess/VMess.cs
+++ b/Netch/Servers/VMess/VMess.cs
@@ -64,7 +64,7 @@ namespace Netch.Servers.VMess
         /// <summary>
         ///		TLS 底层传输安全
         /// </summary>
-        public bool? TLSSecure { get; set; }
+        public bool TLSSecure { get; set; } = false;
 
         /// <summary>
         ///		Mux 多路复用
diff --git a/Netch/Servers/VMess/VMessUtil.cs b/Netch/Servers/VMess/VMessUtil.cs
index e78f31ca..b36b9a00 100644
--- a/Netch/Servers/VMess/VMessUtil.cs
+++ b/Netch/Servers/VMess/VMessUtil.cs
@@ -49,7 +49,7 @@ namespace Netch.Servers.VMess
                 type = server.FakeType,
                 host = server.Host,
                 path = server.Path,
-                tls = server.TLSSecure ?? Global.Settings.V2RayConfig.AllowInsecure ? "tls" : ""
+                tls = server.TLSSecure ? "tls" : ""
             });
             return "vmess://" + ShareLink.URLSafeBase64Encode(vmessJson);
         }