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

Merge pull request #4058 from matrix-org/bwindels/dontpassmethodstoverify 

remove methods arg to requestVerification(DM)
pull/21833/head
Bruno Windels 2020-02-13 08:51:36 +00:00 committed by GitHub
parent d172e1bf85 33f3a61b94
commit ec708b5e9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/dialogs/DeviceVerifyDialog.js
View File

@ -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) {

8
src/components/views/dialogs/NewSessionReviewDialog.js
View File

@ -22,9 +22,7 @@ import { replaceableComponent } from '../../../utils/replaceableComponent';
import VerificationRequestDialog from './VerificationRequestDialog'; import VerificationRequestDialog from './VerificationRequestDialog';
import BaseDialog from './BaseDialog'; import BaseDialog from './BaseDialog';
import DialogButtons from '../elements/DialogButtons'; import DialogButtons from '../elements/DialogButtons';
import {verificationMethods} from 'matrix-js-sdk/src/crypto';
import {MatrixClientPeg} from "../../../MatrixClientPeg"; import {MatrixClientPeg} from "../../../MatrixClientPeg";
import {SCAN_QR_CODE_METHOD, SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
@replaceableComponent("views.dialogs.NewSessionReviewDialog") @replaceableComponent("views.dialogs.NewSessionReviewDialog")
export default class NewSessionReviewDialog extends React.PureComponent { export default class NewSessionReviewDialog extends React.PureComponent {
@ -43,12 +41,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],
); );

8
src/components/views/right_panel/UserInfo.js
View File

@ -42,8 +42,6 @@ import {textualPowerLevel} from '../../../Roles';
import MatrixClientContext from "../../../contexts/MatrixClientContext"; import MatrixClientContext from "../../../contexts/MatrixClientContext";
import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases"; import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
import EncryptionPanel from "./EncryptionPanel"; import EncryptionPanel from "./EncryptionPanel";
import {verificationMethods} from 'matrix-js-sdk/src/crypto';
import {SCAN_QR_CODE_METHOD, SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
const _disambiguateDevices = (devices) => { const _disambiguateDevices = (devices) => {
const names = Object.create(null); const names = Object.create(null);
@ -157,12 +155,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({