diff --git a/dev/Model/Contact.js b/dev/Model/Contact.js index 4b1147f9a..b3f4df8c3 100644 --- a/dev/Model/Contact.js +++ b/dev/Model/Contact.js @@ -32,7 +32,7 @@ const propertyMap = [ 'URL' => 'Uri', 'UID' => 'FlatText', 'VERSION' => 'FlatText', - 'KEY' => 'FlatText', + 'KEY' => 'FlatText', // data:application/pgp-keys;base64,AZaz09== 'TZ' => 'Text', // vCard 3.0 properties @@ -71,6 +71,21 @@ const propertyMap = [ 'HOBBY' => 'FlatText', 'INTEREST' => 'FlatText', 'ORG-DIRECTORY' => 'FlatText + + + + PGP/INLINE + PGP/MIME + S/MIME + S/MIMEOpaque + + + Ask | Never | IfPossible | Always + + + Ask | Never | IfPossible | Always + + ]; */ @@ -247,20 +262,9 @@ export class ContactModel extends AbstractModel { * @return string */ lineAsCss() { - const result = []; - if (this.deleted()) { - result.push('deleted'); - } - if (this.selected()) { - result.push('selected'); - } - if (this.checked()) { - result.push('checked'); - } - if (this.focused()) { - result.push('focused'); - } - - return result.join(' '); + return (this.selected() ? 'selected' : '') + + (this.deleted() ? ' deleted' : '') + + (this.checked() ? ' checked' : '') + + (this.focused() ? ' focused' : ''); } } diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js index 5d86f6cf3..0ac6a9485 100644 --- a/dev/View/Popup/Contacts.js +++ b/dev/View/Popup/Contacts.js @@ -279,7 +279,10 @@ export class ContactsPopupView extends AbstractViewPopup { let count = 0, list = []; - if (!iError && arrayLength(data.Result.List)) { + if (iError) { +// console.error(data); + alert(data?.ErrorMessage || getNotification(iError)); + } else if (arrayLength(data.Result.List)) { data.Result.List.forEach(item => { item = ContactModel.reviveFromJson(item); item && list.push(item);