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

Remove redundant notification target.

Browse Source
This commit is contained in:
Burak Kaan Köse
2026-03-01 09:50:05 +01:00
parent 76e3b7289e
commit 11158fe737
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Wino.Mail.WinUI/Services/NotificationBuilder.cs
+9 -23
View File
@@ -5,11 +5,10 @@ using System.Threading.Tasks;
using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging;
using Microsoft.Toolkit.Uwp.Notifications; using Microsoft.Toolkit.Uwp.Notifications;
using Serilog; using Serilog;
using Windows.ApplicationModel;
using Windows.Data.Xml.Dom; using Windows.Data.Xml.Dom;
using Windows.UI.Notifications; using Windows.UI.Notifications;
using Wino.Core.Domain.Entities.Calendar;
using Wino.Core.Domain; using Wino.Core.Domain;
using Wino.Core.Domain.Entities.Calendar;
using Wino.Core.Domain.Entities.Mail; using Wino.Core.Domain.Entities.Mail;
using Wino.Core.Domain.Entities.Shared; using Wino.Core.Domain.Entities.Shared;
using Wino.Core.Domain.Enums; using Wino.Core.Domain.Enums;
@@ -96,7 +95,7 @@ public class NotificationBuilder : INotificationBuilder
Src = new Uri("ms-winsoundevent:Notification.Mail") Src = new Uri("ms-winsoundevent:Notification.Mail")
}); });
ShowToast(builder, ToastTargetApp.Mail); ShowToast(builder);
} }
else else
{ {
@@ -151,7 +150,7 @@ public class NotificationBuilder : INotificationBuilder
}); });
// Use UniqueId as tag to allow removal // Use UniqueId as tag to allow removal
ShowToast(builder, ToastTargetApp.Mail, mailItem.UniqueId.ToString()); ShowToast(builder, mailItem.UniqueId.ToString());
} }
private ToastButton GetDismissButton() private ToastButton GetDismissButton()
@@ -242,7 +241,7 @@ public class NotificationBuilder : INotificationBuilder
{ {
try try
{ {
ToastNotificationManager.History.Remove(mailUniqueId.ToString(), null, GetAppUserModelId(ToastTargetApp.Mail)); ToastNotificationManager.History.Remove(mailUniqueId.ToString(), null);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -263,7 +262,7 @@ public class NotificationBuilder : INotificationBuilder
builder.AddArgument(Constants.ToastMailAccountIdKey, account.Id.ToString()); builder.AddArgument(Constants.ToastMailAccountIdKey, account.Id.ToString());
builder.AddArgument(Constants.ToastModeKey, Constants.ToastModeMail); builder.AddArgument(Constants.ToastModeKey, Constants.ToastModeMail);
builder.AddButton(new ToastButton().SetContent(Translator.Buttons_FixAccount)); builder.AddButton(new ToastButton().SetContent(Translator.Buttons_FixAccount));
ShowToast(builder, ToastTargetApp.Mail); ShowToast(builder);
} }
public void CreateWebView2RuntimeMissingNotification() public void CreateWebView2RuntimeMissingNotification()
@@ -276,7 +275,7 @@ public class NotificationBuilder : INotificationBuilder
builder.AddButton(GetDismissButton()); builder.AddButton(GetDismissButton());
builder.AddArgument(Constants.ToastModeKey, Constants.ToastModeMail); builder.AddArgument(Constants.ToastModeKey, Constants.ToastModeMail);
ShowToast(builder, ToastTargetApp.Mail); ShowToast(builder);
} }
public Task CreateCalendarReminderNotificationAsync(CalendarItem calendarItem, long reminderDurationInSeconds) public Task CreateCalendarReminderNotificationAsync(CalendarItem calendarItem, long reminderDurationInSeconds)
@@ -309,12 +308,12 @@ public class NotificationBuilder : INotificationBuilder
}); });
var tag = $"calendar-reminder-{calendarItem.Id:N}-{reminderDurationInSeconds}"; var tag = $"calendar-reminder-{calendarItem.Id:N}-{reminderDurationInSeconds}";
ShowToast(builder, ToastTargetApp.Calendar, tag); ShowToast(builder, tag);
return Task.CompletedTask; return Task.CompletedTask;
} }
private static void ShowToast(ToastContentBuilder builder, ToastTargetApp targetApp, string? tag = null) private static void ShowToast(ToastContentBuilder builder, string? tag = null)
{ {
var toastNotification = new ToastNotification(builder.GetToastContent().GetXml()); var toastNotification = new ToastNotification(builder.GetToastContent().GetXml());
@@ -323,20 +322,7 @@ public class NotificationBuilder : INotificationBuilder
toastNotification.Tag = tag; toastNotification.Tag = tag;
} }
var appUserModelId = GetAppUserModelId(targetApp); var notifier = ToastNotificationManager.CreateToastNotifier();
var notifier = ToastNotificationManager.CreateToastNotifier(appUserModelId);
notifier.Show(toastNotification); notifier.Show(toastNotification);
} }
private static string GetAppUserModelId(ToastTargetApp targetApp)
{
_ = targetApp;
return $"{Package.Current.Id.FamilyName}!{MailApplicationId}";
}
private enum ToastTargetApp
{
Mail,
Calendar
}
} }