v2rayN/ServiceLib/Global.cs

@@ -69,7 +69,7 @@ namespace ServiceLib
         public const int MinFontSize = 8;
         public const string RebootAs = "rebootas";
         public const string AvaAssets = "avares://v2rayN/Assets/";
-        public const string LocalAppData = "V2RAYN_LOCAL_APPLICATION_DATA_V2";
+        public const string LocalAppData = "V2RAYN_LOCAL_APPLICATION_DATA";
         public const string V2RayLocalAsset = "V2RAY_LOCATION_ASSET";
         public const string XrayLocalAsset = "XRAY_LOCATION_ASSET";
         public const int SpeedTestPageSize = 1000;

v2rayN/ServiceLib/Services/DownloadService.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Net;
 using System.Net.Http.Headers;
 using System.Net.Sockets;
@@ -222,20 +222,20 @@ namespace ServiceLib.Services
 
         public async Task<int> RunAvailabilityCheck(IWebProxy? webProxy)
         {
-            var responseTime = -1;
             try
             {
                 webProxy ??= await GetWebProxy(true);
-                var config = AppHandler.Instance.Config;
 
-                for (var i = 0; i < 2; i++)
+                try
                 {
-                    responseTime = await GetRealPingTime(config.SpeedTestItem.SpeedPingTestUrl, webProxy, 10);
+                    var config = AppHandler.Instance.Config;
-                    if (responseTime > 0)
+                    var responseTime = await GetRealPingTime(config.SpeedTestItem.SpeedPingTestUrl, webProxy, 10);
-                    {
+                    return responseTime;
-                        break;
                 }
-                    await Task.Delay(500);
+                catch (Exception ex)
+                {
+                    Logging.SaveLog(_tag, ex);
+                    return -1;
                 }
             }
             catch (Exception ex)
@@ -243,7 +243,6 @@ namespace ServiceLib.Services
                 Logging.SaveLog(_tag, ex);
                 return -1;
             }
-            return responseTime;
         }
 
         public async Task<int> GetRealPingTime(string url, IWebProxy? webProxy, int downloadTimeout)

v2rayN/ServiceLib/ViewModels/GlobalHotkeySettingViewModel.cs

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

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -316,8 +316,6 @@ namespace ServiceLib.ViewModels
                 return;
             }
 
-            _updateView?.Invoke(EViewAction.DispatcherServerAvailability, ResUI.Speedtesting);
-
             var msg = await (new UpdateService()).RunAvailabilityCheck();
 
             NoticeHandler.Instance.SendMessageEx(msg);

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

@@ -247,10 +247,7 @@ namespace v2rayN.Desktop.Views
 
                 case EViewAction.AddServerViaClipboard:
                     var clipboardData = await AvaUtils.GetClipboardData(this);
-                    if (ViewModel != null)
+                    ViewModel?.AddServerViaClipboardAsync(clipboardData);
-                    {
-                        await ViewModel.AddServerViaClipboardAsync(clipboardData);
-                    }
                     break;
 
                 case EViewAction.AdjustMainLvColWidth:
@@ -297,10 +294,7 @@ namespace v2rayN.Desktop.Views
                     break;
 
                 case WindowCloseReason.ApplicationShutdown or WindowCloseReason.OSShutdown:
-                    if (ViewModel != null)
+                    await ViewModel?.MyAppExitAsync(true);
-                    {
-                        await ViewModel.MyAppExitAsync(true);
-                    }
                     break;
             }
 
@@ -315,10 +309,7 @@ namespace v2rayN.Desktop.Views
                 {
                     case Key.V:
                         var clipboardData = await AvaUtils.GetClipboardData(this);
-                        if (ViewModel != null)
+                        ViewModel?.AddServerViaClipboardAsync(clipboardData);
-                        {
-                            await ViewModel.AddServerViaClipboardAsync(clipboardData);
-                        }
                         break;
 
                     case Key.S:
@@ -367,11 +358,7 @@ namespace v2rayN.Desktop.Views
             {
                 return;
             }
-
+            await ViewModel?.ScanImageResult(fileName);
-            if (ViewModel != null)
-            {
-                await ViewModel.ScanImageResult(fileName);
-            }
         }
 
         private void MenuCheckUpdate_Click(object? sender, RoutedEventArgs e)
