mirror of
https://github.com/moparisthebest/mail
synced 2024-11-30 04:42:15 -05:00
fix order of mail list
This commit is contained in:
parent
f53eaeeecf
commit
785ba0c9e8
@ -303,6 +303,7 @@ define(function(require) {
|
|||||||
*/
|
*/
|
||||||
EmailDAO.prototype.listMessages = function(options, callback) {
|
EmailDAO.prototype.listMessages = function(options, callback) {
|
||||||
var self = this,
|
var self = this,
|
||||||
|
plaintextItems = [],
|
||||||
encryptedList = [];
|
encryptedList = [];
|
||||||
|
|
||||||
// validate options
|
// validate options
|
||||||
@ -327,6 +328,8 @@ define(function(require) {
|
|||||||
// find encrypted items
|
// find encrypted items
|
||||||
emails.forEach(function(i) {
|
emails.forEach(function(i) {
|
||||||
if (i.body.indexOf(str.cryptPrefix) !== -1 && i.body.indexOf(str.cryptSuffix) !== -1) {
|
if (i.body.indexOf(str.cryptPrefix) !== -1 && i.body.indexOf(str.cryptSuffix) !== -1) {
|
||||||
|
// add item to plaintext list for display later
|
||||||
|
plaintextItems.push(i);
|
||||||
// parse ct object from ascii armored message block
|
// parse ct object from ascii armored message block
|
||||||
encryptedList.push(parseMessageBlock(i));
|
encryptedList.push(parseMessageBlock(i));
|
||||||
}
|
}
|
||||||
@ -334,8 +337,14 @@ define(function(require) {
|
|||||||
|
|
||||||
// decrypt items
|
// decrypt items
|
||||||
decryptList(encryptedList, function(err, decryptedList) {
|
decryptList(encryptedList, function(err, decryptedList) {
|
||||||
|
// replace encrypted subject and body
|
||||||
|
for (var j = 0; j < plaintextItems.length; j++) {
|
||||||
|
plaintextItems[j].subject = decryptedList[j].subject;
|
||||||
|
plaintextItems[j].body = decryptedList[j].body;
|
||||||
|
}
|
||||||
|
|
||||||
// return only decrypted items
|
// return only decrypted items
|
||||||
callback(null, decryptedList);
|
callback(null, plaintextItems);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user