From fea5bc9c48398c7b24b5cc6eb6506d48af079bc0 Mon Sep 17 00:00:00 2001 From: RMidhunSuresh Date: Thu, 15 Jun 2023 14:07:18 +0530 Subject: [PATCH] Fix resolveStartMessages not working --- .../SAS/stages/SelectVerificationMethodStage.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/matrix/verification/SAS/stages/SelectVerificationMethodStage.ts b/src/matrix/verification/SAS/stages/SelectVerificationMethodStage.ts index aa2302fb..743c8ba0 100644 --- a/src/matrix/verification/SAS/stages/SelectVerificationMethodStage.ts +++ b/src/matrix/verification/SAS/stages/SelectVerificationMethodStage.ts @@ -18,10 +18,11 @@ import {CancelReason, VerificationEventType} from "../channel/types"; import {KEY_AGREEMENT_LIST, HASHES_LIST, MAC_LIST, SAS_LIST} from "./constants"; import {SendAcceptVerificationStage} from "./SendAcceptVerificationStage"; import {SendKeyStage} from "./SendKeyStage"; +import {Deferred} from "../../../../utils/Deferred"; import type {ILogItem} from "../../../../logging/types"; export class SelectVerificationMethodStage extends BaseSASVerificationStage { - private hasSentStartMessage = false; + private hasSentStartMessage?: Promise; private allowSelection = true; public otherDeviceName: string; @@ -36,6 +37,7 @@ export class SelectVerificationMethodStage extends BaseSASVerificationStage { // We received the start message this.allowSelection = false; if (this.hasSentStartMessage) { + await this.hasSentStartMessage; await this.resolveStartConflict(log); } else { @@ -96,6 +98,8 @@ export class SelectVerificationMethodStage extends BaseSASVerificationStage { async selectEmojiMethod(log: ILogItem) { if (!this.allowSelection) { return; } + const deferred = new Deferred(); + this.hasSentStartMessage = deferred.promise; const content = { method: "m.sas.v1", from_device: this.ourUserDeviceId, @@ -110,6 +114,6 @@ export class SelectVerificationMethodStage extends BaseSASVerificationStage { * to the next stage (where we will send the key). */ await this.channel.send(VerificationEventType.Start, content, log); - this.hasSentStartMessage = true; + deferred.resolve(); } }