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

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

Browse source
This commit is contained in:
Weblate 2018-07-20 14:01:32 +00:00
commit da8f77e621
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/CallHandler.js
View file

@ -59,6 +59,7 @@ import sdk from './index';
import { _t } from './languageHandler'; import { _t } from './languageHandler';
import Matrix from 'matrix-js-sdk'; import Matrix from 'matrix-js-sdk';
import dis from './dispatcher'; import dis from './dispatcher';
import SdkConfig from './SdkConfig';
import { showUnknownDeviceDialogForCalls } from './cryptodevices'; import { showUnknownDeviceDialogForCalls } from './cryptodevices';
import SettingsStore from "./settings/SettingsStore"; import SettingsStore from "./settings/SettingsStore";
import WidgetUtils from './utils/WidgetUtils'; import WidgetUtils from './utils/WidgetUtils';
@ -474,11 +475,15 @@ async function _startCallApp(roomId, type) {
'avatarUrl=$matrix_avatar_url', 'avatarUrl=$matrix_avatar_url',
'email=$matrix_user_id', 'email=$matrix_user_id',
].join('&'); ].join('&');
const widgetUrl = (
'https://scalar.vector.im/api/widgets' + let widgetUrl;
'/jitsi.html?' + if (SdkConfig.get().integrations_jitsi_widget_url) {
queryString // Try this config key. This probably isn't ideal as a way of discovering this
); // URL, but this will at least allow the integration manager to not be hardcoded.
widgetUrl = SdkConfig.get().integrations_jitsi_widget_url + '?' + queryString;
} else {
widgetUrl = SdkConfig.get().integrations_rest_url + '/widgets/jitsi.html?' + queryString;
}
const widgetData = { widgetSessionId }; const widgetData = { widgetSessionId };