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

Fix for prune non single draft items.

Browse Source
This commit is contained in:
Burak Kaan Köse
2024-07-15 00:58:20 +02:00
parent 7de89ffe57
commit 0894c56c19
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Wino.Mail.ViewModels/Collections/WinoMailCollection.cs
View File

@@ -459,14 +459,25 @@ namespace Wino.Mail.ViewModels.Collections
var singleViewModel = threadMailItemViewModel.GetSingleItemViewModel(); var singleViewModel = threadMailItemViewModel.GetSingleItemViewModel();
var groupKey = GetGroupingKey(singleViewModel); var groupKey = GetGroupingKey(singleViewModel);
await ExecuteUIThread(() => { RemoveItemInternal(group, threadMailItemViewModel); }); await ExecuteUIThread(() =>
{
RemoveItemInternal(group, threadMailItemViewModel);
InsertItemInternal(groupKey, singleViewModel);
});
// If thread->single conversion is being done, we should ignore it for non-draft items. // If thread->single conversion is being done, we should ignore it for non-draft items.
// eg. Deleting a reply message from draft folder. Single non-draft item should not be re-added. // eg. Deleting a reply message from draft folder. Single non-draft item should not be re-added.
if (!PruneSingleNonDraftItems || singleViewModel.IsDraft) if (PruneSingleNonDraftItems && !singleViewModel.IsDraft)
{ {
await ExecuteUIThread(() => { InsertItemInternal(groupKey, singleViewModel); }); // This item should not be here anymore.
// It's basically a reply mail in Draft folder.
var newGroup = _mailItemSource.FirstGroupByKeyOrDefault(groupKey);
if (newGroup != null)
{
await ExecuteUIThread(() => { RemoveItemInternal(newGroup, singleViewModel); });
}
} }
} }
else if (threadMailItemViewModel.ThreadItems.Count == 0) else if (threadMailItemViewModel.ThreadItems.Count == 0)
@@ -481,18 +492,6 @@ namespace Wino.Mail.ViewModels.Collections
UpdateUniqueIdHashes(removalItem, false); UpdateUniqueIdHashes(removalItem, false);
} }
var newGroupKey = GetGroupingKey(threadMailItemViewModel);
// Make sure to update group key after the thread is updated.
if (!oldGroupKey.Equals(newGroupKey))
{
await ExecuteUIThread(() =>
{
RemoveItemInternal(group, threadMailItemViewModel);
InsertItemInternal(newGroupKey, threadMailItemViewModel);
});
}
shouldExit = true; shouldExit = true;
break; break;
} }