Skip to content

Add support for federated calls #4120

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

Add support for federated calls #4120

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6706bc2
Store federation properties in signaling settings
danxuliu Aug 28, 2024
f3c7913
Get signaling settings by room when starting a call
danxuliu Aug 28, 2024
86b0648
Provide federation values when joining a room in the external signaling
danxuliu Aug 28, 2024
3b7c5e1
Store actor data from signaling messages with participant updates
danxuliu Aug 28, 2024
0ff783e
Show proper avatar for federated users in calls
danxuliu Aug 28, 2024
166107d
fixup! Provide federation values when joining a room in the external …
danxuliu Aug 28, 2024
18a0394
fixup! Provide federation values when joining a room in the external …
danxuliu Sep 13, 2024
c7af117
fixup! Store federation properties in signaling settings
danxuliu Sep 13, 2024
148dedb
fixup! Provide federation values when joining a room in the external …
danxuliu Sep 13, 2024
4cea7b2
Provide federation values to external signaling server in chat
danxuliu Sep 13, 2024
033e3e8
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 <[email protected]>
  • Loading branch information
@danxuliu @mahibi
danxuliu authored and mahibi committed Sep 13, 2024
commit 148dedbc6cb803ad210080feed2c90ad7047e19a
6 changes: 5 additions & 1 deletion app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,15 @@ RoomOverallWebSocketMessage getAssembledJoinOrLeaveRoomModel(String roomId, Stri
roomWebSocketMessage.setRoomId(roomId);
roomWebSocketMessage.setSessionId(sessionId);
if (federation != null) {
String federationAuthToken = null;
if (federation.getHelloAuthParams() != null) {
federationAuthToken = federation.getHelloAuthParams().getToken();
}
RoomFederationWebSocketMessage roomFederationWebSocketMessage = new RoomFederationWebSocketMessage();
roomFederationWebSocketMessage.setSignaling(federation.getServer());
roomFederationWebSocketMessage.setUrl(federation.getNextcloudServer() + "/ocs/v2.php/apps/spreed/api/v3/signaling/backend");
roomFederationWebSocketMessage.setRoomid(federation.getRoomId());
roomFederationWebSocketMessage.setToken(federation.getHelloAuthParams().getToken());
roomFederationWebSocketMessage.setToken(federationAuthToken);
roomWebSocketMessage.setRoomFederationWebSocketMessage(roomFederationWebSocketMessage);
}
roomOverallWebSocketMessage.setRoomWebSocketMessage(roomWebSocketMessage);
Expand Down