PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3569 from matrix-org/t3chguy/CallHandler_fail_ToS

Browse source 
If ToS gets rejected/any Scalar error then don't make Jitsi widget
This commit is contained in:
Michael Telatynski 2019-10-28 10:05:46 +00:00 committed by GitHub
commit 89e69ddb0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/CallHandler.js
View file

@ -387,7 +387,7 @@ async function _startCallApp(roomId, type) {
// work for us. Better that the user knows before everyone else in the // work for us. Better that the user knows before everyone else in the
// room sees it. // room sees it.
const managers = IntegrationManagers.sharedInstance(); const managers = IntegrationManagers.sharedInstance();
let haveScalar = true; let haveScalar = false;
if (managers.hasManager()) { if (managers.hasManager()) {
try { try {
const scalarClient = managers.getPrimaryManager().getScalarClient(); const scalarClient = managers.getPrimaryManager().getScalarClient();
@ -396,8 +396,6 @@ async function _startCallApp(roomId, type) {
} catch (e) { } catch (e) {
// ignore // ignore
} }
} else {
haveScalar = false;
} }
if (!haveScalar) { if (!haveScalar) {