Эх сурвалжийг харах

reformat code

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
Marcel Hibbe 7 сар өмнө
parent
commit
033e3e86c1

+ 2 - 2
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()
         }

+ 5 - 3
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<SignalingSettingsOverall> {
+            ncApi!!.getSignalingSettings(
+                credentials,
+                ApiUtils.getUrlForSignalingSettings(apiVersion, conversationUser!!.baseUrl, roomToken!!)
+            ).blockingSubscribe(object : Observer<SignalingSettingsOverall> {
                 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) {

+ 6 - 2
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()