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

Revert a PGP change of #600

Browse source
This commit is contained in:
the-djmaze 2022-11-01 19:19:38 +01:00
parent b39d023241
commit bd117d02e6
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dev/Stores/User/Pgp.js
View file

@ -132,7 +132,8 @@ export const
} }
async decrypt(message) { async decrypt(message) {
const armoredText = message.plain(), const sender = message.from[0].email,
armoredText = message.plain(),
emails = [...message.from,...message.to,...message.cc].validUnique(); emails = [...message.from,...message.to,...message.cc].validUnique();
if (!this.isEncrypted(armoredText)) { if (!this.isEncrypted(armoredText)) {
throw Error('Not armored text'); throw Error('Not armored text');
@ -147,8 +148,8 @@ export const
return result; return result;
}); });
if (email) { if (email) {
let result = await OpenPGPUserStore.decrypt(armoredText, email.email); let result = await OpenPGPUserStore.decrypt(armoredText, sender);
if (result?.data) { if (result) {
return result; return result;
} }
console.error('OpenPGP decrypt failed'); console.error('OpenPGP decrypt failed');
@ -175,7 +176,7 @@ export const
armoredText, armoredText,
this.mailvelopeKeyring, this.mailvelopeKeyring,
{ {
senderAddress: message.from[0].email senderAddress: sender
// emails[i].email // emails[i].email
} }
); );