@@ -395,10 +382,8 @@ namespace v2rayN.Desktop.Views
 
             _blCloseByUser = true;
             StorageUI();
-            if (ViewModel != null)
+
-            {
+            await ViewModel?.MyAppExitAsync(false);
-                await ViewModel.MyAppExitAsync(false);
-            }
         }
 
         #endregion Event

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

@@ -247,11 +247,8 @@ namespace v2rayN.Desktop.Views
         }
 
         private void ClbdestOverride_SelectionChanged(object? sender, SelectionChangedEventArgs e)
-        {
-            if (ViewModel != null)
         {
             ViewModel.destOverride = clbdestOverride.SelectedItems.Cast<string>().ToList();
         }
     }
-    }
 }

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

@@ -102,16 +102,11 @@ namespace v2rayN.Desktop.Views
         private async void LstProfiles_Sorting(object? sender, DataGridColumnEventArgs e)
         {
             e.Handled = true;
-
+            await ViewModel?.SortServer(e.Column.Tag.ToString());
-            if (ViewModel != null && e.Column?.Tag?.ToString() != null)
-            {
-                await ViewModel.SortServer(e.Column.Tag.ToString());
-            }
-
             e.Handled = false;
         }
 
-        #region Event
+        //#region Event
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
         {
@@ -184,9 +179,7 @@ namespace v2rayN.Desktop.Views
 
                 case EViewAction.DispatcherRefreshServersBiz:
                     Dispatcher.UIThread.Post(() =>
-                    {
+                        ViewModel?.RefreshServersBiz(),
-                        _ = RefreshServersBiz();
-                    },
                     DispatcherPriority.Default);
                     break;
             }
@@ -205,26 +198,10 @@ namespace v2rayN.Desktop.Views
             await DialogHost.Show(dialog);
         }
 
-        public async Task RefreshServersBiz()
-        {
-            if (ViewModel != null)
-            {
-                await ViewModel.RefreshServersBiz();
-            }
-
-            if (lstProfiles.SelectedIndex > 0)
-            {
-                lstProfiles.ScrollIntoView(lstProfiles.SelectedItem, null);
-            }
-        }
-
         private void lstProfiles_SelectionChanged(object? sender, SelectionChangedEventArgs e)
-        {
-            if (ViewModel != null)
         {
             ViewModel.SelectedProfiles = lstProfiles.SelectedItems.Cast<ProfileItemModel>().ToList();
         }
-        }
 
         private void LstProfiles_DoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
         {
@@ -356,9 +333,9 @@ namespace v2rayN.Desktop.Views
             }
         }
 
-        #endregion Event
+        //#endregion Event
 
-        #region UI
+        //#region UI
 
         private void RestoreUI()
         {
@@ -411,9 +388,9 @@ namespace v2rayN.Desktop.Views
             _config.UiItem.MainColumnItem = lvColumnItem;
         }
 
-        #endregion UI
+        //#endregion UI
 
-        #region Drag and Drop
+        //#region Drag and Drop
 
         //private Point startPoint = new();
         //private int startIndex = -1;
@@ -503,6 +480,6 @@ namespace v2rayN.Desktop.Views
         //    }
         //}
 
-        #endregion Drag and Drop
+        //#endregion Drag and Drop
     }
 }

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

@@ -84,20 +84,14 @@ namespace v2rayN.Desktop.Views
         }
 
         private void ClbProtocol_SelectionChanged(object? sender, SelectionChangedEventArgs e)
-        {
-            if (ViewModel != null)
         {
             ViewModel.ProtocolItems = clbProtocol.SelectedItems.Cast<string>().ToList();
         }
-        }
 
         private void ClbInboundTag_SelectionChanged(object? sender, SelectionChangedEventArgs e)
-        {
-            if (ViewModel != null)
         {
             ViewModel.InboundTagItems = clbInboundTag.SelectedItems.Cast<string>().ToList();
         }
-        }
 
         private void linkRuleobjectDoc_Click(object? sender, RoutedEventArgs e)
         {

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

@@ -166,12 +166,9 @@ namespace v2rayN.Desktop.Views
         }
 
         private void lstRules_SelectionChanged(object? sender, SelectionChangedEventArgs e)
