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

Added hashset uniqueid mail check to prevent gmail unread folder items to be removed on next item selection.

Browse Source
This commit is contained in:
Burak Kaan Köse
2024-04-28 20:20:29 +02:00
parent 0322bcd047
commit babed18af0
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Wino.Core/Services/MailService.cs
View File

@@ -394,9 +394,7 @@ namespace Wino.Core.Services
await Connection.DeleteAsync(mailCopy).ConfigureAwait(false); await Connection.DeleteAsync(mailCopy).ConfigureAwait(false);
// Update UI except unread folder to prevent automatic navigation to the next mail. ReportUIChange(new MailRemovedMessage(mailCopy));
if (mailCopy.AssignedFolder.SpecialFolderType != SpecialFolderType.Unread)
ReportUIChange(new MailRemovedMessage(mailCopy));
} }
#endregion #endregion

32
Wino.Mail.ViewModels/MailListPageViewModel.cs
View File

@@ -45,6 +45,14 @@ namespace Wino.Mail.ViewModels
private Guid? trackingSynchronizationId = null; private Guid? trackingSynchronizationId = null;
private int completedTrackingSynchronizationCount = 0; private int completedTrackingSynchronizationCount = 0;
/* [Bug] Unread folder reads All emails automatically with setting "Mark as Read: When Selected" enabled
* https://github.com/bkaankose/Wino-Mail/issues/162
* We store the UniqueIds of the mails that are marked as read in Gmail Unread folder
* to prevent them from being removed from the list when they are marked as read.
*/
private HashSet<Guid> gmailUnreadFolderMarkedAsReadUniqueIds = new HashSet<Guid>();
private IObservable<System.Reactive.EventPattern<NotifyCollectionChangedEventArgs>> selectionChangedObservable = null; private IObservable<System.Reactive.EventPattern<NotifyCollectionChangedEventArgs>> selectionChangedObservable = null;
public WinoMailCollection MailCollection { get; } = new WinoMailCollection(); public WinoMailCollection MailCollection { get; } = new WinoMailCollection();
@@ -210,9 +218,9 @@ namespace Wino.Mail.ViewModels
_activeMailItem = selectedMailItemViewModel; _activeMailItem = selectedMailItemViewModel;
Messenger.Send(new ActiveMailItemChangedEvent(selectedMailItemViewModel)); Messenger.Send(new ActiveMailItemChangedEvent(_activeMailItem));
if (selectedMailItemViewModel == null) return; if (_activeMailItem == null || _activeMailItem.IsRead) return;
// Automatically set mark as read or not based on preferences. // Automatically set mark as read or not based on preferences.
@@ -220,13 +228,16 @@ namespace Wino.Mail.ViewModels
if (markAsPreference == MailMarkAsOption.WhenSelected) if (markAsPreference == MailMarkAsOption.WhenSelected)
{ {
if (selectedMailItemViewModel != null && !selectedMailItemViewModel.IsRead) var operation = MailOperation.MarkAsRead;
{ var package = new MailOperationPreperationRequest(operation, _activeMailItem.MailCopy);
var operation = MailOperation.MarkAsRead;
var package = new MailOperationPreperationRequest(operation,_activeMailItem.MailCopy);
await ExecuteMailOperationAsync(package); if (ActiveFolder?.SpecialFolderType == SpecialFolderType.Unread &&
!gmailUnreadFolderMarkedAsReadUniqueIds.Contains(_activeMailItem.UniqueId))
{
gmailUnreadFolderMarkedAsReadUniqueIds.Add(_activeMailItem.UniqueId);
} }
await ExecuteMailOperationAsync(package);
} }
else if (markAsPreference == MailMarkAsOption.AfterDelay && PreferencesService.MarkAsDelay >= 0) else if (markAsPreference == MailMarkAsOption.AfterDelay && PreferencesService.MarkAsDelay >= 0)
{ {
@@ -558,13 +569,17 @@ namespace Wino.Mail.ViewModels
// We should delete the items only if: // We should delete the items only if:
// 1. They are deleted from the active folder. // 1. They are deleted from the active folder.
// 2. Deleted from draft or sent folder. // 2. Deleted from draft or sent folder.
// 3. Removal is not caused by Gmail Unread folder action.
// Delete/sent are special folders that can list their items in other folders. // Delete/sent are special folders that can list their items in other folders.
bool removedFromActiveFolder = ActiveFolder.HandlingFolders.Any(a => a.Id == removedMail.AssignedFolder.Id); bool removedFromActiveFolder = ActiveFolder.HandlingFolders.Any(a => a.Id == removedMail.AssignedFolder.Id);
bool removedFromDraftOrSent = removedMail.AssignedFolder.SpecialFolderType == SpecialFolderType.Draft || bool removedFromDraftOrSent = removedMail.AssignedFolder.SpecialFolderType == SpecialFolderType.Draft ||
removedMail.AssignedFolder.SpecialFolderType == SpecialFolderType.Sent; removedMail.AssignedFolder.SpecialFolderType == SpecialFolderType.Sent;
if (removedFromActiveFolder || removedFromDraftOrSent) bool isDeletedByGmailUnreadFolderAction = ActiveFolder.SpecialFolderType == SpecialFolderType.Unread &&
gmailUnreadFolderMarkedAsReadUniqueIds.Contains(removedMail.UniqueId);
if ((removedFromActiveFolder || removedFromDraftOrSent) && !isDeletedByGmailUnreadFolderAction)
{ {
bool isDeletedMailSelected = SelectedItems.Any(a => a.MailCopy.UniqueId == removedMail.UniqueId); bool isDeletedMailSelected = SelectedItems.Any(a => a.MailCopy.UniqueId == removedMail.UniqueId);
@@ -801,6 +816,7 @@ namespace Wino.Mail.ViewModels
isChangingFolder = true; isChangingFolder = true;
ActiveFolder = message.BaseFolderMenuItem; ActiveFolder = message.BaseFolderMenuItem;
gmailUnreadFolderMarkedAsReadUniqueIds.Clear();
trackingSynchronizationId = null; trackingSynchronizationId = null;
completedTrackingSynchronizationCount = 0; completedTrackingSynchronizationCount = 0;