Fixing UI thread issues with bulk operations and request queue refactoring.

This commit is contained in:
Burak Kaan Köse
2026-04-20 02:18:23 +02:00
parent 3bd0b69429
commit 54148716bb
38 changed files with 1644 additions and 206 deletions
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using CommunityToolkit.Mvvm.Messaging;
using Wino.Core.Domain.Entities.Mail;
using Wino.Core.Domain.Enums;
@@ -14,18 +15,26 @@ public record EmptyFolderRequest(MailItemFolder Folder, List<MailCopy> MailsToDe
public bool ExcludeMustHaveFolders => false;
public override void ApplyUIChanges()
{
foreach (var item in MailsToDelete)
{
WeakReferenceMessenger.Default.Send(new MailRemovedMessage(item, EntityUpdateSource.ClientUpdated));
}
var removedMails = MailsToDelete?
.Where(item => item != null)
.ToList();
if (removedMails == null || removedMails.Count == 0)
return;
WeakReferenceMessenger.Default.Send(new BulkMailRemovedMessage(removedMails, EntityUpdateSource.ClientUpdated));
}
public override void RevertUIChanges()
{
foreach (var item in MailsToDelete)
{
WeakReferenceMessenger.Default.Send(new MailAddedMessage(item, EntityUpdateSource.ClientReverted));
}
var addedMails = MailsToDelete?
.Where(item => item != null)
.ToList();
if (addedMails == null || addedMails.Count == 0)
return;
WeakReferenceMessenger.Default.Send(new BulkMailAddedMessage(addedMails, EntityUpdateSource.ClientReverted));
}
public List<Guid> SynchronizationFolderIds => [Folder.Id];
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using CommunityToolkit.Mvvm.Messaging;
using Wino.Core.Domain.Entities.Mail;
using Wino.Core.Domain.Enums;
@@ -17,31 +18,31 @@ public record MarkFolderAsReadRequest(MailItemFolder Folder, List<MailCopy> Mail
public override void ApplyUIChanges()
{
if (MailsToMarkRead == null || MailsToMarkRead.Count == 0) return;
var updatedMails = MailsToMarkRead?
.Where(item => item != null && !item.IsRead)
.Select(item => new MailStateChange(item.UniqueId, IsRead: true))
.ToList();
foreach (var item in MailsToMarkRead)
{
// Skip if already read
if (item.IsRead) continue;
if (updatedMails == null || updatedMails.Count == 0)
return;
item.IsRead = true;
WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(item, EntityUpdateSource.ClientUpdated, MailCopyChangeFlags.IsRead));
}
WeakReferenceMessenger.Default.Send(new BulkMailStateUpdatedMessage(
updatedMails,
EntityUpdateSource.ClientUpdated));
}
public override void RevertUIChanges()
{
if (MailsToMarkRead == null || MailsToMarkRead.Count == 0) return;
var updatedMails = MailsToMarkRead?
.Where(item => item != null && !item.IsRead)
.Select(item => new MailStateChange(item.UniqueId, IsRead: false))
.ToList();
foreach (var item in MailsToMarkRead)
{
// Skip if already unread (wasn't changed by ApplyUIChanges)
if (!item.IsRead) continue;
if (updatedMails == null || updatedMails.Count == 0)
return;
item.IsRead = false;
WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(item, EntityUpdateSource.ClientReverted, MailCopyChangeFlags.IsRead));
}
WeakReferenceMessenger.Default.Send(new BulkMailStateUpdatedMessage(
updatedMails,
EntityUpdateSource.ClientReverted));
}
}
+20
View File
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using CommunityToolkit.Mvvm.Messaging;
using Wino.Core.Domain.Entities.Mail;
using Wino.Core.Domain.Enums;
@@ -38,6 +39,7 @@ public record ArchiveRequest(bool IsArchiving, MailCopy Item, MailItemFolder Fro
}
public override MailSynchronizerOperation Operation => MailSynchronizerOperation.Archive;
public override object GroupingKey() => (Operation, IsArchiving, FromFolder.Id, ToFolder?.Id ?? Guid.Empty);
public override void ApplyUIChanges()
{
@@ -55,4 +57,22 @@ public class BatchArchiveRequest : BatchCollection<ArchiveRequest>
public BatchArchiveRequest(IEnumerable<ArchiveRequest> collection) : base(collection)
{
}
public override void ApplyUIChanges()
{
var removedMails = this.Select(x => x.Item).Where(x => x != null).ToList();
if (removedMails.Count == 0)
return;
WeakReferenceMessenger.Default.Send(new BulkMailRemovedMessage(removedMails, EntityUpdateSource.ClientUpdated));
}
public override void RevertUIChanges()
{
var addedMails = this.Select(x => x.Item).Where(x => x != null).ToList();
if (addedMails.Count == 0)
return;
WeakReferenceMessenger.Default.Send(new BulkMailAddedMessage(addedMails, EntityUpdateSource.ClientReverted));
}
}
+40 -8
View File
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using CommunityToolkit.Mvvm.Messaging;
using Wino.Core.Domain.Entities.Mail;
using Wino.Core.Domain.Enums;
@@ -25,25 +26,26 @@ public record ChangeFlagRequest(MailCopy Item, bool IsFlagged) : MailRequestBase
/// If the mail is already in the desired flagged state, no change is needed.
/// </summary>
public bool IsNoOp { get; } = Item.IsFlagged == IsFlagged;
public bool OriginalIsFlagged => _originalIsFlagged;
public override object GroupingKey() => (Operation, Item.FolderId, IsFlagged);
public override void ApplyUIChanges()
{
// Skip UI update if the mail is already in the desired state
if (IsNoOp) return;
Item.IsFlagged = IsFlagged;
WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(Item, EntityUpdateSource.ClientUpdated, MailCopyChangeFlags.IsFlagged));
WeakReferenceMessenger.Default.Send(new MailStateUpdatedMessage(
new MailStateChange(Item.UniqueId, IsFlagged: IsFlagged),
EntityUpdateSource.ClientUpdated));
}
public override void RevertUIChanges()
{
// Skip UI revert if this was a no-op request
if (IsNoOp) return;
Item.IsFlagged = _originalIsFlagged;
WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(Item, EntityUpdateSource.ClientReverted, MailCopyChangeFlags.IsFlagged));
WeakReferenceMessenger.Default.Send(new MailStateUpdatedMessage(
new MailStateChange(Item.UniqueId, IsFlagged: _originalIsFlagged),
EntityUpdateSource.ClientReverted));
}
}
@@ -52,4 +54,34 @@ public class BatchChangeFlagRequest : BatchCollection<ChangeFlagRequest>
public BatchChangeFlagRequest(IEnumerable<ChangeFlagRequest> collection) : base(collection)
{
}
public override void ApplyUIChanges()
{
var updatedMails = this
.Where(x => !x.IsNoOp)
.Select(x => new MailStateChange(x.Item.UniqueId, IsFlagged: x.IsFlagged))
.ToList();
if (updatedMails.Count == 0)
return;
WeakReferenceMessenger.Default.Send(new BulkMailStateUpdatedMessage(
updatedMails,
EntityUpdateSource.ClientUpdated));
}
public override void RevertUIChanges()
{
var updatedMails = this
.Where(x => !x.IsNoOp)
.Select(x => new MailStateChange(x.Item.UniqueId, IsFlagged: x.OriginalIsFlagged))
.ToList();
if (updatedMails.Count == 0)
return;
WeakReferenceMessenger.Default.Send(new BulkMailStateUpdatedMessage(
updatedMails,
EntityUpdateSource.ClientReverted));
}
}
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using CommunityToolkit.Mvvm.Messaging;
using Wino.Core.Domain.Entities.Mail;
using Wino.Core.Domain.Enums;
@@ -30,6 +31,7 @@ public record ChangeJunkStateRequest(bool IsJunk, MailCopy Item, MailItemFolder
public bool ExcludeMustHaveFolders => false;
public override MailSynchronizerOperation Operation => MailSynchronizerOperation.ChangeJunkState;
public override object GroupingKey() => (Operation, IsJunk, FromFolder.Id, TargetFolder?.Id ?? Guid.Empty);
public override void ApplyUIChanges()
{
@@ -47,4 +49,22 @@ public class BatchChangeJunkStateRequest : BatchCollection<ChangeJunkStateReques
public BatchChangeJunkStateRequest(IEnumerable<ChangeJunkStateRequest> collection) : base(collection)
{
}
public override void ApplyUIChanges()
{
var removedMails = this.Select(x => x.Item).Where(x => x != null).ToList();
if (removedMails.Count == 0)
return;
WeakReferenceMessenger.Default.Send(new BulkMailRemovedMessage(removedMails, EntityUpdateSource.ClientUpdated));
}
public override void RevertUIChanges()
{
var addedMails = this.Select(x => x.Item).Where(x => x != null).ToList();
if (addedMails.Count == 0)
return;
WeakReferenceMessenger.Default.Send(new BulkMailAddedMessage(addedMails, EntityUpdateSource.ClientReverted));
}
}
+20
View File
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using CommunityToolkit.Mvvm.Messaging;
using Wino.Core.Domain.Entities.Mail;
using Wino.Core.Domain.Enums;
@@ -19,6 +20,7 @@ public record DeleteRequest(MailCopy MailItem) : MailRequestBase(MailItem),
public List<Guid> SynchronizationFolderIds => [Item.FolderId];
public bool ExcludeMustHaveFolders => false;
public override MailSynchronizerOperation Operation => MailSynchronizerOperation.Delete;
public override object GroupingKey() => (Operation, Item.FolderId);
public override void ApplyUIChanges()
{
@@ -36,4 +38,22 @@ public class BatchDeleteRequest : BatchCollection<DeleteRequest>
public BatchDeleteRequest(IEnumerable<DeleteRequest> collection) : base(collection)
{
}
public override void ApplyUIChanges()
{
var removedMails = this.Select(x => x.Item).Where(x => x != null).ToList();
if (removedMails.Count == 0)
return;
WeakReferenceMessenger.Default.Send(new BulkMailRemovedMessage(removedMails, EntityUpdateSource.ClientUpdated));
}
public override void RevertUIChanges()
{
var addedMails = this.Select(x => x.Item).Where(x => x != null).ToList();
if (addedMails.Count == 0)
return;
WeakReferenceMessenger.Default.Send(new BulkMailAddedMessage(addedMails, EntityUpdateSource.ClientReverted));
}
}
+40 -8
View File
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using CommunityToolkit.Mvvm.Messaging;
using Wino.Core.Domain.Entities.Mail;
using Wino.Core.Domain.Enums;
@@ -24,25 +25,26 @@ public record MarkReadRequest(MailCopy Item, bool IsRead) : MailRequestBase(Item
/// If the mail is already in the desired read state, no change is needed.
/// </summary>
public bool IsNoOp { get; } = Item.IsRead == IsRead;
public bool OriginalIsRead => _originalIsRead;
public override object GroupingKey() => (Operation, Item.FolderId, IsRead);
public override void ApplyUIChanges()
{
// Skip UI update if the mail is already in the desired state
if (IsNoOp) return;
Item.IsRead = IsRead;
WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(Item, EntityUpdateSource.ClientUpdated, MailCopyChangeFlags.IsRead));
WeakReferenceMessenger.Default.Send(new MailStateUpdatedMessage(
new MailStateChange(Item.UniqueId, IsRead: IsRead),
EntityUpdateSource.ClientUpdated));
}
public override void RevertUIChanges()
{
// Skip UI revert if this was a no-op request
if (IsNoOp) return;
Item.IsRead = _originalIsRead;
WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(Item, EntityUpdateSource.ClientReverted, MailCopyChangeFlags.IsRead));
WeakReferenceMessenger.Default.Send(new MailStateUpdatedMessage(
new MailStateChange(Item.UniqueId, IsRead: _originalIsRead),
EntityUpdateSource.ClientReverted));
}
}
@@ -51,4 +53,34 @@ public class BatchMarkReadRequest : BatchCollection<MarkReadRequest>
public BatchMarkReadRequest(IEnumerable<MarkReadRequest> collection) : base(collection)
{
}
public override void ApplyUIChanges()
{
var updatedMails = this
.Where(x => !x.IsNoOp)
.Select(x => new MailStateChange(x.Item.UniqueId, IsRead: x.IsRead))
.ToList();
if (updatedMails.Count == 0)
return;
WeakReferenceMessenger.Default.Send(new BulkMailStateUpdatedMessage(
updatedMails,
EntityUpdateSource.ClientUpdated));
}
public override void RevertUIChanges()
{
var updatedMails = this
.Where(x => !x.IsNoOp)
.Select(x => new MailStateChange(x.Item.UniqueId, IsRead: x.OriginalIsRead))
.ToList();
if (updatedMails.Count == 0)
return;
WeakReferenceMessenger.Default.Send(new BulkMailStateUpdatedMessage(
updatedMails,
EntityUpdateSource.ClientReverted));
}
}
+20
View File
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using CommunityToolkit.Mvvm.Messaging;
using Wino.Core.Domain.Entities.Mail;
using Wino.Core.Domain.Enums;
@@ -15,6 +16,7 @@ public record MoveRequest(MailCopy Item, MailItemFolder FromFolder, MailItemFold
public List<Guid> SynchronizationFolderIds => new() { FromFolder.Id, ToFolder.Id };
public bool ExcludeMustHaveFolders => false;
public override MailSynchronizerOperation Operation => MailSynchronizerOperation.Move;
public override object GroupingKey() => (Operation, FromFolder.Id, ToFolder?.Id ?? Guid.Empty);
public override void ApplyUIChanges()
{
@@ -32,4 +34,22 @@ public class BatchMoveRequest : BatchCollection<MoveRequest>, IUIChangeRequest
public BatchMoveRequest(IEnumerable<MoveRequest> collection) : base(collection)
{
}
public override void ApplyUIChanges()
{
var removedMails = this.Select(x => x.Item).Where(x => x != null).ToList();
if (removedMails.Count == 0)
return;
WeakReferenceMessenger.Default.Send(new BulkMailRemovedMessage(removedMails, EntityUpdateSource.ClientUpdated));
}
public override void RevertUIChanges()
{
var addedMails = this.Select(x => x.Item).Where(x => x != null).ToList();
if (addedMails.Count == 0)
return;
WeakReferenceMessenger.Default.Send(new BulkMailAddedMessage(addedMails, EntityUpdateSource.ClientReverted));
}
}