Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-04-19 21:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Optimize code and remove Action
Some checks failed
release Linux / build (Release) (push) Has been cancelled
Details
release macOS / build (Release) (push) Has been cancelled
Details
release Windows desktop (Avalonia UI) / build (Release) (push) Has been cancelled
Details
release Windows / build (Release) (push) Has been cancelled
Details

Browse source
This commit is contained in:
2dust 2025-02-06 15:28:51 +08:00
parent ba2a636dd2
commit 67ffa810d3
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
v2rayN/ServiceLib/Services/UpdateService.cs
View file

@ -243,7 +243,7 @@ namespace ServiceLib.Services
_updateFunc?.Invoke(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo")); _updateFunc?.Invoke(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));
} }
public async Task RunAvailabilityCheck(Action<bool, string> updateFunc) public async Task<string> RunAvailabilityCheck()
{ {
var downloadHandle = new DownloadService(); var downloadHandle = new DownloadService();
var time = await downloadHandle.RunAvailabilityCheck(null); var time = await downloadHandle.RunAvailabilityCheck(null);
@ -255,7 +255,7 @@ namespace ServiceLib.Services
ip = $"({ipInfo?.country_code}) {ipInfo?.ip}"; ip = $"({ipInfo?.country_code}) {ipInfo?.ip}";
} }
updateFunc?.Invoke(false, string.Format(ResUI.TestMeOutput, time, ip)); return string.Format(ResUI.TestMeOutput, time, ip);
} }
#region CheckUpdate private #region CheckUpdate private

6
v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
View file

@ -311,11 +311,11 @@ namespace ServiceLib.ViewModels
{ {
return; return;
} }
await (new UpdateService()).RunAvailabilityCheck(async (bool success, string msg) =>
{ var msg = await (new UpdateService()).RunAvailabilityCheck();
NoticeHandler.Instance.SendMessageEx(msg); NoticeHandler.Instance.SendMessageEx(msg);
_updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg); _updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg);
});
} }
public void TestServerAvailabilityResult(string msg) public void TestServerAvailabilityResult(string msg)