From 2b1676a4f795c13efbb0c5aebc75ce0fd9f5f733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20Kaan=20K=C3=B6se?= <bkaankose@outlook.com>
Date: Mon, 20 Apr 2026 19:40:32 +0200
Subject: [PATCH] Dispose mail webviews when closing the shell

---
 .../Enums/ThreeButtonDialogResult.cs          |  8 +++
 .../Interfaces/IMailDialogService.cs          |  6 ++
 .../Translations/en_US/resources.json         |  2 +
 Wino.Mail.ViewModels/ComposePageViewModel.cs  | 26 +++++++--
 Wino.Mail.WinUI/Services/DialogService.cs     | 35 +++++++++++
 Wino.Mail.WinUI/ShellWindow.xaml.cs           | 58 ++++++++++++++++++-
 .../Views/Mail/MailListPage.xaml.cs           |  6 --
 7 files changed, 129 insertions(+), 12 deletions(-)
 create mode 100644 Wino.Core.Domain/Enums/ThreeButtonDialogResult.cs

diff --git a/Wino.Core.Domain/Enums/ThreeButtonDialogResult.cs b/Wino.Core.Domain/Enums/ThreeButtonDialogResult.cs
new file mode 100644
index 00000000..ed45ee37
--- /dev/null
+++ b/Wino.Core.Domain/Enums/ThreeButtonDialogResult.cs
@@ -0,0 +1,8 @@
+namespace Wino.Core.Domain.Enums;
+
+public enum ThreeButtonDialogResult
+{
+    Primary,
+    Secondary,
+    Cancel
+}
diff --git a/Wino.Core.Domain/Interfaces/IMailDialogService.cs b/Wino.Core.Domain/Interfaces/IMailDialogService.cs
index f08a0de3..0e070f15 100644
--- a/Wino.Core.Domain/Interfaces/IMailDialogService.cs
+++ b/Wino.Core.Domain/Interfaces/IMailDialogService.cs
@@ -19,6 +19,12 @@ public interface IMailDialogService : IDialogServiceBase
 {
     void ShowReadOnlyCalendarMessage();
     Task<bool> ShowHardDeleteConfirmationAsync();
+    Task<ThreeButtonDialogResult> ShowThreeButtonDialogAsync(string title,
+                                                             string description,
+                                                             string primaryButtonText,
+                                                             string secondaryButtonText,
+                                                             string cancelButtonText,
+                                                             WinoCustomMessageDialogIcon? icon = null);
     Task HandleSystemFolderConfigurationDialogAsync(Guid accountId, IFolderService folderService);
 
     // Custom dialogs
diff --git a/Wino.Core.Domain/Translations/en_US/resources.json b/Wino.Core.Domain/Translations/en_US/resources.json
index bc824f55..3dfd9c1f 100644
--- a/Wino.Core.Domain/Translations/en_US/resources.json
+++ b/Wino.Core.Domain/Translations/en_US/resources.json
@@ -305,6 +305,8 @@
     "DialogMessage_DeleteRecurringSeriesTitle": "Delete Recurring Series",
     "DialogMessage_DiscardDraftConfirmationMessage": "This draft will be discarded. Do you want to continue?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Discard Draft",
+    "DialogMessage_CloseDraftWindowConfirmationMessage": "A draft is still open. Save it before closing the window?",
+    "DialogMessage_CloseDraftWindowConfirmationTitle": "Close Window",
     "DialogMessage_EmptySubjectConfirmation": "Missing Subject",
     "DialogMessage_EmptySubjectConfirmationMessage": "Message has no subject. Do you want to continue?",
     "DialogMessage_EnableStartupLaunchDeniedMessage": "You can enable startup launch from Settings -> App Preferences.",
diff --git a/Wino.Mail.ViewModels/ComposePageViewModel.cs b/Wino.Mail.ViewModels/ComposePageViewModel.cs
index 0ee9033a..b5c03f66 100644
--- a/Wino.Mail.ViewModels/ComposePageViewModel.cs
+++ b/Wino.Mail.ViewModels/ComposePageViewModel.cs
@@ -488,6 +488,12 @@ public partial class ComposePageViewModel : MailBaseViewModel,
 
     [RelayCommand(CanExecute = nameof(canSendMail))]
     private async Task DiscardAsync()
+        => await DiscardDraftAsync();
+
+    public Task SaveDraftAsync()
+        => UpdateMimeChangesAsync();
+
+    public async Task DiscardDraftAsync(bool requireConfirmation = true)
     {
         if (ComposingAccount == null)
         {
@@ -495,14 +501,19 @@ public partial class ComposePageViewModel : MailBaseViewModel,
             return;
         }
 
-        var confirmation = await _dialogService.ShowConfirmationDialogAsync(Translator.DialogMessage_DiscardDraftConfirmationMessage,
-                                                                           Translator.DialogMessage_DiscardDraftConfirmationTitle,
-                                                                           Translator.Buttons_Yes);
+        var confirmation = !requireConfirmation || await _dialogService.ShowConfirmationDialogAsync(Translator.DialogMessage_DiscardDraftConfirmationMessage,
+                                                                                                    Translator.DialogMessage_DiscardDraftConfirmationTitle,
+                                                                                                    Translator.Buttons_Yes);
 
-        if (confirmation)
+        if (!confirmation)
         {
-            isUpdatingMimeBlocked = true;
+            return;
+        }
 
+        isUpdatingMimeBlocked = true;
+
+        try
+        {
             // Don't send delete request for local drafts. Just delete the record and mime locally.
             if (CurrentMailDraftItem.MailCopy.IsLocalDraft)
             {
@@ -514,6 +525,11 @@ public partial class ComposePageViewModel : MailBaseViewModel,
                 await _worker.ExecuteAsync(deletePackage).ConfigureAwait(false);
             }
         }
+        catch
+        {
+            isUpdatingMimeBlocked = false;
+            throw;
+        }
     }
 
     //public override void OnNavigatedFrom(NavigationMode mode, object parameters)
diff --git a/Wino.Mail.WinUI/Services/DialogService.cs b/Wino.Mail.WinUI/Services/DialogService.cs
index cc05bc66..61cd9fe3 100644
--- a/Wino.Mail.WinUI/Services/DialogService.cs
+++ b/Wino.Mail.WinUI/Services/DialogService.cs
@@ -137,6 +137,41 @@ public class DialogService : DialogServiceBase, IMailDialogService
                                            WinoCustomMessageDialogIcon.Warning,
                                            Translator.Buttons_No);
 
