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

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

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

@@ -220,7 +220,10 @@ namespace v2rayN.Desktop.Views
 
         private void lstProfiles_SelectionChanged(object? sender, SelectionChangedEventArgs e)
         {
-            ViewModel.SelectedProfiles = lstProfiles.SelectedItems.Cast<ProfileItemModel>().ToList();
+            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

@@ -85,12 +85,18 @@ namespace v2rayN.Desktop.Views
 
         private void ClbProtocol_SelectionChanged(object? sender, SelectionChangedEventArgs e)
         {
-            ViewModel.ProtocolItems = clbProtocol.SelectedItems.Cast<string>().ToList();
+            if (ViewModel != null)
+            {
+                ViewModel.ProtocolItems = clbProtocol.SelectedItems.Cast<string>().ToList();
+            }
         }
 
         private void ClbInboundTag_SelectionChanged(object? sender, SelectionChangedEventArgs e)
         {
-            ViewModel.InboundTagItems = clbInboundTag.SelectedItems.Cast<string>().ToList();
+            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

@@ -167,7 +167,10 @@ namespace v2rayN.Desktop.Views
 
         private void lstRules_SelectionChanged(object? sender, SelectionChangedEventArgs e)
         {
-            ViewModel.SelectedSources = lstRules.SelectedItems.Cast<RulesItemModel>().ToList();
+            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

@@ -108,7 +108,10 @@ namespace v2rayN.Desktop.Views
 
         private void lstRoutings_SelectionChanged(object? sender, SelectionChangedEventArgs e)
         {
-            ViewModel.SelectedSources = lstRoutings.SelectedItems.Cast<RoutingItemModel>().ToList();
+            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

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

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

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

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -201,7 +201,10 @@ namespace v2rayN.Views
 
         private void lstProfiles_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
         {
-            ViewModel.SelectedProfiles = lstProfiles.SelectedItems.Cast<ProfileItemModel>().ToList();
+            if (ViewModel != null)
+            {
+                ViewModel.SelectedProfiles = lstProfiles.SelectedItems.Cast<ProfileItemModel>().ToList();
+            }
         }
 
         private void LstProfiles_LoadingRow(object? sender, DataGridRowEventArgs e)

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs

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

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs

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

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs

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

v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs

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