From 033e3e86c181dfadf5d13132d0205fb581068ee5 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 13 Sep 2024 16:56:46 +0200 Subject: [PATCH] reformat code Signed-off-by: Marcel Hibbe --- .../java/com/nextcloud/talk/activities/CallActivity.kt | 4 ++-- app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 8 +++++--- .../java/com/nextcloud/talk/webrtc/WebSocketInstance.kt | 8 ++++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt index 706a635e2..90e3689f1 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt @@ -1633,8 +1633,8 @@ class CallActivity : CallBaseActivity() { private fun callOrJoinRoomViaWebSocket() { if (hasExternalSignalingServer) { webSocketClient!!.joinRoomWithRoomTokenAndSession( - roomToken!!, callSession, externalSignalingServer!!.federation - ) + roomToken!!, callSession, externalSignalingServer!!.federation + ) } else { performCall() } diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index f35c205e2..ae0cc210e 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -2437,8 +2437,10 @@ class ChatActivity : if (currentConversation!!.remoteServer != null) { val apiVersion = ApiUtils.getSignalingApiVersion(conversationUser!!, intArrayOf(ApiUtils.API_V3, 2, 1)) - ncApi!!.getSignalingSettings(credentials, ApiUtils.getUrlForSignalingSettings(apiVersion, conversationUser!!.baseUrl, - roomToken!!)).blockingSubscribe(object : Observer { + ncApi!!.getSignalingSettings( + credentials, + ApiUtils.getUrlForSignalingSettings(apiVersion, conversationUser!!.baseUrl, roomToken!!) + ).blockingSubscribe(object : Observer { override fun onSubscribe(d: Disposable) { // unused atm } @@ -3239,7 +3241,7 @@ class ChatActivity : val lon = data["longitude"]!! metaData = "{\"type\":\"geo-location\",\"id\":\"geo:$lat,$lon\",\"latitude\":\"$lat\"," + - "\"longitude\":\"$lon\",\"name\":\"$name\"}" + "\"longitude\":\"$lon\",\"name\":\"$name\"}" } when (type) { diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketInstance.kt b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketInstance.kt index fc5feb6ba..10f338b1a 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketInstance.kt +++ b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketInstance.kt @@ -369,6 +369,7 @@ class WebSocketInstance internal constructor( return hasMCU } + @Suppress("Detekt.ComplexMethod") fun joinRoomWithRoomTokenAndSession( roomToken: String, normalBackendSession: String?, @@ -386,8 +387,11 @@ class WebSocketInstance internal constructor( currentNormalBackendSession = "" currentFederation = null sendMessage(message) - } else if (roomToken == currentRoomToken && normalBackendSession == currentNormalBackendSession && - federation?.roomId == currentFederation?.roomId && federation?.nextcloudServer == federation?.nextcloudServer + } else if ( + roomToken == currentRoomToken && + normalBackendSession == currentNormalBackendSession && + federation?.roomId == currentFederation?.roomId && + federation?.nextcloudServer == federation?.nextcloudServer ) { Log.d(TAG, "roomToken & session are unchanged. Joining locally without to send websocket message") sendRoomJoinedEvent()