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

fix logic on identity view address

Browse source
This commit is contained in:
Kyle Spearrin 2019-04-29 09:31:44 -04:00
parent 65fe0e8f62
commit 69eeb8bd23
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Core/Models/View/IdentityView.cs
View file

@ -75,23 +75,23 @@ namespace Bit.Core.Models.View
{ {
get get
{ {
if(string.IsNullOrWhiteSpace(Title) || string.IsNullOrWhiteSpace(FirstName) || if(!string.IsNullOrWhiteSpace(Title) || !string.IsNullOrWhiteSpace(FirstName) ||
string.IsNullOrWhiteSpace(MiddleName) || string.IsNullOrWhiteSpace(LastName)) !string.IsNullOrWhiteSpace(MiddleName) || !string.IsNullOrWhiteSpace(LastName))
{ {
var name = string.Empty; var name = string.Empty;
if(string.IsNullOrWhiteSpace(Title)) if(!string.IsNullOrWhiteSpace(Title))
{ {
name = string.Concat(name, Title, " "); name = string.Concat(name, Title, " ");
} }
if(string.IsNullOrWhiteSpace(FirstName)) if(!string.IsNullOrWhiteSpace(FirstName))
{ {
name = string.Concat(name, FirstName, " "); name = string.Concat(name, FirstName, " ");
} }
if(string.IsNullOrWhiteSpace(MiddleName)) if(!string.IsNullOrWhiteSpace(MiddleName))
{ {
name = string.Concat(name, MiddleName, " "); name = string.Concat(name, MiddleName, " ");
} }
if(string.IsNullOrWhiteSpace(LastName)) if(!string.IsNullOrWhiteSpace(LastName))
{ {
name = string.Concat(name, LastName); name = string.Concat(name, LastName);
} }
@ -106,17 +106,17 @@ namespace Bit.Core.Models.View
get get
{ {
var address = Address1; var address = Address1;
if(string.IsNullOrWhiteSpace(Address2)) if(!string.IsNullOrWhiteSpace(Address2))
{ {
if(string.IsNullOrWhiteSpace(address)) if(!string.IsNullOrWhiteSpace(address))
{ {
address += ", "; address += ", ";
} }
address += Address2; address += Address2;
} }
if(string.IsNullOrWhiteSpace(Address3)) if(!string.IsNullOrWhiteSpace(Address3))
{ {
if(string.IsNullOrWhiteSpace(address)) if(!string.IsNullOrWhiteSpace(address))
{ {
address += ", "; address += ", ";
} }