mirror of https://github.com/vector-im/riot-web
remove methods arg to requestVerification(DM)
as it's easy to have this argument be out of sync from all the places this is called from the js-sdk. There is also little point, as you can already specify the methods a consumer of the js-sdk wants to provide through the verificationMethods option when creating the client object.pull/21833/head
parent
91c9c00712
commit
a1844e44f2
|
@ -123,7 +123,7 @@ export default class DeviceVerifyDialog extends React.Component {
|
||||||
const roomId = await ensureDMExistsAndOpen(this.props.userId);
|
const roomId = await ensureDMExistsAndOpen(this.props.userId);
|
||||||
// throws upon cancellation before having started
|
// throws upon cancellation before having started
|
||||||
const request = await client.requestVerificationDM(
|
const request = await client.requestVerificationDM(
|
||||||
this.props.userId, roomId, [verificationMethods.SAS],
|
this.props.userId, roomId,
|
||||||
);
|
);
|
||||||
await request.waitFor(r => r.ready || r.started);
|
await request.waitFor(r => r.ready || r.started);
|
||||||
if (request.ready) {
|
if (request.ready) {
|
||||||
|
|
|
@ -43,12 +43,6 @@ export default class NewSessionReviewDialog extends React.PureComponent {
|
||||||
const cli = MatrixClientPeg.get();
|
const cli = MatrixClientPeg.get();
|
||||||
const request = await cli.requestVerification(
|
const request = await cli.requestVerification(
|
||||||
userId,
|
userId,
|
||||||
[
|
|
||||||
verificationMethods.SAS,
|
|
||||||
SHOW_QR_CODE_METHOD,
|
|
||||||
SCAN_QR_CODE_METHOD,
|
|
||||||
verificationMethods.RECIPROCATE_QR_CODE,
|
|
||||||
],
|
|
||||||
[device.deviceId],
|
[device.deviceId],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -157,12 +157,6 @@ async function verifyDevice(userId, device) {
|
||||||
const cli = MatrixClientPeg.get();
|
const cli = MatrixClientPeg.get();
|
||||||
const verificationRequest = await cli.requestVerification(
|
const verificationRequest = await cli.requestVerification(
|
||||||
userId,
|
userId,
|
||||||
[
|
|
||||||
verificationMethods.SAS,
|
|
||||||
SHOW_QR_CODE_METHOD,
|
|
||||||
SCAN_QR_CODE_METHOD,
|
|
||||||
verificationMethods.RECIPROCATE_QR_CODE,
|
|
||||||
],
|
|
||||||
[device.deviceId],
|
[device.deviceId],
|
||||||
);
|
);
|
||||||
dis.dispatch({
|
dis.dispatch({
|
||||||
|
|
Loading…
Reference in New Issue