Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-04 23:17:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix: decrypt failed when OpenPGP.js not loaded

Browse source
This commit is contained in:
the-djmaze 2022-11-04 15:25:53 +01:00
parent 44c42ade52
commit 8c356d8154
2 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,9 +56,7 @@ export const
addEventListener('mailvelope', () => this.loadKeyrings(identifier));
}
if (OpenPGPUserStore.isSupported()) {
OpenPGPUserStore.loadKeyrings();
}
OpenPGPUserStore.loadKeyrings();
if (SettingsCapa('GnuPG')) {
GnuPGUserStore.loadKeyrings();
@ -139,9 +137,11 @@ export const
}
// Try OpenPGP.js
let result = await OpenPGPUserStore.decrypt(armoredText, sender);
if (result) {
return result;
if (OpenPGPUserStore.isSupported()) {
let result = await OpenPGPUserStore.decrypt(armoredText, sender);
if (result) {
return result;
}
}
// Try Mailvelope (does not support inline images)
@ -161,7 +161,7 @@ export const
*/
const body = message.body;
body.textContent = '';
result = await mailvelope.createDisplayContainer(
let result = await mailvelope.createDisplayContainer(
'#'+body.id,
armoredText,
this.mailvelopeKeyring,