moparisthebest/mail
1
0
Fork 0
mirror of https://github.com/moparisthebest/mail synced 2024-11-21 16:35:04 -05:00
Code Issues Releases Wiki Activity

Review

Browse Source
This commit is contained in:
Tankred Hase 2014-12-18 16:50:11 +01:00
parent 6a8c24d813
commit b01aa6716c
2 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/controller/app/read.js
View File

@ -95,7 +95,7 @@ var ReadCtrl = function($scope, $location, $q, email, invitation, outbox, pgp, k
return keychain.getReceiverPublicKey(user.address);
}).then(function(pubkey) {
if (pubkey.publicKey) {
if (pubkey && pubkey.publicKey) {
user.secure = true;
} else {
user.secure = false;

50
src/js/service/keychain.js
View File

@ -64,40 +64,30 @@ Keychain.prototype.verifyPublicKey = function(uuid) {
* @return [PublicKeyCollection] The requiested public keys
*/
Keychain.prototype.getPublicKeys = function(ids) {
var self = this;
return new Promise(function(resolve, reject) {
var after, already, pubkeys = [];
var self = this,
jobs = [],
pubkeys = [];
// return empty array if key ids are emtpy
if (ids.length < 1) {
resolve(pubkeys);
return;
}
ids.forEach(function(i) {
// lookup locally and in storage
var promise = self.lookupPublicKey(i._id).then(function(pubkey) {
if (!pubkey) {
throw new Error('Error looking up public key!');
}
after = _.after(ids.length, function() {
resolve(pubkeys);
// check if public key with that id has already been fetched
var already = _.findWhere(pubkeys, {
_id: i._id
});
if (!already) {
pubkeys.push(pubkey);
}
});
jobs.push(promise);
});
_.each(ids, function(i) {
// lookup locally and in storage
self.lookupPublicKey(i._id).then(function(pubkey) {
if (!pubkey) {
reject(new Error('Error looking up public key!'));
return;
}
// check if public key with that id has already been fetched
already = null;
already = _.findWhere(pubkeys, {
_id: i._id
});
if (!already) {
pubkeys.push(pubkey);
}
after(); // asynchronously iterate through objects
}).catch(reject);
});
return Promise.all(jobs).then(function() {
return pubkeys;
});
};