Dima/matrix-js-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attempt to switch start event if we already have a verifier

Browse Source
This commit is contained in:
Bruno Windels
2020-01-29 15:16:54 +01:00
parent efd3550f53
commit 9cd6607520
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/crypto/verification/request/VerificationRequest.js
+12 -4
View File
@@ -521,10 +521,18 @@ export class VerificationRequest extends EventEmitter {
}
// only pass events from the other side to the verifier,
// no remote echos of our own events
if (this._verifier && !isRemoteEcho && !this.observeOnly) {
if (type === CANCEL_TYPE || (this._verifier.events
&& this._verifier.events.includes(type))) {
this._verifier.handleEvent(event);
if (this._verifier && !this.observeOnly) {
const oldEvent = this._verifier.startEvent;
// if the verifier does not have a startEvent, it is because it's still sending and we are on the initator side
const oldSender = oldEvent ? oldEvent.getSender() : this._client.getUserId();
const newEventWinsRace = event.getSender() < oldSender;
if (this._verifier.canSwitchStartEvent(event) && newEventWinsRace) {
this._verifier.switchStartEvent(event);
} else if (!isRemoteEcho) {
if (type === CANCEL_TYPE || (this._verifier.events
&& this._verifier.events.includes(type))) {
this._verifier.handleEvent(event);
}
}
}