+    public async Task<ThreeButtonDialogResult> ShowThreeButtonDialogAsync(string title,
+                                                                          string description,
+                                                                          string primaryButtonText,
+                                                                          string secondaryButtonText,
+                                                                          string cancelButtonText,
+                                                                          WinoCustomMessageDialogIcon? icon = null)
+    {
+        var informationContainer = new CustomMessageDialogInformationContainer(
+            title,
+            description,
+            icon ?? WinoCustomMessageDialogIcon.Information,
+            false);
+
+        var dialog = new ContentDialog
+        {
+            Style = ApplicationResourceManager.GetResource<Style>("WinoDialogStyle"),
+            RequestedTheme = ThemeService.RootTheme.ToWindowsElementTheme(),
+            DefaultButton = ContentDialogButton.Primary,
+            PrimaryButtonText = primaryButtonText,
+            SecondaryButtonText = secondaryButtonText,
+            CloseButtonText = cancelButtonText,
+            ContentTemplate = ApplicationResourceManager.GetResource<DataTemplate>("CustomWinoContentDialogContentTemplate"),
+            Content = informationContainer
+        };
+
+        var dialogResult = await HandleDialogPresentationAsync(dialog);
+
+        return dialogResult switch
+        {
+            ContentDialogResult.Primary => ThreeButtonDialogResult.Primary,
+            ContentDialogResult.Secondary => ThreeButtonDialogResult.Secondary,
+            _ => ThreeButtonDialogResult.Cancel
+        };
+    }
+
     public async Task<MailAccount> ShowAccountPickerDialogAsync(List<MailAccount> availableAccounts)
     {
         var accountPicker = new AccountPickerDialog(availableAccounts)
diff --git a/Wino.Mail.WinUI/ShellWindow.xaml.cs b/Wino.Mail.WinUI/ShellWindow.xaml.cs
index 755687ab..bb7c87c0 100644
--- a/Wino.Mail.WinUI/ShellWindow.xaml.cs
+++ b/Wino.Mail.WinUI/ShellWindow.xaml.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Windows.UI;
@@ -20,8 +21,10 @@ using Wino.Mail.WinUI.Helpers;
 using Wino.Mail.WinUI.Interfaces;
 using Wino.Mail.WinUI.Models;
 using Wino.Mail.WinUI.Views;
+using Wino.Messaging.Client.Mails;
 using Wino.Messaging.Client.Shell;
 using Wino.Messaging.UI;
+using Wino.Views.Mail;
 using WinUIEx;
 
 namespace Wino.Mail.WinUI;
@@ -356,12 +359,16 @@ public sealed partial class ShellWindow : WindowEx, IWinoShellWindow,
         SynchronizeTitleBarSearchBox();
     }
 
