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

more null checks on add/edit save

Browse source
This commit is contained in:
Kyle Spearrin 2019-09-06 10:03:11 -04:00
parent 954aa1112a
commit d34279dca5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/App/Pages/Vault/AddEditPageViewModel.cs
View file

@ -406,8 +406,8 @@ namespace Bit.App.Pages
if(Cipher.Login != null) if(Cipher.Login != null)
{ {
Cipher.Login.Uris = Uris?.ToList(); Cipher.Login.Uris = Uris?.ToList();
if(!EditMode && Cipher.Type == CipherType.Login && (Cipher.Login.Uris?.Count ?? 0) == 1 && if(!EditMode && Cipher.Type == CipherType.Login && Cipher.Login.Uris != null &&
string.IsNullOrWhiteSpace(Cipher.Login.Uris.First()?.Uri)) Cipher.Login.Uris.Count == 1 && string.IsNullOrWhiteSpace(Cipher.Login.Uris[0].Uri))
{ {
Cipher.Login.Uris = null; Cipher.Login.Uris = null;
} }
@ -415,7 +415,7 @@ namespace Bit.App.Pages
if(!EditMode && Cipher.OrganizationId != null) if(!EditMode && Cipher.OrganizationId != null)
{ {
if(!Collections?.Any(c => c?.Checked ?? false) ?? true) if(Collections == null || !Collections.Any(c => c != null && c.Checked))
{ {
await Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.SelectOneCollection, await Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.SelectOneCollection,
AppResources.Ok); AppResources.Ok);
@ -423,8 +423,8 @@ namespace Bit.App.Pages
} }
Cipher.CollectionIds = Collections.Any() ? Cipher.CollectionIds = Collections.Any() ?
new HashSet<string>(Collections.Where(c => c?.Checked ?? false && new HashSet<string>(Collections.Where(c => c != null && c.Checked && c.Collection?.Id != null)
c.Collection != null).Select(c => c.Collection.Id)) : null; .Select(c => c.Collection.Id)) : null;
} }
var cipher = await _cipherService.EncryptAsync(Cipher); var cipher = await _cipherService.EncryptAsync(Cipher);