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 more changes of #600

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

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

@ -133,31 +133,21 @@ export const
async decrypt(message) { async decrypt(message) {
const sender = message.from[0].email, const sender = message.from[0].email,
armoredText = message.plain(), armoredText = message.plain();
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');
} }
// Try OpenPGP.js // Try OpenPGP.js
let email = emails.find(email => {
let result = OpenPGPUserStore.getPrivateKeyFor(email.email);
if (result) {
console.log('Trying decrypt with '+result.id+' of '+email.email);
}
return result;
});
if (email) {
let result = await OpenPGPUserStore.decrypt(armoredText, sender); let result = await OpenPGPUserStore.decrypt(armoredText, sender);
if (result) { if (result) {
return result; return result;
} }
console.error('OpenPGP decrypt failed');
}
// Try Mailvelope (does not support inline images) // Try Mailvelope (does not support inline images)
try { try {
let i = emails.length; let emails = [...message.from,...message.to,...message.cc].validUnique(),
i = emails.length;
while (i--) { while (i--) {
if (await this.getMailvelopePrivateKeyFor(emails[i].email)) { if (await this.getMailvelopePrivateKeyFor(emails[i].email)) {
/** /**