remove messages from cache before throwing if the prekey id could not be verified

6 years ago · 2755ff06d8
parent 7186f28019
commit 2755ff06d8
1 changed files with 10 additions and 5 deletions
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@ -731,11 +731,16 @@ MessageReceiver.prototype.extend({
        window.log.info('prekey message from', this.getEnvelopeId(envelope));
        promise = captureActiveSession(sessionCipher)
          .then(async () => {
-            const buffer = dcodeIO.ByteBuffer.wrap(ciphertext);
-            await window.libloki.storage.verifyFriendRequestAcceptPreKey(
-              envelope.source,
-              buffer
-            );
+            try {
+              const buffer = dcodeIO.ByteBuffer.wrap(ciphertext);
+              await window.libloki.storage.verifyFriendRequestAcceptPreKey(
+                envelope.source,
+                buffer
+              );
+            } catch (e) {
+              await this.removeFromCache(envelope);
+              throw e;
+            }
            return this.decryptPreKeyWhisperMessage(
              ciphertext,
              sessionCipher,