Skip to content

Fix silent call #8138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcoambrosini merged 1 commit into from
Oct 10, 2022
Merged

Fix silent call #8138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/utils/signaling.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,12 +264,13 @@ Signaling.Base.prototype._joinCallSuccess = function(/* token */) {
// Override in subclasses if necessary.
}

Signaling.Base.prototype.joinCall = function(token, flags) {
Signaling.Base.prototype.joinCall = function(token, flags, silent) {
return new Promise((resolve, reject) => {
this._trigger('beforeJoinCall', [token])

axios.post(generateOcsUrl('apps/spreed/api/v4/call/{token}', { token }), {
flags,
silent,
})
.then(function() {
this.currentCallToken = token
Expand Down
14 changes: 9 additions & 5 deletions src/utils/webrtc/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,10 @@ let failedToStartCall = null
/**
* @param {object} signaling The signaling object
* @param {object} configuration Media to connect with
* @param {boolean} silent Whether the call should trigger a notifications and
* sound for other participants or not
*/
function startCall(signaling, configuration) {
function startCall(signaling, configuration, silent) {
let flags = PARTICIPANT.CALL_FLAG.IN_CALL
if (configuration) {
if (configuration.audio) {
Expand All @@ -131,7 +133,7 @@ function startCall(signaling, configuration) {
}
}

signaling.joinCall(pendingJoinCallToken, flags).then(() => {
signaling.joinCall(pendingJoinCallToken, flags, silent).then(() => {
startedCall(flags)
}).catch(error => {
failedToStartCall(error)
Expand Down Expand Up @@ -170,10 +172,12 @@ async function signalingJoinConversation(token, sessionId) {
*
* @param {string} token Conversation to join the call
* @param {number} flags Bitwise combination of PARTICIPANT.CALL_FLAG
* @param {boolean} silent Whether the call should trigger a notifications and
* sound for other participants or not
* @return {Promise<void>} Resolved with the actual flags based on the
* available media
*/
async function signalingJoinCall(token, flags) {
async function signalingJoinCall(token, flags, silent) {
if (tokensInSignaling[token]) {
pendingJoinCallToken = token

Expand Down Expand Up @@ -219,13 +223,13 @@ async function signalingJoinCall(token, flags) {
webRtc.off('localMediaStarted', startCallOnceLocalMediaStarted)
webRtc.off('localMediaError', startCallOnceLocalMediaError)

startCall(_signaling, configuration)
startCall(_signaling, configuration, silent)
}
const startCallOnceLocalMediaError = () => {
webRtc.off('localMediaStarted', startCallOnceLocalMediaStarted)
webRtc.off('localMediaError', startCallOnceLocalMediaError)

startCall(_signaling, null)
startCall(_signaling, null, silent)
}

// ".once" can not be used, as both handlers need to be removed when
Expand Down