colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MessageReceiver: Don't wait for cache update to move forward

Browse Source
This commit is contained in:
Scott Nonnenberg
2019-02-13 12:04:45 -08:00
parent 28f96fe893
commit 2c3847affe
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libtextsecure/message_receiver.js
View File

@@ -801,19 +801,18 @@ MessageReceiver.prototype.extend({
.then(plaintext => { .then(plaintext => {
const { isMe, isBlocked } = plaintext || {}; const { isMe, isBlocked } = plaintext || {};
if (isMe || isBlocked) { if (isMe || isBlocked) {
return this.removeFromCache(envelope); this.removeFromCache(envelope);
return null;
} }
return this.updateCache(envelope, plaintext).then( this.updateCache(envelope, plaintext).catch(error => {
() => plaintext,
error => {
window.log.error( window.log.error(
'decrypt failed to save decrypted message contents to cache:', 'decrypt failed to save decrypted message contents to cache:',
error && error.stack ? error.stack : error error && error.stack ? error.stack : error
); );
});
return plaintext; return plaintext;
}
);
}) })
.catch(error => { .catch(error => {
let errorToThrow = error; let errorToThrow = error;