mirror of
https://github.com/2dust/v2rayN.git
synced 2026-11-05 12:04:59 +03:00
Optimize code and remove Action
This commit is contained in:
@@ -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
|
||||||
|
|||||||
@@ -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);
|
|
||||||
_updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg);
|
NoticeHandler.Instance.SendMessageEx(msg);
|
||||||
});
|
_updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void TestServerAvailabilityResult(string msg)
|
public void TestServerAvailabilityResult(string msg)
|
||||||
|
|||||||
Reference in New Issue
Block a user