Refresh tags and bundles on import

gave92 · gave92 · commit bdd031c901b3 · 2021-11-25T03:25:03.000+01:00
Refresh widgets on import
Fix duplicate favorites section
diff --git a/Files/DataModels/SidebarPinnedModel.cs b/Files/DataModels/SidebarPinnedModel.cs
@@ -28,7 +28,7 @@ public class SidebarPinnedModel
 
         private SidebarPinnedController controller;
 
-        private LocationItem favoriteSection, homeSection;
+        private LocationItem favoriteSection;
 
         [JsonIgnore]
         public MainViewModel MainViewModel => App.MainViewModel;
@@ -43,6 +43,7 @@ public void SetController(SidebarPinnedController controller)
 
         public SidebarPinnedModel()
         {
+            favoriteSection = SidebarControl.SideBarItems.FirstOrDefault(x => x.Text == "SidebarFavorites".GetLocalized()) as LocationItem;
         }
 
         /// <summary>
@@ -282,7 +283,7 @@ public async Task AddItemToSidebarAsync(string path)
                     }
                 }
 
-                if (!favoriteSection.ChildItems.Contains(locationItem))
+                if (!favoriteSection.ChildItems.Any(x => x.Path == locationItem.Path))
                 {
                     await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => favoriteSection.ChildItems.Insert(insertIndex, locationItem));
                 }
@@ -303,7 +304,7 @@ private void AddItemToSidebarAsync(LocationItem section)
             var lastItem = favoriteSection.ChildItems.LastOrDefault(x => x.ItemType == NavigationControlItemType.Location && !x.Path.Equals(CommonPaths.RecycleBinPath));
             int insertIndex = lastItem != null ? favoriteSection.ChildItems.IndexOf(lastItem) + 1 : 0;
 
-            if (!favoriteSection.ChildItems.Contains(section))
+            if (!favoriteSection.ChildItems.Any(x => x.Section == section.Section))
             {
                 favoriteSection.ChildItems.Insert(insertIndex, section);
             }
