chore: fixed user notifier default notification handler (#141)

ibetitsmike · web-flow · commit efb60ca8b5f5 · 2025-07-07T14:15:31.000Z
diff --git a/App/App.xaml.cs b/App/App.xaml.cs
@@ -27,7 +27,7 @@
 
 namespace Coder.Desktop.App;
 
-public partial class App : Application, IDispatcherQueueManager, INotificationHandler
+public partial class App : Application, IDispatcherQueueManager, IDefaultNotificationHandler
 {
     private const string MutagenControllerConfigSection = "MutagenController";
     private const string UpdaterConfigSection = "Updater";
@@ -91,7 +91,7 @@ public App()
         services.AddSingleton<IAgentApiClientFactory, AgentApiClientFactory>();
 
         services.AddSingleton<IDispatcherQueueManager>(_ => this);
-        services.AddSingleton<INotificationHandler>(_ => this);
+        services.AddSingleton<IDefaultNotificationHandler>(_ => this);
         services.AddSingleton<ICredentialBackend>(_ =>
             new WindowsCredentialBackend(WindowsCredentialBackend.CoderCredentialsTargetName));
         services.AddSingleton<ICredentialManager, CredentialManager>();
@@ -337,12 +337,8 @@ public void RunInUiThread(DispatcherQueueHandler action)
         dispatcherQueue.TryEnqueue(action);
     }
 
-    public void HandleNotificationActivation(IDictionary<string, string> args)
+    public void HandleNotificationActivation(IDictionary<string, string> _)
     {
-        var app = (App)Current;
-        if (app != null && app.TrayWindow != null)
-        {
-            app.TrayWindow.Tray_Open();
-        }
+        TrayWindow?.Tray_Open();
     }
 }
diff --git a/App/Services/UserNotifier.cs b/App/Services/UserNotifier.cs
@@ -15,6 +15,12 @@ public interface INotificationHandler
     public void HandleNotificationActivation(IDictionary<string, string> args);
 }
 
+// This interface is meant to protect the default
+// notification handler from being overriden by DI.
+public interface IDefaultNotificationHandler : INotificationHandler
+{
+}
+
 public interface IUserNotifier : INotificationHandler, IAsyncDisposable
 {
     public void RegisterHandler(string name, INotificationHandler handler);
@@ -46,7 +52,7 @@ public class UserNotifier : IUserNotifier
     private ConcurrentDictionary<string, INotificationHandler> Handlers { get; } = new();
 
     public UserNotifier(ILogger<UserNotifier> logger, IDispatcherQueueManager dispatcherQueueManager,
-        INotificationHandler notificationHandler)
+        IDefaultNotificationHandler notificationHandler)
     {
         _logger = logger;
         _dispatcherQueueManager = dispatcherQueueManager;
diff --git a/App/Views/TrayWindow.xaml.cs b/App/Views/TrayWindow.xaml.cs
@@ -152,10 +152,13 @@ private void SetPageByState(RpcModel rpcModel, CredentialModel credentialModel,
         }
     }
 
