imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'experimental' into travis/settings/positive

Browse source
This commit is contained in:
Travis Ralston 2019-01-28 08:25:40 -07:00 • committed by GitHub
commit a1e3887a74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 2044 additions and 873 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/MatrixClientPeg.js
View file

@ -29,6 +29,7 @@ import SettingsStore from './settings/SettingsStore';
import MatrixActionCreators from './actions/MatrixActionCreators';
import {phasedRollOutExpiredForUser} from "./PhasedRollOut";
import Modal from './Modal';
import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
interface MatrixClientCreds {
homeserverUrl: string,
@ -184,6 +185,7 @@ class MatrixClientPeg {
deviceId: creds.deviceId,
timelineSupport: true,
forceTURN: !SettingsStore.getValue('webRtcForcePeerToPeer', false),
verificationMethods: [verificationMethods.SAS]
};
this.matrixClient = createMatrixClient(opts, useIndexedDb);