added a default handler

Author: ibetitsmike

App/Services/UserNotifier.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Coder.Desktop.App.Views;
 using Microsoft.Extensions.Logging;
 using Microsoft.Windows.AppNotifications;
 using Microsoft.Windows.AppNotifications.Builder;
@@ -20,17 +21,26 @@ public interface IUserNotifier : INotificationHandler, IAsyncDisposable
     public void UnregisterHandler(string name);
 
     public Task ShowErrorNotification(string title, string message, CancellationToken ct = default);
-    public Task ShowActionNotification(string title, string message, string handlerName, IDictionary<string, string>? args = null, CancellationToken ct = default);
+    public Task ShowActionNotification(string title, string message, string? handlerName, IDictionary<string, string>? args = null, CancellationToken ct = default);
 }
 
-public class UserNotifier(ILogger<UserNotifier> logger, IDispatcherQueueManager dispatcherQueueManager) : IUserNotifier
+public class UserNotifier : IUserNotifier
 {
     private const string CoderNotificationHandler = "CoderNotificationHandler";
 
     private readonly AppNotificationManager _notificationManager = AppNotificationManager.Default;
+    private readonly ILogger<UserNotifier> _logger;
+    private readonly IDispatcherQueueManager _dispatcherQueueManager;
 
     private ConcurrentDictionary<string, INotificationHandler> Handlers { get; } = new();
 
+    public UserNotifier(ILogger<UserNotifier> logger, IDispatcherQueueManager dispatcherQueueManager)
+    {
+        _logger = logger;
+        _dispatcherQueueManager = dispatcherQueueManager;
+        Handlers.TryAdd(nameof(DefaultNotificationHandler), new DefaultNotificationHandler());
+    }
+
     public ValueTask DisposeAsync()
     {
         return ValueTask.CompletedTask;
@@ -61,10 +71,18 @@ public Task ShowErrorNotification(string title, string message, CancellationToke
         return Task.CompletedTask;
     }
 
-    public Task ShowActionNotification(string title, string message, string handlerName, IDictionary<string, string>? args = null, CancellationToken ct = default)
+    public Task ShowActionNotification(string title, string message, string? handlerName, IDictionary<string, string>? args = null, CancellationToken ct = default)
     {
-        if (!Handlers.TryGetValue(handlerName, out _))
-            throw new InvalidOperationException($"No action handler with the name '{handlerName}' is registered.");
+        if (handlerName == null)
+        {
+            // Use default handler if no handler name is provided
+            handlerName = nameof(DefaultNotificationHandler);
+        }
+        else
+        {
+            if (!Handlers.TryGetValue(handlerName, out _))
+                throw new InvalidOperationException($"No action handler with the name '{handlerName}' is registered. Use null for default");
+        }
 
         var builder = new AppNotificationBuilder()
             .AddText(title)
@@ -90,20 +108,32 @@ public void HandleNotificationActivation(IDictionary<string, string> args)
 
         if (!Handlers.TryGetValue(handlerName, out var handler))
         {
-            logger.LogWarning("no action handler '{HandlerName}' found for notification activation, ignoring", handlerName);
+            _logger.LogWarning("no action handler '{HandlerName}' found for notification activation, ignoring", handlerName);
             return;
         }
 
-        dispatcherQueueManager.RunInUiThread(() =>
+        _dispatcherQueueManager.RunInUiThread(() =>
         {
             try
             {
                 handler.HandleNotificationActivation(args);
             }
             catch (Exception ex)
             {
-                logger.LogWarning(ex, "could not handle activation for notification with handler '{HandlerName}", handlerName);
+                _logger.LogWarning(ex, "could not handle activation for notification with handler '{HandlerName}", handlerName);
             }
         });
     }
 }
+
+public class DefaultNotificationHandler : INotificationHandler
+{
+    public void HandleNotificationActivation(IDictionary<string, string> _)
+    {
+        var app = (App)Microsoft.UI.Xaml.Application.Current;
+        if (app != null && app.TrayWindow != null)
+        {
+            app.TrayWindow.Tray_Open();
+        }
+    }
+}

App/Views/TrayWindow.xaml.cs

@@ -23,7 +23,7 @@
 
 namespace Coder.Desktop.App.Views;
 
-public sealed partial class TrayWindow : Window, INotificationHandler
+public sealed partial class TrayWindow : Window
 {
     private const int WIDTH = 300;
 
@@ -38,8 +38,6 @@ public sealed partial class TrayWindow : Window, INotificationHandler
     private VpnLifecycle prevVpnLifecycle = VpnLifecycle.Stopped;
     private RpcLifecycle prevRpcLifecycle = RpcLifecycle.Disconnected;
 
-    private NativeApi.POINT? _lastActivatePosition;
-
     private readonly IRpcController _rpcController;
     private readonly ICredentialManager _credentialManager;
     private readonly ISyncSessionController _syncSessionController;
@@ -69,7 +67,6 @@ public TrayWindow(
         _mainPage = mainPage;
 
         InitializeComponent();
-        _userNotifier.RegisterHandler("TrayWindow", this);
         AppWindow.Hide();
         Activated += Window_Activated;
         RootFrame.SizeChanged += RootFrame_SizeChanged;
@@ -158,7 +155,7 @@ private void NotifyUser(RpcModel rpcModel)
     {
         // This method is called when the state changes, but we don't want to notify
         // the user if the state hasn't changed.
-        var isRpcLifecycleChanged = rpcModel.RpcLifecycle != RpcLifecycle.Connecting && prevRpcLifecycle != rpcModel.RpcLifecycle;
+        var isRpcLifecycleChanged = rpcModel.RpcLifecycle == RpcLifecycle.Disconnected && prevRpcLifecycle != rpcModel.RpcLifecycle;
         var isVpnLifecycleChanged = (rpcModel.VpnLifecycle == VpnLifecycle.Started || rpcModel.VpnLifecycle == VpnLifecycle.Stopped) && prevVpnLifecycle != rpcModel.VpnLifecycle;
 
         if (!isRpcLifecycleChanged && !isVpnLifecycleChanged)
@@ -170,8 +167,7 @@ private void NotifyUser(RpcModel rpcModel)
         if (isRpcLifecycleChanged)
             message += rpcModel.RpcLifecycle switch
             {
-                RpcLifecycle.Connected => "Connected to Coder vpn service.",
-                RpcLifecycle.Disconnected => "Disconnected from Coder vpn service.",
+                RpcLifecycle.Disconnected => "Disconnected from Coder background service.",
                 _ => "" // This will never be hit.
             };
 
@@ -196,7 +192,7 @@ private void NotifyUser(RpcModel rpcModel)
         }
 
         // Trigger notification
-        _userNotifier.ShowActionNotification(message, string.Empty, nameof(TrayWindow), null, CancellationToken.None);
+        _userNotifier.ShowActionNotification(message, string.Empty, null, null, CancellationToken.None);
     }
 
     private void RpcController_StateChanged(object? _, RpcModel model)
@@ -355,7 +351,7 @@ private void Window_Activated(object sender, WindowActivatedEventArgs e)
     }
 
     [RelayCommand]
-    private void Tray_Open()
+    public void Tray_Open()
     {
         MoveResizeAndActivate();
     }
@@ -374,11 +370,6 @@ private void Tray_Exit()
         _ = ((App)Application.Current).ExitApplication();
     }
 
-    public void HandleNotificationActivation(IDictionary<string, string> args)
-    {
-        Tray_Open();
-    }
-
     public static class NativeApi
     {
         [DllImport("dwmapi.dll")]