Winify – Diff between revs 22 and 24

Subversion Repositories:

?pathlinks?

Rev 22 – Go to most recent revision – Details – Blame – Last modification – View Log

 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Configuration;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using AutoUpdaterDotNET;
 using Serilog;
 using Servers;
+using ToastNotifications;
 using Winify.Gotify;
 using Winify.Properties;
 using Winify.Servers.Serialization;
 using Winify.Utilities;
         private readonly Announcements.Announcements _announcements;
         private readonly global::Servers.Servers _servers;
-        private readonly TaskScheduler _taskScheduler;
-        private AboutForm _aboutForm;
+        private readonly TaskScheduler _uiTaskScheduler;
-        private GotifyConnectionManager _gotifyConnectionManager;
+        private AboutForm _aboutForm;
             Settings.Default.PropertyChanged += Default_PropertyChanged;
             _servers = new global::Servers.Servers();
             _servers.Server.CollectionChanged += Server_CollectionChanged;
             _servers.Server.ListChanged += Server_ListChanged;
-            _announcements = new global::Announcements.Announcements();
+            _announcements = new Announcements.Announcements();
             _announcements.Announcement.CollectionChanged += Announcements_CollectionChanged;
             _announcements.Announcement.ListChanged += Announcement_ListChanged;
-            _taskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
-            _notificationManager = new NotificationManager(_taskScheduler);
+            _uiTaskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
                 _gotifyConnectionManager.GotifyNotification -= GotifyConnectionManager_GotifyNotification;
                 _gotifyConnectionManager?.Dispose();
-                _gotifyConnectionManager = null;
-                _notificationManager?.Dispose();
-                _notificationManager = null;
+                _gotifyConnectionManager = null;
                 components.Dispose();
+            }
             await SaveAnnouncements();
+        }
         private void GotifyConnectionManager_GotifyNotification(object sender, GotifyNotificationEventArgs e)
+        {
+            Task.Factory.StartNew(() =>
-        {
+            {
+                foreach (var announcement in _announcements.Announcement)
+                {
+                    if (announcement.AppId == e.Notification.AppId)
+                    {
+                        var configuredNotification = new Notification($"{e.Notification.Title} ({e.Notification.Server.Name}/{e.Notification.AppId})",
+                            e.Notification.Message, announcement.LingerTime, e.Image, FormAnimator.AnimationMethod.Slide,
+                            FormAnimator.AnimationDirection.Up);
+                        configuredNotification.Show();
+                        return;
+                    }
+                }
+                var notification = new Notification($"{e.Notification.Title} ({e.Notification.Server.Name}/{e.Notification.AppId})",
+                    e.Notification.Message, 5000, e.Image, FormAnimator.AnimationMethod.Slide,
+                    FormAnimator.AnimationDirection.Up);
+                notification.Show();
-            _notificationManager.ShowNotification(e, _announcements);
+            }, CancellationToken.None, TaskCreationOptions.None, _uiTaskScheduler);
+        }
         private async void Server_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)