From 4b9bc67cb6275ed5534968a664d1246b32123a28 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 6 Mar 2020 16:48:44 +0100 Subject: [PATCH] remove crypto.verification.start event as it is not used anymore by the react-sdk --- spec/unit/crypto/verification/sas.spec.js | 12 ++++++------ src/client.js | 7 ------- src/crypto/index.js | 5 ----- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/spec/unit/crypto/verification/sas.spec.js b/spec/unit/crypto/verification/sas.spec.js index c67a11846..bea6c4505 100644 --- a/spec/unit/crypto/verification/sas.spec.js +++ b/spec/unit/crypto/verification/sas.spec.js @@ -122,8 +122,8 @@ describe("SAS verification", function() { bobSasEvent = null; bobPromise = new Promise((resolve, reject) => { - bob.client.on("crypto.verification.start", (verifier) => { - verifier.on("show_sas", (e) => { + bob.client.on("crypto.verification.request", request => { + request.verifier.on("show_sas", (e) => { if (!e.sas.emoji || !e.sas.decimal) { e.cancel(); } else if (!aliceSasEvent) { @@ -139,7 +139,7 @@ describe("SAS verification", function() { } } }); - resolve(verifier); + resolve(request.verifier); }); }); @@ -339,11 +339,11 @@ describe("SAS verification", function() { }; const bobPromise = new Promise((resolve, reject) => { - bob.client.on("crypto.verification.start", (verifier) => { - verifier.on("show_sas", (e) => { + bob.client.on("crypto.verification.request", request => { + request.verifier.on("show_sas", (e) => { e.mismatch(); }); - resolve(verifier); + resolve(request.verifier); }); }); diff --git a/src/client.js b/src/client.js index 8c8948265..4871af6af 100644 --- a/src/client.js +++ b/src/client.js @@ -5506,13 +5506,6 @@ MatrixClient.prototype.generateClientSecret = function() { * reject the key verification. */ -/** - * Fires when a key verification started message is received. - * @event module:client~MatrixClient#"crypto.verification.start" - * @param {module:crypto/verification/Base} verifier a verifier object to - * perform the key verification - */ - /** * Fires when a secret request has been cancelled. If the client is prompting * the user to ask whether they want to share a secret, the prompt can be diff --git a/src/crypto/index.js b/src/crypto/index.js index 7e3867f9c..372cf5e20 100644 --- a/src/crypto/index.js +++ b/src/crypto/index.js @@ -2680,12 +2680,7 @@ Crypto.prototype._handleVerificationEvent = async function( } event.setVerificationRequest(request); try { - const hadVerifier = !!request.verifier; await request.channel.handleEvent(event, request, isLiveEvent); - // emit start event when verifier got set - if (!hadVerifier && request.verifier) { - this._baseApis.emit("crypto.verification.start", request.verifier); - } } catch (err) { logger.error("error while handling verification event: " + err.message); }