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

#89 Use OpenPGP.js v5.1.0 (still in progress)

Browse source
This commit is contained in:
the-djmaze 2022-01-27 16:00:52 +01:00
parent dfd255545a
commit ff7e41ad08
130 changed files with 1871 additions and 44411 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dev/View/Popup/Compose.js
View file

@ -279,9 +279,9 @@ class ComposePopupView extends AbstractViewPopup {
currentIdentity: value => {
this.canPgpSign(false);
value && PgpUserStore.hasKeyForSigning(value.email()).then(result => {
value && PgpUserStore.getKeyForSigning(value.email()).then(result => {
console.log({canPgpSign:result});
this.canPgpSign(result)
this.canPgpSign(!!result)
});
},
@ -458,11 +458,10 @@ class ComposePopupView extends AbstractViewPopup {
if ('openpgp' == sign) {
let privateKey;
try {
const keys = PgpUserStore.openpgpKeyring.privateKeys.getForAddress(this.currentIdentity().email());
const keys = PgpUserStore.getOpenPGPPrivateKeyFor(this.currentIdentity().email());
if (keys[0]) {
keys[0].decrypt(window.prompt('Password', ''));
privateKey = keys[0];
cfg.privateKeys = [privateKey];
cfg.privateKey = privateKey = keys[0];
}
} catch (e) {
console.error(e);
@ -478,7 +477,7 @@ class ComposePopupView extends AbstractViewPopup {
// error 'sign and encrypt must be same engine';
} else if ('openpgp' == encrypt) {
this.allRecipients().forEach(recEmail => {
cfg.publicKeys = cfg.publicKeys.concat(PgpUserStore.openpgpKeyring.publicKeys.getForAddress(recEmail));
cfg.publicKeys = cfg.publicKeys.concat(PgpUserStore.getOpenPGPPublicKeyFor(recEmail));
});
pgpPromise = openpgp.encrypt(cfg);
} else if ('openpgp' == sign) {
@ -1502,7 +1501,8 @@ class ComposePopupView extends AbstractViewPopup {
allRecipients() {
const email = new EmailModel();
return [
// this.currentIdentity.email(),
// From/sender is also recipient (Sent mailbox)
this.currentIdentity().email(),
this.to(),
this.cc(),
this.bcc()