-        {
-            if (ViewModel != null)
         {
             ViewModel.SelectedSources = lstRules.SelectedItems.Cast<RulesItemModel>().ToList();
         }
-        }
 
         private void LstRules_DoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
         {

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

@@ -107,12 +107,9 @@ namespace v2rayN.Desktop.Views
         }
 
         private void lstRoutings_SelectionChanged(object? sender, SelectionChangedEventArgs e)
-        {
-            if (ViewModel != null)
         {
             ViewModel.SelectedSources = lstRoutings.SelectedItems.Cast<RoutingItemModel>().ToList();
         }
-        }
 
         private void LstRoutings_DoubleTapped(object? sender, TappedEventArgs e)
         {

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

@@ -83,12 +83,9 @@ namespace v2rayN.Desktop.Views
         }
 
         private void LstSubscription_SelectionChanged(object? sender, SelectionChangedEventArgs e)
-        {
-            if (ViewModel != null)
         {
             ViewModel.SelectedSources = lstSubscription.SelectedItems.Cast<SubItem>().ToList();
         }
-        }
 
         private void menuClose_Click(object? sender, RoutedEventArgs e)
         {

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -258,11 +258,8 @@ namespace v2rayN.Views
         }
 
         private void ClbdestOverride_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
-        {
-            if (ViewModel != null)
         {
             ViewModel.destOverride = clbdestOverride.SelectedItems.Cast<string>().ToList();
         }
     }
-    }
 }

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -166,7 +166,7 @@ namespace v2rayN.Views
                 case EViewAction.DispatcherRefreshServersBiz:
                     Application.Current?.Dispatcher.Invoke((() =>
                     {
-                        _ = RefreshServersBiz();
+                        ViewModel?.RefreshServersBiz();
                     }), DispatcherPriority.Normal);
                     break;
             }
@@ -186,26 +186,10 @@ namespace v2rayN.Views
             await DialogHost.Show(dialog, "RootDialog");
         }
 
-        public async Task RefreshServersBiz()
-        {
-            if (ViewModel != null)
-            {
-                await ViewModel.RefreshServersBiz();
-            }
-
-            if (lstProfiles.SelectedIndex > 0)
-            {
-                lstProfiles.ScrollIntoView(lstProfiles.SelectedItem, null);
-            }
-        }
-
         private void lstProfiles_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
-        {
-            if (ViewModel != null)
         {
             ViewModel.SelectedProfiles = lstProfiles.SelectedItems.Cast<ProfileItemModel>().ToList();
         }
-        }
 
         private void LstProfiles_LoadingRow(object? sender, DataGridRowEventArgs e)
         {

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs

@@ -78,20 +78,14 @@ namespace v2rayN.Views
         }
 
         private void ClbProtocol_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
-        {
-            if (ViewModel != null)
         {
             ViewModel.ProtocolItems = clbProtocol.SelectedItems.Cast<string>().ToList();
         }
-        }
 
         private void ClbInboundTag_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
-        {
-            if (ViewModel != null)
         {
             ViewModel.InboundTagItems = clbInboundTag.SelectedItems.Cast<string>().ToList();
         }
-        }
 
         private void linkRuleobjectDoc_Click(object sender, RoutedEventArgs e)
         {

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs

@@ -161,12 +161,9 @@ namespace v2rayN.Views
         }
 
         private void lstRules_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
-        {
-            if (ViewModel != null)
         {
             ViewModel.SelectedSources = lstRules.SelectedItems.Cast<RulesItemModel>().ToList();
         }
-        }
 
         private void LstRules_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs

@@ -112,12 +112,9 @@ namespace v2rayN.Views
         }
 
         private void lstRoutings_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
-        {
-            if (ViewModel != null)
         {
             ViewModel.SelectedSources = lstRoutings.SelectedItems.Cast<RoutingItemModel>().ToList();
         }
-        }
 
         private void LstRoutings_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {

v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs

@@ -93,12 +93,9 @@ namespace v2rayN.Views
         }
 
         private void LstSubscription_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
-        {
-            if (ViewModel != null)
         {
             ViewModel.SelectedSources = lstSubscription.SelectedItems.Cast<SubItem>().ToList();
         }
-        }
 
         private void menuClose_Click(object sender, System.Windows.RoutedEventArgs e)
         {