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

Don't timeout cancelled requests

Browse Source 
The cancelled flag is used upstream and is therefore public.
This commit is contained in:
Travis Ralston
2019-06-19 14:44:36 -06:00
parent 05ab6ef3ab
commit e34eb48914
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,7 @@ export default class VerificationBase extends EventEmitter {
this.transactionId = transactionId; this.transactionId = transactionId;
this.startEvent = startEvent; this.startEvent = startEvent;
this.request = request; this.request = request;
this.cancelled = false;
this._parent = parent; this._parent = parent;
this._done = false; this._done = false;
this._promise = null; this._promise = null;
@@ -76,7 +77,7 @@ export default class VerificationBase extends EventEmitter {
console.log("Refreshing/starting the verification transaction timeout timer"); console.log("Refreshing/starting the verification transaction timeout timer");
clearTimeout(this._transactionTimeoutTimer); clearTimeout(this._transactionTimeoutTimer);
setTimeout(() => { setTimeout(() => {
if (!this._done) { if (!this._done && !this.cancelled) {
console.log("Triggering verification timeout"); console.log("Triggering verification timeout");
this.cancel(timeoutException); this.cancel(timeoutException);
} }
@@ -135,6 +136,7 @@ export default class VerificationBase extends EventEmitter {
cancel(e) { cancel(e) {
if (!this._done) { if (!this._done) {
this.cancelled = true;
if (this.userId && this.deviceId && this.transactionId) { if (this.userId && this.deviceId && this.transactionId) {
// send a cancellation to the other user (if it wasn't // send a cancellation to the other user (if it wasn't
// cancelled by the other user) // cancelled by the other user)
@@ -168,7 +170,9 @@ export default class VerificationBase extends EventEmitter {
} }
} }
if (this._promise !== null) { if (this._promise !== null) {
this._reject(e); // when we cancel without a promise, we end up with a promise
// but no reject function. If cancel is called again, we'd error.
if (this._reject) this._reject(e);
} else { } else {
this._promise = Promise.reject(e); this._promise = Promise.reject(e);
} }