javier/Wino-Mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Main app aot compatibility.

Browse Source
This commit is contained in:
Burak Kaan Köse
2025-11-14 18:51:48 +01:00
parent ae64094feb
commit b356af8eb4
41 changed files with 220 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml.cs
+9 -7
View File
@@ -1,4 +1,5 @@
using System.Collections.ObjectModel;
using System;
using System.Collections.ObjectModel;
using System.Linq;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.UI.Xaml.Controls;
@@ -9,16 +10,16 @@ namespace Wino.Dialogs;
public sealed partial class AccountReorderDialog : ContentDialog
{
public ObservableCollection<IAccountProviderDetailViewModel> Accounts { get; }
public ObservableCollection<IAccountProviderDetailViewModel> Accounts { get; set; } = null!;
private int count;
private bool isOrdering = false;
private readonly IAccountService _accountService = App.Current.Services.GetService<IAccountService>();
private readonly IAccountService? _accountService = App.Current.Services.GetService<IAccountService>();
public AccountReorderDialog(ObservableCollection<IAccountProviderDetailViewModel> accounts)
public AccountReorderDialog(ObservableCollection<IAccountProviderDetailViewModel>? accounts)
{
Accounts = accounts;
Accounts = accounts ?? throw new ArgumentNullException(nameof(accounts));
count = accounts.Count;
@@ -33,7 +34,7 @@ public sealed partial class AccountReorderDialog : ContentDialog
private void DialogClosed(ContentDialog sender, ContentDialogClosedEventArgs args) => Accounts.CollectionChanged -= AccountsChanged;
private async void AccountsChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
private async void AccountsChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
{
if (count - 1 == Accounts.Count)
isOrdering = true;
@@ -44,7 +45,8 @@ public sealed partial class AccountReorderDialog : ContentDialog
var dict = Accounts.ToDictionary(a => a.StartupEntityId, a => Accounts.IndexOf(a));
await _accountService.UpdateAccountOrdersAsync(dict);
if (_accountService != null)
await _accountService.UpdateAccountOrdersAsync(dict);
isOrdering = false;
}
Wino.Mail.WinUI/Dialogs/CreateAccountAliasDialog.xaml.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace Wino.Dialogs;
public sealed partial class CreateAccountAliasDialog : ContentDialog, ICreateAccountAliasDialog
{
public MailAccountAlias CreatedAccountAlias { get; set; }
public MailAccountAlias CreatedAccountAlias { get; set; } = null!;
public CreateAccountAliasDialog()
{
InitializeComponent();
Wino.Mail.WinUI/Dialogs/KeyboardShortcutDialog.xaml.cs
+2 -2
View File
@@ -25,7 +25,7 @@ public sealed partial class KeyboardShortcutDialog : ContentDialog
{
InitializeComponent();
AvailableMailOperations = GetAvailableMailOperations();
SelectedMailOperation = AvailableMailOperations.FirstOrDefault();
SelectedMailOperation = AvailableMailOperations.FirstOrDefault()!;
}
public KeyboardShortcutDialog(KeyboardShortcut existingShortcut) : this()
@@ -33,7 +33,7 @@ public sealed partial class KeyboardShortcutDialog : ContentDialog
if (existingShortcut != null)
{
KeyInputTextBox.Text = existingShortcut.Key;
SelectedMailOperation = AvailableMailOperations.FirstOrDefault(x => x.Operation == existingShortcut.MailOperation);
SelectedMailOperation = AvailableMailOperations.FirstOrDefault(x => x.Operation == existingShortcut.MailOperation)!;
var modifiers = existingShortcut.ModifierKeys;
IsControlPressed = modifiers.HasFlag(ModifierKeys.Control);
Wino.Mail.WinUI/Dialogs/MessageSourceDialog.xaml.cs
+3 -3
View File
@@ -8,8 +8,8 @@ namespace Wino.Mail.Dialogs;
public sealed partial class MessageSourceDialog : ContentDialog
{
private readonly IClipboardService _clipboardService = App.Current.Services.GetService<IClipboardService>();
public string MessageSource { get; set; }
private readonly IClipboardService? _clipboardService = App.Current.Services.GetService<IClipboardService>();
public string MessageSource { get; set; } = string.Empty;
public bool Copied { get; set; }
public MessageSourceDialog()
{
@@ -18,7 +18,7 @@ public sealed partial class MessageSourceDialog : ContentDialog
private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
{
_clipboardService.CopyClipboardAsync(MessageSource);
_clipboardService!.CopyClipboardAsync(MessageSource);
Copied = true;
}
}
Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml.cs
+2 -2
View File
@@ -17,7 +17,7 @@ public sealed partial class MoveMailDialog : ContentDialog
public static readonly DependencyProperty SelectedFolderProperty = DependencyProperty.Register(nameof(SelectedFolder), typeof(IMailItemFolder), typeof(MoveMailDialog), new PropertyMetadata(null, OnSelectedFolderChanged));
public List<IMailItemFolder> FolderList { get; set; }
public List<IMailItemFolder> FolderList { get; set; } = [];
public MoveMailDialog(List<IMailItemFolder> allFolders)
{
@@ -58,7 +58,7 @@ public sealed partial class MoveMailDialog : ContentDialog
container.IsExpanded = !container.IsExpanded;
}
}
SelectedFolder = null;
SelectedFolder = null!;
}
else
{
Wino.Mail.WinUI/Dialogs/NewImapSetupDialog.xaml.cs
+1 -1
View File
@@ -43,7 +43,7 @@ public sealed partial class NewImapSetupDialog : ContentDialog,
public void Complete(bool cancel)
{
if (!_getServerInfoTaskCompletionSource.Task.IsCompleted)
_getServerInfoTaskCompletionSource.TrySetResult(null);
_getServerInfoTaskCompletionSource.TrySetResult(null!);
isDismissRequested = true;
Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml.cs
+2 -2
View File
@@ -8,7 +8,7 @@ namespace Wino.Dialogs;
public sealed partial class SignatureEditorDialog : ContentDialog
{
public AccountSignature Result;
public AccountSignature Result = null!;
public SignatureEditorDialog()
{
@@ -51,7 +51,7 @@ public sealed partial class SignatureEditorDialog : ContentDialog
private async void SaveClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
{
var newSignature = Regex.Unescape(await WebViewEditor.GetHtmlBodyAsync());
var newSignature = Regex.Unescape((await WebViewEditor.GetHtmlBodyAsync())!);
if (Result == null)
{
Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml.cs
+17 -18
View File
@@ -5,7 +5,6 @@ using Microsoft.UI.Xaml.Controls;
using Wino.Core.Domain;
using Wino.Core.Domain.Entities.Mail;
using Wino.Core.Domain.Enums;
using Wino.Core.Domain.Exceptions;
using Wino.Core.Domain.Models.Folders;
namespace Wino.Dialogs;
@@ -14,14 +13,14 @@ public sealed partial class SystemFolderConfigurationDialog : ContentDialog
{
private bool canDismissDialog = false;
public SystemFolderConfiguration Configuration { get; set; }
public SystemFolderConfiguration? Configuration { get; set; }
public List<MailItemFolder> AvailableFolders { get; }
public MailItemFolder Sent { get; set; }
public MailItemFolder Draft { get; set; }
public MailItemFolder Archive { get; set; }
public MailItemFolder Junk { get; set; }
public MailItemFolder Trash { get; set; }
public MailItemFolder? Sent { get; set; }
public MailItemFolder? Draft { get; set; }
public MailItemFolder? Archive { get; set; }
public MailItemFolder? Junk { get; set; }
public MailItemFolder? Trash { get; set; }
public SystemFolderConfigurationDialog(List<MailItemFolder> availableFolders)
{
@@ -29,11 +28,11 @@ public sealed partial class SystemFolderConfigurationDialog : ContentDialog
AvailableFolders = availableFolders;
Sent = AvailableFolders.Find(a => a.SpecialFolderType == Core.Domain.Enums.SpecialFolderType.Sent);
Draft = AvailableFolders.Find(a => a.SpecialFolderType == Core.Domain.Enums.SpecialFolderType.Draft);
Archive = AvailableFolders.Find(a => a.SpecialFolderType == Core.Domain.Enums.SpecialFolderType.Archive);
Junk = AvailableFolders.Find(a => a.SpecialFolderType == Core.Domain.Enums.SpecialFolderType.Junk);
Trash = AvailableFolders.Find(a => a.SpecialFolderType == Core.Domain.Enums.SpecialFolderType.Deleted);
Sent = AvailableFolders.Find(a => a.SpecialFolderType == SpecialFolderType.Sent);
Draft = AvailableFolders.Find(a => a.SpecialFolderType == SpecialFolderType.Draft);
Archive = AvailableFolders.Find(a => a.SpecialFolderType == SpecialFolderType.Archive);
Junk = AvailableFolders.Find(a => a.SpecialFolderType == SpecialFolderType.Junk);
Trash = AvailableFolders.Find(a => a.SpecialFolderType == SpecialFolderType.Deleted);
}
private void DialogClosing(ContentDialog sender, ContentDialogClosingEventArgs args)
@@ -46,21 +45,21 @@ public sealed partial class SystemFolderConfigurationDialog : ContentDialog
private void SaveClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
{
ValidationErrorTextBlock.Text = string.Empty;
ValidationErrorTextBlock!.Text = string.Empty;
var allSpecialFolders = new List<MailItemFolder>()
var allSpecialFolders = new List<MailItemFolder?>()
{
Sent, Draft, Archive, Trash, Junk
};
if (allSpecialFolders.Any(a => a != null && a.SpecialFolderType == SpecialFolderType.Inbox))
ValidationErrorTextBlock.Text = Translator.SystemFolderConfigDialogValidation_InboxSelected;
ValidationErrorTextBlock!.Text = Translator.SystemFolderConfigDialogValidation_InboxSelected;
if (new HashSet<Guid>(allSpecialFolders.Where(a => a != null).Select(x => x.Id)).Count != allSpecialFolders.Where(a => a != null).Count())
ValidationErrorTextBlock.Text = Translator.SystemFolderConfigDialogValidation_DuplicateSystemFolders;
if (new HashSet<Guid>(allSpecialFolders.Where(a => a != null).Select(x => x!.Id)).Count != allSpecialFolders.Where(a => a != null).Count())
ValidationErrorTextBlock!.Text = Translator.SystemFolderConfigDialogValidation_DuplicateSystemFolders;
// Check if we can save.
if (string.IsNullOrEmpty(ValidationErrorTextBlock.Text))
if (string.IsNullOrEmpty(ValidationErrorTextBlock!.Text))
{
var configuration = new SystemFolderConfiguration(Sent, Draft, Archive, Trash, Junk);