matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-29 16:43:09 +03:00
Code Activity

Add a catch so the error doesn't propagate to later decryptions

Browse Source
This commit is contained in:
David Baker
2020-04-17 18:03:15 +01:00
parent 83879fa945
commit 83b33d9d7a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/crypto/algorithms/olm.js
View File

@@ -272,10 +272,12 @@ OlmDecryption.prototype._decryptMessage = async function(
// not a prekey message: we can safely just try & decrypt it // not a prekey message: we can safely just try & decrypt it
return this._reallyDecryptMessage(theirDeviceIdentityKey, message); return this._reallyDecryptMessage(theirDeviceIdentityKey, message);
} else { } else {
this._olmDevice._olmPrekeyPromise = this._olmDevice._olmPrekeyPromise.then(() => { const myPromise = this._olmDevice._olmPrekeyPromise.then(() => {
return this._reallyDecryptMessage(theirDeviceIdentityKey, message); return this._reallyDecryptMessage(theirDeviceIdentityKey, message);
}); });
return await this._olmDevice._olmPrekeyPromise; // we want the error, but don't propagate it to the next decryption
this._olmDevice._olmPrekeyPromise = myPromise.catch(() => {});
return await myPromise;
} }
}; };