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

Couple fixes for beta.

Browse Source
This commit is contained in:
Burak Kaan Köse
2026-04-16 13:45:11 +02:00
parent 65f7e0236a
commit 784144cd13
12 changed files with 217 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Wino.Core.Domain/Interfaces/IAccountService.cs
+14
View File
@@ -23,6 +23,20 @@ public interface IAccountService
/// <returns>All local accounts</returns>
Task<List<MailAccount>> GetAccountsAsync();
/// <summary>
/// Checks whether an account with the same display name already exists.
/// </summary>
/// <param name="name">Account display name.</param>
/// <param name="excludedAccountId">Optional account id to exclude from the check.</param>
Task<bool> AccountNameExistsAsync(string name, Guid? excludedAccountId = null);
/// <summary>
/// Checks whether an account with the same primary address already exists.
/// </summary>
/// <param name="address">Primary e-mail address.</param>
/// <param name="excludedAccountId">Optional account id to exclude from the check.</param>
Task<bool> AccountAddressExistsAsync(string address, Guid? excludedAccountId = null);
/// <summary>
/// Returns single MailAccount
/// </summary>
Wino.Core.Domain/Translations/en_US/resources.json
+4
View File
@@ -274,10 +274,13 @@
"Dialog_DontAskAgain": "Don't ask again",
"DialogMessage_AccountLimitMessage": "You have reached the account creation limit.\nWould you like to purchase 'Unlimited Account' add-on to continue?",
"DialogMessage_AccountLimitTitle": "Account Limit Reached",
"DialogMessage_AccountAddressExistsMessage": "An account with the same e-mail address already exists.",
"DialogMessage_AccountExistsTitle": "Existing Account",
"DialogMessage_AliasCreatedMessage": "New alias is succesfully created.",
"DialogMessage_AliasCreatedTitle": "Created New Alias",
"DialogMessage_AliasExistsMessage": "This alias is already in use.",
"DialogMessage_AliasExistsTitle": "Existing Alias",
"DialogMessage_AccountNameExistsMessage": "An account with the same name already exists.",
"DialogMessage_AliasNotSelectedMessage": "You must select an alias before sending a message.",
"DialogMessage_AliasNotSelectedTitle": "Missing Alias",
"DialogMessage_CantDeleteRootAliasMessage": "Root alias can't be deleted. This is your main identity associated with your account setup.",
@@ -883,6 +886,7 @@
"SettingsMailCategories_Title": "Categories",
"SettingsEditAccountDetails_Title": "Edit Account Details",
"SettingsEditAccountDetails_Description": "Change account name, sender name and assign a new color if you like.",
"SettingsAccountDetails_NavigationTitle": "{0} details",
"EditAccountDetailsPage_SaveSuccess_Title": "Changes Saved",
"EditAccountDetailsPage_SaveSuccess_Message": "Your account details have been updated successfully.",
"MailCategoryManagementPage_Title": "Categories",
Wino.Core.ViewModels/AccountManagementPageViewModelBase.cs
+6 -1
View File
@@ -69,7 +69,7 @@ public abstract partial class AccountManagementPageViewModelBase : CoreBaseViewM
[RelayCommand]
private void NavigateAccountDetails(AccountProviderDetailViewModel accountDetails)
{
Messenger.Send(new BreadcrumbNavigationRequested(accountDetails.Account.Name,
Messenger.Send(new BreadcrumbNavigationRequested(GetAccountDetailsTitle(accountDetails.Account),
WinoPage.AccountDetailsPage,
accountDetails.Account.Id));
}
@@ -131,4 +131,9 @@ public abstract partial class AccountManagementPageViewModelBase : CoreBaseViewM
{
OnPropertyChanged(nameof(HasAccountsDefined));
}
private static string GetAccountDetailsTitle(MailAccount account)
=> !string.IsNullOrWhiteSpace(account?.Address)
? string.Format(Translator.SettingsAccountDetails_NavigationTitle, account.Address)
: account?.Name ?? Translator.AccountDetailsPage_Title;
}
Wino.Core.ViewModels/SettingOptionsPageViewModel.cs
+6 -1
View File
@@ -149,7 +149,7 @@ public partial class SettingOptionsPageViewModel : CoreBaseViewModel
switch (account)
{
case AccountProviderDetailViewModel accountDetails:
Messenger.Send(new BreadcrumbNavigationRequested(accountDetails.Account.Name, WinoPage.AccountDetailsPage, accountDetails.Account.Id));
Messenger.Send(new BreadcrumbNavigationRequested(GetAccountDetailsTitle(accountDetails.Account), WinoPage.AccountDetailsPage, accountDetails.Account.Id));
break;
case MergedAccountProviderDetailViewModel mergedAccount:
Messenger.Send(new BreadcrumbNavigationRequested(mergedAccount.MergedInbox.Name, WinoPage.MergedAccountDetailsPage, mergedAccount));
@@ -201,6 +201,11 @@ public partial class SettingOptionsPageViewModel : CoreBaseViewModel
});
}
private static string GetAccountDetailsTitle(MailAccount account)
=> !string.IsNullOrWhiteSpace(account?.Address)
? string.Format(Translator.SettingsAccountDetails_NavigationTitle, account.Address)
: account?.Name ?? Translator.AccountDetailsPage_Title;
private void InitializeQuickSettings()
{
_isInitializingSettings = true;
Wino.Mail.ViewModels/AccountSetupProgressPageViewModel.cs
+5
View File
@@ -220,7 +220,12 @@ public partial class AccountSetupProgressPageViewModel : MailBaseViewModel
_createdAccount.Base64ProfilePictureData = profileResult.ProfileInformation.Base64ProfilePictureData;
if (!string.IsNullOrEmpty(profileResult.ProfileInformation.AccountAddress))
{
if (await _accountService.AccountAddressExistsAsync(profileResult.ProfileInformation.AccountAddress, _createdAccount.Id).ConfigureAwait(false))
throw new InvalidOperationException(Translator.DialogMessage_AccountAddressExistsMessage);
_createdAccount.Address = profileResult.ProfileInformation.AccountAddress;
}
await _accountService.UpdateProfileInformationAsync(_createdAccount.Id, profileResult.ProfileInformation);
}
Wino.Mail.ViewModels/ImapCalDavSettingsPageViewModel.cs
+37
View File
@@ -34,6 +34,7 @@ public partial class ImapCalDavSettingsPageViewModel : MailBaseViewModel
private Guid _editingAccountId;
private SpecialImapProvider _editingSpecialImapProvider;
private TaskCompletionSource<ImapCalDavSetupResult> _completionSource;
private AccountCreationDialogResult _accountCreationContext;
private bool _isCompletionFinalized;
private bool _localOnlyInfoShown;
@@ -283,6 +284,7 @@ public partial class ImapCalDavSettingsPageViewModel : MailBaseViewModel
_pageMode = context.Mode;
_editingAccountId = context.AccountId;
_completionSource = context.CompletionSource;
_accountCreationContext = context.AccountCreationDialogResult;
_isCompletionFinalized = false;
_localOnlyInfoShown = false;
SelectedSetupTabIndex = 0;
@@ -406,6 +408,13 @@ public partial class ImapCalDavSettingsPageViewModel : MailBaseViewModel
ValidateImapSettings(serverInformation);
ValidateCalendarModeSpecificSettings(serverInformation);
var excludedAccountId = _pageMode == ImapCalDavSettingsPageMode.Edit
? _editingAccountId
: (Guid?)null;
if (!await ValidateAccountUniquenessAsync(excludedAccountId).ConfigureAwait(false))
return;
await ValidateImapConnectivityAsync(serverInformation);
IsImapValidationSucceeded = true;
@@ -770,6 +779,34 @@ public partial class ImapCalDavSettingsPageViewModel : MailBaseViewModel
Messenger.Send(new BackBreadcrumNavigationRequested());
}
private async Task<bool> ValidateAccountUniquenessAsync(Guid? excludedAccountId)
{
var accountName = (_pageMode == ImapCalDavSettingsPageMode.Create || _pageMode == ImapCalDavSettingsPageMode.Wizard)
? _accountCreationContext?.AccountName
: null;
if (!string.IsNullOrWhiteSpace(accountName) &&
await _accountService.AccountNameExistsAsync(accountName, excludedAccountId).ConfigureAwait(false))
{
_mailDialogService.InfoBarMessage(
Translator.DialogMessage_AccountExistsTitle,
Translator.DialogMessage_AccountNameExistsMessage,
InfoBarMessageType.Error);
return false;
}
if (await _accountService.AccountAddressExistsAsync(EmailAddress, excludedAccountId).ConfigureAwait(false))
{
_mailDialogService.InfoBarMessage(
Translator.DialogMessage_AccountExistsTitle,
Translator.DialogMessage_AccountAddressExistsMessage,
InfoBarMessageType.Error);
return false;
}
return true;
}
private async Task SaveEditFlowAsync(CustomServerInformation serverInformation)
{
var account = await _accountService.GetAccountAsync(_editingAccountId).ConfigureAwait(false);
Wino.Mail.ViewModels/ProviderSelectionPageViewModel.cs
+17 -1
View File
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using CommunityToolkit.Mvvm.Messaging;
@@ -16,6 +17,8 @@ namespace Wino.Mail.ViewModels;
public partial class ProviderSelectionPageViewModel : MailBaseViewModel
{
private readonly IAccountService _accountService;
private readonly IDialogServiceBase _dialogService;
private readonly IProviderService _providerService;
private readonly INewThemeService _themeService;
@@ -53,10 +56,14 @@ public partial class ProviderSelectionPageViewModel : MailBaseViewModel
public bool IsInitialSynchronizationWarningVisible => SelectedInitialSynchronizationRange?.IsEverything == true;
public ProviderSelectionPageViewModel(
IAccountService accountService,
IDialogServiceBase dialogService,
IProviderService providerService,
INewThemeService themeService,
WelcomeWizardContext wizardContext)
{
_accountService = accountService;
_dialogService = dialogService;
_providerService = providerService;
_themeService = themeService;
WizardContext = wizardContext;
@@ -107,10 +114,19 @@ public partial class ProviderSelectionPageViewModel : MailBaseViewModel
}
[RelayCommand]
private void Proceed()
private async Task ProceedAsync()
{
if (!CanProceed) return;
if (await _accountService.AccountNameExistsAsync(AccountName).ConfigureAwait(false))
{
await _dialogService.ShowMessageAsync(
Translator.DialogMessage_AccountNameExistsMessage,
Translator.DialogMessage_AccountExistsTitle,
WinoCustomMessageDialogIcon.Warning);
return;
}
// Persist to wizard context
WizardContext.SelectedProvider = SelectedProvider;
WizardContext.AccountName = AccountName?.Trim();
Wino.Mail.ViewModels/SpecialImapCredentialsPageViewModel.cs
+16 -1
View File
@@ -15,6 +15,8 @@ namespace Wino.Mail.ViewModels;
public partial class SpecialImapCredentialsPageViewModel : MailBaseViewModel
{
private readonly IAccountService _accountService;
private readonly IDialogServiceBase _dialogService;
private static readonly Dictionary<SpecialImapProvider, string> AppPasswordHelpLinks = new()
{
{ SpecialImapProvider.iCloud, "https://support.apple.com/en-us/102654" },
@@ -56,9 +58,13 @@ public partial class SpecialImapCredentialsPageViewModel : MailBaseViewModel
: Translator.ProviderSelection_CalendarMode_CalDavDescription_Yahoo;
public SpecialImapCredentialsPageViewModel(
IAccountService accountService,
IDialogServiceBase dialogService,
INativeAppService nativeAppService,
WelcomeWizardContext wizardContext)
{
_accountService = accountService;
_dialogService = dialogService;
_nativeAppService = nativeAppService;
WizardContext = wizardContext;
}
@@ -98,10 +104,19 @@ public partial class SpecialImapCredentialsPageViewModel : MailBaseViewModel
}
[RelayCommand]
private void Proceed()
private async Task ProceedAsync()
{
if (!CanProceed) return;
if (await _accountService.AccountAddressExistsAsync(EmailAddress).ConfigureAwait(false))
{
await _dialogService.ShowMessageAsync(
Translator.DialogMessage_AccountAddressExistsMessage,
Translator.DialogMessage_AccountExistsTitle,
WinoCustomMessageDialogIcon.Warning);
return;
}
WizardContext.DisplayName = DisplayName?.Trim();
WizardContext.EmailAddress = EmailAddress?.Trim();
WizardContext.AppSpecificPassword = AppSpecificPassword?.Trim();
Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml
+10
View File
@@ -127,6 +127,16 @@
Text="{x:Bind ViewModel.SenderName, Mode=TwoWay}" />
</controls:SettingsCard>
<controls:SettingsCard Header="{x:Bind domain:Translator.IMAPSetupDialog_MailAddress}">
<controls:SettingsCard.HeaderIcon>
<SymbolIcon Symbol="Mail" />
</controls:SettingsCard.HeaderIcon>
<TextBox
Width="250"
IsReadOnly="True"
Text="{x:Bind ViewModel.Address, Mode=OneWay}" />
</controls:SettingsCard>
<controls:SettingsCard
HorizontalContentAlignment="Stretch"
VerticalContentAlignment="Stretch"
Wino.Mail.WinUI/Views/Mail/ComposePage.xaml.cs
+46 -13
View File
@@ -22,12 +22,10 @@ using Wino.Core.Domain.Entities.Mail;
using Wino.Core.Domain.Entities.Shared;
using Wino.Core.Domain.Models.Reader;
using Wino.Mail.ViewModels.Data;
using Wino.Mail.ViewModels.Messages;
using Wino.Mail.WinUI.Controls;
using Wino.Mail.WinUI.Extensions;
using Wino.Mail.WinUI.Interfaces;
using Wino.Mail.WinUI.Models;
using Wino.Messaging.Client.Mails;
using Wino.Messaging.Client.Shell;
using Wino.Views.Abstract;
@@ -42,6 +40,7 @@ public sealed partial class ComposePage : ComposePageAbstract,
private bool _isPoppedOut;
private bool _isInitialFocusHandled;
private readonly Dictionary<TokenizingTextBox, List<AccountContact>> _recipientSuggestions = [];
public bool SupportsPopOut => !_isPoppedOut;
public event EventHandler<PopOutRequestedEventArgs>? PopOutRequested;
@@ -132,12 +131,17 @@ public sealed partial class ComposePage : ComposePageAbstract,
{
_ = ViewModel.ExecuteUIThread(() =>
{
var addresses = x.Result;
var addresses = x.Result ?? [];
_recipientSuggestions[box] = addresses;
senderBox.ItemsSource = addresses;
});
});
}
else
{
_recipientSuggestions[box] = [];
}
}
});
}
@@ -293,7 +297,7 @@ public sealed partial class ComposePage : ComposePageAbstract,
{
base.OnNavigatedTo(e);
FocusManager.GotFocus += GlobalFocusManagerGotFocus;
// FocusManager.GotFocus += GlobalFocusManagerGotFocus;
var webView = GetWebView();
@@ -335,24 +339,44 @@ public sealed partial class ComposePage : ComposePageAbstract,
private async void TokenItemAdding(TokenizingTextBox sender, TokenItemAddingEventArgs args)
{
// Check is valid email.
if (!EmailValidator.Validate(args.TokenText))
var deferral = args.GetDeferral();
try
{
var suggestedContact = GetFirstSuggestedContact(sender);
var tokenText = suggestedContact?.Address ?? args.TokenText;
var addressCollection = sender.Tag?.ToString() switch
{
"ToBox" => ViewModel.ToItems,
"CCBox" => ViewModel.CCItems,
"BCCBox" => ViewModel.BCCItems,
_ => null
};
if (suggestedContact == null && !EmailValidator.Validate(tokenText))
{
args.Cancel = true;
ViewModel.NotifyInvalidEmail(args.TokenText);
return;
}
var deferral = args.GetDeferral();
AccountContact? addedItem = null;
var addedItem = (sender.Tag?.ToString()) switch
if (suggestedContact != null)
{
"ToBox" => await ViewModel.GetAddressInformationAsync(args.TokenText, ViewModel.ToItems),
"CCBox" => await ViewModel.GetAddressInformationAsync(args.TokenText, ViewModel.CCItems),
"BCCBox" => await ViewModel.GetAddressInformationAsync(args.TokenText, ViewModel.BCCItems),
addedItem = addressCollection?.Any(a => string.Equals(a.Address, suggestedContact.Address, StringComparison.OrdinalIgnoreCase)) == true
? null
: suggestedContact;
}
else
{
addedItem = sender.Tag?.ToString() switch
{
"ToBox" => await ViewModel.GetAddressInformationAsync(tokenText, ViewModel.ToItems),
"CCBox" => await ViewModel.GetAddressInformationAsync(tokenText, ViewModel.CCItems),
"BCCBox" => await ViewModel.GetAddressInformationAsync(tokenText, ViewModel.BCCItems),
_ => null
};
}
if (addedItem == null)
{
@@ -363,9 +387,13 @@ public sealed partial class ComposePage : ComposePageAbstract,
{
args.Item = addedItem;
}
}
finally
{
_recipientSuggestions[sender] = [];
deferral.Complete();
}
}
void IRecipient<ApplicationThemeChanged>.Receive(ApplicationThemeChanged message)
{
@@ -438,6 +466,11 @@ public sealed partial class ComposePage : ComposePageAbstract,
}
}
private AccountContact? GetFirstSuggestedContact(TokenizingTextBox box)
=> _recipientSuggestions.TryGetValue(box, out var suggestions)
? suggestions.FirstOrDefault()
: null;
private void ComposerLoaded(object sender, RoutedEventArgs e)
{
if (ShouldFocusRecipients())
Wino.Mail.WinUI/Views/SettingsPage.xaml.cs
+7 -1
View File
@@ -5,6 +5,7 @@ using CommunityToolkit.Mvvm.Messaging;
using Microsoft.UI.Xaml.Media.Animation;
using Microsoft.UI.Xaml.Navigation;
using Wino.Core.Domain;
using Wino.Core.Domain.Entities.Shared;
using Wino.Core.Domain.Enums;
using Wino.Core.Domain.Models.Settings;
using Wino.Helpers;
@@ -162,7 +163,7 @@ public sealed partial class SettingsPage : SettingsPageAbstract,
DispatcherQueue.TryEnqueue(() =>
{
activePage.Title = message.Account.Name;
activePage.Title = GetAccountDetailsTitle(message.Account);
_ = RefreshCurrentPageStateAsync();
UpdateWindowTitle();
});
@@ -249,6 +250,11 @@ public sealed partial class SettingsPage : SettingsPageAbstract,
: activeTitle;
}
private static string GetAccountDetailsTitle(MailAccount account)
=> !string.IsNullOrWhiteSpace(account?.Address)
? string.Format(Translator.SettingsAccountDetails_NavigationTitle, account.Address)
: account?.Name ?? Translator.AccountDetailsPage_Title;
public Task OnTitleBarSearchTextChangedAsync()
{
SearchSuggestions.Clear();
Wino.Services/AccountService.cs
+34
View File
@@ -240,6 +240,34 @@ public class AccountService : BaseDatabaseService, IAccountService
return accounts;
}
public async Task<bool> AccountNameExistsAsync(string name, Guid? excludedAccountId = null)
{
var normalizedName = name?.Trim();
if (string.IsNullOrWhiteSpace(normalizedName))
return false;
var accounts = await Connection.Table<MailAccount>().ToListAsync().ConfigureAwait(false);
return accounts.Any(account =>
account.Id != excludedAccountId &&
string.Equals(account.Name?.Trim(), normalizedName, StringComparison.OrdinalIgnoreCase));
}
public async Task<bool> AccountAddressExistsAsync(string address, Guid? excludedAccountId = null)
{
var normalizedAddress = address?.Trim();
if (string.IsNullOrWhiteSpace(normalizedAddress))
return false;
var accounts = await Connection.Table<MailAccount>().ToListAsync().ConfigureAwait(false);
return accounts.Any(account =>
account.Id != excludedAccountId &&
string.Equals(account.Address?.Trim(), normalizedAddress, StringComparison.OrdinalIgnoreCase));
}
public async Task CreateRootAliasAsync(Guid accountId, string address)
{
var rootAlias = new MailAccountAlias()
@@ -610,6 +638,12 @@ public class AccountService : BaseDatabaseService, IAccountService
{
Guard.IsNotNull(account);
if (await AccountNameExistsAsync(account.Name).ConfigureAwait(false))
throw new InvalidOperationException(Translator.DialogMessage_AccountNameExistsMessage);
if (await AccountAddressExistsAsync(account.Address).ConfigureAwait(false))
throw new InvalidOperationException(Translator.DialogMessage_AccountAddressExistsMessage);
if (!account.CreatedAt.HasValue)
{
account.CreatedAt = DateTime.UtcNow;