Skip to content

[stable-20.0] Add support for federated calls #4207

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
mahibi merged 11 commits into from
Sep 13, 2024
Merged

[stable-20.0] Add support for federated calls #4207

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7cd9a3f
Store federation properties in signaling settings
danxuliu Aug 28, 2024
c485d2f
Get signaling settings by room when starting a call
danxuliu Aug 28, 2024
96da1b8
Provide federation values when joining a room in the external signaling
danxuliu Aug 28, 2024
ae7ed62
Store actor data from signaling messages with participant updates
danxuliu Aug 28, 2024
21839e7
Show proper avatar for federated users in calls
danxuliu Aug 28, 2024
3cdcd22
fixup! Provide federation values when joining a room in the external …
danxuliu Aug 28, 2024
2663eca
fixup! Provide federation values when joining a room in the external …
danxuliu Sep 13, 2024
55c91f3
fixup! Store federation properties in signaling settings
danxuliu Sep 13, 2024
50aa428
fixup! Provide federation values when joining a room in the external …
danxuliu Sep 13, 2024
c7544b3
Provide federation values to external signaling server in chat
danxuliu Sep 13, 2024
9fb8add
reformat code
mahibi Sep 13, 2024
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
Prev Previous commit
Next Next commit
fixup! Provide federation values when joining a room in the external … 
…signaling

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
  • Loading branch information
@danxuliu @backportbot
danxuliu authored and backportbot[bot] committed Sep 13, 2024
commit 2663ecabed151f23bd03545b5e4956cfed1d03d1
5 changes: 3 additions & 2 deletions app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1632,8 +1632,9 @@ class CallActivity : CallBaseActivity() {

private fun callOrJoinRoomViaWebSocket() {
if (hasExternalSignalingServer) {
webSocketClient!!.joinRoomWithRoomTokenAndSession(roomToken!!, callSession,
externalSignalingServer!!.federation)
webSocketClient!!.joinRoomWithRoomTokenAndSession(
roomToken!!, callSession, externalSignalingServer!!.federation
)
} else {
performCall()
}
Expand Down
10 changes: 7 additions & 3 deletions app/src/main/java/com/nextcloud/talk/webrtc/WebSocketInstance.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,11 @@ class WebSocketInstance internal constructor(
return hasMCU
}

fun joinRoomWithRoomTokenAndSession(roomToken: String, normalBackendSession: String?,
federation: FederationSettings? = null) {
fun joinRoomWithRoomTokenAndSession(
roomToken: String,
normalBackendSession: String?,
federation: FederationSettings? = null
) {
Log.d(TAG, "joinRoomWithRoomTokenAndSession")
Log.d(TAG, " roomToken: $roomToken")
Log.d(TAG, " session: $normalBackendSession")
Expand All @@ -384,7 +387,8 @@ class WebSocketInstance internal constructor(
currentFederation = null
sendMessage(message)
} else if (roomToken == currentRoomToken && normalBackendSession == currentNormalBackendSession &&
federation == currentFederation) {
federation?.roomId == currentFederation?.roomId && federation?.nextcloudServer == federation?.nextcloudServer
) {
Log.d(TAG, "roomToken & session are unchanged. Joining locally without to send websocket message")
sendRoomJoinedEvent()
} else {
Expand Down