[padding] rm

KevinSHIT · Sep 25, 2020 · 0d7c99d · 0d7c99d
1 parent da2eb39
commit 0d7c99d
Show file tree

Hide file tree

Showing 7 changed files with 132 additions and 119 deletions.
diff --git a/NaiveSharp/ConstText/Msg.cs b/NaiveSharp/ConstText/Msg.cs
@@ -0,0 +1,9 @@
+namespace NaiveSharp.ConstText
+{
+    public static class Msg
+    {
+        public const string RUNNING_UNDER_BGD = "Hi there! Naive # is still running under background!";
+
+        public const string TIP_TITLE = "Naive# Tip";
+    }
+}
diff --git a/NaiveSharp/Controller/Command.cs b/NaiveSharp/Controller/Command.cs
@@ -19,10 +19,6 @@ public static void RunNaive(string proto)
                                     NaiveCmdBuilder.Proxy(Config.Scheme, Config.Username, Config.Password,
                                         Config.Host) +
                                     " --listen=" + proto.ToLower() + "://127.0.0.1:1080";
-            if (Config.Padding ?? false)
-            {
-                p.StartInfo.Arguments += " --padding";
-            }
 
             // TODO: ADD EXTRA-HEADERS SUPPORT
 

diff --git a/NaiveSharp/Controller/Sharelink.cs b/NaiveSharp/Controller/Sharelink.cs
@@ -66,11 +66,6 @@ public class Sharelink
 
             var query = HttpUtility.ParseQueryString(uri.Query);
 
-            config.Padding = null;
-            if (bool.TryParse(query["padding"], out bool n))
-            {
-                config.Padding = n;
-            }
             if (!string.IsNullOrWhiteSpace(query["extra-headers"]))
             {
                 config.ExtraHeaders = query["extra-headers"];
@@ -81,10 +76,7 @@ public class Sharelink
         public static string Generate()
         {
             var queryC = HttpUtility.ParseQueryString(string.Empty);
-            if (Config.Padding.HasValue)
-            {
-                queryC.Add("padding", Config.Padding.ToString().ToLower());
-            }
+
             if (!string.IsNullOrWhiteSpace(Config.ExtraHeaders))
             {
                 queryC.Add("extra-headers", Config.ExtraHeaders);
@@ -121,8 +113,6 @@ public struct NaiveConfig
 
         public string Scheme;
 
-        public bool? Padding;
-
         public string ExtraHeaders;
     }
 }
diff --git a/NaiveSharp/Model/Config.cs b/NaiveSharp/Model/Config.cs
@@ -16,8 +16,6 @@ public class Config
 
         public static string Scheme { set; get; } = "https";
 
-        public static bool? Padding { set; get; } = null;
-
         public static string ExtraHeaders { set; get; } = null;
 
         public static bool Debug { get; set; } = false;
@@ -26,7 +24,7 @@ public class Config
 
         public static string ConvertToNs()
         {
-            return Controller.NaiveCmdBuilder.Proxy(Scheme, Username, Password, Host).ToBase64() + " " + Padding;
+            return Controller.NaiveCmdBuilder.Proxy(Scheme, Username, Password, Host).ToBase64();
         }
 
     }

diff --git a/NaiveSharp/NaiveSharp.csproj b/NaiveSharp/NaiveSharp.csproj
@@ -97,6 +97,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ConstText\Msg.cs" />
     <Compile Include="ConstText\Path\Clash.cs" />
     <Compile Include="ConstText\Path\Config.cs" />
     <Compile Include="ConstText\Path\Naive.cs" />

diff --git a/NaiveSharp/View/MainWindow.Designer.cs b/NaiveSharp/View/MainWindow.Designer.cs
diff --git a/NaiveSharp/View/MainWindow.cs b/NaiveSharp/View/MainWindow.cs
@@ -221,15 +221,6 @@ private void txtHost_TextChanged(object sender, EventArgs e)
             SyncToTag();
         }
 
-        private void chkPadding_CheckedChanged(object sender, EventArgs e)
-        {
-            if (!(chkPadding.Checked == false && Config.Padding == null))
-            {
-                Config.Padding = chkPadding.Checked;
-                SyncToTag();
-            }
-        }
-
         private void rdoHttps_CheckedChanged(object sender, EventArgs e)
         {
             if (rdoHttps.Checked)
@@ -360,7 +351,7 @@ private void MainWindow_FormClosing(object sender, FormClosingEventArgs e)
                 Hide();
                 if (Config.IsFirstTimeHide)
                 {
-                    icnNotify.ShowBalloonTip(1000, "Naive # Tip", "Hey! Naive # is still running under background!",
+                    icnNotify.ShowBalloonTip(1000, Msg.TIP_TITLE, Msg.RUNNING_UNDER_BGD,
                         ToolTipIcon.Info);
                     Config.IsFirstTimeHide = false;
                 }
@@ -433,8 +424,6 @@ private void tvwNodeList_AfterSelect(object sender, TreeViewEventArgs e)
                     txtHost.Text = x.Value.Host;
                     txtUsername.Text = x.Value.Username;
                     txtPassword.Text = x.Value.Password;
-                    chkPadding.Checked = x.Value.Padding ?? false;
-                    Config.Padding = x.Value.Padding;
                     rdoHttps.Checked = x.Value.Scheme.Contains("https");
                     rdoQuic.Checked = x.Value.Scheme.Contains("quic");
                 }