resolve warnings

Signed-off-by: Marcel Hibbe <[email protected]>

Author: mahibi

app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt

@@ -310,7 +310,7 @@ class CallActivity : CallBaseActivity() {
     private var handler: Handler? = null
     private var currentCallStatus: CallStatus? = null
     private var mediaPlayer: MediaPlayer? = null
-    
+
     private var binding: CallActivityBinding? = null
     private var audioOutputDialog: AudioOutputDialog? = null
     private var moreCallActionsDialog: MoreCallActionsDialog? = null

app/src/main/java/com/nextcloud/talk/activities/ParticipantHandler.kt

@@ -73,6 +73,7 @@ class ParticipantHandler(
         }
 
         override fun onIceConnectionStateChanged(iceConnectionState: IceConnectionState?) {
+            // do nothing
         }
     }
 
@@ -167,7 +168,11 @@ class ParticipantHandler(
             return
         }
 
-        Log.d(TAG, "setPeerConnection " + _uiState.value.nick + " " + this.peerConnection?.peerConnection?.iceConnectionState())
+        Log.d(
+            TAG,
+            "setPeerConnection " + _uiState.value.nick + " " +
+                this.peerConnection?.peerConnection?.iceConnectionState()
+        )
 
         handleIceConnectionStateChange(this.peerConnection?.peerConnection?.iceConnectionState())
         handleStreamChange(this.peerConnection?.stream)
@@ -182,7 +187,6 @@ class ParticipantHandler(
         this.screenPeerConnection = screenPeerConnectionWrapper
 
         if (this.screenPeerConnection == null) {
-            // callParticipantModel.setScreenIceConnectionState(null)
             _uiState.update { it.copy(screenMediaStream = null) }
             return
         }
@@ -195,6 +199,8 @@ class ParticipantHandler(
     fun isConnected(iceConnectionState: IceConnectionState?): Boolean =
         iceConnectionState == IceConnectionState.CONNECTED ||
             iceConnectionState == IceConnectionState.COMPLETED ||
+            // If there is no connection state that means that no connection is needed,
+            // so it is a special case that is also seen as "connected".
             iceConnectionState == null
 
     fun updateNick(nick: String?) = _uiState.update { it.copy(nick = nick ?: "Guest") }

app/src/test/java/com/nextcloud/talk/call/MessageSenderTest.kt

@@ -123,65 +123,66 @@ class MessageSenderTest {
     }
 
     @Test
-    fun testSendSignalingMessageToAll() = testScope.runTest {
-        val sentTo: MutableList<String?> = ArrayList()
-        doAnswer { invocation: InvocationOnMock ->
-            val arguments = invocation.arguments
-            val message = (arguments[0] as NCSignalingMessage)
-
-            sentTo.add(message.to)
-            null
-        }.`when`(signalingMessageSender!!).send(any())
-
-        val message = NCSignalingMessage()
-        messageSender!!.sendToAll(message)
-
-        assertTrue(sentTo.contains("theSessionId1"))
-        assertTrue(sentTo.contains("theSessionId2"))
-        assertTrue(sentTo.contains("theSessionId3"))
-        assertTrue(sentTo.contains("theSessionId4"))
-        Mockito.verify(signalingMessageSender!!, times(4)).send(message)
-        Mockito.verifyNoMoreInteractions(signalingMessageSender)
-    }
+    fun testSendSignalingMessageToAll() =
+        testScope.runTest {
+            val sentTo: MutableList<String?> = ArrayList()
+            doAnswer { invocation: InvocationOnMock ->
+                val arguments = invocation.arguments
+                val message = (arguments[0] as NCSignalingMessage)
+
+                sentTo.add(message.to)
+                null
+            }.`when`(signalingMessageSender!!).send(any())
+
+            val message = NCSignalingMessage()
+            messageSender!!.sendToAll(message)
+
+            assertTrue(sentTo.contains("theSessionId1"))
+            assertTrue(sentTo.contains("theSessionId2"))
+            assertTrue(sentTo.contains("theSessionId3"))
+            assertTrue(sentTo.contains("theSessionId4"))
+            Mockito.verify(signalingMessageSender!!, times(4)).send(message)
+            Mockito.verifyNoMoreInteractions(signalingMessageSender)
+        }
 
     @Test
-    fun testSendSignalingMessageToAllWhenParticipantsWereUpdated() = testScope.runTest {
-        viewModel.addParticipant(
-            baseUrl = "",
-            roomToken = "",
-            sessionId = "theSessionId5",
-            signalingMessageReceiver = mockReceiver
-        )
-        testDispatcher.scheduler.advanceUntilIdle()
-
-        viewModel.removeParticipant("theSessionId2")
-        testDispatcher.scheduler.advanceUntilIdle()
-        viewModel.removeParticipant("theSessionId3")
-        testDispatcher.scheduler.advanceUntilIdle()
-
-        val updatedSessionKeys = viewModel.participants.value
-            .mapNotNull { it.sessionKey }
-            .toSet()
-
-        messageSender = MessageSender(signalingMessageSender, updatedSessionKeys, emptyList())
-
-
-        val sentTo: MutableList<String?> = ArrayList()
-        doAnswer { invocation: InvocationOnMock ->
-            val arguments = invocation.arguments
-            val message = (arguments[0] as NCSignalingMessage)
-
-            sentTo.add(message.to)
-            null
-        }.`when`(signalingMessageSender!!).send(any())
-
-        val message = NCSignalingMessage()
-        messageSender!!.sendToAll(message)
-
-        assertTrue(sentTo.contains("theSessionId1"))
-        assertTrue(sentTo.contains("theSessionId4"))
-        assertTrue(sentTo.contains("theSessionId5"))
-        Mockito.verify(signalingMessageSender!!, times(3)).send(message)
-        Mockito.verifyNoMoreInteractions(signalingMessageSender)
-    }
+    fun testSendSignalingMessageToAllWhenParticipantsWereUpdated() =
+        testScope.runTest {
+            viewModel.addParticipant(
+                baseUrl = "",
+                roomToken = "",
+                sessionId = "theSessionId5",
+                signalingMessageReceiver = mockReceiver
+            )
+            testDispatcher.scheduler.advanceUntilIdle()
+
+            viewModel.removeParticipant("theSessionId2")
+            testDispatcher.scheduler.advanceUntilIdle()
+            viewModel.removeParticipant("theSessionId3")
+            testDispatcher.scheduler.advanceUntilIdle()
+
+            val updatedSessionKeys = viewModel.participants.value
+                .mapNotNull { it.sessionKey }
+                .toSet()
+
+            messageSender = MessageSender(signalingMessageSender, updatedSessionKeys, emptyList())
+
+            val sentTo: MutableList<String?> = ArrayList()
+            doAnswer { invocation: InvocationOnMock ->
+                val arguments = invocation.arguments
+                val message = (arguments[0] as NCSignalingMessage)
+
+                sentTo.add(message.to)
+                null
+            }.`when`(signalingMessageSender!!).send(any())
+
+            val message = NCSignalingMessage()
+            messageSender!!.sendToAll(message)
+
+            assertTrue(sentTo.contains("theSessionId1"))
+            assertTrue(sentTo.contains("theSessionId4"))
+            assertTrue(sentTo.contains("theSessionId5"))
+            Mockito.verify(signalingMessageSender!!, times(3)).send(message)
+            Mockito.verifyNoMoreInteractions(signalingMessageSender)
+        }
 }