Optimization and improvement, using event subscribers

v2rayN/ServiceLib/Handler/AppEvents.cs

@@ -7,6 +7,8 @@ public static class AppEvents
 {
     public static readonly Subject<Unit> ProfilesRefreshRequested = new();
 
+    public static readonly Subject<Unit> SubscriptionsRefreshRequested = new();
+
     public static readonly Subject<string> SendSnackMsgRequested = new();
 
     public static readonly Subject<string> SendMsgViewRequested = new();
@@ -18,4 +20,6 @@ public static class AppEvents
     public static readonly Subject<Unit> AdjustMainLvColWidthRequested = new();
 
     public static readonly Subject<ServerSpeedItem> DispatcherStatisticsRequested = new();
+
+    public static readonly Subject<string> SetDefaultServerRequested = new();
 }

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -301,7 +301,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     private void RefreshSubscriptions()
     {
-        Locator.Current.GetService<ProfilesViewModel>()?.RefreshSubscriptions();
+        AppEvents.SubscriptionsRefreshRequested.OnNext(Unit.Default);
     }
 
     #endregion Servers && Groups

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -240,11 +240,21 @@ public class ProfilesViewModel : MyReactiveObject
             .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async _ => await RefreshServersBiz());
 
+        AppEvents.SubscriptionsRefreshRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async _ => await RefreshSubscriptions());
+
         AppEvents.DispatcherStatisticsRequested
             .AsObservable()
             .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async result => await UpdateStatistics(result));
 
+        AppEvents.SetDefaultServerRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async indexId => await SetDefaultServer(indexId));
+
         #endregion AppEvents
 
         _ = Init();
@@ -380,7 +390,7 @@ public class ProfilesViewModel : MyReactiveObject
         await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);
     }
 
-    public async Task RefreshSubscriptions()
+    private async Task RefreshSubscriptions()
     {
         SubItems.Clear();
 
@@ -565,7 +575,7 @@ public class ProfilesViewModel : MyReactiveObject
         await SetDefaultServer(SelectedProfile.IndexId);
     }
 
-    public async Task SetDefaultServer(string? indexId)
+    private async Task SetDefaultServer(string? indexId)
     {
         if (indexId.IsNullOrEmpty())
         {

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -329,7 +329,7 @@ public class StatusBarViewModel : MyReactiveObject
         {
             return;
         }
-        Locator.Current.GetService<ProfilesViewModel>()?.SetDefaultServer(SelectedServer.ID);
+        AppEvents.SetDefaultServerRequested.OnNext(SelectedServer.ID);        
     }
 
     public async Task TestServerAvailability()