Optimize code and remove Action

2dust · Feb 6, 2025 · 67ffa81 · 67ffa81
1 parent ba2a636
commit 67ffa81
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/v2rayN/ServiceLib/Services/UpdateService.cs b/v2rayN/ServiceLib/Services/UpdateService.cs
@@ -243,7 +243,7 @@ public async Task UpdateGeoFileAll(Config config, Action<bool, string> updateFun
             _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 time = await downloadHandle.RunAvailabilityCheck(null);
@@ -255,7 +255,7 @@ public async Task RunAvailabilityCheck(Action<bool, string> updateFunc)
                 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

diff --git a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
@@ -311,11 +311,11 @@ public async Task TestServerAvailability()
             {
                 return;
             }
-            await (new UpdateService()).RunAvailabilityCheck(async (bool success, string msg) =>
-            {
-                NoticeHandler.Instance.SendMessageEx(msg);
-                _updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg);
-            });
+
+            var msg = await (new UpdateService()).RunAvailabilityCheck();
+
+            NoticeHandler.Instance.SendMessageEx(msg);
+            _updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg);
         }
 
         public void TestServerAvailabilityResult(string msg)