From a079a849f6bd2bca81a1e6f16fc68ef5072640c8 Mon Sep 17 00:00:00 2001
From: QxQ <59914293+U-v-U@users.noreply.github.com>
Date: Fri, 25 Sep 2020 21:20:53 +0800
Subject: [PATCH] update: cleanup and removed VMess testsEnabled

---
 makespec/BUILDVERSION                       |  2 +-
 src/plugins/common/CommonTypes.hpp          | 42 ++++++++-------------
 src/plugins/protocols/ui/outbound/vmess.cpp |  5 ---
 src/plugins/protocols/ui/outbound/vmess.hpp |  2 -
 src/plugins/protocols/ui/outbound/vmess.ui  | 24 ------------
 5 files changed, 17 insertions(+), 58 deletions(-)

diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION
index 7341a4ec..78062f38 100644
--- a/makespec/BUILDVERSION
+++ b/makespec/BUILDVERSION
@@ -1 +1 @@
-5942
+5943
diff --git a/src/plugins/common/CommonTypes.hpp b/src/plugins/common/CommonTypes.hpp
index 583e5caa..dac616ae 100644
--- a/src/plugins/common/CommonTypes.hpp
+++ b/src/plugins/common/CommonTypes.hpp
@@ -19,14 +19,12 @@ struct SocksServerObject
     {
         QString user;
         QString pass;
-        int level;
-        UserObject() : user(), pass(), level(0){};
+        int level = 0;
         JSONSTRUCT_REGISTER(UserObject, F(user, pass, level))
     };
-    QString address;
-    int port;
+    QString address = "0.0.0.0";
+    int port = 0;
     QList<UserObject> users;
-    SocksServerObject() : address("0.0.0.0"), port(0), users(){};
     JSONSTRUCT_REGISTER(SocksServerObject, F(address, port, users))
 };
 
@@ -38,14 +36,12 @@ struct HttpServerObject
     {
         QString user;
         QString pass;
-        int level;
-        UserObject() : user(), pass(), level(0){};
+        int level = 0;
         JSONSTRUCT_REGISTER(UserObject, F(user, pass, level))
     };
-    QString address;
-    int port;
+    QString address = "0.0.0.0";
+    int port = 0;
     QList<UserObject> users;
-    HttpServerObject() : address("0.0.0.0"), port(0), users(){};
     JSONSTRUCT_REGISTER(HttpServerObject, F(address, port, users))
 };
 
@@ -53,11 +49,10 @@ struct HttpServerObject
 // ShadowSocks Server
 struct ShadowSocksServerObject
 {
-    QString address;
-    QString method;
+    QString address = "0.0.0.0";
+    QString method = "aes-256-cfb";
     QString password;
-    int port;
-    ShadowSocksServerObject() : address("0.0.0.0"), method("aes-256-cfb"), password(""), port(0){};
+    int port = 0;
     JSONSTRUCT_REGISTER(ShadowSocksServerObject, F(address, port, method, password))
 };
 
@@ -68,16 +63,14 @@ struct VLESSServerObject
     struct UserObject
     {
         QString id;
-        QString encryption;
+        QString encryption = "none";
         QString flow;
-        UserObject() : id(), encryption("none"), flow(){};
         JSONSTRUCT_REGISTER(UserObject, F(id, encryption, flow))
     };
 
     QString address;
-    int port;
+    int port = 0;
     QList<UserObject> users;
-    VLESSServerObject() : address(""), port(0), users(){};
     JSONSTRUCT_REGISTER(VLESSServerObject, F(address, port, users))
 };
 
@@ -89,17 +82,14 @@ struct VMessServerObject
     struct UserObject
     {
         QString id;
-        int alterId;
-        QString security;
-        int level;
-        QString testsEnabled;
-        UserObject() : id(), alterId(VMESS_USER_ALTERID_DEFAULT), security("auto"), level(0), testsEnabled("none"){};
-        JSONSTRUCT_REGISTER(UserObject, F(id, alterId, security, level, testsEnabled))
+        int alterId = VMESS_USER_ALTERID_DEFAULT;
+        QString security = "auto";
+        int level = 0;
+        JSONSTRUCT_REGISTER(UserObject, F(id, alterId, security, level))
     };
 
     QString address;
-    int port;
+    int port = 0;
     QList<UserObject> users;
-    VMessServerObject() : address(""), port(0), users(){};
     JSONSTRUCT_REGISTER(VMessServerObject, F(address, port, users))
 };
diff --git a/src/plugins/protocols/ui/outbound/vmess.cpp b/src/plugins/protocols/ui/outbound/vmess.cpp
index 515de30e..4e9c3083 100644
--- a/src/plugins/protocols/ui/outbound/vmess.cpp
+++ b/src/plugins/protocols/ui/outbound/vmess.cpp
@@ -35,8 +35,3 @@ void VmessOutboundEditor::on_alterLineEdit_valueChanged(int arg1)
 {
     vmess.users.front().alterId = arg1;
 }
-
-void VmessOutboundEditor::on_testsEnabledCombo_currentIndexChanged(const QString &arg1)
-{
-    vmess.users.front().testsEnabled = arg1;
-}
diff --git a/src/plugins/protocols/ui/outbound/vmess.hpp b/src/plugins/protocols/ui/outbound/vmess.hpp
index 7f681128..44e7cadc 100644
--- a/src/plugins/protocols/ui/outbound/vmess.hpp
+++ b/src/plugins/protocols/ui/outbound/vmess.hpp
@@ -37,7 +37,6 @@ class VmessOutboundEditor
             idLineEdit->setText(user.id);
             alterLineEdit->setValue(user.alterId);
             securityCombo->setCurrentText(user.security);
-            testsEnabledCombo->setCurrentText(user.testsEnabled);
         })
     }
     const QJsonObject GetContent() const override
@@ -59,5 +58,4 @@ class VmessOutboundEditor
     void on_idLineEdit_textEdited(const QString &arg1);
     void on_securityCombo_currentIndexChanged(const QString &arg1);
     void on_alterLineEdit_valueChanged(int arg1);
-    void on_testsEnabledCombo_currentIndexChanged(const QString &arg1);
 };
diff --git a/src/plugins/protocols/ui/outbound/vmess.ui b/src/plugins/protocols/ui/outbound/vmess.ui
index 30c1f422..eda97f6a 100644
--- a/src/plugins/protocols/ui/outbound/vmess.ui
+++ b/src/plugins/protocols/ui/outbound/vmess.ui
@@ -88,30 +88,6 @@
      </item>
     </widget>
    </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Tests</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QComboBox" name="testsEnabledCombo">
-     <property name="editable">
-      <bool>true</bool>
-     </property>
-     <item>
-      <property name="text">
-       <string notr="true">none</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">VMessAEAD</string>
-      </property>
-     </item>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>