From 88175b13ef3babce3525c19673dbda7da1246ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=B4=E5=A8=83=E9=85=B1?= Date: Thu, 27 Jul 2017 15:54:11 +0800 Subject: [PATCH 1/2] update gfwlist pac Url --- shadowsocks-csharp/Controller/UpdateChecker.cs | 2 +- shadowsocks-csharp/Program.cs | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/shadowsocks-csharp/Controller/UpdateChecker.cs b/shadowsocks-csharp/Controller/UpdateChecker.cs index f5ed3fe9..73726a09 100755 --- a/shadowsocks-csharp/Controller/UpdateChecker.cs +++ b/shadowsocks-csharp/Controller/UpdateChecker.cs @@ -21,7 +21,7 @@ public class UpdateChecker public const string Name = "ShadowsocksR"; public const string Copyright = "Copyright © BreakWa11 2017. Fork from Shadowsocks by clowwindy"; - public const string Version = "4.6.1"; + public const string Version = "4.7.0"; #if !_DOTNET_4_0 public const string NetVer = "2.0"; #elif !_CONSOLE diff --git a/shadowsocks-csharp/Program.cs b/shadowsocks-csharp/Program.cs index 2a392251..75df2c43 100755 --- a/shadowsocks-csharp/Program.cs +++ b/shadowsocks-csharp/Program.cs @@ -65,16 +65,18 @@ static void Main(string[] args) { if (try_times >= 5) return; - InputPassword dlg = new InputPassword(); - if (dlg.ShowDialog() == DialogResult.OK) - Configuration.SetPassword(dlg.password); - else - return; + using (InputPassword dlg = new InputPassword()) + { + if (dlg.ShowDialog() == DialogResult.OK) + Configuration.SetPassword(dlg.password); + else + return; + } try_times += 1; } #endif _controller = new ShadowsocksController(); - + HostMap.Instance().LoadHostFile(); #if !_CONSOLE _viewController = new MenuViewController(_controller); #endif From f0ab14c108404e9b7b7df27d977ce9e62a931f02 Mon Sep 17 00:00:00 2001 From: zhhwin Date: Mon, 21 Aug 2017 08:08:48 +0000 Subject: [PATCH 2/2] update Gfwlist Pac Url --- shadowsocks-csharp/Controller/GfwListUpdater.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shadowsocks-csharp/Controller/GfwListUpdater.cs b/shadowsocks-csharp/Controller/GfwListUpdater.cs index 8c2b701b..77aa04cb 100644 --- a/shadowsocks-csharp/Controller/GfwListUpdater.cs +++ b/shadowsocks-csharp/Controller/GfwListUpdater.cs @@ -16,7 +16,7 @@ public class GFWListUpdater private const string GFWLIST_BACKUP_URL = "https://raw.githubusercontent.com/breakwa11/breakwa11.github.io/master/ssr/gfwlist.txt"; - private const string GFWLIST_TEMPLATE_URL = "https://raw.githubusercontent.com/breakwa11/breakwa11.github.io/master/ssr/ss_gfw.pac"; + private const string GFWLIST_TEMPLATE_URL = "https://raw.githubusercontent.com/petronny/gfwlist2pac/master/gfwlist.pac"; private static string PAC_FILE = PACServer.PAC_FILE; @@ -234,4 +234,4 @@ public List ParseResult(string response) return valid_lines; } } -} \ No newline at end of file +}