bozhihouc/clashN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn off system proxy when updating subscription

Browse Source
This commit is contained in:
2dust
2022-06-26 15:27:59 +08:00
parent 4adb5f76ec
commit 96cc6fec63
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
clashN/clashN/Handler/UpdateHandle.cs
View File

@@ -5,6 +5,7 @@ using System.IO;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Text; using System.Text;
using System.Threading;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
@@ -173,6 +174,16 @@ namespace clashN.Handler
Task.Run(async () => Task.Run(async () =>
{ {
//Turn off system proxy
bool bSysProxyType = false;
if (!blProxy && config.sysProxyType == ESysProxyType.ForcedChange)
{
bSysProxyType = true;
config.sysProxyType = ESysProxyType.ForcedClear;
SysProxyHandle.UpdateSysProxy(config, false);
Thread.Sleep(3000);
}
if (profileItems == null) if (profileItems == null)
{ {
profileItems = config.profileItems; profileItems = config.profileItems;
@@ -201,6 +212,10 @@ namespace clashN.Handler
url = String.Format(config.constItem.subConvertUrl, Utils.UrlEncode(url)); url = String.Format(config.constItem.subConvertUrl, Utils.UrlEncode(url));
} }
var result = await (new DownloadHandle()).DownloadStringAsync(url, blProxy, userAgent); var result = await (new DownloadHandle()).DownloadStringAsync(url, blProxy, userAgent);
if (blProxy && Utils.IsNullOrEmpty(result))
{
result = await (new DownloadHandle()).DownloadStringAsync(url, false, userAgent);
}
_updateFunc(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}"); _updateFunc(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
@@ -223,6 +238,12 @@ namespace clashN.Handler
_updateFunc(false, $"-------------------------------------------------------"); _updateFunc(false, $"-------------------------------------------------------");
} }
//restore system proxy
if (bSysProxyType)
{
config.sysProxyType = ESysProxyType.ForcedChange;
SysProxyHandle.UpdateSysProxy(config, false);
}
_updateFunc(true, $"{ResUI.MsgUpdateSubscriptionEnd}"); _updateFunc(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
}); });
} }