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

Prevent delay between mail addings and better folder init cancellation.

Browse Source
This commit is contained in:
Burak Kaan Köse
2024-08-25 02:01:08 +02:00
parent c8fce82dc1
commit d0b54ea44b
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -614,8 +614,6 @@ namespace Wino.Mail.ViewModels
try
{
await listManipulationSemepahore.WaitAsync();
if (ActiveFolder == null) return;
// At least accounts must match.
@@ -631,6 +629,8 @@ namespace Wino.Mail.ViewModels
// Item should be prevented from being added to the list due to filter.
if (!shouldPreventIgnoringFilter && ShouldPreventItemAdd(addedMail)) return;
await listManipulationSemepahore.WaitAsync();
await MailCollection.AddAsync(addedMail);
await ExecuteUIThread(() => { NotifyItemFoundState(); });
@@ -762,12 +762,17 @@ namespace Wino.Mail.ViewModels
// Folder is changed during initialization.
// Just cancel the existing one and wait for new initialization.
if (listManipulationSemepahore.CurrentCount == 0)
{
Debug.WriteLine("Canceling initialization of mails.");
//if (listManipulationSemepahore.CurrentCount == 0)
//{
// Debug.WriteLine("Canceling initialization of mails.");
// listManipulationCancellationTokenSource.Cancel();
// listManipulationCancellationTokenSource.Token.ThrowIfCancellationRequested();
//}
if (!listManipulationCancellationTokenSource.IsCancellationRequested)
{
listManipulationCancellationTokenSource.Cancel();
listManipulationCancellationTokenSource.Token.ThrowIfCancellationRequested();
}
listManipulationCancellationTokenSource = new CancellationTokenSource();
@@ -794,15 +799,18 @@ namespace Wino.Mail.ViewModels
SearchQuery,
MailCollection.MailCopyIdHashSet);
var items = await _mailService.FetchMailsAsync(initializationOptions).ConfigureAwait(false);
var items = await _mailService.FetchMailsAsync(initializationOptions, cancellationToken).ConfigureAwait(false);
// Here they are already threaded if needed.
// We don't need to insert them one by one.
// Just create VMs and do bulk insert.
if (!listManipulationCancellationTokenSource.IsCancellationRequested)
{
// Here they are already threaded if needed.
// We don't need to insert them one by one.
// Just create VMs and do bulk insert.
var viewModels = PrepareMailViewModels(items);
var viewModels = PrepareMailViewModels(items);
await ExecuteUIThread(() => { MailCollection.AddRange(viewModels, true); });
await ExecuteUIThread(() => { MailCollection.AddRange(viewModels, true); });
}
}
catch (OperationCanceledException)
{