Merge remote-tracking branch 'origin/master' into develop

src/CallHandler.js

@@ -58,7 +58,6 @@ import sdk from './index';
 import { _t } from './languageHandler';
 import Matrix from 'matrix-js-sdk';
 import dis from './dispatcher';
-import SettingsStore from "./settings/SettingsStore";
 
 global.mxCalls = {
     //room_id: MatrixCall
@@ -245,9 +244,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({

src/MatrixClientPeg.js

@@ -21,6 +21,7 @@ import utils from 'matrix-js-sdk/lib/utils';
 import EventTimeline from 'matrix-js-sdk/lib/models/event-timeline';
 import EventTimelineSet from 'matrix-js-sdk/lib/models/event-timeline-set';
 import createMatrixClient from './utils/createMatrixClient';
+import SettingsStore from './settings/SettingsStore';
 
 interface MatrixClientCreds {
     homeserverUrl: string,
@@ -144,6 +145,7 @@ class MatrixClientPeg {
             userId: creds.userId,
             deviceId: creds.deviceId,
             timelineSupport: true,
+            forceTURN: SettingsStore.getValue('webRtcForceTURN', false),
         };
 
         this.matrixClient = createMatrixClient(opts, this.indexedDbWorkerScript);

src/components/structures/UserSettings.js

@@ -92,7 +92,12 @@ const ANALYTICS_SETTINGS = [
 
 // These settings must be defined in SettingsStore
 const WEBRTC_SETTINGS = [
-    { id: 'webRtcForceTURN' },
+    {
+        id: 'webRtcForceTURN',
+        fn: (val) => {
+            MatrixClientPeg.get().setForceTURN(val);
+        },
+    },
 ];
 
 // These settings must be defined in SettingsStore