diff --git a/src/crypto/verification/request/InRoomChannel.js b/src/crypto/verification/request/InRoomChannel.js index 916847ac7..19b49fd75 100644 --- a/src/crypto/verification/request/InRoomChannel.js +++ b/src/crypto/verification/request/InRoomChannel.js @@ -44,11 +44,6 @@ export class InRoomChannel { this._requestEventId = null; } - /** Whether this channel needs m.key.verification.done messages to be sent after a successful verification */ - get needsDoneMessage() { - return true; - } - get receiveStartFromOtherDevices() { return true; } diff --git a/src/crypto/verification/request/ToDeviceChannel.js b/src/crypto/verification/request/ToDeviceChannel.js index 5f0a13194..ea47fe5e8 100644 --- a/src/crypto/verification/request/ToDeviceChannel.js +++ b/src/crypto/verification/request/ToDeviceChannel.js @@ -61,10 +61,6 @@ export class ToDeviceChannel { return this._deviceId; } - get needsDoneMessage() { - return false; - } - static getEventType(event) { return event.getType(); } diff --git a/src/crypto/verification/request/VerificationRequest.js b/src/crypto/verification/request/VerificationRequest.js index 429e448b1..87442613a 100644 --- a/src/crypto/verification/request/VerificationRequest.js +++ b/src/crypto/verification/request/VerificationRequest.js @@ -819,11 +819,9 @@ export class VerificationRequest extends EventEmitter { } onVerifierFinished() { - if (this.channel.needsDoneMessage) { - // verification in DM requires a done message - this.channel.send("m.key.verification.done", {}); - } + this.channel.send("m.key.verification.done", {}); this._verifierHasFinished = true; + // move to .done phase const newTransitions = this._applyPhaseTransitions(); if (newTransitions.length) { this._setPhase(newTransitions[newTransitions.length - 1].phase);