.editorconfig

@@ -2,7 +2,7 @@ root = true
 
 [*]
 charset = utf-8
-indent_style = space
+indent_style = tab
 tab_width = 4
 indent_size = 4
 end_of_line = crlf
@@ -84,13 +84,13 @@ csharp_style_prefer_readonly_struct_member = true:warning
 csharp_prefer_braces = true:warning
 csharp_prefer_simple_using_statement = true:warning
 csharp_prefer_system_threading_lock = true:warning
-csharp_style_namespace_declarations = file_scoped:warning
+csharp_style_namespace_declarations = block_scoped:warning
 csharp_style_prefer_method_group_conversion = true:warning
 csharp_style_prefer_primary_constructors = true:warning
 csharp_style_prefer_top_level_statements = false:warning
 csharp_prefer_simple_default_expression = true:warning
 csharp_style_deconstructed_variable_declaration = true:warning
-csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
+csharp_style_implicit_object_creation_when_type_is_apparent = false:warning
 csharp_style_inlined_variable_declaration = true:warning
 csharp_style_prefer_index_operator = false:warning
 csharp_style_prefer_local_over_anonymous_function = true:warning

v2rayN/AmazTool/UpgradeApp.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.IO.Compression;
 using System.Text;
 
@@ -59,8 +59,7 @@ namespace AmazTool
                         Console.WriteLine(entry.FullName);
 
                         var lst = entry.FullName.Split(splitKey);
-                        if (lst.Length == 1)
+                        if (lst.Length == 1) continue;
-                            continue;
                         var fullName = string.Join(splitKey, lst[1..lst.Length]);
 
                         if (string.Equals(Utils.GetExePath(), Utils.GetPath(fullName), StringComparison.OrdinalIgnoreCase))

v2rayN/ServiceLib/Common/DownloaderHelper.cs

@@ -1,5 +1,5 @@
+using Downloader;
 using System.Net;
-using Downloader;
 
 namespace ServiceLib.Common
 {

v2rayN/ServiceLib/Common/HttpClientHelper.cs

@@ -38,15 +38,13 @@ namespace ServiceLib.Common
 
         public async Task<string?> GetAsync(string url)
         {
-            if (Utils.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url)) return null;
-                return null;
             return await httpClient.GetStringAsync(url);
         }
 
         public async Task<string?> GetAsync(HttpClient client, string url, CancellationToken token = default)
         {
-            if (Utils.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url)) return null;
-                return null;
             return await client.GetStringAsync(url, token);
         }
 