+    /// <summary>
+    /// This method is called when the state changes, but we don't want to notify
+    /// the user if the state hasn't changed.
+    /// </summary>
+    /// <param name="rpcModel"></param>
     private void MaybeNotifyUser(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.Disconnected && curRpcLifecycle != rpcModel.RpcLifecycle;
         var isVpnLifecycleChanged = (rpcModel.VpnLifecycle == VpnLifecycle.Started || rpcModel.VpnLifecycle == VpnLifecycle.Stopped) && curVpnLifecycle != rpcModel.VpnLifecycle;
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`
`28`	`28`	`namespace Coder.Desktop.App;`
`29`	`29`
`30`		`-public partial class App : Application, IDispatcherQueueManager, INotificationHandler`
	`30`	`+public partial class App : Application, IDispatcherQueueManager, IDefaultNotificationHandler`
`31`	`31`	`{`
`32`	`32`	`private const string MutagenControllerConfigSection = "MutagenController";`
`33`	`33`	`private const string UpdaterConfigSection = "Updater";`
`@@ -91,7 +91,7 @@ public App()`
`91`	`91`	`services.AddSingleton<IAgentApiClientFactory, AgentApiClientFactory>();`
`92`	`92`
`93`	`93`	`services.AddSingleton<IDispatcherQueueManager>(_ => this);`
`94`		`- services.AddSingleton<INotificationHandler>(_ => this);`
	`94`	`+ services.AddSingleton<IDefaultNotificationHandler>(_ => this);`
`95`	`95`	`services.AddSingleton<ICredentialBackend>(_ =>`
`96`	`96`	`new WindowsCredentialBackend(WindowsCredentialBackend.CoderCredentialsTargetName));`
`97`	`97`	`services.AddSingleton<ICredentialManager, CredentialManager>();`
`@@ -337,12 +337,8 @@ public void RunInUiThread(DispatcherQueueHandler action)`
`337`	`337`	`dispatcherQueue.TryEnqueue(action);`
`338`	`338`	`}`
`339`	`339`
`340`		`- public void HandleNotificationActivation(IDictionary<string, string> args)`
	`340`	`+ public void HandleNotificationActivation(IDictionary<string, string> _)`
`341`	`341`	`{`
`342`		`- var app = (App)Current;`
`343`		`- if (app != null && app.TrayWindow != null)`
`344`		`- {`
`345`		`- app.TrayWindow.Tray_Open();`
`346`		`- }`
	`342`	`+ TrayWindow?.Tray_Open();`
`347`	`343`	`}`
`348`	`344`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,12 @@ public interface INotificationHandler`
`15`	`15`	`public void HandleNotificationActivation(IDictionary<string, string> args);`
`16`	`16`	`}`
`17`	`17`
	`18`	`+// This interface is meant to protect the default`
	`19`	`+// notification handler from being overriden by DI.`
	`20`	`+public interface IDefaultNotificationHandler : INotificationHandler`
	`21`	`+{`
	`22`	`+}`
	`23`	`+`
`18`	`24`	`public interface IUserNotifier : INotificationHandler, IAsyncDisposable`
`19`	`25`	`{`
`20`	`26`	`public void RegisterHandler(string name, INotificationHandler handler);`
`@@ -46,7 +52,7 @@ public class UserNotifier : IUserNotifier`
`46`	`52`	`private ConcurrentDictionary<string, INotificationHandler> Handlers { get; } = new();`
`47`	`53`
`48`	`54`	`public UserNotifier(ILogger<UserNotifier> logger, IDispatcherQueueManager dispatcherQueueManager,`
`49`		`- INotificationHandler notificationHandler)`
	`55`	`+ IDefaultNotificationHandler notificationHandler)`
`50`	`56`	`{`
`51`	`57`	`_logger = logger;`
`52`	`58`	`_dispatcherQueueManager = dispatcherQueueManager;`
Original file line number	Diff line number	Diff line change
`@@ -152,10 +152,13 @@ private void SetPageByState(RpcModel rpcModel, CredentialModel credentialModel,`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
	`155`	`+ /// <summary>`
	`156`	`+ /// This method is called when the state changes, but we don't want to notify`
	`157`	`+ /// the user if the state hasn't changed.`
	`158`	`+ /// </summary>`
	`159`	`+ /// <param name="rpcModel"></param>`
`155`	`160`	`private void MaybeNotifyUser(RpcModel rpcModel)`
`156`	`161`	`{`
`157`		`- // This method is called when the state changes, but we don't want to notify`
`158`		`- // the user if the state hasn't changed.`
`159`	`162`	`var isRpcLifecycleChanged = rpcModel.RpcLifecycle == RpcLifecycle.Disconnected && curRpcLifecycle != rpcModel.RpcLifecycle;`
`160`	`163`	`var isVpnLifecycleChanged = (rpcModel.VpnLifecycle == VpnLifecycle.Started \|\| rpcModel.VpnLifecycle == VpnLifecycle.Stopped) && curVpnLifecycle != rpcModel.VpnLifecycle;`
`161`	`164`