Possible app crash fixed, when icollection is refreshed

BornToBeRoot · BornToBeRoot · commit 41fdb77f17e0 · 2019-07-09T15:41:40.000+02:00
diff --git a/Source/NETworkManager/Models/Settings/CredentialManager.cs b/Source/NETworkManager/Models/Settings/CredentialManager.cs
@@ -10,6 +10,8 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Xml.Serialization;
+using System.Windows;
+using System.Windows.Threading;
 
 namespace NETworkManager.Models.Settings
 {
@@ -97,7 +99,7 @@ private static void DeserializeFromByteArray(byte[] xml)
         }
 
         public static void Save()
-        {            
+        {
             // Serialize as xml (utf-8)
             byte[] credentials = SerializeToByteArray();
 
@@ -144,12 +146,22 @@ public static void SetMasterPassword(SecureString masterPasword)
 
         public static void AddCredential(CredentialInfo credential)
         {
-            Credentials.Add(credential);
+            // Possible fix for appcrash --> when icollection view is refreshed...           
+            Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(delegate
+            {
+                lock (Credentials)
+                    Credentials.Add(credential);
+            }));
         }
 
         public static void RemoveCredential(CredentialInfo credential)
         {
-            Credentials.Remove(credential);
+            // Possible fix for appcrash --> when icollection view is refreshed...
+            Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(delegate
+            {
+                lock (Credentials)
+                    Credentials.Remove(credential);
+            }));
         }
 
         #region Encryption / Decryption
diff --git a/Source/NETworkManager/Models/Settings/ProfileManager.cs b/Source/NETworkManager/Models/Settings/ProfileManager.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
+using System.Windows;
+using System.Windows.Threading;
 using System.Xml;
 using System.Xml.Serialization;
 using MahApps.Metro.Controls.Dialogs;
@@ -111,7 +113,12 @@ public static void Reset()
 
         public static void AddProfile(ProfileInfo profile)
         {
-            Profiles.Add(profile);
+            // Possible fix for appcrash --> when icollection view is refreshed...
+            Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(delegate
+            {
+                lock (Profiles)
+                    Profiles.Add(profile);
+            }));
         }
 
         public static void AddProfile(ProfileViewModel instance)
@@ -250,7 +257,12 @@ public static void AddProfile(ProfileViewModel instance)
 
         public static void RemoveProfile(ProfileInfo profile)
         {
-            Profiles.Remove(profile);
+            // Possible fix for appcrash --> when icollection view is refreshed...
+            Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(delegate
+            {
+                lock (Profiles)
+                    Profiles.Remove(profile);
+            }));            
         }
 
         public static void RenameGroup(string oldGroup, string group)
@@ -297,7 +309,7 @@ public static async void ShowAddProfileDialog(IProfileManager viewModel, IDialog
             viewModel.OnProfileDialogOpen();
             await dialogCoordinator.ShowMetroDialogAsync(viewModel, customDialog);
         }
-      
+
         public static async void ShowEditProfileDialog(IProfileManager viewModel, IDialogCoordinator dialogCoordinator, ProfileInfo selectedProfile)
         {
             var customDialog = new CustomDialog
