fix(core, framework): ensure guid always passed, deprecate old UpdateNotification method

Author: Xjph

ObservatoryCore/NativeNotification/NativePopup.cs

@@ -9,7 +9,7 @@ public class NativePopup
 
         public NativePopup()
         {
-            notifications = new();
+            notifications = [];
         }
 
         public Guid InvokeNativeNotification(NotificationArgs notificationArgs)
@@ -53,17 +53,19 @@ private void NotifyWindow_Closed(object? sender, EventArgs e)
 
         public void CloseNotification(Guid guid)
         {
-            if (notifications.ContainsKey(guid))
+            if (notifications.TryGetValue(guid, out NotificationForm? value))
             {
-                notifications[guid].Close();
+                value.Close();
             }
         }
 
-        public void UpdateNotification(Guid guid, NotificationArgs notificationArgs)
+        public void UpdateNotification(NotificationArgs notificationArgs)
         {
-            if (notifications.ContainsKey(guid))
+            var guid = notificationArgs.Guid 
+                ?? throw new ArgumentNullException(nameof(notificationArgs), "Cannot update notification without Guid.");
+            if (notifications.TryGetValue(guid, out NotificationForm? value))
             {
-                notifications[guid].Update(notificationArgs);
+                value.Update(notificationArgs);
             }
         }
 

ObservatoryCore/ObservatoryCore.csproj

@@ -12,7 +12,7 @@
 
     <PropertyGroup>
 		<ProjectName>Elite Observatory Core</ProjectName>
-	    <VersionSuffix>1.2.7.$([System.DateTime]::UtcNow.DayOfYear.ToString().PadLeft(3, "0"))$([System.DateTime]::UtcNow.Hour)</VersionSuffix>
+	    <VersionSuffix>1.2.8.$([System.DateTime]::UtcNow.DayOfYear.ToString().PadLeft(3, "0"))$([System.DateTime]::UtcNow.Hour)</VersionSuffix>
 	    <AssemblyVersion Condition=" '$(VersionSuffix)' == '' ">0.0.0.1</AssemblyVersion>
 	    <AssemblyVersion Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</AssemblyVersion>
 	    <Version Condition=" '$(VersionSuffix)' == '' ">0.0.1.0</Version>

ObservatoryCore/PluginManagement/PluginCore.cs

@@ -90,6 +90,13 @@ public void CancelNotification(Guid id)
         }
 
         public void UpdateNotification(Guid id, NotificationArgs notificationArgs)
+        {
+            // Always use explicitly passed Guid.
+            notificationArgs.Guid = id;
+            UpdateNotification(notificationArgs);
+        }
+
+        public void UpdateNotification(NotificationArgs notificationArgs)
         {
             if (!IsLogMonitorBatchReading)
             {
@@ -100,7 +107,7 @@ public void UpdateNotification(Guid id, NotificationArgs notificationArgs)
                 }
 
                 if ((notificationArgs.Rendering & NotificationRendering.NativeVisual) != 0)
-                    NativePopup.UpdateNotification(id, notificationArgs);
+                    NativePopup.UpdateNotification(notificationArgs);
 
                 if (Properties.Core.Default.VoiceNotify && (notificationArgs.Rendering & NotificationRendering.NativeVocal) != 0)
                 {

ObservatoryFramework/Interfaces.cs

@@ -230,8 +230,15 @@ public interface IObservatoryCore
         /// </summary>
         /// <param name="notificationId">Guid of notification to be updated.</param>
         /// <param name="notificationEventArgs">NotificationArgs object specifying updated notification content and behaviour.</param>
+        [Obsolete("This method has been deprecated in favour of UpdateNotification(NotificationArgs notificationEventArgs)")]
         public void UpdateNotification(Guid notificationId, NotificationArgs notificationEventArgs);
 
+        /// <summary>
+        /// Update an active notification with a new set of NotificationsArgs. Timeout values are reset and begin counting again from zero if specified.
+        /// </summary>
+        /// <param name="notificationEventArgs">NotificationArgs object specifying updated notification content and behaviour.</param>
+        public void UpdateNotification(NotificationArgs notificationEventArgs);
+
         /// <summary>
         /// Add an item to the bottom of the basic UI grid.
         /// </summary>