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

delint CallHandler

Browse source
This commit is contained in:
David Baker 2018-06-18 16:00:42 +01:00
parent 8cf17a66e5
commit e1e60cb147
2 changed files with 72 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.eslintignore.errorfiles
View file

@ -4,7 +4,6 @@ src/autocomplete/AutocompleteProvider.js
src/autocomplete/Autocompleter.js src/autocomplete/Autocompleter.js
src/autocomplete/EmojiProvider.js src/autocomplete/EmojiProvider.js
src/autocomplete/UserProvider.js src/autocomplete/UserProvider.js
src/CallHandler.js
src/component-index.js src/component-index.js
src/components/structures/BottomLeftMenu.js src/components/structures/BottomLeftMenu.js
src/components/structures/CompatibilityPage.js src/components/structures/CompatibilityPage.js

26
src/CallHandler.js
View file

@ -124,7 +124,7 @@ function _setCallListeners(call) {
description: _t( description: _t(
"There are unknown devices in this room: "+ "There are unknown devices in this room: "+
"if you proceed without verifying them, it will be "+ "if you proceed without verifying them, it will be "+
"possible for someone to eavesdrop on your call." "possible for someone to eavesdrop on your call.",
), ),
button: _t('Review Devices'), button: _t('Review Devices'),
onFinished: function(confirmed) { onFinished: function(confirmed) {
@ -247,6 +247,7 @@ function _onAction(payload) {
switch (payload.action) { switch (payload.action) {
case 'place_call': case 'place_call':
{
if (module.exports.getAnyActiveCall()) { if (module.exports.getAnyActiveCall()) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Call Handler', 'Existing Call', ErrorDialog, { Modal.createTrackedDialog('Call Handler', 'Existing Call', ErrorDialog, {
@ -266,13 +267,13 @@ function _onAction(payload) {
return; return;
} }
var room = MatrixClientPeg.get().getRoom(payload.room_id); const room = MatrixClientPeg.get().getRoom(payload.room_id);
if (!room) { if (!room) {
console.error("Room %s does not exist.", payload.room_id); console.error("Room %s does not exist.", payload.room_id);
return; return;
} }
var members = room.getJoinedMembers(); const members = room.getJoinedMembers();
if (members.length <= 1) { if (members.length <= 1) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Call Handler', 'Cannot place call with self', ErrorDialog, { Modal.createTrackedDialog('Call Handler', 'Cannot place call with self', ErrorDialog, {
@ -292,6 +293,7 @@ function _onAction(payload) {
local_element: payload.local_element, local_element: payload.local_element,
}); });
} }
}
break; break;
case 'place_conference_call': case 'place_conference_call':
console.log("Place conference call in %s", payload.room_id); console.log("Place conference call in %s", payload.room_id);
@ -338,10 +340,18 @@ function _onAction(payload) {
}, function(err) { }, function(err) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
console.error("Conference call failed: " + err); console.error("Conference call failed: " + err);
Modal.createTrackedDialog('Call Handler', 'Failed to set up conference call', ErrorDialog, { Modal.createTrackedDialog(
'Call Handler',
'Failed to set up conference call',
ErrorDialog,
{
title: _t('Failed to set up conference call'), title: _t('Failed to set up conference call'),
description: _t('Conference call failed.') + ' ' + ((err && err.message) ? err.message : ''), description: (
}); _t('Conference call failed.') +
' ' + ((err && err.message) ? err.message : '')
),
},
);
}); });
} }
}, },
@ -350,6 +360,7 @@ function _onAction(payload) {
} }
break; break;
case 'incoming_call': case 'incoming_call':
{
if (module.exports.getAnyActiveCall()) { if (module.exports.getAnyActiveCall()) {
// ignore multiple incoming calls. in future, we may want a line-1/line-2 setup. // ignore multiple incoming calls. in future, we may want a line-1/line-2 setup.
// we avoid rejecting with "busy" in case the user wants to answer it on a different device. // we avoid rejecting with "busy" in case the user wants to answer it on a different device.
@ -363,9 +374,10 @@ function _onAction(payload) {
return; return;
} }
var call = payload.call; const call = payload.call;
_setCallListeners(call); _setCallListeners(call);
_setCallState(call, call.roomId, "ringing"); _setCallState(call, call.roomId, "ringing");
}
break; break;
case 'hangup': case 'hangup':
if (!calls[payload.room_id]) { if (!calls[payload.room_id]) {