Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some more changes for #600

Browse source
This commit is contained in:
the-djmaze 2022-11-01 19:14:08 +01:00
parent 41df46dbed
commit b39d023241
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dev/Stores/User/GnuPG.js
View file

@ -15,9 +15,10 @@ const
askPassphrase = async (privateKey, btnTxt = 'LABEL_SIGN') => askPassphrase = async (privateKey, btnTxt = 'LABEL_SIGN') =>
await AskPopupView.password('GnuPG key<br>' + privateKey.id + ' ' + privateKey.emails[0], 'OPENPGP/'+btnTxt), await AskPopupView.password('GnuPG key<br>' + privateKey.id + ' ' + privateKey.emails[0], 'OPENPGP/'+btnTxt),
findGnuPGKey = (keys, query, sign) => findGnuPGKey = (keys, query/*, sign*/) =>
keys.find(key => keys.find(key =>
key[sign ? 'can_sign' : 'can_decrypt'] // key[sign ? 'can_sign' : 'can_decrypt']
(key.can_sign || key.can_decrypt)
&& (key.emails.includes(query) || key.subkeys.find(key => query == key.keyid || query == key.fingerprint)) && (key.emails.includes(query) || key.subkeys.find(key => query == key.keyid || query == key.fingerprint))
); );

24
dev/View/User/MailBox/MessageView.js
View file

@ -529,16 +529,18 @@ export class MailMessageView extends AbstractViewRight {
pgpDecrypt() { pgpDecrypt() {
const oMessage = currentMessage(); const oMessage = currentMessage();
PgpUserStore.decrypt(oMessage).then(result => { PgpUserStore.decrypt(oMessage).then(result => {
if (result?.data) { if (result) {
oMessage.pgpDecrypted(true); if (result.data) {
MimeToMessage(result.data, oMessage); oMessage.pgpDecrypted(true);
oMessage.html() ? oMessage.viewHtml() : oMessage.viewPlain(); MimeToMessage(result.data, oMessage);
if (result.signatures?.length) { oMessage.html() ? oMessage.viewHtml() : oMessage.viewPlain();
oMessage.pgpSigned(true); if (result.signatures?.length) {
oMessage.pgpVerified({ oMessage.pgpSigned(true);
signatures: result.signatures, oMessage.pgpVerified({
success: !!result.signatures.length signatures: result.signatures,
}); success: !!result.signatures.length
});
}
} }
} else { } else {
// TODO: translate // TODO: translate
@ -553,6 +555,8 @@ export class MailMessageView extends AbstractViewRight {
PgpUserStore.verify(oMessage).then(result => { PgpUserStore.verify(oMessage).then(result => {
if (result) { if (result) {
oMessage.pgpVerified(result); oMessage.pgpVerified(result);
} else {
alert('Verification failed or no valid public key found');
} }
/* /*
if (result?.success) { if (result?.success) {