Winify – Diff between revs 6 and 7

Subversion Repositories:

?pathlinks?

Rev 6 – Details – Blame – Last modification – View Log

 ï»¿using System;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Configuration;
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
+{
     public partial class Form1 : Form
+    {
         #region Private Delegates, Events, Enums, Properties, Indexers and Fields
-        private readonly GotifyConnectionManager _gotifyConnectionManager;
+        private readonly Servers.Servers _servers;
         private AboutForm _aboutForm;
             // Bind to settings changed event.
             Settings.Default.SettingsLoaded += Default_SettingsLoaded;
             Settings.Default.SettingsSaving += Default_SettingsSaving;
             Settings.Default.PropertyChanged += Default_PropertyChanged;
+            _servers = new Servers.Servers();
+            _servers.Server.CollectionChanged += Server_CollectionChanged;
-            _gotifyConnectionManager = new GotifyConnectionManager();
+            _gotifyConnectionManager = new GotifyConnectionManager(_servers);
             Task.Run(async () =>
             {
+                var restoredServers = await LoadServers();
+                foreach (var server in restoredServers.Server)
                 _servers = await LoadServers();
                     _servers.Server.Add(server);
                 _gotifyConnectionManager.UpdateServers(_servers);
             });
         /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
         protected override void Dispose(bool disposing)
+        {
             if (disposing && components != null)
+            {
+                _servers.Server.CollectionChanged -= Server_CollectionChanged;
+                Settings.Default.SettingsLoaded -= Default_SettingsLoaded;
+                Settings.Default.SettingsSaving -= Default_SettingsSaving;
+                Settings.Default.PropertyChanged -= Default_PropertyChanged;
+                _gotifyConnectionManager?.Dispose();
+                _gotifyConnectionManager = null;
                 components.Dispose();
+            }
             base.Dispose(disposing);
+        }
+        #endregion
+        #region Event Handlers
+        private async void Server_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (await ServersSerialization.Serialize(_servers, Constants.ServersFile))
+            {
+                case SerializationFailure serializationFailure:
+                    Debug.WriteLine(serializationFailure.Exception.Message);
-        #endregion
+                    break;
+            }
         #region Event Handlers
                 return;
+            }
             _settingsForm = new SettingsForm(_servers);
-            _settingsForm.Closing += SettingsForm_Closing;
-            _settingsForm.ServersUpdated += SettingsForm_ServersUpdated;
+            _settingsForm.Closing += SettingsForm_Closing;
             _settingsForm.Show();
-        }
-        private async void SettingsForm_ServersUpdated(object sender, ServersUpdatedEventArgs e)
-        {
-            _servers = e.Servers;
-            switch (await ServersSerialization.Serialize(e.Servers, Constants.ServersFile))
-            {
-                case SerializationSuccess _:
-                    _gotifyConnectionManager.UpdateServers(e.Servers);
-                    break;
-                case SerializationFailure serializationFailure:
-                    Debug.WriteLine(serializationFailure.Exception.Message);
-                    break;
-            }
+        }
         private void SettingsForm_Closing(object sender, CancelEventArgs e)
+        {
             if (_settingsForm == null)
+            {
                 return;
-            }
+            }
             _settingsForm.Closing -= SettingsForm_Closing;
-            _settingsForm.ServersUpdated -= SettingsForm_ServersUpdated;
+            _settingsForm.Closing -= SettingsForm_Closing;
             _settingsForm.Dispose();