From 6762f35adeba7a66ace6cdb589822ae358658477 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Wed, 10 Jan 2024 17:44:55 +0800 Subject: [PATCH] Optimize code --- v2rayN/v2rayN/Common/Utils.cs | 8 ++++---- v2rayN/v2rayN/Handler/CoreConfigSingbox.cs | 4 ++-- v2rayN/v2rayN/Handler/DownloadHandle.cs | 2 +- v2rayN/v2rayN/Handler/SpeedtestHandler.cs | 4 ++-- v2rayN/v2rayN/Handler/UpdateHandle.cs | 4 ++-- v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs | 2 +- v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs | 6 +++--- v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/v2rayN/v2rayN/Common/Utils.cs b/v2rayN/v2rayN/Common/Utils.cs index fd8f9499fc2..4b87d590920 100644 --- a/v2rayN/v2rayN/Common/Utils.cs +++ b/v2rayN/v2rayN/Common/Utils.cs @@ -206,7 +206,7 @@ public static int ToInt(object obj) { return Convert.ToInt32(obj); } - catch (Exception ex) + catch //(Exception ex) { //SaveLog(ex.Message, ex); return 0; @@ -219,7 +219,7 @@ public static bool ToBool(object obj) { return Convert.ToBoolean(obj); } - catch (Exception ex) + catch //(Exception ex) { //SaveLog(ex.Message, ex); return false; @@ -232,7 +232,7 @@ public static string ToString(object obj) { return obj?.ToString() ?? string.Empty; } - catch (Exception ex) + catch// (Exception ex) { //SaveLog(ex.Message, ex); return string.Empty; @@ -546,7 +546,7 @@ public static string GetPath(string fileName) /// public static string GetExePath() { - return Environment.ProcessPath; + return Environment.ProcessPath ?? string.Empty; } public static string StartupPath() diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs index 78ac1ece3ad..629f84bd910 100644 --- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs +++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs @@ -177,7 +177,7 @@ private int GenInbounds(SingboxConfig singboxConfig) _config.tunModeItem.stack = Global.TunStacks[0]; } - var tunInbound = JsonUtils.FromJson(Utils.GetEmbedText(Global.TunSingboxInboundFileName)); + var tunInbound = JsonUtils.FromJson(Utils.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { }; tunInbound.mtu = _config.tunModeItem.mtu; tunInbound.strict_route = _config.tunModeItem.strictRoute; tunInbound.stack = _config.tunModeItem.stack; @@ -196,7 +196,7 @@ private int GenInbounds(SingboxConfig singboxConfig) return 0; } - private Inbound4Sbox? GetInbound(Inbound4Sbox inItem, string tag, int offset, bool bSocks) + private Inbound4Sbox GetInbound(Inbound4Sbox inItem, string tag, int offset, bool bSocks) { var inbound = JsonUtils.DeepCopy(inItem); inbound.tag = tag; diff --git a/v2rayN/v2rayN/Handler/DownloadHandle.cs b/v2rayN/v2rayN/Handler/DownloadHandle.cs index 0b761cda15b..62bb2d625e4 100644 --- a/v2rayN/v2rayN/Handler/DownloadHandle.cs +++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs @@ -298,7 +298,7 @@ public async Task GetRealPingTime(string url, IWebProxy? webProxy, int down responseTime = timer.Elapsed.Milliseconds; } - catch (Exception ex) + catch //(Exception ex) { //Utils.SaveLog(ex.Message, ex); } diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs index 9c7bc4ff6f5..ba0c39bbfdd 100644 --- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs +++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs @@ -103,7 +103,7 @@ private async Task RunPingSubAsync(Action updateFun) { try { - Task.Run(() => updateFun(it)); + _ = Task.Run(() => updateFun(it)); } catch (Exception ex) { @@ -349,7 +349,7 @@ private int GetTcpingTime(string url, int port) try { - if (!IPAddress.TryParse(url, out IPAddress ipAddress)) + if (!IPAddress.TryParse(url, out IPAddress? ipAddress)) { IPHostEntry ipHostInfo = System.Net.Dns.GetHostEntry(url); ipAddress = ipHostInfo.AddressList[0]; diff --git a/v2rayN/v2rayN/Handler/UpdateHandle.cs b/v2rayN/v2rayN/Handler/UpdateHandle.cs index fa24247ff83..365eb039039 100644 --- a/v2rayN/v2rayN/Handler/UpdateHandle.cs +++ b/v2rayN/v2rayN/Handler/UpdateHandle.cs @@ -221,7 +221,7 @@ public void UpdateSubscriptionProcess(Config config, string subId, bool blProxy, //more url if (Utils.IsNullOrEmpty(item.convertTarget) && !Utils.IsNullOrEmpty(item.moreUrl.TrimEx())) { - if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result)) + if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result!)) { result = Utils.Base64Decode(result); } @@ -245,7 +245,7 @@ public void UpdateSubscriptionProcess(Config config, string subId, bool blProxy, } if (!Utils.IsNullOrEmpty(result2)) { - if (Utils.IsBase64String(result2)) + if (Utils.IsBase64String(result2!)) { result += Utils.Base64Decode(result2); } diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs index 64a219b8b8a..b4f3d234da1 100644 --- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs @@ -1132,7 +1132,7 @@ public async void ShareServer() _noticeHandler?.Enqueue(ResUI.PleaseSelectServer); return; } - string url = ShareHandler.GetShareUrl(item); + var url = ShareHandler.GetShareUrl(item); if (Utils.IsNullOrEmpty(url)) { return; diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs index d1bf0cfe390..0fd7a0c5061 100644 --- a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs @@ -80,9 +80,9 @@ public RoutingRuleSettingViewModel(RoutingItem routingItem, Window view) { ImportRulesFromClipboard(); }); - ImportRulesFromUrlCmd = ReactiveCommand.Create(() => + ImportRulesFromUrlCmd = ReactiveCommand.CreateFromTask(() => { - ImportRulesFromUrl(); + return ImportRulesFromUrl(); }); RuleRemoveCmd = ReactiveCommand.Create(() => @@ -142,7 +142,7 @@ public void RefreshRulesItems() public void RuleEdit(bool blNew) { - RulesItem item; + RulesItem? item; if (blNew) { item = new(); diff --git a/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs index b5631c3851b..0fdf36c2083 100644 --- a/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs @@ -103,7 +103,7 @@ private void DeleteSub() foreach (var it in SelectedSources) { - ConfigHandler.DeleteSubItem(_config, it?.id); + ConfigHandler.DeleteSubItem(_config, it.id); } RefreshSubItems(); _noticeHandler?.Enqueue(ResUI.OperationSuccess);