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

Fixed an issue where notification payloads don't carry remote folder id with them.

Browse Source
This commit is contained in:
Burak Kaan Köse
2024-06-13 23:38:02 +02:00
parent 690e04c377
commit c00f0c9f52
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Wino.Core.UWP/Services/NotificationBuilder.cs
View File

@@ -21,17 +21,22 @@ namespace Wino.Core.UWP.Services
private readonly IUnderlyingThemeService _underlyingThemeService; private readonly IUnderlyingThemeService _underlyingThemeService;
private readonly IAccountService _accountService; private readonly IAccountService _accountService;
private readonly IFolderService _folderService; private readonly IFolderService _folderService;
private readonly IMailService _mailService;
public NotificationBuilder(IUnderlyingThemeService underlyingThemeService, IAccountService accountService, IFolderService folderService) public NotificationBuilder(IUnderlyingThemeService underlyingThemeService,
IAccountService accountService,
IFolderService folderService,
IMailService mailService)
{ {
_underlyingThemeService = underlyingThemeService; _underlyingThemeService = underlyingThemeService;
_accountService = accountService; _accountService = accountService;
_folderService = folderService; _folderService = folderService;
_mailService = mailService;
} }
public async Task CreateNotificationsAsync(Guid inboxFolderId, IEnumerable<IMailItem> newMailItems) public async Task CreateNotificationsAsync(Guid inboxFolderId, IEnumerable<IMailItem> downloadedMailItems)
{ {
var mailCount = newMailItems.Count(); var mailCount = downloadedMailItems.Count();
// If there are more than 3 mails, just display 1 general toast. // If there are more than 3 mails, just display 1 general toast.
if (mailCount > 3) if (mailCount > 3)
@@ -40,7 +45,7 @@ namespace Wino.Core.UWP.Services
builder.SetToastScenario(ToastScenario.Default); builder.SetToastScenario(ToastScenario.Default);
builder.AddText(Translator.Notifications_MultipleNotificationsTitle); builder.AddText(Translator.Notifications_MultipleNotificationsTitle);
builder.AddText(string.Format(Translator.Notifications_MultipleNotificationsTitle, mailCount)); builder.AddText(string.Format(Translator.Notifications_MultipleNotificationsMessage, mailCount));
builder.AddButton(GetDismissButton()); builder.AddButton(GetDismissButton());
@@ -48,7 +53,22 @@ namespace Wino.Core.UWP.Services
} }
else else
{ {
foreach (var mailItem in newMailItems) var validItems = new List<IMailItem>();
// Fetch mails again to fill up assigned folder data and latest statuses.
// They've been marked as read by executing synchronizer tasks until inital sync finishes.
foreach (var item in downloadedMailItems)
{
var mailItem = await _mailService.GetSingleMailItemAsync(item.UniqueId);
if (mailItem != null && mailItem.AssignedFolder != null)
{
validItems.Add(mailItem);
}
}
foreach (var mailItem in validItems)
{ {
if (mailItem.IsRead) if (mailItem.IsRead)
continue; continue;