Improve support for device switching

GetStream · Aug 7, 2024 · 6acdd61 · 6acdd61
1 parent 3892ea9
commit 6acdd61
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/MediaManager.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/MediaManager.kt
@@ -453,10 +453,12 @@ class MicrophoneManager(
         }
 
         if (canHandleDeviceSwitch()) {
-            audioHandler = TelecomCompat.listenForDevices(
+            audioHandler = TelecomCompat.getAudioHandler(
                 context = mediaManager.context,
                 listener = { devices, selected ->
-                    logger.i { "[setup] listenForDevices. Selected: $selected, available: $devices" }
+                    logger.i {
+                        "[setup] listenForDevices. Selected: ${selected?.name}, available: ${devices.map { it.name }}"
+                    }
 
                     _devices.value = devices
                     _selectedDevice.value = selected

diff --git a/...eo-android-core/src/main/kotlin/io/getstream/video/android/core/telecom/TelecomHandler.kt b/...eo-android-core/src/main/kotlin/io/getstream/video/android/core/telecom/TelecomHandler.kt
@@ -40,9 +40,9 @@ import io.getstream.video.android.model.StreamCallId
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -161,14 +161,15 @@ internal class TelecomHandler private constructor(
                         callControlScope = this
                         streamToTelecomEventBridge.onEvent(this)
 
-                        val availableEndpoints = callControlScope?.availableEndpoints
-                        val selectedEndpoint = callControlScope?.currentCallEndpoint
-
-                        availableEndpoints
-                            ?.map { endpointList -> endpointList.map { it.toStreamAudioDevice() } }
-                            ?.onEach { deviceListener?.invoke(it, null) }
-                            ?.distinctUntilChanged()
-                            ?.launchIn(this) // TODO-Telecom: manage 2 scopes?
+                        combine(availableEndpoints, currentCallEndpoint) { list, device ->
+                            Pair(
+                                list.map { it.toStreamAudioDevice() },
+                                device.toStreamAudioDevice(),
+                            )
+                        }
+                            .distinctUntilChanged()
+                            .onEach { deviceListener?.invoke(it.first, it.second) }
+                            .launchIn(this)
                     },
                 )
             }

diff --git a/...ideo-android-core/src/main/kotlin/io/getstream/video/android/core/telecom/TelecomUtils.kt b/...ideo-android-core/src/main/kotlin/io/getstream/video/android/core/telecom/TelecomUtils.kt
@@ -97,7 +97,7 @@ internal object TelecomCompat {
     }
 
     @TargetApi(Build.VERSION_CODES.O)
-    fun listenForDevices(context: Context, listener: AvailableDevicesListener): AudioHandler {
+    fun getAudioHandler(context: Context, listener: AvailableDevicesListener): AudioHandler {
         val applicationContext = context.applicationContext // TODO-Telecom: Abstract out in one place
         val isTelecomSupported = TelecomHandler.isSupported(applicationContext)
         val telecomHandler = TelecomHandler.getInstance(applicationContext)