Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 04:29:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update openpgpjs (1.2.0 -> 2.3.0) (#1023)

Browse source
This commit is contained in:
RainLoop Team 2016-05-05 03:14:38 +03:00
parent 125d4e0282
commit a655b94aba
19 changed files with 20792 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dev/App/User.jsx
View file

@ -455,6 +455,7 @@ class AppUser extends AbstractApp
iIndex,
oItem.primaryKey.getFingerprint(),
oItem.primaryKey.getKeyId().toHex().toLowerCase(),
_.uniq(_.compact(_.map(oItem.getKeyIds(), (item) => item && item.toHex ? item.toHex() : null))),
aUsers,
aEmails,
oItem.isPrivate(),
@ -1297,7 +1298,8 @@ class AppUser extends AbstractApp
{
try
{
PgpStore.openpgp.initWorker(Links.openPgpWorkerJs());
// PgpStore.openpgp.initWorker(Links.openPgpWorkerJs()); // 1.2.0
PgpStore.openpgp.initWorker({path: Links.openPgpWorkerJs()}); // 2.3.0
}
catch (e)
{
@ -1305,8 +1307,6 @@ class AppUser extends AbstractApp
}
}
// PgpStore.openpgp.config.useWebCrypto = false;
PgpStore.openpgpKeyring = new openpgp.Keyring();
PgpStore.capaOpenPGP(true);