mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-24 18:08:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed issue where multiple threads were attempting to modify search result list (#761)

Browse source 
* Fixed issue where multiple threads were attempting to modify search result list

* Fixed race condition
This commit is contained in:
Matt Portune 2020-03-09 18:43:28 -04:00 committed by GitHub
parent 6263788d6a
commit 8a059e0fbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App/Pages/Vault/CiphersPage.xaml.cs
View file

@ -75,7 +75,7 @@ namespace Bit.App.Pages
{ {
return; return;
} }
_vm.Search(e.NewTextValue, 500); _vm.Search(e.NewTextValue, 200);
} }
private void SearchBar_SearchButtonPressed(object sender, EventArgs e) private void SearchBar_SearchButtonPressed(object sender, EventArgs e)

13
src/App/Pages/Vault/CiphersPageViewModel.cs
View file

@ -77,7 +77,7 @@ namespace Bit.App.Pages
.GetValueOrDefault(); .GetValueOrDefault();
if(!string.IsNullOrWhiteSpace((Page as CiphersPage).SearchBar.Text)) if(!string.IsNullOrWhiteSpace((Page as CiphersPage).SearchBar.Text))
{ {
Search((Page as CiphersPage).SearchBar.Text, 500); Search((Page as CiphersPage).SearchBar.Text, 200);
} }
} }
@ -110,16 +110,19 @@ namespace Bit.App.Pages
} }
catch(OperationCanceledException) catch(OperationCanceledException)
{ {
ciphers = new List<CipherView>(); return;
} }
} }
if(ciphers == null) if(ciphers == null)
{ {
ciphers = new List<CipherView>(); ciphers = new List<CipherView>();
} }
Ciphers.ResetWithRange(ciphers); Device.BeginInvokeOnMainThread(() =>
ShowNoData = searchable && Ciphers.Count == 0; {
ShowList = searchable && !ShowNoData; Ciphers.ResetWithRange(ciphers);
ShowNoData = searchable && Ciphers.Count == 0;
ShowList = searchable && !ShowNoData;
});
}, cts.Token); }, cts.Token);
_searchCancellationTokenSource = cts; _searchCancellationTokenSource = cts;
} }