matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-02 17:02:31 +03:00
Code Activity

detect other end cancelling and reject main promise

Browse Source
This commit is contained in:
Bruno Windels
2019-11-04 14:38:24 +01:00
parent 9140d5a091
commit 37558ac1b4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/crypto/verification/Base.js
View File

@@ -151,6 +151,10 @@ export default class VerificationBase extends EventEmitter {
this._rejectEvent = undefined; this._rejectEvent = undefined;
this._resetTimer(); this._resetTimer();
this._resolveEvent(e); this._resolveEvent(e);
} else if (e.getType() === "m.key.verification.cancel") {
const reject = this._reject;
this._reject = undefined;
reject(new Error("Other side cancelled verification"));
} else { } else {
const exception = new Error( const exception = new Error(
"Unexpected message: expecting " + this._expectedEvent "Unexpected message: expecting " + this._expectedEvent