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

crash fixes

Browse source
This commit is contained in:
Kyle Spearrin 2019-05-28 22:57:59 -04:00
parent 6218c65ec6
commit 437a60a967
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
View file

@ -15,6 +15,7 @@ namespace Bit.App.Pages
public class GroupingsPageViewModel : BaseViewModel public class GroupingsPageViewModel : BaseViewModel
{ {
private bool _refreshing; private bool _refreshing;
private bool _doingLoad;
private bool _loading; private bool _loading;
private bool _loaded; private bool _loaded;
private bool _showAddCipherButton; private bool _showAddCipherButton;
@ -107,6 +108,11 @@ namespace Bit.App.Pages
public async Task LoadAsync() public async Task LoadAsync()
{ {
if(_doingLoad)
{
return;
}
_doingLoad = true;
ShowNoData = false; ShowNoData = false;
Loading = true; Loading = true;
ShowList = false; ShowList = false;
@ -190,6 +196,7 @@ namespace Bit.App.Pages
} }
finally finally
{ {
_doingLoad = false;
ShowNoData = !groupedItems.Any(); ShowNoData = !groupedItems.Any();
ShowList = !ShowNoData; ShowList = !ShowNoData;
Loaded = true; Loaded = true;

2
src/Core/Services/SettingsService.cs
View file

@ -37,7 +37,7 @@ namespace Bit.Core.Services
if(settings != null && settings.ContainsKey(Keys_EquivalentDomains)) if(settings != null && settings.ContainsKey(Keys_EquivalentDomains))
{ {
var jArray = (settings[Keys_EquivalentDomains] as JArray); var jArray = (settings[Keys_EquivalentDomains] as JArray);
return jArray.ToObject<List<List<string>>>(); return jArray?.ToObject<List<List<string>>>();
} }
return null; return null;
} }