review

Author: deansheather

App/App.xaml.cs

@@ -16,6 +16,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.Win32;
 using Microsoft.Windows.AppLifecycle;
@@ -26,7 +27,7 @@
 
 namespace Coder.Desktop.App;
 
-public partial class App : Application
+public partial class App : Application, IDispatcherQueueManager
 {
     private const string MutagenControllerConfigSection = "MutagenController";
     private const string UpdaterConfigSection = "Updater";
@@ -50,13 +51,11 @@ public partial class App : Application
     private readonly ILogger<App> _logger;
     private readonly IUriHandler _uriHandler;
     private readonly IUserNotifier _userNotifier;
-
-    private bool _handleWindowClosed = true;
-
     private readonly ISettingsManager<CoderConnectSettings> _settingsManager;
-
     private readonly IHostApplicationLifetime _appLifetime;
 
+    private bool _handleWindowClosed = true;
+
     public App()
     {
         var builder = Host.CreateApplicationBuilder();
@@ -91,7 +90,7 @@ public App()
         services.AddSingleton<ICoderApiClientFactory, CoderApiClientFactory>();
         services.AddSingleton<IAgentApiClientFactory, AgentApiClientFactory>();
 
-        services.AddSingleton<IDispatcherQueueManager, AppDispatcherQueueManager>();
+        services.AddSingleton<IDispatcherQueueManager>(_ => this);
         services.AddSingleton<ICredentialBackend>(_ =>
             new WindowsCredentialBackend(WindowsCredentialBackend.CoderCredentialsTargetName));
         services.AddSingleton<ICredentialManager, CredentialManager>();
@@ -323,4 +322,17 @@ private static void AddDefaultConfig(IConfigurationBuilder builder)
 #endif
         });
     }
+
+    public void RunInUiThread(DispatcherQueueHandler action)
+    {
+        var dispatcherQueue = TrayWindow?.DispatcherQueue;
+        if (dispatcherQueue is null)
+            throw new InvalidOperationException("DispatcherQueue is not available");
+        if (dispatcherQueue.HasThreadAccess)
+        {
+            action();
+            return;
+        }
+        dispatcherQueue.TryEnqueue(action);
+    }
 }

App/Services/DispatcherQueueManager.cs

@@ -1,29 +1,8 @@
-using System;
 using Microsoft.UI.Dispatching;
-using Microsoft.UI.Xaml;
 
 namespace Coder.Desktop.App.Services;
 
 public interface IDispatcherQueueManager
 {
     public void RunInUiThread(DispatcherQueueHandler action);
 }
-
-public class AppDispatcherQueueManager : IDispatcherQueueManager
-{
-    private static DispatcherQueue? DispatcherQueue =>
-        ((App)Application.Current).TrayWindow?.DispatcherQueue;
-
-    public void RunInUiThread(DispatcherQueueHandler action)
-    {
-        var dispatcherQueue = DispatcherQueue;
-        if (dispatcherQueue is null)
-            throw new InvalidOperationException("DispatcherQueue is not available");
-        if (dispatcherQueue.HasThreadAccess)
-        {
-            action();
-            return;
-        }
-        dispatcherQueue.TryEnqueue(action);
-    }
-}

App/Services/UpdateController.cs

@@ -163,6 +163,7 @@ public async Task CheckForUpdatesNow()
 
     public ValueTask DisposeAsync()
     {
+        _userNotifier.UnregisterHandler(NotificationHandlerName);
         _sparkle?.Dispose();
         return ValueTask.CompletedTask;
     }
@@ -203,9 +204,9 @@ public class CoderSparkleUIFactory(IUserNotifier userNotifier, IUpdaterUpdateAva
 {
     public bool ForceDisableToastMessages;
 
-    bool IUIFactory.HideReleaseNotes { get; set; }
-    bool IUIFactory.HideSkipButton { get; set; }
-    bool IUIFactory.HideRemindMeLaterButton { get; set; }
+    public bool HideReleaseNotes { get; set; }
+    public bool HideSkipButton { get; set; }
+    public bool HideRemindMeLaterButton { get; set; }
 
     // This stuff is ignored as we use our own template in the ViewModel
     // directly:
@@ -215,8 +216,6 @@ public class CoderSparkleUIFactory(IUserNotifier userNotifier, IUpdaterUpdateAva
     public IUpdateAvailable CreateUpdateAvailableWindow(List<AppCastItem> updates, ISignatureVerifier? signatureVerifier,
         string currentVersion = "", string appName = "Coder Desktop", bool isUpdateAlreadyDownloaded = false)
     {
-        IUIFactory factory = this;
-
         var viewModel = updateAvailableViewModelFactory.Create(
             updates,
             signatureVerifier,
@@ -225,11 +224,11 @@ public IUpdateAvailable CreateUpdateAvailableWindow(List<AppCastItem> updates, I
             isUpdateAlreadyDownloaded);
 
         var window = new UpdaterUpdateAvailableWindow(viewModel);
-        if (factory.HideReleaseNotes)
+        if (HideReleaseNotes)
             (window as IUpdateAvailable).HideReleaseNotes();
-        if (factory.HideSkipButton)
+        if (HideSkipButton)
             (window as IUpdateAvailable).HideSkipButton();
-        if (factory.HideRemindMeLaterButton)
+        if (HideRemindMeLaterButton)
             (window as IUpdateAvailable).HideRemindMeLaterButton();
 
         return window;

App/Services/UserNotifier.cs

@@ -17,6 +17,7 @@ public interface INotificationHandler
 public interface IUserNotifier : INotificationHandler, IAsyncDisposable
 {
     public void RegisterHandler(string name, INotificationHandler handler);
+    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);
@@ -47,6 +48,12 @@ public void RegisterHandler(string name, INotificationHandler handler)
             throw new InvalidOperationException($"A handler with the name '{name}' is already registered.");
     }
 
+    public void UnregisterHandler(string name)
+    {
+        if (!Handlers.TryRemove(name, out _))
+            throw new InvalidOperationException($"No handler with the name '{name}' is registered.");
+    }
+
     public Task ShowErrorNotification(string title, string message, CancellationToken ct = default)
     {
         var builder = new AppNotificationBuilder().AddText(title).AddText(message);
@@ -57,10 +64,7 @@ public Task ShowErrorNotification(string title, string message, CancellationToke
     public Task ShowActionNotification(string title, string message, string handlerName, IDictionary<string, string>? args = null, CancellationToken ct = default)
     {
         if (!Handlers.TryGetValue(handlerName, out _))
-        {
-            logger.LogWarning("no action handler found for notification with name {HandlerName}, ignoring", handlerName);
-            return Task.CompletedTask;
-        }
+            throw new InvalidOperationException($"No action handler with the name '{handlerName}' is registered.");
 
         var builder = new AppNotificationBuilder()
             .AddText(title)