moparisthebest/keepass2android
1
0
Fork 0
mirror of https://github.com/moparisthebest/keepass2android synced 2024-11-29 12:32:21 -05:00
Code Issues Releases Wiki Activity

Fixed reference equality checks for PwUuid

Browse Source
This commit is contained in:
AlexVallat 2013-07-13 08:14:32 +01:00
parent f06ce9c58b
commit bf84662857
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/KeePassLib2Android/PwCustomIcon.cs
View File

@ -58,8 +58,8 @@ namespace KeePassLib
{ {
Debug.Assert(pwUuid != null); Debug.Assert(pwUuid != null);
if(pwUuid == null) throw new ArgumentNullException("pwUuid"); if(pwUuid == null) throw new ArgumentNullException("pwUuid");
Debug.Assert(pwUuid != PwUuid.Zero); Debug.Assert(!pwUuid.EqualsValue(PwUuid.Zero));
if(pwUuid == PwUuid.Zero) throw new ArgumentException("pwUuid == 0"); if(pwUuid.EqualsValue(PwUuid.Zero)) throw new ArgumentException("pwUuid == 0");
Debug.Assert(pbImageDataPng != null); Debug.Assert(pbImageDataPng != null);
if(pbImageDataPng == null) throw new ArgumentNullException("pbImageDataPng"); if(pbImageDataPng == null) throw new ArgumentNullException("pbImageDataPng");

4
src/KeePassLib2Android/Serialization/KdbxFile.Write.cs
View File

@ -377,7 +377,7 @@ namespace KeePassLib.Serialization
WriteObject(ElemNotes, pg.Notes, true); WriteObject(ElemNotes, pg.Notes, true);
WriteObject(ElemIcon, (int)pg.IconId); WriteObject(ElemIcon, (int)pg.IconId);
if(pg.CustomIconUuid != PwUuid.Zero) if(!pg.CustomIconUuid.EqualsValue(PwUuid.Zero))
WriteObject(ElemCustomIconID, pg.CustomIconUuid); WriteObject(ElemCustomIconID, pg.CustomIconUuid);
WriteList(ElemTimes, pg); WriteList(ElemTimes, pg);
@ -402,7 +402,7 @@ namespace KeePassLib.Serialization
WriteObject(ElemUuid, pe.Uuid); WriteObject(ElemUuid, pe.Uuid);
WriteObject(ElemIcon, (int)pe.IconId); WriteObject(ElemIcon, (int)pe.IconId);
if(pe.CustomIconUuid != PwUuid.Zero) if(!pe.CustomIconUuid.EqualsValue(PwUuid.Zero))
WriteObject(ElemCustomIconID, pe.CustomIconUuid); WriteObject(ElemCustomIconID, pe.CustomIconUuid);
WriteObject(ElemFgColor, StrUtil.ColorToUnnamedHtml(pe.ForegroundColor, true), false); WriteObject(ElemFgColor, StrUtil.ColorToUnnamedHtml(pe.ForegroundColor, true), false);