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

PreRelease fixes

Browse source
This commit is contained in:
RainLoop Team 2015-07-05 22:06:19 +04:00
parent 34a9b8cbc5
commit 42bac6aa2f
55 changed files with 578 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dev/View/Popup/NewOpenPgpKey.js
View file

@ -42,7 +42,6 @@
var
self = this,
sUserID = '',
mKeyPair = null,
oOpenpgpKeyring = PgpStore.openpgpKeyring
;
@ -72,7 +71,7 @@
'passphrase': Utils.trim(self.password())
});
mPromise.then(function () {
mPromise.then(function (mKeyPair) {
self.submitRequest(false);
@ -80,6 +79,7 @@
{
oOpenpgpKeyring.privateKeys.importKey(mKeyPair.privateKeyArmored);
oOpenpgpKeyring.publicKeys.importKey(mKeyPair.publicKeyArmored);
oOpenpgpKeyring.store();
require('App/User').reloadOpenPgpKeys();
@ -89,8 +89,11 @@
})['catch'](function() {
self.submitRequest(false);
});
} catch (e) {}
}
catch (e)
{
self.submitRequest(false);
}
}, 100);