From 148dedbc6cb803ad210080feed2c90ad7047e19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 13 Sep 2024 12:55:50 +0200 Subject: [PATCH] fixup! Provide federation values when joining a room in the external signaling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- .../nextcloud/talk/webrtc/WebSocketConnectionHelper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java index a8ed4c667..57452c094 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java @@ -138,11 +138,15 @@ public class WebSocketConnectionHelper { 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);