@@ -322,7 +323,7 @@ public async Task AddAllItemsToSidebar()
             await SidebarControl.SideBarItemsSemaphore.WaitAsync();
             try
             {
-                homeSection = new LocationItem()
+                var homeSection = new LocationItem()
                 {
                     Text = "SidebarHome".GetLocalized(),
                     Section = SectionType.Home,
@@ -332,7 +333,7 @@ public async Task AddAllItemsToSidebar()
                     Path = "Home".GetLocalized(),
                     ChildItems = new ObservableCollection<INavigationControlItem>()
                 };
-                favoriteSection = new LocationItem()
+                favoriteSection ??= new LocationItem()
                 {
                     Text = "SidebarFavorites".GetLocalized(),
                     Section = SectionType.Favorites,
@@ -347,7 +348,7 @@ public async Task AddAllItemsToSidebar()
                     AddItemToSidebarAsync(homeSection);
                 }
 
-                if (!SidebarControl.SideBarItems.Contains(favoriteSection))
+                if (!SidebarControl.SideBarItems.Any(x => x.Text == "SidebarFavorites".GetLocalized()))
                 {
                     SidebarControl.SideBarItems.BeginBulkOperation();
                     var index = 0; // First section
diff --git a/Files/Helpers/RegistryToJsonSettingsMerger.cs b/Files/Helpers/RegistryToJsonSettingsMerger.cs
@@ -45,7 +45,7 @@ public static void MergeSettings()
                     userSettingsService.MultitaskingSettingsService.AlwaysOpenDualPaneInNewTab = appSettings.Get(false, "AlwaysOpenDualPaneInNewTab");
 
                     // Widgets
-                    userSettingsService.WidgetsSettingsService.ShowFoldersWidget = appSettings.Get(true, "ShowFolderWidgetWidget");
+                    userSettingsService.WidgetsSettingsService.ShowFoldersWidget = appSettings.Get(true, "ShowFoldersWidget");
                     userSettingsService.WidgetsSettingsService.ShowRecentFilesWidget = appSettings.Get(true, "ShowRecentFilesWidget");
                     userSettingsService.WidgetsSettingsService.ShowDrivesWidget = appSettings.Get(true, "ShowDrivesWidget");
                     userSettingsService.WidgetsSettingsService.ShowBundlesWidget = appSettings.Get(false, "ShowBundlesWidget");
diff --git a/Files/Services/IBundlesSettingsService.cs b/Files/Services/IBundlesSettingsService.cs
@@ -1,12 +1,11 @@
-﻿using Files.EventArguments;
-using System;
+﻿using System;
 using System.Collections.Generic;
 
 namespace Files.Services
 {
     public interface IBundlesSettingsService
     {
-        event EventHandler<SettingChangedEventArgs> OnSettingChangedEvent;
+        event EventHandler OnSettingImportedEvent;
 
         bool FlushSettings();
 
diff --git a/Files/Services/IFileTagsSettingsService.cs b/Files/Services/IFileTagsSettingsService.cs
@@ -1,13 +1,12 @@
-﻿using Files.EventArguments;
-using Files.Filesystem;
+﻿using Files.Filesystem;
 using System;
 using System.Collections.Generic;
 
 namespace Files.Services
 {
     public interface IFileTagsSettingsService
     {
-        event EventHandler<SettingChangedEventArgs> OnSettingChangedEvent;
+        event EventHandler OnSettingImportedEvent;
 
         IList<FileTag> FileTagList { get; set; }
 
diff --git a/Files/Services/Implementation/BundlesSettingsService.cs b/Files/Services/Implementation/BundlesSettingsService.cs
@@ -1,12 +1,15 @@
 ﻿using Files.Extensions;
 using Files.Models.JsonSettings;
+using System;
 using System.Collections.Generic;
 using Windows.Storage;
 
 namespace Files.Services.Implementation
 {
     public sealed class BundlesSettingsService : BaseObservableJsonSettingsModel, IBundlesSettingsService
     {
+        public event EventHandler OnSettingImportedEvent;
+
         public BundlesSettingsService()
             : base(System.IO.Path.Combine(ApplicationData.Current.LocalFolder.Path, Constants.LocalSettings.SettingsFolderName, Constants.LocalSettings.BundlesSettingsFileName),
                   isCachingEnabled: true)
@@ -33,6 +36,7 @@ public override bool ImportSettings(object import)
             if (SavedBundles != null)
             {
                 FlushSettings();
+                OnSettingImportedEvent?.Invoke(this, null);
                 return true;
             }
 
diff --git a/Files/Services/Implementation/FileTagsSettingsService.cs b/Files/Services/Implementation/FileTagsSettingsService.cs
@@ -10,6 +10,8 @@ namespace Files.Services.Implementation
 {
     public sealed class FileTagsSettingsService : BaseJsonSettingsModel, IFileTagsSettingsService
     {
+        public event EventHandler OnSettingImportedEvent;
+
         private static readonly List<FileTag> s_defaultFileTags = new List<FileTag>()
         {
             new FileTag("Blue", "#0072BD"),
@@ -68,6 +70,7 @@ public override bool ImportSettings(object import)
             if (FileTagList != null)
             {
                 FlushSettings();
+                OnSettingImportedEvent?.Invoke(this, null);
                 return true;
             }
 
diff --git a/Files/UserControls/InnerNavigationToolbar.xaml b/Files/UserControls/InnerNavigationToolbar.xaml
@@ -231,7 +231,7 @@
                                 <ToggleSwitch
                                     x:Uid="NavToolbarShowFolderWidget"
                                     Header="Show Folders widget"
-                                    IsOn="{x:Bind ViewModel.ShowFolderWidgetWidget, Mode=TwoWay}" />
+                                    IsOn="{x:Bind ViewModel.ShowFoldersWidget, Mode=TwoWay}" />
                                 <ToggleSwitch
                                     x:Uid="NavToolbarShowDrivesWidget"
                                     Header="Show Drives widget"
diff --git a/Files/ViewModels/ItemViewModel.cs b/Files/ViewModels/ItemViewModel.cs
@@ -360,18 +360,19 @@ public ItemViewModel(FolderSettingsViewModel folderSettingsViewModel)
             shouldDisplayFileExtensions =  UserSettingsService.PreferencesSettingsService.ShowFileExtensions;
 
             UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;
-            FileTagsSettingsService.OnSettingChangedEvent += FileTagsSettingsService_OnSettingChangedEvent;
+            FileTagsSettingsService.OnSettingImportedEvent += FileTagsSettingsService_OnSettingImportedEvent;
             AppServiceConnectionHelper.ConnectionChanged += AppServiceConnectionHelper_ConnectionChanged;
         }
 
-        private void FileTagsSettingsService_OnSettingChangedEvent(object sender, SettingChangedEventArgs e)
+        private async void FileTagsSettingsService_OnSettingImportedEvent(object sender, EventArgs e)
         {
-            switch (e.settingName)
+            await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() =>
             {
-                case nameof(FileTagsSettingsService.FileTagList):
-                    // Reload tags
-                    break;
-            }
+                if (WorkingDirectory != "Home".GetLocalized())
+                {
+                    RefreshItems(null);
+                }
+            });
         }
 
         private async void UserSettingsService_OnSettingChangedEvent(object sender, SettingChangedEventArgs e)
@@ -2263,7 +2264,7 @@ public void Dispose()
                 Connection.RequestReceived -= Connection_RequestReceived;
             }
             UserSettingsService.OnSettingChangedEvent -= UserSettingsService_OnSettingChangedEvent;
-            FileTagsSettingsService.OnSettingChangedEvent -= FileTagsSettingsService_OnSettingChangedEvent;
+            FileTagsSettingsService.OnSettingImportedEvent -= FileTagsSettingsService_OnSettingImportedEvent;
             AppServiceConnectionHelper.ConnectionChanged -= AppServiceConnectionHelper_ConnectionChanged;
             DefaultIcons.Clear();
         }
diff --git a/Files/ViewModels/NavToolbarViewModel.cs b/Files/ViewModels/NavToolbarViewModel.cs
@@ -328,6 +328,21 @@ public NavToolbarViewModel()
             dragOverTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
             SearchBox.SuggestionChosen += SearchRegion_SuggestionChosen;
             SearchBox.Escaped += SearchRegion_Escaped;
+            UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;
+        }
+
+        private void UserSettingsService_OnSettingChangedEvent(object sender, EventArguments.SettingChangedEventArgs e)
+        {
+            switch (e.settingName)
+            {
+                case nameof(ShowFoldersWidget):
+                case nameof(ShowDrivesWidget):
+                case nameof(ShowBundlesWidget):
+                case nameof(ShowRecentFilesWidget):
+                    RefreshWidgetsRequested?.Invoke(this, EventArgs.Empty);
+                    OnPropertyChanged(e.settingName);
+                    break;
+            }
         }
 
         private DispatcherQueueTimer dragOverTimer;
@@ -642,7 +657,7 @@ public void UpdateAdditionnalActions()
 
         #region WidgetsPage Widgets
 
-        public bool ShowFolderWidgetWidget
+        public bool ShowFoldersWidget
         {
             get => UserSettingsService.WidgetsSettingsService.ShowFoldersWidget;
             set
@@ -1050,6 +1065,7 @@ public void Dispose()
         {
             SearchBox.SuggestionChosen -= SearchRegion_SuggestionChosen;
             SearchBox.Escaped -= SearchRegion_Escaped;
+            UserSettingsService.OnSettingChangedEvent -= UserSettingsService_OnSettingChangedEvent;
 
             InstanceViewModel.FolderSettings.SortDirectionPreferenceUpdated -= FolderSettings_SortDirectionPreferenceUpdated;
             InstanceViewModel.FolderSettings.SortOptionPreferenceUpdated -= FolderSettings_SortOptionPreferenceUpdated;
diff --git a/Files/ViewModels/Widgets/Bundles/BundlesViewModel.cs b/Files/ViewModels/Widgets/Bundles/BundlesViewModel.cs
@@ -105,7 +105,7 @@ public BundlesViewModel()
             ImportBundlesCommand = new AsyncRelayCommand(ImportBundles);
             ExportBundlesCommand = new AsyncRelayCommand(ExportBundles);
 
-            BundlesSettingsService.OnSettingChangedEvent += BundlesSettingsService_OnSettingChangedEvent;
+            BundlesSettingsService.OnSettingImportedEvent += BundlesSettingsService_OnSettingImportedEvent;
         }
 
         #endregion Constructor
@@ -259,14 +259,9 @@ private async Task ExportBundles()
 
         #region Handlers
 
-        private async void BundlesSettingsService_OnSettingChangedEvent(object sender, EventArguments.SettingChangedEventArgs e)
+        private async void BundlesSettingsService_OnSettingImportedEvent(object sender, EventArgs e)
         {
-            switch (e.settingName)
-            {
-                case nameof(BundlesSettingsService.SavedBundles):
-                    await Load();
-                    break;
-            }
+            await Load();
         }
 
         private void OpenPathHandle(string path, FilesystemItemType itemType, bool openSilent, bool openViaApplicationPicker, IEnumerable<string> selectItems)
@@ -285,8 +280,6 @@ private void OpenPathInNewPaneHandle(string path)
         /// <param name="item"></param>
         private void NotifyItemRemovedHandle(BundleContainerViewModel item)
         {
-            BundlesSettingsService.OnSettingChangedEvent -= BundlesSettingsService_OnSettingChangedEvent;
-
             Items.Remove(item);
             item?.Dispose();
 
@@ -464,6 +457,7 @@ public void Dispose()
             }
 
             Items.CollectionChanged -= Items_CollectionChanged;
+            BundlesSettingsService.OnSettingImportedEvent -= BundlesSettingsService_OnSettingImportedEvent;
         }
 
         #endregion IDisposable

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class SidebarPinnedModel`
`28`	`28`
`29`	`29`	`private SidebarPinnedController controller;`
`30`	`30`
`31`		`- private LocationItem favoriteSection, homeSection;`
	`31`	`+ private LocationItem favoriteSection;`
`32`	`32`
`33`	`33`	`[JsonIgnore]`
`34`	`34`	`public MainViewModel MainViewModel => App.MainViewModel;`
`@@ -43,6 +43,7 @@ public void SetController(SidebarPinnedController controller)`
`43`	`43`
`44`	`44`	`public SidebarPinnedModel()`
`45`	`45`	`{`
	`46`	`+ favoriteSection = SidebarControl.SideBarItems.FirstOrDefault(x => x.Text == "SidebarFavorites".GetLocalized()) as LocationItem;`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`/// <summary>`
`@@ -282,7 +283,7 @@ public async Task AddItemToSidebarAsync(string path)`
`282`	`283`	`}`
`283`	`284`	`}`
`284`	`285`
`285`		`- if (!favoriteSection.ChildItems.Contains(locationItem))`
	`286`	`+ if (!favoriteSection.ChildItems.Any(x => x.Path == locationItem.Path))`
`286`	`287`	`{`
`287`	`288`	`await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => favoriteSection.ChildItems.Insert(insertIndex, locationItem));`
`288`	`289`	`}`
`@@ -303,7 +304,7 @@ private void AddItemToSidebarAsync(LocationItem section)`
`303`	`304`	`var lastItem = favoriteSection.ChildItems.LastOrDefault(x => x.ItemType == NavigationControlItemType.Location && !x.Path.Equals(CommonPaths.RecycleBinPath));`
`304`	`305`	`int insertIndex = lastItem != null ? favoriteSection.ChildItems.IndexOf(lastItem) + 1 : 0;`
`305`	`306`
`306`		`- if (!favoriteSection.ChildItems.Contains(section))`
	`307`	`+ if (!favoriteSection.ChildItems.Any(x => x.Section == section.Section))`
`307`	`308`	`{`
`308`	`309`	`favoriteSection.ChildItems.Insert(insertIndex, section);`
`309`	`310`	`}`
`@@ -322,7 +323,7 @@ public async Task AddAllItemsToSidebar()`
`322`	`323`	`await SidebarControl.SideBarItemsSemaphore.WaitAsync();`
`323`	`324`	`try`
`324`	`325`	`{`
`325`		`- homeSection = new LocationItem()`
	`326`	`+ var homeSection = new LocationItem()`
`326`	`327`	`{`
`327`	`328`	`Text = "SidebarHome".GetLocalized(),`
`328`	`329`	`Section = SectionType.Home,`
`@@ -332,7 +333,7 @@ public async Task AddAllItemsToSidebar()`
`332`	`333`	`Path = "Home".GetLocalized(),`
`333`	`334`	`ChildItems = new ObservableCollection<INavigationControlItem>()`
`334`	`335`	`};`
`335`		`- favoriteSection = new LocationItem()`
	`336`	`+ favoriteSection ??= new LocationItem()`
`336`	`337`	`{`
`337`	`338`	`Text = "SidebarFavorites".GetLocalized(),`
`338`	`339`	`Section = SectionType.Favorites,`
`@@ -347,7 +348,7 @@ public async Task AddAllItemsToSidebar()`
`347`	`348`	`AddItemToSidebarAsync(homeSection);`
`348`	`349`	`}`
`349`	`350`
`350`		`- if (!SidebarControl.SideBarItems.Contains(favoriteSection))`
	`351`	`+ if (!SidebarControl.SideBarItems.Any(x => x.Text == "SidebarFavorites".GetLocalized()))`
`351`	`352`	`{`
`352`	`353`	`SidebarControl.SideBarItems.BeginBulkOperation();`
`353`	`354`	`var index = 0; // First section`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`		`-using Files.EventArguments;`
`2`		`-using System;`
	`1`	`+using System;`
`3`	`2`	`using System.Collections.Generic;`
`4`	`3`
`5`	`4`	`namespace Files.Services`
`6`	`5`	`{`
`7`	`6`	`public interface IBundlesSettingsService`
`8`	`7`	`{`
`9`		`- event EventHandler<SettingChangedEventArgs> OnSettingChangedEvent;`
	`8`	`+ event EventHandler OnSettingImportedEvent;`
`10`	`9`
`11`	`10`	`bool FlushSettings();`
`12`	`11`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,12 @@`
`1`		`-using Files.EventArguments;`
`2`		`-using Files.Filesystem;`
	`1`	`+using Files.Filesystem;`
`3`	`2`	`using System;`
`4`	`3`	`using System.Collections.Generic;`
`5`	`4`
`6`	`5`	`namespace Files.Services`
`7`	`6`	`{`
`8`	`7`	`public interface IFileTagsSettingsService`
`9`	`8`	`{`
`10`		`- event EventHandler<SettingChangedEventArgs> OnSettingChangedEvent;`
	`9`	`+ event EventHandler OnSettingImportedEvent;`
`11`	`10`
`12`	`11`	`IList<FileTag> FileTagList { get; set; }`
`13`	`12`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,15 @@`
`1`	`1`	`using Files.Extensions;`
`2`	`2`	`using Files.Models.JsonSettings;`
	`3`	`+using System;`
`3`	`4`	`using System.Collections.Generic;`
`4`	`5`	`using Windows.Storage;`
`5`	`6`
`6`	`7`	`namespace Files.Services.Implementation`
`7`	`8`	`{`
`8`	`9`	`public sealed class BundlesSettingsService : BaseObservableJsonSettingsModel, IBundlesSettingsService`
`9`	`10`	`{`
	`11`	`+ public event EventHandler OnSettingImportedEvent;`
	`12`	`+`
`10`	`13`	`public BundlesSettingsService()`
`11`	`14`	`: base(System.IO.Path.Combine(ApplicationData.Current.LocalFolder.Path, Constants.LocalSettings.SettingsFolderName, Constants.LocalSettings.BundlesSettingsFileName),`
`12`	`15`	`isCachingEnabled: true)`
`@@ -33,6 +36,7 @@ public override bool ImportSettings(object import)`
`33`	`36`	`if (SavedBundles != null)`
`34`	`37`	`{`
`35`	`38`	`FlushSettings();`
	`39`	`+ OnSettingImportedEvent?.Invoke(this, null);`
`36`	`40`	`return true;`
`37`	`41`	`}`
`38`	`42`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ namespace Files.Services.Implementation`
`10`	`10`	`{`
`11`	`11`	`public sealed class FileTagsSettingsService : BaseJsonSettingsModel, IFileTagsSettingsService`
`12`	`12`	`{`
	`13`	`+ public event EventHandler OnSettingImportedEvent;`
	`14`	`+`
`13`	`15`	`private static readonly List<FileTag> s_defaultFileTags = new List<FileTag>()`
`14`	`16`	`{`
`15`	`17`	`new FileTag("Blue", "#0072BD"),`
`@@ -68,6 +70,7 @@ public override bool ImportSettings(object import)`
`68`	`70`	`if (FileTagList != null)`
`69`	`71`	`{`
`70`	`72`	`FlushSettings();`
	`73`	`+ OnSettingImportedEvent?.Invoke(this, null);`
`71`	`74`	`return true;`
`72`	`75`	`}`
`73`	`76`
Original file line number	Diff line number	Diff line change
`@@ -360,18 +360,19 @@ public ItemViewModel(FolderSettingsViewModel folderSettingsViewModel)`
`360`	`360`	`shouldDisplayFileExtensions = UserSettingsService.PreferencesSettingsService.ShowFileExtensions;`
`361`	`361`
`362`	`362`	`UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;`
`363`		`- FileTagsSettingsService.OnSettingChangedEvent += FileTagsSettingsService_OnSettingChangedEvent;`
	`363`	`+ FileTagsSettingsService.OnSettingImportedEvent += FileTagsSettingsService_OnSettingImportedEvent;`
`364`	`364`	`AppServiceConnectionHelper.ConnectionChanged += AppServiceConnectionHelper_ConnectionChanged;`
`365`	`365`	`}`
`366`	`366`
`367`		`- private void FileTagsSettingsService_OnSettingChangedEvent(object sender, SettingChangedEventArgs e)`
	`367`	`+ private async void FileTagsSettingsService_OnSettingImportedEvent(object sender, EventArgs e)`
`368`	`368`	`{`
`369`		`- switch (e.settingName)`
	`369`	`+ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() =>`
`370`	`370`	`{`
`371`		`- case nameof(FileTagsSettingsService.FileTagList):`
`372`		`- // Reload tags`
`373`		`- break;`
`374`		`- }`
	`371`	`+ if (WorkingDirectory != "Home".GetLocalized())`
	`372`	`+ {`
	`373`	`+ RefreshItems(null);`
	`374`	`+ }`
	`375`	`+ });`
`375`	`376`	`}`
`376`	`377`
`377`	`378`	`private async void UserSettingsService_OnSettingChangedEvent(object sender, SettingChangedEventArgs e)`
`@@ -2263,7 +2264,7 @@ public void Dispose()`
`2263`	`2264`	`Connection.RequestReceived -= Connection_RequestReceived;`
`2264`	`2265`	`}`
`2265`	`2266`	`UserSettingsService.OnSettingChangedEvent -= UserSettingsService_OnSettingChangedEvent;`
`2266`		`- FileTagsSettingsService.OnSettingChangedEvent -= FileTagsSettingsService_OnSettingChangedEvent;`
	`2267`	`+ FileTagsSettingsService.OnSettingImportedEvent -= FileTagsSettingsService_OnSettingImportedEvent;`
`2267`	`2268`	`AppServiceConnectionHelper.ConnectionChanged -= AppServiceConnectionHelper_ConnectionChanged;`
`2268`	`2269`	`DefaultIcons.Clear();`
`2269`	`2270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public BundlesViewModel()`
`105`	`105`	`ImportBundlesCommand = new AsyncRelayCommand(ImportBundles);`
`106`	`106`	`ExportBundlesCommand = new AsyncRelayCommand(ExportBundles);`
`107`	`107`
`108`		`- BundlesSettingsService.OnSettingChangedEvent += BundlesSettingsService_OnSettingChangedEvent;`
	`108`	`+ BundlesSettingsService.OnSettingImportedEvent += BundlesSettingsService_OnSettingImportedEvent;`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`#endregion Constructor`
`@@ -259,14 +259,9 @@ private async Task ExportBundles()`
`259`	`259`
`260`	`260`	`#region Handlers`
`261`	`261`
`262`		`- private async void BundlesSettingsService_OnSettingChangedEvent(object sender, EventArguments.SettingChangedEventArgs e)`
	`262`	`+ private async void BundlesSettingsService_OnSettingImportedEvent(object sender, EventArgs e)`
`263`	`263`	`{`
`264`		`- switch (e.settingName)`
`265`		`- {`
`266`		`- case nameof(BundlesSettingsService.SavedBundles):`
`267`		`- await Load();`
`268`		`- break;`
`269`		`- }`
	`264`	`+ await Load();`
`270`	`265`	`}`
`271`	`266`
`272`	`267`	`private void OpenPathHandle(string path, FilesystemItemType itemType, bool openSilent, bool openViaApplicationPicker, IEnumerable<string> selectItems)`
`@@ -285,8 +280,6 @@ private void OpenPathInNewPaneHandle(string path)`
`285`	`280`	`/// <param name="item"></param>`
`286`	`281`	`private void NotifyItemRemovedHandle(BundleContainerViewModel item)`
`287`	`282`	`{`
`288`		`- BundlesSettingsService.OnSettingChangedEvent -= BundlesSettingsService_OnSettingChangedEvent;`
`289`		`-`
`290`	`283`	`Items.Remove(item);`
`291`	`284`	`item?.Dispose();`
`292`	`285`
`@@ -464,6 +457,7 @@ public void Dispose()`
`464`	`457`	`}`
`465`	`458`
`466`	`459`	`Items.CollectionChanged -= Items_CollectionChanged;`
	`460`	`+ BundlesSettingsService.OnSettingImportedEvent -= BundlesSettingsService_OnSettingImportedEvent;`
`467`	`461`	`}`
`468`	`462`
`469`	`463`	`#endregion IDisposable`