From 2c02285def8be47d31ee9b297625d7e8563eb311 Mon Sep 17 00:00:00 2001
From: YFdyh000 <yfdyh000@gmail.com>
Date: Sun, 19 Apr 2020 00:58:55 +0800
Subject: [PATCH] refine GFWLIST_URL option

---
 v2rayN/v2rayN/Forms/MainForm.cs                    | 3 ++-
 v2rayN/v2rayN/Forms/OptionSettingForm.resx         | 9 +++------
 v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx | 2 +-
 v2rayN/v2rayN/Handler/ConfigHandler.cs             | 4 ----
 v2rayN/v2rayN/Mode/Config.cs                       | 2 +-
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs
index dcef6554..aeaeabb4 100644
--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -1460,7 +1460,8 @@ namespace v2rayN.Forms
                 };
             }
             AppendText(false, UIRes.I18N("MsgStartUpdatingPAC"));
-            pacListHandle.WebDownloadString(config.urlGFWList);
+            string url = Utils.IsNullOrEmpty(config.urlGFWList) ? Global.GFWLIST_URL : config.urlGFWList;
+            pacListHandle.WebDownloadString(url);
         }
 
         private void tsbCheckClearPACList_Click(object sender, EventArgs e)
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.resx
index ea494864..7e082631 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.resx
@@ -964,7 +964,7 @@
     <value>27</value>
   </data>
   <data name="label13.Text" xml:space="preserve">
-    <value>Custom GFWList address (please fill in the blank without customization)</value>
+    <value>Custom GFWList address (use default value if leave blank)</value>
   </data>
   <data name="&gt;&gt;label13.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -1915,10 +1915,7 @@
     <value>4</value>
   </data>
   <data name="txturlGFWList.Location" type="System.Drawing.Point, System.Drawing">
-    <value>32, 205</value>
-  </data>
-  <data name="txturlGFWList.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
+    <value>32, 200</value>
   </data>
   <data name="&gt;&gt;txturlGFWList.Name" xml:space="preserve">
     <value>txturlGFWList</value>
@@ -1927,7 +1924,7 @@
     <value>tabGUI</value>
   </data>
   <data name="txturlGFWList.Size" type="System.Drawing.Size, System.Drawing">
-    <value>541, 100</value>
+    <value>541, 21</value>
   </data>
   <data name="txturlGFWList.TabIndex" type="System.Int32, mscorlib">
     <value>28</value>
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
index 293a96d7..b7968de4 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
@@ -252,7 +252,7 @@
     <value>227, 12</value>
   </data>
   <data name="label13.Text" xml:space="preserve">
-    <value>自定义GFWList地址(不需自定义请填空白)</value>
+    <value>自定义GFWList地址(留空则使用默认值)</value>
   </data>
   <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
     <value>191, 12</value>
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index dba4aad4..51301432 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -133,10 +133,6 @@ namespace v2rayN.Handler
             {
                 config.speedPingTestUrl = Global.SpeedPingTestUrl;
             }
-            if (Utils.IsNullOrEmpty(config.urlGFWList))
-            {
-                config.urlGFWList = Global.GFWLIST_URL;
-            }
             //if (Utils.IsNullOrEmpty(config.remoteDNS))
             //{
             //    config.remoteDNS = "1.1.1.1";
diff --git a/v2rayN/v2rayN/Mode/Config.cs b/v2rayN/v2rayN/Mode/Config.cs
index d473462f..0003fe03 100644
--- a/v2rayN/v2rayN/Mode/Config.cs
+++ b/v2rayN/v2rayN/Mode/Config.cs
@@ -86,7 +86,7 @@ namespace v2rayN.Mode
         /// </summary>
         public string speedPingTestUrl { get; set; }
         /// <summary>
-        /// 自定义GFWList url
+        /// 自定义GFWList url。空白则使用 Global.GFWLIST_URL
         /// </summary>
         public string urlGFWList { get; set; }