OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4202 from matrix-org/bwindels/devicelegacyverif 

Send verification request to a single device in a way compatible with non-cross-signing
pull/21833/head
Bruno Windels 2020-03-12 11:30:21 +00:00 committed by GitHub
parent 6b552e5ce8 e373dbd616
commit b8f30f55fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/verification.js
View File

@ -23,6 +23,7 @@ import {RIGHT_PANEL_PHASES} from "./stores/RightPanelStorePhases";
import {findDMForUser} from './createRoom';
import {accessSecretStorage} from './CrossSigningManager';
import SettingsStore from './settings/SettingsStore';
import {verificationMethods} from 'matrix-js-sdk/src/crypto';
async function enable4SIfNeeded() {
const cli = MatrixClientPeg.get();
@ -57,9 +58,10 @@ export async function verifyDevice(user, device) {
return;
}
const cli = MatrixClientPeg.get();
const verificationRequestPromise = cli.requestVerification(
const verificationRequestPromise = cli.legacyDeviceVerification(
user.userId,
[device.deviceId],
device.deviceId,
verificationMethods.SAS,
);
dis.dispatch({
action: "set_right_panel_phase",
@ -77,7 +79,7 @@ export async function legacyVerifyUser(user) {
return;
}
const cli = MatrixClientPeg.get();
const verificationRequestPromise = cli.requestVerification(user.userId);
const verificationRequestPromise = cli.beginKeyVerification(user.userId);
dis.dispatch({
action: "set_right_panel_phase",
phase: RIGHT_PANEL_PHASES.EncryptionPanel,