Gracefully handle browsers which don't do VoIP
Specifically: - Don't show inbound call ringing - Don't let users place calls/conf calls - Show call records with "not supported by this browser".pull/21833/head
parent
e792201cd6
commit
3485a74036
|
@ -173,17 +173,27 @@ function _onAction(payload) {
|
||||||
console.error("Unknown conf call type: %s", payload.type);
|
console.error("Unknown conf call type: %s", payload.type);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
var ErrorDialog = sdk.getComponent("organisms.ErrorDialog");
|
||||||
|
|
||||||
switch (payload.action) {
|
switch (payload.action) {
|
||||||
case 'place_call':
|
case 'place_call':
|
||||||
if (module.exports.getAnyActiveCall()) {
|
if (module.exports.getAnyActiveCall()) {
|
||||||
var ErrorDialog = sdk.getComponent("organisms.ErrorDialog");
|
|
||||||
Modal.createDialog(ErrorDialog, {
|
Modal.createDialog(ErrorDialog, {
|
||||||
title: "Existing Call",
|
title: "Existing Call",
|
||||||
description: "You are already in a call."
|
description: "You are already in a call."
|
||||||
});
|
});
|
||||||
return; // don't allow >1 call to be placed.
|
return; // don't allow >1 call to be placed.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// if the runtime env doesn't do VoIP, whine.
|
||||||
|
if (!MatrixClientPeg.get().supportsVoip()) {
|
||||||
|
Modal.createDialog(ErrorDialog, {
|
||||||
|
title: "VoIP is unsupported",
|
||||||
|
description: "You cannot place VoIP calls in this browser."
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var room = MatrixClientPeg.get().getRoom(payload.room_id);
|
var 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);
|
||||||
|
@ -218,11 +228,17 @@ function _onAction(payload) {
|
||||||
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);
|
||||||
if (!Modulator.hasConferenceHandler()) {
|
if (!Modulator.hasConferenceHandler()) {
|
||||||
var ErrorDialog = sdk.getComponent("organisms.ErrorDialog");
|
|
||||||
Modal.createDialog(ErrorDialog, {
|
Modal.createDialog(ErrorDialog, {
|
||||||
description: "Conference calls are not supported in this client"
|
description: "Conference calls are not supported in this client"
|
||||||
});
|
});
|
||||||
} else {
|
}
|
||||||
|
else if (!MatrixClientPeg.get().supportsVoip()) {
|
||||||
|
Modal.createDialog(ErrorDialog, {
|
||||||
|
title: "VoIP is unsupported",
|
||||||
|
description: "You cannot place VoIP calls in this browser."
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else {
|
||||||
var ConferenceHandler = Modulator.getConferenceHandler();
|
var ConferenceHandler = Modulator.getConferenceHandler();
|
||||||
ConferenceHandler.createNewMatrixCall(
|
ConferenceHandler.createNewMatrixCall(
|
||||||
MatrixClientPeg.get(), payload.room_id
|
MatrixClientPeg.get(), payload.room_id
|
||||||
|
@ -238,6 +254,12 @@ function _onAction(payload) {
|
||||||
payload.call.hangup("busy");
|
payload.call.hangup("busy");
|
||||||
return; // don't allow >1 call to be received, hangup newer one.
|
return; // don't allow >1 call to be received, hangup newer one.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// if the runtime env doesn't do VoIP, stop here.
|
||||||
|
if (!MatrixClientPeg.get().supportsVoip()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var call = payload.call;
|
var call = payload.call;
|
||||||
_setCallListeners(call);
|
_setCallListeners(call);
|
||||||
_setCallState(call, call.roomId, "ringing");
|
_setCallState(call, call.roomId, "ringing");
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
var MatrixClientPeg = require("./MatrixClientPeg");
|
||||||
|
|
||||||
function textForMemberEvent(ev) {
|
function textForMemberEvent(ev) {
|
||||||
// XXX: SYJS-16 "sender is sometimes null for join messages"
|
// XXX: SYJS-16 "sender is sometimes null for join messages"
|
||||||
|
@ -78,12 +79,14 @@ function textForMessageEvent(ev) {
|
||||||
|
|
||||||
function textForCallAnswerEvent(event) {
|
function textForCallAnswerEvent(event) {
|
||||||
var senderName = event.sender ? event.sender.name : "Someone";
|
var senderName = event.sender ? event.sender.name : "Someone";
|
||||||
return senderName + " answered the call.";
|
var supported = MatrixClientPeg.get().supportsVoip() ? "" : " (not supported by this browser)";
|
||||||
|
return senderName + " answered the call." + supported;
|
||||||
};
|
};
|
||||||
|
|
||||||
function textForCallHangupEvent(event) {
|
function textForCallHangupEvent(event) {
|
||||||
var senderName = event.sender ? event.sender.name : "Someone";
|
var senderName = event.sender ? event.sender.name : "Someone";
|
||||||
return senderName + " ended the call.";
|
var supported = MatrixClientPeg.get().supportsVoip() ? "" : " (not supported by this browser)";
|
||||||
|
return senderName + " ended the call." + supported;
|
||||||
};
|
};
|
||||||
|
|
||||||
function textForCallInviteEvent(event) {
|
function textForCallInviteEvent(event) {
|
||||||
|
@ -94,7 +97,8 @@ function textForCallInviteEvent(event) {
|
||||||
event.getContent().offer.sdp.indexOf('m=video') !== -1) {
|
event.getContent().offer.sdp.indexOf('m=video') !== -1) {
|
||||||
type = "video";
|
type = "video";
|
||||||
}
|
}
|
||||||
return senderName + " placed a " + type + " call.";
|
var supported = MatrixClientPeg.get().supportsVoip() ? "" : " (not supported by this browser)";
|
||||||
|
return senderName + " placed a " + type + " call." + supported;
|
||||||
};
|
};
|
||||||
|
|
||||||
var handlers = {
|
var handlers = {
|
||||||
|
|
Loading…
Reference in New Issue