2
0

Merge branch 'master' of github.com:Lyndir/MasterPassword

This commit is contained in:
Maarten Billemont 2016-07-21 10:02:35 -04:00
commit af7327555c

View File

@ -84,7 +84,7 @@ public class MPSiteMarshaller {
strf( "%d:%d:%d", // strf( "%d:%d:%d", //
site.getSiteType().getType(), // type site.getSiteType().getType(), // type
site.getAlgorithmVersion().toInt(), // algorithm site.getAlgorithmVersion().toInt(), // algorithm
site.getSiteCounter() ), // counter site.getSiteCounter().intValue() ), // counter
ifNotNullElse( site.getLoginName(), "" ), // loginName ifNotNullElse( site.getLoginName(), "" ), // loginName
site.getSiteName(), // siteName site.getSiteName(), // siteName
ifNotNullElse( contentMode.contentForSite( site, masterKey ), "" ) // password ifNotNullElse( contentMode.contentForSite( site, masterKey ), "" ) // password