matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-16 22:01:54 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show

Browse Source
This commit is contained in:
David Baker
2017-11-20 10:00:47 +00:00
parent 65e1d49f37 292b912038
commit e2f5e16fa7
7 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/CallHandler.js
View File

@ -59,7 +59,6 @@ import sdk from './index';
import { _t } from './languageHandler';
import Matrix from 'matrix-js-sdk';
import dis from './dispatcher';
import SettingsStore from "./settings/SettingsStore";
import { showUnknownDeviceDialogForCalls } from './cryptodevices';
global.mxCalls = {
@ -281,9 +280,7 @@ function _onAction(payload) {
return;
} else if (members.length === 2) {
console.log("Place %s call in %s", payload.type, payload.room_id);
const call = Matrix.createNewMatrixCall(MatrixClientPeg.get(), payload.room_id, {
forceTURN: SettingsStore.getValue('webRtcForceTURN'),
});
const call = Matrix.createNewMatrixCall(MatrixClientPeg.get(), payload.room_id);
placeCall(call);
} else { // > 2
dis.dispatch({