Fixes an issue for which changes to Bundles are not saved (#5439)

Author: gave92

Diff for: Files/Models/Settings/BaseJsonSettingsModel.cs

@@ -173,42 +173,6 @@ protected virtual bool Set<TValue>(TValue value, [CallerMemberName] string prope
         {
             try
             {
-                // Check if caching is enabled
-                if (isCachingEnabled)
-                {
-                    // If cache contains the setting...
-                    if (settingsCache.ContainsKey(propertyName))
-                    {
-                        TValue settingValue;
-
-                        // Get the object
-                        object settingObject = settingsCache[propertyName];
-
-                        // Check if it's a JToken object
-                        if (settingObject is JToken jtoken)
-                        {
-                            // Get the value from JToken
-                            settingValue = jtoken.ToObject<TValue>();
-                        }
-                        else
-                        {
-                            // Otherwise, it is TValue, get the value
-                            settingValue = (TValue)settingObject;
-                        }
-
-                        // Compare the setting and the new value
-                        if (EqualityComparer<TValue>.Default.Equals(value, settingValue))
-                        {
-                            // Both are equal meaning the cache doesn't have to be reloaded, return
-                            return false;
-                        }
-
-                        // The values aren't equal, continue, to update the file and cache
-                    }
-
-                    // The value doesn't exist, continue, to update the file and cache
-                }
-
                 // If cache doesn't contain the setting...
                 if (!settingsCache.ContainsKey(propertyName))
                 {

Diff for: Files/ViewModels/ItemViewModel.cs

@@ -1127,6 +1127,7 @@ private async void RapidAddItemsToCollectionAsync(string path, string previousDi
             }
             finally
             {
+                DirectoryInfoUpdated?.Invoke(this, EventArgs.Empty); // Make sure item count is updated
                 enumFolderSemaphore.Release();
                 itemLoadEvent.Set();
             }

Diff for: Files/Views/ColumnShellPage.xaml.cs

@@ -182,8 +182,6 @@ public ColumnShellPage()
             SystemNavigationManager.GetForCurrentView().BackRequested += ColumnShellPage_BackRequested;
 
             App.DrivesManager.PropertyChanged += DrivesManager_PropertyChanged;
-
-            AppServiceConnectionHelper.ConnectionChanged += AppServiceConnectionHelper_ConnectionChanged;
         }
 
         void InitToolbarCommands()
@@ -494,8 +492,6 @@ private void OnNavigationParamsChanged()
         public static readonly DependencyProperty NavParamsProperty =
             DependencyProperty.Register("NavParams", typeof(string), typeof(ColumnShellPage), new PropertyMetadata(null));
 
-        public NamedPipeAsAppServiceConnection ServiceConnection { get; private set; }
-
         private TabItemArguments tabItemArguments;
 
         public TabItemArguments TabItemArguments
@@ -535,7 +531,7 @@ private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        private async void Page_Loaded(object sender, RoutedEventArgs e)
+        private void Page_Loaded(object sender, RoutedEventArgs e)
         {
             FilesystemViewModel = new ItemViewModel(InstanceViewModel?.FolderSettings);
             FilesystemViewModel.WorkingDirectoryModified += ViewModel_WorkingDirectoryModified;
@@ -544,7 +540,6 @@ private async void Page_Loaded(object sender, RoutedEventArgs e)
             FilesystemViewModel.PageTypeUpdated += FilesystemViewModel_PageTypeUpdated;
             FilesystemViewModel.OnSelectionRequestedEvent += FilesystemViewModel_OnSelectionRequestedEvent;
             OnNavigationParamsChanged();
-            ServiceConnection = await AppServiceConnectionHelper.Instance;
             this.Loaded -= Page_Loaded;
         }
 
@@ -803,12 +798,6 @@ public void Dispose()
                 FilesystemViewModel.OnSelectionRequestedEvent -= FilesystemViewModel_OnSelectionRequestedEvent;
                 FilesystemViewModel.Dispose();
             }
-            AppServiceConnectionHelper.ConnectionChanged -= AppServiceConnectionHelper_ConnectionChanged;
-        }
-
-        private async void AppServiceConnectionHelper_ConnectionChanged(object sender, Task<NamedPipeAsAppServiceConnection> e)
-        {
-            ServiceConnection = await e;
         }
 
         private void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoadStatusChangedEventArgs e)

Diff for: Files/Views/ModernShellPage.xaml.cs

@@ -188,8 +188,6 @@ public ModernShellPage()
             SystemNavigationManager.GetForCurrentView().BackRequested += ModernShellPage_BackRequested;
 
             App.DrivesManager.PropertyChanged += DrivesManager_PropertyChanged;
-
-            AppServiceConnectionHelper.ConnectionChanged += AppServiceConnectionHelper_ConnectionChanged;
         }
 
         void InitToolbarCommands()
@@ -522,8 +520,6 @@ private void OnNavigationParamsChanged()
         public static readonly DependencyProperty NavParamsProperty =
             DependencyProperty.Register("NavParams", typeof(string), typeof(ModernShellPage), new PropertyMetadata(null));
 
-        public NamedPipeAsAppServiceConnection ServiceConnection { get; private set; }
-
         private TabItemArguments tabItemArguments;
 
         public TabItemArguments TabItemArguments
@@ -563,7 +559,7 @@ private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        private async void Page_Loaded(object sender, RoutedEventArgs e)
+        private void Page_Loaded(object sender, RoutedEventArgs e)
         {
             FilesystemViewModel = new ItemViewModel(InstanceViewModel?.FolderSettings);
             FilesystemViewModel.WorkingDirectoryModified += ViewModel_WorkingDirectoryModified;
@@ -572,7 +568,6 @@ private async void Page_Loaded(object sender, RoutedEventArgs e)
             FilesystemViewModel.PageTypeUpdated += FilesystemViewModel_PageTypeUpdated;
             FilesystemViewModel.OnSelectionRequestedEvent += FilesystemViewModel_OnSelectionRequestedEvent;
             OnNavigationParamsChanged();
-            ServiceConnection = await AppServiceConnectionHelper.Instance;
             this.Loaded -= Page_Loaded;
         }
 
@@ -945,13 +940,6 @@ public void Dispose()
             {
                 disposableContent?.Dispose();
             }
-
-            AppServiceConnectionHelper.ConnectionChanged -= AppServiceConnectionHelper_ConnectionChanged;
-        }
-
-        private async void AppServiceConnectionHelper_ConnectionChanged(object sender, Task<NamedPipeAsAppServiceConnection> e)
-        {
-            ServiceConnection = await e;
         }
 
         private void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoadStatusChangedEventArgs e)