From 949005eda72382859b47a0e4694a90dfae7cb4c0 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Mon, 31 Jan 2022 12:34:41 +0100 Subject: [PATCH] #89 OpenPGP better labeling --- dev/Stores/User/OpenPGP.js | 2 +- dev/View/User/MailBox/MessageView.js | 2 -- .../v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dev/Stores/User/OpenPGP.js b/dev/Stores/User/OpenPGP.js index 6137d8e59..9f5db818f 100644 --- a/dev/Stores/User/OpenPGP.js +++ b/dev/Stores/User/OpenPGP.js @@ -51,7 +51,7 @@ class OpenPgpKeyModel { if (key.users) { key.users.forEach(user => user.userID.email && aEmails.push(user.userID.email)); } - this.id = key.getKeyID().toHex(); + this.id = key.getKeyID().toHex().toUpperCase(); this.fingerprint = key.getFingerprint(); this.can_encrypt = !!key.getEncryptionKey(); this.can_sign = !!key.getSigningKey(); diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index bd467acf9..634e3968c 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -729,8 +729,6 @@ export class MailMessageView extends AbstractViewRight { const publicKey = OpenPGPUserStore.getPublicKeyFor(sender); OpenPGPUserStore.verify(message.plain(), null/*detachedSignature*/, publicKey).then(result => { if (result) { - // TODO: if result.data is not cleartext then - // parse mime to find and verify signature message.plain(result.data); message.viewPlain(); console.dir({signatures:result.signatures}); diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html index 9c552c90b..881095fef 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpGenerate.html @@ -40,7 +40,7 @@