@@ -77,13 +75,11 @@ namespace ServiceLib.Common
         {
             ArgumentNullException.ThrowIfNull(url);
             ArgumentNullException.ThrowIfNull(fileName);
-            if (File.Exists(fileName))
+            if (File.Exists(fileName)) File.Delete(fileName);
-                File.Delete(fileName);
 
             using var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
 
-            if (!response.IsSuccessStatusCode)
+            if (!response.IsSuccessStatusCode) throw new Exception(response.StatusCode.ToString());
-                throw new Exception(response.StatusCode.ToString());
 
             var total = response.Content.Headers.ContentLength ?? -1L;
             var canReportProgress = total != -1 && progress != null;
@@ -101,8 +97,7 @@ namespace ServiceLib.Common
                 var read = await stream.ReadAsync(buffer, token);
                 totalRead += read;
 
-                if (read == 0)
+                if (read == 0) break;
-                    break;
                 await file.WriteAsync(buffer.AsMemory(0, read), token);
 
                 if (canReportProgress)

v2rayN/ServiceLib/Common/Job.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 namespace ServiceLib.Common
@@ -75,8 +75,7 @@ namespace ServiceLib.Common
 
         private void Dispose(bool disposing)
         {
-            if (disposed)
+            if (disposed) return;
-                return;
             disposed = true;
 
             if (disposing)

v2rayN/ServiceLib/Common/Logging.cs

@@ -1,4 +1,4 @@
-using NLog;
+using NLog;
 using NLog.Config;
 using NLog.Targets;
 
@@ -27,16 +27,14 @@ namespace ServiceLib.Common
 
         public static void SaveLog(string strContent)
         {
-            if (!LogManager.IsLoggingEnabled())
+            if (!LogManager.IsLoggingEnabled()) return;
-                return;
 
             LogManager.GetLogger("Log1").Info(strContent);
         }
 
         public static void SaveLog(string strTitle, Exception ex)
         {
-            if (!LogManager.IsLoggingEnabled())
+            if (!LogManager.IsLoggingEnabled()) return;
-                return;
 
             var logger = LogManager.GetLogger("Log2");
             logger.Debug($"{strTitle},{ex.Message}");

v2rayN/ServiceLib/Common/ProcUtils.cs

@@ -19,10 +19,8 @@ public static class ProcUtils
         }
         try
         {
-            if (fileName.Contains(' '))
+            if (fileName.Contains(' ')) fileName = fileName.AppendQuotes();
-                fileName = fileName.AppendQuotes();
+            if (arguments.Contains(' ')) arguments = arguments.AppendQuotes();
-            if (arguments.Contains(' '))
-                arguments = arguments.AppendQuotes();
 
             Process process = new()
             {
@@ -85,18 +83,10 @@ public static class ProcUtils
 
         GetProcessKeyInfo(proc, review, out var procId, out var fileName, out var processName);
 
-        try
+        try { proc?.Kill(true); } catch (Exception ex) { Logging.SaveLog(_tag, ex); }
-        { proc?.Kill(true); }
+        try { proc?.Kill(); } catch (Exception ex) { Logging.SaveLog(_tag, ex); }
-        catch (Exception ex) { Logging.SaveLog(_tag, ex); }
+        try { proc?.Close(); } catch (Exception ex) { Logging.SaveLog(_tag, ex); }
-        try
+        try { proc?.Dispose(); } catch (Exception ex) { Logging.SaveLog(_tag, ex); }
-        { proc?.Kill(); }
-        catch (Exception ex) { Logging.SaveLog(_tag, ex); }
-        try
-        { proc?.Close(); }
-        catch (Exception ex) { Logging.SaveLog(_tag, ex); }
-        try
-        { proc?.Dispose(); }
-        catch (Exception ex) { Logging.SaveLog(_tag, ex); }
 
         await Task.Delay(300);
         await ProcessKillByKeyInfo(review, procId, fileName, processName);
@@ -107,8 +97,7 @@ public static class ProcUtils
         procId = null;
         fileName = null;
         processName = null;
-        if (!review)
+        if (!review) return;
-            return;
         try
         {
             procId = proc?.Id;

v2rayN/ServiceLib/Common/SqliteHelper.cs

@@ -1,5 +1,5 @@
+using SQLite;
 using System.Collections;
-using SQLite;
 
 namespace ServiceLib.Common
 {

v2rayN/ServiceLib/Common/StringEx.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 
 namespace ServiceLib.Common
 {
@@ -21,8 +21,7 @@ namespace ServiceLib.Common
 
         public static bool BeginWithAny(this string s, IEnumerable<char> chars)
         {
-            if (s.IsNullOrEmpty())
+            if (s.IsNullOrEmpty()) return false;
-                return false;
             return chars.Contains(s.First());
         }
 
@@ -35,8 +34,7 @@ namespace ServiceLib.Common
         {
             while (reader.ReadLine() is { } line)
             {
-                if (line.IsWhiteSpace())
+                if (line.IsWhiteSpace()) continue;
-                    continue;
                 yield return line;
             }
         }

v2rayN/ServiceLib/Common/Utils.cs

@@ -1,3 +1,5 @@
+using CliWrap;
+using CliWrap.Buffered;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Net;
@@ -8,8 +10,6 @@ using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Security.Principal;
 using System.Text;
-using CliWrap;
-using CliWrap.Buffered;
 
 namespace ServiceLib.Common
 {
@@ -176,8 +176,7 @@ namespace ServiceLib.Common
         {
             try
             {
-                if (plainText.IsNullOrEmpty())
+                if (plainText.IsNullOrEmpty()) return "";
-                    return "";
                 plainText = plainText.Trim()
                     .Replace(Environment.NewLine, "")
                     .Replace("\n", "")
@@ -373,8 +372,7 @@ namespace ServiceLib.Common
 
         public static bool IsBase64String(string? plainText)
         {
-            if (plainText.IsNullOrEmpty())
+            if (plainText.IsNullOrEmpty()) return false;
-                return false;
             var buffer = new Span<byte>(new byte[plainText.Length]);
             return Convert.TryFromBase64String(plainText, buffer, out var _);
         }
@@ -464,12 +462,9 @@ namespace ServiceLib.Common
             if (IPAddress.TryParse(ip, out var address))
             {
                 var ipBytes = address.GetAddressBytes();
-                if (ipBytes[0] == 10)
+                if (ipBytes[0] == 10) return true;
-                    return true;
+                if (ipBytes[0] == 172 && ipBytes[1] >= 16 && ipBytes[1] <= 31) return true;
-                if (ipBytes[0] == 172 && ipBytes[1] >= 16 && ipBytes[1] <= 31)
+                if (ipBytes[0] == 192 && ipBytes[1] == 168) return true;
-                    return true;
-                if (ipBytes[0] == 192 && ipBytes[1] == 168)
-                    return true;
             }
 
             return false;
@@ -609,11 +604,9 @@ namespace ServiceLib.Common
 
                     foreach (var host in hostsList)
                     {
-                        if (host.StartsWith("#"))
+                        if (host.StartsWith("#")) continue;
-                            continue;
                         var hostItem = host.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                        if (hostItem.Length != 2)
+                        if (hostItem.Length != 2) continue;
-                            continue;
                         systemHosts.Add(hostItem.Last(), hostItem.First());
                     }
                 }
@@ -882,10 +875,8 @@ namespace ServiceLib.Common
 
         public static async Task<string?> SetLinuxChmod(string? fileName)
         {
-            if (fileName.IsNullOrEmpty())
+            if (fileName.IsNullOrEmpty()) return null;
-                return null;
+            if (fileName.Contains(' ')) fileName = fileName.AppendQuotes();
-            if (fileName.Contains(' '))
-                fileName = fileName.AppendQuotes();
             //File.SetUnixFileMode(fileName, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute);
             var arg = new List<string>() { "-c", $"chmod +x {fileName}" };
             return await GetCliWrapOutput("/bin/bash", arg);

v2rayN/ServiceLib/Common/WindowsUtils.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using System.Security.Cryptography;
 using System.Text;
 using Microsoft.Win32;
@@ -55,20 +56,21 @@ namespace ServiceLib.Common
 
         public static async Task RemoveTunDevice()
         {
-            try
+	        try
-            {
+	        {
-                var sum = MD5.HashData(Encoding.UTF8.GetBytes("wintunsingbox_tun"));
+		        var sum = MD5.HashData(Encoding.UTF8.GetBytes("wintunsingbox_tun"));
-                var guid = new Guid(sum);
+		        var guid = new Guid(sum);
-                var pnpUtilPath = @"C:\Windows\System32\pnputil.exe";
+		        var pnpUtilPath = @"C:\Windows\System32\pnputil.exe";
-                var arg = $$""" /remove-device  "SWD\Wintun\{{{guid}}}" """;
+		        var arg = $$""" /remove-device  "SWD\Wintun\{{{guid}}}" """;
 
-                // Try to remove the device
+				// Try to remove the device
-                await Utils.GetCliWrapOutput(pnpUtilPath, arg);
+				await Utils.GetCliWrapOutput(pnpUtilPath, arg);
-            }
+				 
-            catch (Exception ex)
+			}
-            {
+			catch (Exception ex)
-                Logging.SaveLog(_tag, ex);
+			{
-            }
+				Logging.SaveLog(_tag, ex);
-        }
+			}
-    }
+		}
+	}
 }

v2rayN/ServiceLib/Handler/AutoStartupHandler.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using System.Security.Principal;
 using System.Text.RegularExpressions;
 
@@ -29,12 +30,12 @@ namespace ServiceLib.Handler
             }
             else if (Utils.IsOSX())
             {
-                await ClearTaskOSX();
+	            await ClearTaskOSX();
 
-                if (config.GuiItem.AutoRun)
+	            if (config.GuiItem.AutoRun)
-                {
+	            {
-                    await SetTaskOSX();
+		            await SetTaskOSX();
-                }
+	            }
             }
 
             return true;
@@ -171,46 +172,46 @@ namespace ServiceLib.Handler
 
         private static async Task ClearTaskOSX()
         {
-            try
+	        try
-            {
+	        {
-                var launchAgentPath = GetLaunchAgentPathMacOS();
+		        var launchAgentPath = GetLaunchAgentPathMacOS();
-                if (File.Exists(launchAgentPath))
+		        if (File.Exists(launchAgentPath))
-                {
+		        {
-                    var args = new[] { "-c", $"launchctl unload -w \"{launchAgentPath}\"" };
+			        var args = new[] { "-c", $"launchctl unload -w \"{launchAgentPath}\"" };
-                    await Utils.GetCliWrapOutput("/bin/bash", args);
+			        await Utils.GetCliWrapOutput("/bin/bash", args);
 
-                    File.Delete(launchAgentPath);
+			        File.Delete(launchAgentPath);
-                }
+		        }
-            }
+	        }
-            catch (Exception ex)
+	        catch (Exception ex)
-            {
+	        {
-                Logging.SaveLog(_tag, ex);
+		        Logging.SaveLog(_tag, ex);
-            }
+	        }
         }
 
         private static async Task SetTaskOSX()
         {
-            try
+	        try
-            {
+	        {
-                var plistContent = GenerateLaunchAgentPlist();
+		        var plistContent = GenerateLaunchAgentPlist();
-                var launchAgentPath = GetLaunchAgentPathMacOS();
+		        var launchAgentPath = GetLaunchAgentPathMacOS();
-                await File.WriteAllTextAsync(launchAgentPath, plistContent);
+		        await File.WriteAllTextAsync(launchAgentPath, plistContent);
 
-                var args = new[] { "-c", $"launchctl load -w \"{launchAgentPath}\"" };
+		        var args = new[] { "-c", $"launchctl load -w \"{launchAgentPath}\"" };
-                await Utils.GetCliWrapOutput("/bin/bash", args);
+		        await Utils.GetCliWrapOutput("/bin/bash", args);
-            }
+	        }
-            catch (Exception ex)
+	        catch (Exception ex)
-            {
+	        {
-                Logging.SaveLog(_tag, ex);
+		        Logging.SaveLog(_tag, ex);
-            }
+	        }
         }
 
         private static string GetLaunchAgentPathMacOS()
         {
-            var homePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+	        var homePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-            var launchAgentPath = Path.Combine(homePath, "Library", "LaunchAgents", $"{Global.AppName}-LaunchAgent.plist");
+	        var launchAgentPath = Path.Combine(homePath, "Library", "LaunchAgents", $"{Global.AppName}-LaunchAgent.plist");
-            Directory.CreateDirectory(Path.GetDirectoryName(launchAgentPath));
+	        Directory.CreateDirectory(Path.GetDirectoryName(launchAgentPath));
-            return launchAgentPath;
+	        return launchAgentPath;
         }
 
         private static string GenerateLaunchAgentPlist()

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -873,8 +873,7 @@ namespace ServiceLib.Handler
 
             List<ProfileItem> lstKeep = new();
             List<ProfileItem> lstRemove = new();
-            if (!config.GuiItem.KeepOlderDedupl)
+            if (!config.GuiItem.KeepOlderDedupl) lstProfile.Reverse();
-                lstProfile.Reverse();
 
             foreach (ProfileItem item in lstProfile)
             {
@@ -1364,8 +1363,7 @@ namespace ServiceLib.Handler
             };
 
             var uri = Utils.TryUri(url);
-            if (uri == null)
+            if (uri == null) return -1;
-                return -1;
             //Do not allow http protocol
             if (url.StartsWith(Global.HttpProtocol) && !Utils.IsPrivateNetwork(uri.IdnHost))
             {

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -84,13 +84,13 @@ namespace ServiceLib.Handler
             await CoreStop();
             await Task.Delay(100);
 
-            if (Utils.IsWindows() && _config.TunModeItem.EnableTun)
+			if (Utils.IsWindows() && _config.TunModeItem.EnableTun)
-            {
+			{
-                await Task.Delay(100);
+				await Task.Delay(100);
-                await WindowsUtils.RemoveTunDevice();
+				await WindowsUtils.RemoveTunDevice();
-            }
+			}
 
-            await CoreStart(node);
+			await CoreStart(node);
             await CoreStartPreService(node);
             if (_process != null)
             {
@@ -246,14 +246,12 @@ namespace ServiceLib.Handler
                 {
                     proc.OutputDataReceived += (sender, e) =>
                     {
-                        if (Utils.IsNullOrEmpty(e.Data))
+                        if (Utils.IsNullOrEmpty(e.Data)) return;
-                            return;
                         UpdateFunc(false, e.Data + Environment.NewLine);
                     };
                     proc.ErrorDataReceived += (sender, e) =>
                     {
-                        if (Utils.IsNullOrEmpty(e.Data))
+                        if (Utils.IsNullOrEmpty(e.Data)) return;
-                            return;
                         UpdateFunc(false, e.Data + Environment.NewLine);
                     };
                 }
@@ -267,8 +265,7 @@ namespace ServiceLib.Handler
                     await Task.Delay(10);
                     await proc.StandardInput.WriteLineAsync(pwd);
                 }
-                if (isNeedSudo)
+                if (isNeedSudo) _linuxSudoPid = proc.Id;
-                    _linuxSudoPid = proc.Id;
 
                 if (displayLog)
                 {

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -1,4 +1,4 @@
-using System.Collections.Specialized;
+using System.Collections.Specialized;
 
 namespace ServiceLib.Handler.Fmt
 {
@@ -214,8 +214,7 @@ namespace ServiceLib.Handler.Fmt
         {
             foreach (var item in s)
             {
-                if (str.Contains(item, StringComparison.OrdinalIgnoreCase))
+                if (str.Contains(item, StringComparison.OrdinalIgnoreCase)) return true;
-                    return true;
             }
             return false;
         }

v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt
 {
     public class Hysteria2Fmt : BaseFmt
     {
@@ -11,8 +11,7 @@ namespace ServiceLib.Handler.Fmt
             };
 
             var url = Utils.TryUri(str);
-            if (url == null)
+            if (url == null) return null;
-                return null;
 
             item.Address = url.IdnHost;
             item.Port = url.Port;
@@ -29,8 +28,7 @@ namespace ServiceLib.Handler.Fmt
 
         public static string? ToUri(ProfileItem? item)
         {
-            if (item == null)
+            if (item == null) return null;
-                return null;
             string url = string.Empty;
 
             string remark = string.Empty;

v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs

@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 
 namespace ServiceLib.Handler.Fmt
 {
@@ -26,8 +26,7 @@ namespace ServiceLib.Handler.Fmt
 
         public static string? ToUri(ProfileItem? item)
         {
-            if (item == null)
+            if (item == null) return null;
-                return null;
             string url = string.Empty;
 
             string remark = string.Empty;
@@ -83,8 +82,7 @@ namespace ServiceLib.Handler.Fmt
         private static ProfileItem? ResolveSip002(string result)
         {
             var parsedUrl = Utils.TryUri(result);
-            if (parsedUrl == null)
+            if (parsedUrl == null) return null;
-                return null;
 
             ProfileItem item = new()
             {

v2rayN/ServiceLib/Handler/Fmt/SocksFmt.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt
 {
     public class SocksFmt : BaseFmt
     {
@@ -23,8 +23,7 @@ namespace ServiceLib.Handler.Fmt
 
         public static string? ToUri(ProfileItem? item)
         {
-            if (item == null)
+            if (item == null) return null;
-                return null;
             var url = string.Empty;
 
             var remark = string.Empty;
@@ -87,8 +86,7 @@ namespace ServiceLib.Handler.Fmt
         private static ProfileItem? ResolveSocksNew(string result)
         {
             var parsedUrl = Utils.TryUri(result);
-            if (parsedUrl == null)
+            if (parsedUrl == null) return null;
-                return null;
 
             ProfileItem item = new()
             {

v2rayN/ServiceLib/Handler/Fmt/TrojanFmt.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt
 {
     public class TrojanFmt : BaseFmt
     {
@@ -12,8 +12,7 @@ namespace ServiceLib.Handler.Fmt
             };
 
             var url = Utils.TryUri(str);
-            if (url == null)
+            if (url == null) return null;
-                return null;
 
             item.Address = url.IdnHost;
             item.Port = url.Port;
@@ -28,8 +27,7 @@ namespace ServiceLib.Handler.Fmt
 
         public static string? ToUri(ProfileItem? item)
         {
-            if (item == null)
+            if (item == null) return null;
-                return null;
             string url = string.Empty;
 
             string remark = string.Empty;

v2rayN/ServiceLib/Handler/Fmt/TuicFmt.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt
 {
     public class TuicFmt : BaseFmt
     {
@@ -12,8 +12,7 @@ namespace ServiceLib.Handler.Fmt
             };
 
             var url = Utils.TryUri(str);
-            if (url == null)
+            if (url == null) return null;
-                return null;
 
             item.Address = url.IdnHost;
             item.Port = url.Port;
@@ -35,8 +34,7 @@ namespace ServiceLib.Handler.Fmt
 
         public static string? ToUri(ProfileItem? item)
         {
-            if (item == null)
+            if (item == null) return null;
-                return null;
             string url = string.Empty;
 
             string remark = string.Empty;

v2rayN/ServiceLib/Handler/Fmt/VLESSFmt.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt
 {
     public class VLESSFmt : BaseFmt
     {
@@ -13,8 +13,7 @@ namespace ServiceLib.Handler.Fmt
             };
 
             var url = Utils.TryUri(str);
-            if (url == null)
+            if (url == null) return null;
-                return null;
 
             item.Address = url.IdnHost;
             item.Port = url.Port;
@@ -31,8 +30,7 @@ namespace ServiceLib.Handler.Fmt
 
         public static string? ToUri(ProfileItem? item)
         {
-            if (item == null)
+            if (item == null) return null;
-                return null;
             string url = string.Empty;
 
             string remark = string.Empty;

v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt
 {
     public class VmessFmt : BaseFmt
     {
@@ -19,8 +19,7 @@ namespace ServiceLib.Handler.Fmt
 
         public static string? ToUri(ProfileItem? item)
         {
-            if (item == null)
+            if (item == null) return null;
-                return null;
             string url = string.Empty;
 
             VmessQRCode vmessQRCode = new()
@@ -107,8 +106,7 @@ namespace ServiceLib.Handler.Fmt
             };
 
             var url = Utils.TryUri(str);
-            if (url == null)
+            if (url == null) return null;
-                return null;
 
             item.Address = url.IdnHost;
             item.Port = url.Port;

v2rayN/ServiceLib/Handler/Fmt/WireguardFmt.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt
 {
     public class WireguardFmt : BaseFmt
     {
@@ -12,8 +12,7 @@ namespace ServiceLib.Handler.Fmt
             };
 
             var url = Utils.TryUri(str);
-            if (url == null)
+            if (url == null) return null;
-                return null;
 
             item.Address = url.IdnHost;
             item.Port = url.Port;
@@ -32,8 +31,7 @@ namespace ServiceLib.Handler.Fmt
 
         public static string? ToUri(ProfileItem? item)
         {
-            if (item == null)
+            if (item == null) return null;
-                return null;
             string url = string.Empty;
 
             string remark = string.Empty;

v2rayN/ServiceLib/Handler/PacHandler.cs

@@ -1,4 +1,4 @@
-using System.Net.Sockets;
+using System.Net.Sockets;
 using System.Text;
 
 namespace ServiceLib.Handler
@@ -89,8 +89,7 @@ namespace ServiceLib.Handler
 
         public static void Stop()
         {
-            if (_tcpListener == null)
+            if (_tcpListener == null) return;
-                return;
             try
             {
                 _isRunning = false;

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs

@@ -176,8 +176,7 @@ namespace ServiceLib.Handler.SysProxy
             }
 
             // FREE the data ASAP
-            if (list.szConnection != nint.Zero)
+            if (list.szConnection != nint.Zero) Marshal.FreeHGlobal(list.szConnection); // release mem 3
-                Marshal.FreeHGlobal(list.szConnection); // release mem 3
             if (optionCount > 1)
             {
                 Marshal.FreeHGlobal(options[1].m_Value.m_StringPtr); // release mem 1

v2rayN/ServiceLib/Handler/WebDavHandler.cs

@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net;
 using WebDav;
 
 namespace ServiceLib.Handler
@@ -61,8 +61,7 @@ namespace ServiceLib.Handler
 
         private async Task<bool> TryCreateDir()
         {
-            if (_client is null)
+            if (_client is null) return false;
-                return false;
             try
             {
                 var result2 = await _client.Mkcol(_webDir);

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -1048,8 +1048,7 @@ namespace ServiceLib.Services.CoreConfig
                     var countDomain = 0;
                     foreach (var it in item.Domain)
                     {
-                        if (ParseV2Domain(it, rule1))
+                        if (ParseV2Domain(it, rule1)) countDomain++;
-                            countDomain++;
                     }
                     if (countDomain > 0)
                     {
@@ -1063,8 +1062,7 @@ namespace ServiceLib.Services.CoreConfig
                     var countIp = 0;
                     foreach (var it in item.Ip)
                     {
-                        if (ParseV2Address(it, rule2))
+                        if (ParseV2Address(it, rule2)) countIp++;
-                            countIp++;
                     }
                     if (countIp > 0)
                     {
@@ -1150,14 +1148,12 @@ namespace ServiceLib.Services.CoreConfig
             }
             else if (address.StartsWith("geoip:"))
             {
-                if (rule.geoip is null)
+                if (rule.geoip is null) { rule.geoip = new(); }
-                { rule.geoip = new(); }
                 rule.geoip?.Add(address.Substring(6));
             }
             else
             {
-                if (rule.ip_cidr is null)
+                if (rule.ip_cidr is null) { rule.ip_cidr = new(); }
-                { rule.ip_cidr = new(); }
                 rule.ip_cidr?.Add(address);
             }
             return true;
@@ -1275,8 +1271,7 @@ namespace ServiceLib.Services.CoreConfig
         {
             static void AddRuleSets(List<string> ruleSets, List<string>? rule_set)
             {
-                if (rule_set != null)
+                if (rule_set != null) ruleSets.AddRange(rule_set);
-                    ruleSets.AddRange(rule_set);
             }
             var geosite = "geosite";
             var geoip = "geoip";
@@ -1344,8 +1339,7 @@ namespace ServiceLib.Services.CoreConfig
             singboxConfig.route.rule_set = [];
             foreach (var item in new HashSet<string>(ruleSets))
             {
-                if (Utils.IsNullOrEmpty(item))
+                if (Utils.IsNullOrEmpty(item)) { continue; }
-                { continue; }
                 var customRuleset = customRulesets.FirstOrDefault(t => t.tag != null && t.tag.Equals(item));
                 if (customRuleset is null)
                 {

v2rayN/ServiceLib/Services/SpeedtestService.cs

@@ -1,7 +1,7 @@
+using ReactiveUI;
 using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
-using ReactiveUI;
 
 namespace ServiceLib.Services
 {
@@ -119,8 +119,7 @@ namespace ServiceLib.Services
 
         private void ExitLoop(string x)
         {
-            if (_exitLoop)
+            if (_exitLoop) return;
-                return;
             _exitLoop = true;
             UpdateFunc("", ResUI.SpeedtestingStop);
         }
@@ -262,8 +261,7 @@ namespace ServiceLib.Services
                 UpdateFunc(it.IndexId, "", ResUI.Speedtesting);
 
                 var item = await AppHandler.Instance.GetProfileItem(it.IndexId);
-                if (item is null)
+                if (item is null) continue;
-                    continue;
 
                 var webProxy = new WebProxy($"socks5://{Global.Loopback}:{it.Port}");
 
@@ -325,8 +323,7 @@ namespace ServiceLib.Services
                 UpdateFunc(it.IndexId, "", ResUI.Speedtesting);
 
                 var item = await AppHandler.Instance.GetProfileItem(it.IndexId);
-                if (item is null)
+                if (item is null) continue;
-                    continue;
 
                 var webProxy = new WebProxy($"socks5://{Global.Loopback}:{it.Port}");
                 _ = downloadHandle.DownloadDataAsync(url, webProxy, timeout, (success, msg) =>

v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs

@@ -1,4 +1,4 @@
-using System.Net.WebSockets;
+using System.Net.WebSockets;
 using System.Text;
 
 namespace ServiceLib.Services.Statistics
@@ -109,8 +109,7 @@ namespace ServiceLib.Services.Statistics
 
         private void ParseOutput(string source, out ulong up, out ulong down)
         {
-            up = 0;
+            up = 0; down = 0;
-            down = 0;
             try
             {
                 var trafficItem = JsonUtils.Deserialize<TrafficItem>(source);

v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Services.Statistics
+namespace ServiceLib.Services.Statistics
 {
     public class StatisticsXrayService
     {
@@ -63,8 +63,7 @@ namespace ServiceLib.Services.Statistics
                 foreach (string key in source.stats.outbound.Keys)
                 {
                     var value = source.stats.outbound[key];
-                    if (value == null)
+                    if (value == null) continue;
-                        continue;
                     var state = JsonUtils.Deserialize<V2rayMetricsVarsLink>(value.ToString());
 
                     if (key.StartsWith(Global.ProxyTag))

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -368,7 +368,6 @@ namespace ServiceLib.Services
             try
             {
                 var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(type);
-                var coreUrl = await GetUrlFromCore(coreInfo) ?? string.Empty;
                 SemanticVersion curVersion;
                 string message;
                 string? url;
@@ -380,28 +379,28 @@ namespace ServiceLib.Services
                         {
                             curVersion = await GetCoreVersion(type);
                             message = string.Format(ResUI.IsLatestCore, type, curVersion.ToVersionString("v"));
-                            url = string.Format(coreUrl, version.ToVersionString("v"));
+                            url = string.Format(GetUrlFromCore(coreInfo), version.ToVersionString("v"));
                             break;
                         }
                     case ECoreType.mihomo:
                         {
                             curVersion = await GetCoreVersion(type);
                             message = string.Format(ResUI.IsLatestCore, type, curVersion);
-                            url = string.Format(coreUrl, version.ToVersionString("v"));
+                            url = string.Format(GetUrlFromCore(coreInfo), version.ToVersionString("v"));
                             break;
                         }
                     case ECoreType.sing_box:
                         {
                             curVersion = await GetCoreVersion(type);
                             message = string.Format(ResUI.IsLatestCore, type, curVersion.ToVersionString("v"));
-                            url = string.Format(coreUrl, version.ToVersionString("v"), version);
+                            url = string.Format(GetUrlFromCore(coreInfo), version.ToVersionString("v"), version);
                             break;
                         }
                     case ECoreType.v2rayN:
                         {
                             curVersion = new SemanticVersion(Utils.GetVersionInfo());
                             message = string.Format(ResUI.IsLatestN, type, curVersion);
-                            url = string.Format(coreUrl, version);
+                            url = string.Format(GetUrlFromCore(coreInfo), version);
                             break;
                         }
                     default:
@@ -423,18 +422,17 @@ namespace ServiceLib.Services
             }
         }
 
-        private async Task<string?> GetUrlFromCore(CoreInfo? coreInfo)
+        private string? GetUrlFromCore(CoreInfo? coreInfo)
         {
             if (Utils.IsWindows())
             {
                 //Check for standalone windows .Net version
-                if (coreInfo?.CoreType == ECoreType.v2rayN && RuntimeInformation.ProcessArchitecture == Architecture.X64)
+                if (coreInfo?.CoreType == ECoreType.v2rayN
+                    && File.Exists(Path.Combine(Utils.StartupPath(), "wpfgfx_cor3.dll"))
+                    && File.Exists(Path.Combine(Utils.StartupPath(), "D3DCompiler_47_cor3.dll"))
+                   )
                 {
-                    var runtimes = await Utils.GetCliWrapOutput("dotnet", "--list-runtimes");
+                    return coreInfo?.DownloadUrlWin64?.Replace(".zip", "-SelfContained.zip");
-                    if (runtimes == null || runtimes.Contains("Microsoft.WindowsDesktop.App 8") == false)
-                    {
-                        return coreInfo?.DownloadUrlWin64?.Replace(".zip", "-SelfContained.zip");
-                    }
                 }
 
                 return RuntimeInformation.ProcessArchitecture switch

v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs

@@ -1,6 +1,6 @@
-using System.Reactive;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using System.Reactive;
 
 namespace ServiceLib.ViewModels
 {

v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs

@@ -1,6 +1,6 @@
-using System.Reactive;
+using ReactiveUI;
-using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using System.Reactive;
 
 namespace ServiceLib.ViewModels
 {

v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs

@@ -1,7 +1,7 @@
-using System.Reactive;
+using ReactiveUI;
-using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
+using System.Reactive;
 
 namespace ServiceLib.ViewModels
 {

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -1,10 +1,10 @@
-using System.Reactive;
+using DynamicData;
-using System.Runtime.InteropServices;
-using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
+using System.Reactive;
+using System.Runtime.InteropServices;
 
 namespace ServiceLib.ViewModels
 {
@@ -83,8 +83,7 @@ namespace ServiceLib.ViewModels
             for (var k = _checkUpdateModel.Count - 1; k >= 0; k--)
             {
                 var item = _checkUpdateModel[k];
-                if (item.IsSelected != true)
+                if (item.IsSelected != true) continue;
-                    continue;
 
                 UpdateView(item.CoreType, "...");
                 if (item.CoreType == _geo)
@@ -298,8 +297,7 @@ namespace ServiceLib.ViewModels
         public void UpdateViewResult(CheckUpdateModel model)
         {
             var found = _checkUpdateModel.FirstOrDefault(t => t.CoreType == model.CoreType);
-            if (found == null)
+            if (found == null) return;
-                return;
             var itemCopy = JsonUtils.DeepCopy(found);
             itemCopy.Remarks = model.Remarks;
             _checkUpdateModel.Replace(found, itemCopy);

v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs

@@ -1,9 +1,9 @@
-using System.Reactive;
-using System.Reactive.Linq;
 using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using System.Reactive;
+using System.Reactive.Linq;
 
 namespace ServiceLib.ViewModels
 {
@@ -115,8 +115,7 @@ namespace ServiceLib.ViewModels
 
                 lstModel.Add(model);
             }
-            if (lstModel.Count <= 0)
+            if (lstModel.Count <= 0) { return; }
-            { return; }
 
             _connectionItems.AddRange(lstModel);
         }

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -1,9 +1,9 @@
-using System.Reactive;
-using System.Reactive.Linq;
 using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using System.Reactive;
+using System.Reactive.Linq;
 using static ServiceLib.Models.ClashProviders;
 using static ServiceLib.Models.ClashProxies;
 

v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs

@@ -1,6 +1,6 @@
-using System.Reactive;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using System.Reactive;
 
 namespace ServiceLib.ViewModels
 {

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -1,7 +1,7 @@
-using System.Reactive;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
+using System.Reactive;
 
 namespace ServiceLib.ViewModels
 {
@@ -570,8 +570,7 @@ namespace ServiceLib.ViewModels
             {
                 Locator.Current.GetService<ClashProxiesViewModel>()?.ProxiesReload();
             }
-            else
+            else { TabMainSelectedIndex = 0; }
-            { TabMainSelectedIndex = 0; }
         }
 
         private async Task LoadCore()

v2rayN/ServiceLib/ViewModels/MsgViewModel.cs

@@ -1,7 +1,7 @@
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
 using System.Collections.Concurrent;
 using System.Text.RegularExpressions;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
 
 namespace ServiceLib.ViewModels
 {

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -1,6 +1,6 @@
-using System.Reactive;
+using ReactiveUI;
-using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using System.Reactive;
 
 namespace ServiceLib.ViewModels
 {

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -1,11 +1,11 @@
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Text;
 using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
+using System.Reactive;
+using System.Reactive.Linq;
+using System.Text;
 
 namespace ServiceLib.ViewModels
 {

v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs

@@ -1,6 +1,6 @@
-using System.Reactive;
+using ReactiveUI;
-using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using System.Reactive;
 
 namespace ServiceLib.ViewModels
 {

v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs

@@ -1,9 +1,9 @@
+using DynamicData.Binding;
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
 using System.Reactive;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using DynamicData.Binding;
-using ReactiveUI;
-using ReactiveUI.Fody.Helpers;
 
 namespace ServiceLib.ViewModels
 {

v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs

@@ -1,7 +1,7 @@
-using System.Reactive;
+using DynamicData.Binding;
-using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using System.Reactive;
 
 namespace ServiceLib.ViewModels
 {

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -1,9 +1,9 @@
-using System.Reactive;
+using DynamicData.Binding;
-using System.Text;
-using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
+using System.Reactive;
+using System.Text;
 
 namespace ServiceLib.ViewModels
 {
@@ -225,22 +225,19 @@ namespace ServiceLib.ViewModels
         private async Task AddServerViaClipboard()
         {
             var service = Locator.Current.GetService<MainWindowViewModel>();
-            if (service != null)
+            if (service != null) await service.AddServerViaClipboardAsync(null);
-                await service.AddServerViaClipboardAsync(null);
         }
 
         private async Task AddServerViaScan()
         {
             var service = Locator.Current.GetService<MainWindowViewModel>();
-            if (service != null)
+            if (service != null) await service.AddServerViaScanAsync();
-                await service.AddServerViaScanAsync();
         }
 
         private async Task UpdateSubscriptionProcess(bool blProxy)
         {
             var service = Locator.Current.GetService<MainWindowViewModel>();
-            if (service != null)
+            if (service != null) await service.UpdateSubscriptionProcess("", blProxy);
-                await service.UpdateSubscriptionProcess("", blProxy);
         }
 
         public async Task RefreshServersBiz()

v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs

@@ -1,6 +1,6 @@
-using System.Reactive;
+using ReactiveUI;
-using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using System.Reactive;
 
 namespace ServiceLib.ViewModels
 {

v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs

@@ -1,8 +1,8 @@
-using System.Reactive;
+using DynamicData;
-using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using System.Reactive;
 
 namespace ServiceLib.ViewModels
 {

v2rayN/v2rayN.Desktop/App.axaml.cs

@@ -64,8 +64,7 @@ public partial class App : Application
             {
                 var clipboardData = await AvaUtils.GetClipboardData(desktop.MainWindow);
                 var service = Locator.Current.GetService<MainWindowViewModel>();
-                if (service != null)
+                if (service != null) _ = service.AddServerViaClipboardAsync(clipboardData);
-                    _ = service.AddServerViaClipboardAsync(clipboardData);
             }
         }
     }
@@ -73,8 +72,7 @@ public partial class App : Application
     private async void MenuExit_Click(object? sender, EventArgs e)
     {
         var service = Locator.Current.GetService<MainWindowViewModel>();
-        if (service != null)
+        if (service != null) await service.MyAppExitAsync(true);
-            await service.MyAppExitAsync(true);
         service?.Shutdown(true);
     }
 }

v2rayN/v2rayN.Desktop/Common/AvaUtils.cs

@@ -1,4 +1,4 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Media.Imaging;
@@ -13,8 +13,7 @@ namespace v2rayN.Desktop.Common
             try
             {
                 var clipboard = TopLevel.GetTopLevel(owner)?.Clipboard;
-                if (clipboard == null)
+                if (clipboard == null) return null;
-                    return null;
                 return await clipboard.GetTextAsync();
             }
             catch
@@ -28,8 +27,7 @@ namespace v2rayN.Desktop.Common
             try
             {
                 var clipboard = TopLevel.GetTopLevel(visual)?.Clipboard;
-                if (clipboard == null)
+                if (clipboard == null) return;
-                    return;
                 var dataObject = new DataObject();
                 dataObject.Set(DataFormats.Text, strData);
                 await clipboard.SetDataObjectAsync(dataObject);

v2rayN/v2rayN.Desktop/Common/UI.cs

@@ -1,4 +1,4 @@
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Platform.Storage;
 using MsBox.Avalonia;
 using MsBox.Avalonia.Enums;
@@ -18,8 +18,7 @@ namespace v2rayN.Desktop.Common
         public static async Task<string?> OpenFileDialog(Window owner, FilePickerFileType? filter)
         {
             var sp = GetStorageProvider(owner);
-            if (sp is null)
+            if (sp is null) return null;
-                return null;
           
             // Start async operation to open the dialog.
             var files = await sp.OpenFilePickerAsync(new FilePickerOpenOptions
@@ -34,8 +33,7 @@ namespace v2rayN.Desktop.Common
         public static async Task<string?> SaveFileDialog(Window owner, string filter)
         {
             var sp = GetStorageProvider(owner);
-            if (sp is null)
+            if (sp is null) return null;
-                return null;
 
             // Start async operation to open the dialog.
             var files = await sp.SaveFilePickerAsync(new FilePickerSaveOptions

v2rayN/v2rayN.Desktop/Converters/DelayColorConverter.cs

@@ -1,6 +1,6 @@
-using System.Globalization;
+using Avalonia.Data.Converters;
-using Avalonia.Data.Converters;
 using Avalonia.Media;
+using System.Globalization;
 
 namespace v2rayN.Desktop.Converters
 {

v2rayN/v2rayN.Desktop/Program.cs

@@ -53,5 +53,5 @@ internal class Program
         .WithFontByDefault()
         .LogToTrace()
         .UseReactiveUI()
-        .With(new MacOSPlatformOptions { ShowInDock = false });
+        .With(new MacOSPlatformOptions { ShowInDock = false});
 }

v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs

@@ -1,4 +1,3 @@
-using System.Reactive.Linq;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
@@ -8,6 +7,7 @@ using Avalonia.Styling;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Semi.Avalonia;
+using System.Reactive.Linq;
 
 namespace v2rayN.Desktop.ViewModels
 {
@@ -100,8 +100,7 @@ namespace v2rayN.Desktop.ViewModels
         private void ModifyFontSize()
         {
             double size = CurrentFontSize;
-            if (size < Global.MinFontSize)
+            if (size < Global.MinFontSize) return;
-                return;
 
             Style style = new(x => Selectors.Or(
                 x.OfType<Button>(),

v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml.cs

@@ -1,7 +1,7 @@
-using System.Reactive.Disposables;
+using Avalonia.Interactivity;
-using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using ReactiveUI;
+using System.Reactive.Disposables;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs

@@ -1,8 +1,8 @@
-using System.Reactive.Disposables;
+using Avalonia.Controls;
-using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using ReactiveUI;
+using System.Reactive.Disposables;
 
 namespace v2rayN.Desktop.Views
 {

v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml.cs

@@ -1,8 +1,8 @@
-using System.Reactive.Disposables;
+using Avalonia.Controls;
-using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using ReactiveUI;
+using System.Reactive.Disposables;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views

v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs

@@ -1,7 +1,7 @@
-using System.Reactive.Disposables;
+using Avalonia.ReactiveUI;
-using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using ReactiveUI;
+using System.Reactive.Disposables;
 
 namespace v2rayN.Desktop.Views
 {
@@ -27,16 +27,14 @@ namespace v2rayN.Desktop.Views
             switch (action)
             {
                 case EViewAction.DispatcherCheckUpdate:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Dispatcher.UIThread.Post(() =>
                         ViewModel?.UpdateViewResult((CheckUpdateModel)obj),
                     DispatcherPriority.Default);
                     break;
 
                 case EViewAction.DispatcherCheckUpdateFinished:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Dispatcher.UIThread.Post(() =>
                         ViewModel?.UpdateFinishedResult((bool)obj),
                     DispatcherPriority.Default);

v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs

@@ -1,9 +1,9 @@
-using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using ReactiveUI;
+using System.Reactive.Disposables;
 
 namespace v2rayN.Desktop.Views
 {
@@ -34,8 +34,7 @@ namespace v2rayN.Desktop.Views
             switch (action)
             {
                 case EViewAction.DispatcherRefreshConnections:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Dispatcher.UIThread.Post(() =>
                         ViewModel?.RefreshConnections((List<ConnectionItem>?)obj),
                      DispatcherPriority.Default);

v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml.cs

@@ -1,10 +1,10 @@
-using System.Reactive.Disposables;
 using Avalonia.Input;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using DynamicData;
 using ReactiveUI;
 using Splat;
+using System.Reactive.Disposables;
 
 namespace v2rayN.Desktop.Views
 {
@@ -49,8 +49,7 @@ namespace v2rayN.Desktop.Views
                     break;
 
                 case EViewAction.DispatcherProxiesDelayTest:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Dispatcher.UIThread.Post(() =>
                         ViewModel?.ProxiesDelayTestResult((SpeedTestResult)obj),
                         DispatcherPriority.Default);

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs

@@ -1,7 +1,7 @@
-using System.Reactive.Disposables;
+using Avalonia.Interactivity;
-using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using ReactiveUI;
+using System.Reactive.Disposables;
 
 namespace v2rayN.Desktop.Views
 {

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -1,5 +1,4 @@
-using System.Reactive.Disposables;
+using Avalonia;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Notifications;
@@ -11,6 +10,7 @@ using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
 using Splat;
+using System.Reactive.Disposables;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views
@@ -181,13 +181,11 @@ namespace v2rayN.Desktop.Views
             switch (action)
             {
                 case EViewAction.AddServerWindow:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     return await new AddServerWindow((ProfileItem)obj).ShowDialog<bool>(this);
 
                 case EViewAction.AddServer2Window:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     return await new AddServer2Window((ProfileItem)obj).ShowDialog<bool>(this);
 
                 case EViewAction.DNSSettingWindow:
@@ -212,8 +210,7 @@ namespace v2rayN.Desktop.Views
                     break;
 
                 case EViewAction.DispatcherStatistics:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Dispatcher.UIThread.Post(() =>
                         ViewModel?.SetStatisticsResult((ServerSpeedItem)obj),
                     DispatcherPriority.Default);
@@ -392,7 +389,7 @@ namespace v2rayN.Desktop.Views
             _blCloseByUser = true;
             StorageUI();
 
-            await ViewModel?.MyAppExitAsync(false);
+	        await ViewModel?.MyAppExitAsync(false);
         }
 
         #endregion Event
@@ -401,32 +398,32 @@ namespace v2rayN.Desktop.Views
 
         public void ShowHideWindow(bool? blShow)
         {
-            var bl = blShow ?? (!_config.UiItem.ShowInTaskbar ^ (WindowState == WindowState.Minimized));
+	        var bl = blShow ?? (!_config.UiItem.ShowInTaskbar ^ (WindowState==WindowState.Minimized));
-            if (bl)
+	        if (bl)
-            {
+	        {
-                this.Show();
+		        this.Show();
-                if (this.WindowState == WindowState.Minimized)
+		        if (this.WindowState == WindowState.Minimized)
-                {
+		        {
-                    this.WindowState = WindowState.Normal;
+			        this.WindowState = WindowState.Normal;
-                }
+		        }
-                this.Activate();
+		        this.Activate();
-                this.Focus();
+		        this.Focus();
-            }
+	        }
-            else
+	        else
-            {
+	        {
-                if (Utils.IsOSX() || _config.UiItem.Hide2TrayWhenClose)
+		        if (Utils.IsOSX() || _config.UiItem.Hide2TrayWhenClose)
-                {
+		        {
-                    foreach (var ownedWindow in this.OwnedWindows)
+			        foreach (var ownedWindow in this.OwnedWindows)
-                    {
+			        {
-                        ownedWindow.Close();
+				        ownedWindow.Close();
-                    }
+			        }
-                    this.Hide();
+			        this.Hide();
-                }
+		        }
-                else
+		        else
-                {
+		        {
-                    this.WindowState = WindowState.Minimized;
+			        this.WindowState = WindowState.Minimized;
-                }
+		        }
-            }
+	        }
 
             _config.UiItem.ShowInTaskbar = bl;
         }

v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs

@@ -1,8 +1,8 @@
-using System.Reactive.Disposables;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using ReactiveUI;
+using System.Reactive.Disposables;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views
@@ -27,8 +27,7 @@ namespace v2rayN.Desktop.Views
             switch (action)
             {
                 case EViewAction.DispatcherShowMsg:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
 
                     Dispatcher.UIThread.Post(() =>
                         ShowMsg(obj),

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -1,7 +1,7 @@
-using System.Reactive.Disposables;
+using Avalonia.Controls;
-using Avalonia.Controls;
 using Avalonia.ReactiveUI;
 using ReactiveUI;
+using System.Reactive.Disposables;
 
 namespace v2rayN.Desktop.Views
 {

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -1,4 +1,3 @@
-using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -8,6 +7,7 @@ using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
 using Splat;
+using System.Reactive.Disposables;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views
@@ -112,8 +112,7 @@ namespace v2rayN.Desktop.Views
             switch (action)
             {
                 case EViewAction.SetClipboardData:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     await AvaUtils.SetClipboardData(this, (string)obj);
                     break;
 
@@ -136,8 +135,7 @@ namespace v2rayN.Desktop.Views
                     break;
 
                 case EViewAction.SaveFileDialog:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     var fileName = await UI.SaveFileDialog(_window, "");
                     if (fileName.IsNullOrEmpty())
                     {
@@ -147,29 +145,24 @@ namespace v2rayN.Desktop.Views
                     break;
 
                 case EViewAction.AddServerWindow:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     return await new AddServerWindow((ProfileItem)obj).ShowDialog<bool>(_window);
 
                 case EViewAction.AddServer2Window:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     return await new AddServer2Window((ProfileItem)obj).ShowDialog<bool>(_window);
 
                 case EViewAction.ShareServer:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     await ShareServer((string)obj);
                     break;
 
                 case EViewAction.SubEditWindow:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     return await new SubEditWindow((SubItem)obj).ShowDialog<bool>(_window);
 
                 case EViewAction.DispatcherSpeedTest:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Dispatcher.UIThread.Post(() =>
                         ViewModel?.SetSpeedTestResult((SpeedTestResult)obj),
                     DispatcherPriority.Default);
@@ -205,8 +198,7 @@ namespace v2rayN.Desktop.Views
         private void LstProfiles_DoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
         {
             var source = e.Source as Border;
-            if (source?.Name == "HeaderBackground")
+            if (source?.Name == "HeaderBackground") return;
-                return;
             if (_config.UiItem.DoubleClick2Activate)
             {
                 ViewModel?.SetDefaultServer();

v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs

@@ -1,4 +1,4 @@
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Media.Imaging;
 
 namespace v2rayN.Desktop.Views
@@ -28,8 +28,7 @@ namespace v2rayN.Desktop.Views
 
         private Bitmap? ByteToBitmap(byte[]? bytes)
         {
-            if (bytes is null)
+            if (bytes is null) return null;
-                return null;
 
             using var ms = new MemoryStream(bytes);
             return new Bitmap(ms);

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs

@@ -1,8 +1,8 @@
-using System.Reactive.Disposables;
+using Avalonia.Controls;
-using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using ReactiveUI;
+using System.Reactive.Disposables;
 
 namespace v2rayN.Desktop.Views
 {

v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml.cs

@@ -1,10 +1,11 @@
-using System.Reactive.Disposables;
+using Avalonia.Controls;
-using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
 using Avalonia.ReactiveUI;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
+using System.Reactive.Disposables;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views
@@ -94,8 +95,7 @@ namespace v2rayN.Desktop.Views
                     break;
 
                 case EViewAction.RoutingRuleDetailsWindow:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     return await new RoutingRuleDetailsWindow((RulesItem)obj).ShowDialog<bool>(this);
 
                 case EViewAction.ImportRulesFromFile:
@@ -108,8 +108,7 @@ namespace v2rayN.Desktop.Views
                     break;
 
                 case EViewAction.SetClipboardData:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     await AvaUtils.SetClipboardData(this, (string)obj);
                     break;
 

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs

@@ -1,10 +1,10 @@
-using System.Reactive.Disposables;
+using Avalonia.Controls;
-using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
+using System.Reactive.Disposables;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views
@@ -75,8 +75,7 @@ namespace v2rayN.Desktop.Views
                     break;
 
                 case EViewAction.RoutingRuleSettingWindow:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     return await new RoutingRuleSettingWindow((RoutingItem)obj).ShowDialog<bool>(this);
             }
             return await Task.FromResult(true);

v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs

@@ -1,4 +1,3 @@
-using System.Reactive.Disposables;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -6,6 +5,7 @@ using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using ReactiveUI;
 using Splat;
+using System.Reactive.Disposables;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views
@@ -50,8 +50,7 @@ namespace v2rayN.Desktop.Views
             switch (action)
             {
                 case EViewAction.DispatcherServerAvailability:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Dispatcher.UIThread.Post(() =>
                         ViewModel?.TestServerAvailabilityResult((string)obj),
                     DispatcherPriority.Default);
@@ -72,8 +71,7 @@ namespace v2rayN.Desktop.Views
                     break;
 
                 case EViewAction.SetClipboardData:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     await AvaUtils.SetClipboardData(this, (string)obj);
                     break;
             }

v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs

@@ -1,8 +1,8 @@
-using System.Reactive.Disposables;
 using Avalonia;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using ReactiveUI;
+using System.Reactive.Disposables;
 
 namespace v2rayN.Desktop.Views
 {

v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs

@@ -1,11 +1,11 @@
-using System.Reactive.Disposables;
+using Avalonia.Controls;
-using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using DialogHostAvalonia;
 using DynamicData;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
+using System.Reactive.Disposables;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views
@@ -52,15 +52,13 @@ namespace v2rayN.Desktop.Views
                     break;
 
                 case EViewAction.SubEditWindow:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     var window = new SubEditWindow((SubItem)obj);
                     await window.ShowDialog(this);
                     break;
 
                 case EViewAction.ShareSub:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     await ShareSub((string)obj);
                     break;
             }

v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs

@@ -1,7 +1,7 @@
-using System.Reactive.Disposables;
+using Avalonia;
-using Avalonia;
 using Avalonia.ReactiveUI;
 using ReactiveUI;
+using System.Reactive.Disposables;
 using v2rayN.Desktop.ViewModels;
 
 namespace v2rayN.Desktop.Views

v2rayN/v2rayN/App.xaml

@@ -1,9 +1,9 @@
-<Application
+<Application
     x:Class="v2rayN.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     ShutdownMode="OnExplicitShutdown"
     StartupUri="Views/MainWindow.xaml">
     <Application.Resources>

v2rayN/v2rayN/Common/UI.cs

@@ -1,5 +1,5 @@
+using Microsoft.Win32;
 using System.Windows;
-using Microsoft.Win32;
 
 namespace v2rayN
 {

v2rayN/v2rayN/Common/WindowsUtils.cs

@@ -1,10 +1,13 @@
+using Microsoft.Win32;
+using System.Diagnostics;
 using System.Drawing;
 using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+using System.Text;
 using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using Microsoft.Win32;
 
 namespace v2rayN
 {
@@ -61,6 +64,8 @@ namespace v2rayN
                 BitmapSizeOptions.FromEmptyOptions());
         }
 
+       
+
         public static void SetDarkBorder(Window window, string? theme)
         {
             var isDark = theme switch

v2rayN/v2rayN/Handler/HotkeyHandler.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Windows;
@@ -37,20 +37,16 @@ namespace v2rayN.Handler
         private void Init()
         {
             _hotkeyTriggerDic.Clear();
-            if (_config.GlobalHotkeys == null)
+            if (_config.GlobalHotkeys == null) return;
-                return;
             foreach (var item in _config.GlobalHotkeys)
             {
                 if (item.KeyCode != null && (Key)item.KeyCode != Key.None)
                 {
                     int key = KeyInterop.VirtualKeyFromKey((Key)item.KeyCode);
                     KeyModifiers modifiers = KeyModifiers.None;
-                    if (item.Control)
+                    if (item.Control) modifiers |= KeyModifiers.Ctrl;
-                        modifiers |= KeyModifiers.Ctrl;
+                    if (item.Shift) modifiers |= KeyModifiers.Shift;
-                    if (item.Shift)
+                    if (item.Alt) modifiers |= KeyModifiers.Alt;
-                        modifiers |= KeyModifiers.Shift;
-                    if (item.Alt)
-                        modifiers |= KeyModifiers.Alt;
                     key = (key << 16) | (int)modifiers;
                     if (!_hotkeyTriggerDic.ContainsKey(key))
                     {
@@ -115,12 +111,9 @@ namespace v2rayN.Handler
 
             var mdif = (KeyModifiers)_fsModifiers;
             var key = KeyInterop.KeyFromVirtualKey(_vkey);
-            if ((mdif & KeyModifiers.Ctrl) == KeyModifiers.Ctrl)
+            if ((mdif & KeyModifiers.Ctrl) == KeyModifiers.Ctrl) _hotkeyStr.Append($"{KeyModifiers.Ctrl}+");
-                _hotkeyStr.Append($"{KeyModifiers.Ctrl}+");
+            if ((mdif & KeyModifiers.Alt) == KeyModifiers.Alt) _hotkeyStr.Append($"{KeyModifiers.Alt}+");
-            if ((mdif & KeyModifiers.Alt) == KeyModifiers.Alt)
+            if ((mdif & KeyModifiers.Shift) == KeyModifiers.Shift) _hotkeyStr.Append($"{KeyModifiers.Shift}+");
-                _hotkeyStr.Append($"{KeyModifiers.Alt}+");
-            if ((mdif & KeyModifiers.Shift) == KeyModifiers.Shift)
-                _hotkeyStr.Append($"{KeyModifiers.Shift}+");
             _hotkeyStr.Append(key.ToString());
 
             foreach (var name in _hotkeyTriggerDic[hotkeycode])

v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs

@@ -1,7 +1,3 @@
-using System.Reactive.Linq;
-using System.Runtime.InteropServices;
-using System.Windows;
-using System.Windows.Interop;
 using DynamicData;
 using DynamicData.Binding;
 using MaterialDesignColors;
@@ -9,6 +5,10 @@ using MaterialDesignColors.ColorManipulation;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using System.Reactive.Linq;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Interop;
 
 namespace v2rayN.ViewModels
 {
@@ -145,8 +145,7 @@ namespace v2rayN.ViewModels
         private void ModifyFontSize()
         {
             double size = (long)CurrentFontSize;
-            if (size < Global.MinFontSize)
+            if (size < Global.MinFontSize) return;
-                return;
 
             Application.Current.Resources["StdFontSize"] = size;
             Application.Current.Resources["StdFontSize1"] = size + 1;

v2rayN/v2rayN/Views/AddServer2Window.xaml.cs

@@ -1,6 +1,6 @@
+using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
-using ReactiveUI;
 
 namespace v2rayN.Views
 {

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -1,7 +1,7 @@
+using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
-using ReactiveUI;
 
 namespace v2rayN.Views
 {

v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs

@@ -1,6 +1,6 @@
+using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
-using ReactiveUI;
 
 namespace v2rayN.Views
 {

v2rayN/v2rayN/Views/CheckUpdateView.xaml.cs

@@ -1,7 +1,7 @@
+using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Threading;
-using ReactiveUI;
 
 namespace v2rayN.Views
 {
@@ -27,8 +27,7 @@ namespace v2rayN.Views
             switch (action)
             {
                 case EViewAction.DispatcherCheckUpdate:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Application.Current?.Dispatcher.Invoke((() =>
                     {
                         ViewModel?.UpdateViewResult((CheckUpdateModel)obj);
@@ -36,8 +35,7 @@ namespace v2rayN.Views
                     break;
 
                 case EViewAction.DispatcherCheckUpdateFinished:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Application.Current?.Dispatcher.Invoke((() =>
                     {
                         ViewModel?.UpdateFinishedResult((bool)obj);

v2rayN/v2rayN/Views/ClashConnectionsView.xaml

@@ -1,11 +1,11 @@
 <reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.ClashConnectionsView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     d:DesignHeight="450"

v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs

@@ -1,8 +1,8 @@
+using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Threading;
-using ReactiveUI;
 
 namespace v2rayN.Views
 {
@@ -36,8 +36,7 @@ namespace v2rayN.Views
             switch (action)
             {
                 case EViewAction.DispatcherRefreshConnections:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Application.Current?.Dispatcher.Invoke((() =>
                     {
                         ViewModel?.RefreshConnections((List<ConnectionItem>?)obj);

v2rayN/v2rayN/Views/ClashProxiesView.xaml

@@ -1,14 +1,14 @@
 <reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.ClashProxiesView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    xmlns:converters="clr-namespace:v2rayN.Converters"
     d:DesignHeight="450"
     d:DesignWidth="800"
     x:TypeArguments="vms:ClashProxiesViewModel"

v2rayN/v2rayN/Views/ClashProxiesView.xaml.cs

@@ -1,9 +1,9 @@
+using ReactiveUI;
+using Splat;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
-using ReactiveUI;
-using Splat;
 
 namespace v2rayN.Views
 {
@@ -52,8 +52,7 @@ namespace v2rayN.Views
 
                 case EViewAction.DispatcherProxiesDelayTest:
 
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Application.Current?.Dispatcher.Invoke((() =>
                     {
                         ViewModel?.ProxiesDelayTestResult((SpeedTestResult)obj);

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -1,6 +1,6 @@
+using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
-using ReactiveUI;
 
 namespace v2rayN.Views
 {

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml

@@ -1,11 +1,11 @@
-<reactiveui:ReactiveWindow
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.GlobalHotkeySettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSetting}"

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs

@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -75,12 +75,9 @@ namespace v2rayN.Views
         {
             var res = new StringBuilder();
 
-            if (item.Control)
+            if (item.Control) res.Append($"{ModifierKeys.Control}+");
-                res.Append($"{ModifierKeys.Control}+");
+            if (item.Shift) res.Append($"{ModifierKeys.Shift}+");
-            if (item.Shift)
+            if (item.Alt) res.Append($"{ModifierKeys.Alt}+");
-                res.Append($"{ModifierKeys.Shift}+");
-            if (item.Alt)
-                res.Append($"{ModifierKeys.Alt}+");
             if (item.KeyCode != null && (Key)item.KeyCode != Key.None)
                 res.Append($"{(Key)item.KeyCode}");
 

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -1,14 +1,14 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
-    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     xmlns:view="clr-namespace:v2rayN.Views"
+    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="v2rayN"
     Width="900"
     Height="700"

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -1,3 +1,6 @@
+using MaterialDesignThemes.Wpf;
+using ReactiveUI;
+using Splat;
 using System.ComponentModel;
 using System.Reactive.Disposables;
 using System.Windows;
@@ -6,9 +9,6 @@ using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Threading;
-using MaterialDesignThemes.Wpf;
-using ReactiveUI;
-using Splat;
 using v2rayN.Handler;
 
 namespace v2rayN.Views
@@ -168,13 +168,11 @@ namespace v2rayN.Views
             switch (action)
             {
                 case EViewAction.AddServerWindow:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     return (new AddServerWindow((ProfileItem)obj)).ShowDialog() ?? false;
 
                 case EViewAction.AddServer2Window:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     return (new AddServer2Window((ProfileItem)obj)).ShowDialog() ?? false;
 
                 case EViewAction.DNSSettingWindow:
@@ -200,8 +198,7 @@ namespace v2rayN.Views
                     break;
 
                 case EViewAction.DispatcherStatistics:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Application.Current?.Dispatcher.Invoke((() =>
                     {
                         ViewModel?.SetStatisticsResult((ServerSpeedItem)obj);
@@ -283,12 +280,10 @@ namespace v2rayN.Views
                 switch (e.Key)
                 {
                     case Key.V:
-                        if (Keyboard.FocusedElement is TextBox)
+                        if (Keyboard.FocusedElement is TextBox) return;
-                            return;
                         var clipboardData = WindowsUtils.GetClipboardData();
                         var service = Locator.Current.GetService<MainWindowViewModel>();
-                        if (service != null)
+                        if (service != null) _ = service.AddServerViaClipboardAsync(clipboardData);
-                            _ = service.AddServerViaClipboardAsync(clipboardData);
                         break;
 
                     case Key.S:
@@ -393,10 +388,8 @@ namespace v2rayN.Views
 
             var maxWidth = SystemParameters.WorkArea.Width;
             var maxHeight = SystemParameters.WorkArea.Height;
-            if (Width > maxWidth)
+            if (Width > maxWidth) Width = maxWidth;
-                Width = maxWidth;
+            if (Height > maxHeight) Height = maxHeight;
-            if (Height > maxHeight)
-                Height = maxHeight;
             if (_config.UiItem.MainGirdHeight1 > 0 && _config.UiItem.MainGirdHeight2 > 0)
             {
                 if (_config.UiItem.MainGirdOrientation == EGirdOrientation.Horizontal)

v2rayN/v2rayN/Views/MsgView.xaml.cs

@@ -1,7 +1,7 @@
+using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Threading;
-using ReactiveUI;
 
 namespace v2rayN.Views
 {
@@ -37,8 +37,7 @@ namespace v2rayN.Views
             switch (action)
             {
                 case EViewAction.DispatcherShowMsg:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Application.Current?.Dispatcher.Invoke((() =>
                     {
                         ShowMsg(obj);

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -1,9 +1,9 @@
+using ReactiveUI;
 using System.Globalization;
 using System.IO;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Media;
-using ReactiveUI;
 
 namespace v2rayN.Views
 {

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -1,3 +1,6 @@
+using MaterialDesignThemes.Wpf;
+using ReactiveUI;
+using Splat;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
@@ -5,9 +8,6 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Threading;
-using MaterialDesignThemes.Wpf;
-using ReactiveUI;
-using Splat;
 using v2rayN.Base;
 using Point = System.Windows.Point;
 
@@ -99,8 +99,7 @@ namespace v2rayN.Views
             switch (action)
             {
                 case EViewAction.SetClipboardData:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     WindowsUtils.SetClipboardData((string)obj);
                     break;
 
@@ -123,8 +122,7 @@ namespace v2rayN.Views
                     break;
 
                 case EViewAction.SaveFileDialog:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     if (UI.SaveFileDialog(out string fileName, "Config|*.json") != true)
                     {
                         return false;
@@ -133,29 +131,24 @@ namespace v2rayN.Views
                     break;
 
                 case EViewAction.AddServerWindow:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     return (new AddServerWindow((ProfileItem)obj)).ShowDialog() ?? false;
 
                 case EViewAction.AddServer2Window:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     return (new AddServer2Window((ProfileItem)obj)).ShowDialog() ?? false;
 
                 case EViewAction.ShareServer:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     ShareServer((string)obj);
                     break;
 
                 case EViewAction.SubEditWindow:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     return (new SubEditWindow((SubItem)obj)).ShowDialog() ?? false;
 
                 case EViewAction.DispatcherSpeedTest:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Application.Current?.Dispatcher.Invoke((() =>
                     {
                         ViewModel?.SetSpeedTestResult((SpeedTestResult)obj);
@@ -410,16 +403,13 @@ namespace v2rayN.Views
                        Math.Abs(diff.Y) > SystemParameters.MinimumVerticalDragDistance))
             {
                 // Get the dragged Item
-                if (sender is not DataGrid listView)
+                if (sender is not DataGrid listView) return;
-                    return;
                 var listViewItem = FindAncestor<DataGridRow>((DependencyObject)e.OriginalSource);
-                if (listViewItem == null)
+                if (listViewItem == null) return;           // Abort
-                    return;           // Abort
+                                                            // Find the data behind the ListViewItem
-                                      // Find the data behind the ListViewItem
                 ProfileItemModel item = (ProfileItemModel)listView.ItemContainerGenerator.ItemFromContainer(listViewItem);
-                if (item == null)
+                if (item == null) return;                   // Abort
-                    return;                   // Abort
+                                                            // Initialize the drag & drop operation
-                                              // Initialize the drag & drop operation
                 startIndex = lstProfiles.SelectedIndex;
                 DataObject dragData = new(formatData, item);
                 DragDrop.DoDragDrop(listViewItem, dragData, DragDropEffects.Copy | DragDropEffects.Move);
@@ -439,8 +429,7 @@ namespace v2rayN.Views
             if (e.Data.GetDataPresent(formatData) && sender == e.Source)
             {
                 // Get the drop Item destination
-                if (sender is not DataGrid listView)
+                if (sender is not DataGrid listView) return;
-                    return;
                 var listViewItem = FindAncestor<DataGridRow>((DependencyObject)e.OriginalSource);
                 if (listViewItem == null)
                 {
@@ -450,8 +439,7 @@ namespace v2rayN.Views
                 }
                 // Find the data behind the Item
                 ProfileItemModel item = (ProfileItemModel)listView.ItemContainerGenerator.ItemFromContainer(listViewItem);
-                if (item == null)
+                if (item == null) return;
-                    return;
                 // Move item into observable collection
                 // (this will be automatically reflected to lstView.ItemsSource)
                 e.Effects = DragDropEffects.Move;

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml

@@ -1,11 +1,11 @@
-<reactiveui:ReactiveWindow
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingRuleDetailsSetting}"

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs

@@ -1,6 +1,6 @@
+using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
-using ReactiveUI;
 
 namespace v2rayN.Views
 {

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml

@@ -1,11 +1,11 @@
-<reactiveui:ReactiveWindow
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs

@@ -1,7 +1,7 @@
+using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
-using ReactiveUI;
 
 namespace v2rayN.Views
 {
@@ -89,8 +89,7 @@ namespace v2rayN.Views
 
                 case EViewAction.RoutingRuleDetailsWindow:
 
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     return (new RoutingRuleDetailsWindow((RulesItem)obj)).ShowDialog() ?? false;
 
                 case EViewAction.ImportRulesFromFile:
@@ -103,8 +102,7 @@ namespace v2rayN.Views
                     break;
 
                 case EViewAction.SetClipboardData:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     WindowsUtils.SetClipboardData((string)obj);
                     break;
 

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs

@@ -1,7 +1,7 @@
+using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
-using ReactiveUI;
 
 namespace v2rayN.Views
 {
@@ -72,8 +72,7 @@ namespace v2rayN.Views
 
                 case EViewAction.RoutingRuleSettingWindow:
 
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     return (new RoutingRuleSettingWindow((RoutingItem)obj)).ShowDialog() ?? false;
             }
             return await Task.FromResult(true);

v2rayN/v2rayN/Views/StatusBarView.xaml.cs

@@ -1,9 +1,9 @@
+using ReactiveUI;
+using Splat;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
-using ReactiveUI;
-using Splat;
 using v2rayN.Handler;
 
 namespace v2rayN.Views
@@ -77,8 +77,7 @@ namespace v2rayN.Views
             switch (action)
             {
                 case EViewAction.DispatcherServerAvailability:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     Application.Current?.Dispatcher.Invoke((() =>
                     {
                         ViewModel?.TestServerAvailabilityResult((string)obj);
@@ -99,10 +98,8 @@ namespace v2rayN.Views
                         Application.Current.MainWindow.Icon = WindowsHandler.Instance.GetAppIcon(_config);
                     }), DispatcherPriority.Normal);
                     break;
-
                 case EViewAction.SetClipboardData:
-                    if (obj is null)
+                    if (obj is null) return false;
-                        return false;
                     WindowsUtils.SetClipboardData((string)obj);
                     break;
             }
@@ -113,8 +110,7 @@ namespace v2rayN.Views
         {
             tbNotify.Dispose();
             var service = Locator.Current.GetService<MainWindowViewModel>();
-            if (service != null)
+            if (service != null) await service.MyAppExitAsync(false);
-                await service.MyAppExitAsync(false);
         }
 
         private void txtRunningInfoDisplay_MouseDoubleClick(object sender, MouseButtonEventArgs e)