Optimize and improve code

v2rayN/ServiceLib/ViewModels/GlobalHotkeySettingViewModel.cs

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

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

@@ -247,8 +247,11 @@ 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

@@ -219,9 +219,12 @@ namespace v2rayN.Desktop.Views
         }
 
         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)
         {

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

@@ -84,14 +84,20 @@ 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,9 +166,12 @@ 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,9 +107,12 @@ 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,9 +83,12 @@ 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,8 +258,11 @@ 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

@@ -200,9 +200,12 @@ namespace v2rayN.Views
         }
 
         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,14 +78,20 @@ 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,9 +161,12 @@ 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,9 +112,12 @@ 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,9 +93,12 @@ 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)
         {