mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 04:21:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4021 from matrix-org/travis/fix-scan-temp

Browse source 
Advertise that we can scan QR codes even though we can't
This commit is contained in:
Travis Ralston 2020-02-01 00:22:10 +00:00 committed by GitHub
commit 98c8986ead
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/MatrixClientPeg.js
View file

@ -32,7 +32,7 @@ import MatrixClientBackedSettingsHandler from "./settings/handlers/MatrixClientB
import * as StorageManager from './utils/StorageManager'; import * as StorageManager from './utils/StorageManager';
import IdentityAuthClient from './IdentityAuthClient'; import IdentityAuthClient from './IdentityAuthClient';
import { crossSigningCallbacks } from './CrossSigningManager'; import { crossSigningCallbacks } from './CrossSigningManager';
import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode"; import {SCAN_QR_CODE_METHOD, SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
interface MatrixClientCreds { interface MatrixClientCreds {
homeserverUrl: string, homeserverUrl: string,
@ -221,6 +221,7 @@ class _MatrixClientPeg {
verificationMethods: [ verificationMethods: [
verificationMethods.SAS, verificationMethods.SAS,
SHOW_QR_CODE_METHOD, SHOW_QR_CODE_METHOD,
SCAN_QR_CODE_METHOD, // XXX: We don't actually support scanning yet!
verificationMethods.RECIPROCATE_QR_CODE, verificationMethods.RECIPROCATE_QR_CODE,
], ],
unstableClientRelationAggregation: true, unstableClientRelationAggregation: true,