[stable16] Fix joining call before joining room after forced reconnection with external signaling #1850
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![backportbot-nextcloud[bot]](https://avatars.githubusercontent.com/in/21012?s=60&v=4){kind=small}
When the external signaling server is used "joinCall()" does not join the call if its room has not been joined first. However, when that happens, the call is automatically joined later once the room has been joined. In that case the same flags given when "joinCall()" was called should be used once the call is actually joined; otherwise, if no flags are provided, the default flags would be used by the server, which may not match the real call flags. Signed-off-by: Daniel Calviño Sánchez <[email protected]>
When the external signaling server is used, after successfully sending a "joinRoom" message to the Nextcloud server a message is sent too the external signaling server (Standalone._joinRoomSuccess); this registers the Nextcloud session in the signaling server, and is needed by the signaling server to be able to properly process further messages from that session. Joining a call requires that the Nextcloud session is registered, so "joinCall()" is queued until joining the room if called before that; whether the session is registered or not is tracked with "signalingRoomJoined". When a reconnection is forced the room is joined again and, if the participant was in a call, the call is joined again. As the Nextcloud session changed the call should not be joined until the new session is registered again. However, as "signalingRoomJoined" was emptied only in "leaveRoom()" and this is not called in a forced reconnection its value still matched the room token, so the call was immediately joined after a reconnection without properly waiting for the session to be registered. Due to this the external signaling server could received the message to join the call after or before the session was registered (depending on how fast the messages were sent and processed), and thus the call was properly joined or not depending on the case. In the external signaling server the Nextcloud session is unregistered when the "bye" message is received, so for parallelism with that behaviour "signalingRoomJoined" is now emptied too when sending the "bye" message (instead of explicitly emptying it only for forced reconnections). Signed-off-by: Daniel Calviño Sánchez <[email protected]>
backportbot-nextcloud
bot
added
bug
feature: frontend 🖌️
Ivansss
approved these changes
May 24, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport of #1847