when remoteServer is used:

joinRoomWithRoomTokenAndSession in onNext of getSignalingSettings else get websocket from WebSocketConnectionHelper and then joinRoomWithRoomTokenAndSession Signed-off-by: Marcel Hibbe <[email protected]>
nextcloud · Nov 14, 2024 · f094860 · f094860
1 parent 87ce87b
commit f094860
Showing 1 changed file with 54 additions and 49 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -696,14 +696,8 @@ class ChatActivity :
                     logConversationInfos("joinRoomWithPassword#onNext")
 
                     setupWebsocket()
-                    if (webSocketInstance != null) {
-                        webSocketInstance?.joinRoomWithRoomTokenAndSession(
-                            roomToken,
-                            sessionIdAfterRoomJoined,
-                            externalSignalingServer?.federation
-                        )
-                    }
-                    if (startCallFromNotification != null && startCallFromNotification) {
+
+                    if (startCallFromNotification) {
                         startCallFromNotification = false
                         startACall(voiceOnly, false)
                     }
@@ -2471,13 +2465,6 @@ class ChatActivity :
             Log.d(TAG, "sessionID was valid -> skip joinRoom")
 
             setupWebsocket()
-            if (webSocketInstance != null) {
-                webSocketInstance?.joinRoomWithRoomTokenAndSession(
-                    roomToken,
-                    sessionIdAfterRoomJoined,
-                    externalSignalingServer?.federation
-                )
-            }
         }
     }
 
@@ -2521,47 +2508,65 @@ class ChatActivity :
                         // unused atm
                     }
 
-                override fun onNext(signalingSettingsOverall: SignalingSettingsOverall) {
-                    if (signalingSettingsOverall.ocs!!.settings!!.externalSignalingServer == null ||
-                        signalingSettingsOverall.ocs!!.settings!!.externalSignalingServer?.isEmpty() == true
-                    ) {
-                        return
-                    }
+                    override fun onNext(signalingSettingsOverall: SignalingSettingsOverall) {
+                        if (signalingSettingsOverall.ocs!!.settings!!.externalSignalingServer == null ||
+                            signalingSettingsOverall.ocs!!.settings!!.externalSignalingServer?.isEmpty() == true
+                        ) {
+                            return
+                        }
 
-                    externalSignalingServer = ExternalSignalingServer()
-                    externalSignalingServer!!.externalSignalingServer = signalingSettingsOverall.ocs!!.settings!!
-                        .externalSignalingServer
-                    externalSignalingServer!!.externalSignalingTicket = signalingSettingsOverall.ocs!!.settings!!
-                        .externalSignalingTicket
-                    externalSignalingServer!!.federation = signalingSettingsOverall.ocs!!.settings!!.federation
-
-                    webSocketInstance = WebSocketConnectionHelper.getExternalSignalingInstanceForServer(
-                        externalSignalingServer!!.externalSignalingServer,
-                        conversationUser,
-                        externalSignalingServer!!.externalSignalingTicket,
-                        TextUtils.isEmpty(credentials)
-                    )
-                }
+                        externalSignalingServer = ExternalSignalingServer()
+                        externalSignalingServer!!.externalSignalingServer = signalingSettingsOverall.ocs!!.settings!!
+                            .externalSignalingServer
+                        externalSignalingServer!!.externalSignalingTicket = signalingSettingsOverall.ocs!!.settings!!
+                            .externalSignalingTicket
+                        externalSignalingServer!!.federation = signalingSettingsOverall.ocs!!.settings!!.federation
+
+                        webSocketInstance = WebSocketConnectionHelper.getExternalSignalingInstanceForServer(
+                            externalSignalingServer!!.externalSignalingServer,
+                            conversationUser,
+                            externalSignalingServer!!.externalSignalingTicket,
+                            TextUtils.isEmpty(credentials)
+                        )
 
-                override fun onError(e: Throwable) {
-                    Log.e(CallActivity.TAG, e.message, e)
-                }
+                        if (webSocketInstance != null) {
+                            webSocketInstance?.joinRoomWithRoomTokenAndSession(
+                                roomToken,
+                                sessionIdAfterRoomJoined,
+                                externalSignalingServer?.federation
+                            )
+                        }
 
-                override fun onComplete() {
-                    // unused atm
-                }
-            })
+                        signalingMessageSender = webSocketInstance?.signalingMessageSender
+                        webSocketInstance?.getSignalingMessageReceiver()?.addListener(localParticipantMessageListener)
+                        webSocketInstance?.getSignalingMessageReceiver()?.addListener(conversationMessageListener)
+                    }
+
+                    override fun onError(e: Throwable) {
+                        Log.e(TAG, e.message, e)
+                    }
+
+                    override fun onComplete() {
+                        // unused atm
+                    }
+                })
         } else {
             webSocketInstance = WebSocketConnectionHelper.getWebSocketInstanceForUser(conversationUser!!)
-        }
 
-        if (webSocketInstance == null) {
-            Log.d(TAG, "webSocketInstance not set up. This should only happen when not using the HPB")
-        }
+            if (webSocketInstance != null) {
+                webSocketInstance?.joinRoomWithRoomTokenAndSession(
+                    roomToken,
+                    sessionIdAfterRoomJoined,
+                    null
+                )
 
-        signalingMessageSender = webSocketInstance?.signalingMessageSender
-        webSocketInstance?.getSignalingMessageReceiver()?.addListener(localParticipantMessageListener)
-        webSocketInstance?.getSignalingMessageReceiver()?.addListener(conversationMessageListener)
+                signalingMessageSender = webSocketInstance?.signalingMessageSender
+                webSocketInstance?.getSignalingMessageReceiver()?.addListener(localParticipantMessageListener)
+                webSocketInstance?.getSignalingMessageReceiver()?.addListener(conversationMessageListener)
+            } else {
+                Log.d(TAG, "webSocketInstance not set up. This is only expected when not using the HPB")
+            }
+        }
     }
 
     private fun processCallStartedMessages(chatMessageList: List<ChatMessage>) {