-    private void OnAppWindowClosing(object sender, Microsoft.UI.Windowing.AppWindowClosingEventArgs e)
+    private async void OnAppWindowClosing(object sender, AppWindowClosingEventArgs e)
     {
         if (_allowClose || (Application.Current as App)?.IsExiting == true)
             return;
 
         e.Cancel = true;
+
+        if (!await PrepareMailModeForHideAsync())
+            return;
+
         var windowManager = WinoApplication.Current.Services.GetService<IWinoWindowManager>();
         windowManager?.HideWindow(this);
     }
@@ -398,6 +405,55 @@ public sealed partial class ShellWindow : WindowEx, IWinoShellWindow,
         UnregisterRecipients();
     }
 
+    private async Task<bool> PrepareMailModeForHideAsync()
+    {
+        if (MainShellFrame.Content is not WinoAppShell shellPage)
+            return true;
+
+        if (shellPage.GetShellFrame().Content is not MailListPage mailListPage)
+            return true;
+
+        var renderingFrame = mailListPage.FindName("RenderingFrame") as Frame;
+
+        if (renderingFrame?.Content is ComposePage composePage)
+        {
+            var closeResult = await MailDialogService.ShowThreeButtonDialogAsync(
+                Translator.DialogMessage_CloseDraftWindowConfirmationTitle,
+                Translator.DialogMessage_CloseDraftWindowConfirmationMessage,
+                Translator.Buttons_Save,
+                Translator.Buttons_Discard,
+                Translator.Buttons_Cancel,
+                WinoCustomMessageDialogIcon.Warning);
+
+            if (closeResult == ThreeButtonDialogResult.Cancel)
+            {
+                return false;
+            }
+
+            try
+            {
+                if (closeResult == ThreeButtonDialogResult.Primary)
+                {
+                    await composePage.ViewModel.SaveDraftAsync();
+                }
+                else
+                {
+                    await composePage.ViewModel.DiscardDraftAsync(requireConfirmation: false);
+                }
+            }
+            catch (Exception ex)
+            {
+                MailDialogService.InfoBarMessage(Translator.GeneralTitle_Error, ex.Message, InfoBarMessageType.Error);
+                return false;
+            }
+        }
+
+        await mailListPage.ViewModel.MailCollection.UnselectAllAsync();
+        WeakReferenceMessenger.Default.Send(new DisposeRenderingFrameRequested());
+
+        return true;
+    }
+
     private void RegisterRecipients()
     {
         WeakReferenceMessenger.Default.Register<TitleBarShellContentUpdated>(this);
diff --git a/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs b/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs
index 1e3cb57f..3a332669 100644
--- a/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs
@@ -56,7 +56,6 @@ public sealed partial class MailListPage : MailListPageAbstract,
 {
     private const double RENDERING_COLUMN_MIN_WIDTH = 375;
     private const int SELECTION_SETTLE_DELAY_MS = 120;
-    private const int RENDERING_FRAME_RELEASE_DELAY_MS = 2000;
     private int _idleNavigationRequestVersion = 0;
     private int _mailActivationRequestVersion = 0;
     private IPopoutClient? _activePopoutClient;
@@ -546,11 +545,6 @@ public sealed partial class MailListPage : MailListPageAbstract,
             }
         }
 
-        await Task.Delay(RENDERING_FRAME_RELEASE_DELAY_MS);
-
-        if (requestVersion != _idleNavigationRequestVersion) return;
-        if (ViewModel.MailCollection.SelectedItemsCount != 0) return;
-
         // Ensure rendering frame actually navigates away from Compose/Rendering pages.
         // Otherwise those pages keep their messenger registrations alive.
         ViewModel.NavigationService.Navigate(WinoPage.IdlePage, null, NavigationReferenceFrame.RenderingFrame, NavigationTransitionType.DrillIn);