Merge remote-tracking branch 'origin/develop' into develop

2018-03-29 17:33:49 +00:00 · 2018-03-29 17:33:49 +00:00 · 1447c04dda
parent 50a2756203 a79c558763
commit 1447c04dda
1 changed files with 4 additions and 0 deletions
--- a/src/Notifier.js
+++ b/src/Notifier.js
@ -256,6 +256,10 @@ const Notifier = {
    },

    onEventDecrypted: function(ev) {
+        // 'decrypted' means the decryption process has finished: it may have failed,
+        // in which case it might decrypt soon if the keys arrive
+        if (ev.isDecryptionFailure()) return;
+
        const idx = this.pendingEncryptedEventIds.indexOf(ev.getId());
        if (idx === -1) return;