remove unnecessary checks for doesParticipantExist

add log in getParticipant if not found

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

Author: mahibi

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

@@ -2120,7 +2120,6 @@ class CallActivity : CallBaseActivity() {
             it.stopCapture()
             it.startCapture(width, height, FRAME_RATE)
         }
-        // updateSelfVideoViewPosition(isPortrait)
     }
 
     private fun setupOrientationListener(context: Context) {
@@ -2453,13 +2452,12 @@ class CallActivity : CallBaseActivity() {
             peerConnectionWrapper.removeObserver(selfPeerConnectionObserver)
         }
 
-        if (!callViewModel.doesParticipantExist(sessionId)) {
-            if ("screen" == type) {
-                callViewModel.getParticipant(sessionId)?.setScreenPeerConnection(null)
-            } else {
-                callViewModel.getParticipant(sessionId)?.setPeerConnection(null)
-            }
+        if ("screen" == type) {
+            callViewModel.getParticipant(sessionId)?.setScreenPeerConnection(null)
+        } else {
+            callViewModel.getParticipant(sessionId)?.setPeerConnection(null)
         }
+
         peerConnectionWrapper.removePeerConnection()
         peerConnectionWrapperList.remove(peerConnectionWrapper)
     }
@@ -2797,9 +2795,7 @@ class CallActivity : CallBaseActivity() {
 
         private fun onOfferOrAnswer(nick: String?) {
             this.nick = nick
-            if (callViewModel.doesParticipantExist(sessionId)) {
-                callViewModel.getParticipant(sessionId)?.updateNick(nick)
-            }
+            callViewModel.getParticipant(sessionId)?.updateNick(nick)
         }
     }
 

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

@@ -6,6 +6,7 @@
  */
 package com.nextcloud.talk.activities
 
+import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.nextcloud.talk.signaling.SignalingMessageReceiver
@@ -26,7 +27,13 @@ class CallViewModel @Inject constructor() : ViewModel() {
     private val _activeScreenShareSession = MutableStateFlow<ParticipantUiState?>(null)
     val activeScreenShareSession: StateFlow<ParticipantUiState?> = _activeScreenShareSession.asStateFlow()
 
-    fun getParticipant(sessionId: String?): ParticipantHandler? = participantHandlers[sessionId]
+    fun getParticipant(sessionId: String?): ParticipantHandler? {
+        if (sessionId == null) {
+            Log.w(TAG, "Attempted to get participant with null sessionId.")
+            return null
+        }
+        return participantHandlers[sessionId]
+    }
 
     fun doesParticipantExist(sessionId: String?): Boolean = (participantHandlers.containsKey(sessionId))
 
@@ -86,4 +93,8 @@ class CallViewModel @Inject constructor() : ViewModel() {
         participantHandlers.clear()
         _participants.value = emptyList()
     }
+
+    companion object {
+        private val TAG = CallViewModel::class.java.simpleName
+    }
 }