Merge branch 'develop' into release/1.0.15

GetStream · Sep 27, 2024 · 050c43d · 050c43d
2 parents 8c5e473 + ba29ce4
commit 050c43d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 35 deletions.
diff --git a/stream-video-android-core/api/stream-video-android-core.api b/stream-video-android-core/api/stream-video-android-core.api
@@ -478,15 +478,14 @@ public final class io/getstream/video/android/core/MemberState {
 }
 
 public final class io/getstream/video/android/core/MicrophoneManager {
-	public fun <init> (Lio/getstream/video/android/core/MediaManagerImpl;ZI)V
+	public fun <init> (Lio/getstream/video/android/core/MediaManagerImpl;I)V
 	public final fun canHandleDeviceSwitch ()Z
 	public final fun cleanup ()V
 	public final fun disable (Z)V
 	public static synthetic fun disable$default (Lio/getstream/video/android/core/MicrophoneManager;ZILjava/lang/Object;)V
 	public final fun getAudioUsage ()I
 	public final fun getDevices ()Lkotlinx/coroutines/flow/StateFlow;
 	public final fun getMediaManager ()Lio/getstream/video/android/core/MediaManagerImpl;
-	public final fun getPreferSpeakerphone ()Z
 	public final fun getSelectedDevice ()Lkotlinx/coroutines/flow/StateFlow;
 	public final fun getStatus ()Lkotlinx/coroutines/flow/StateFlow;
 	public final fun isEnabled ()Lkotlinx/coroutines/flow/StateFlow;
@@ -868,11 +867,8 @@ public abstract interface class io/getstream/video/android/core/audio/AudioHandl
 
 public final class io/getstream/video/android/core/audio/AudioSwitchHandler : io/getstream/video/android/core/audio/AudioHandler {
 	public static final field Companion Lio/getstream/video/android/core/audio/AudioSwitchHandler$Companion;
-	public fun <init> (Landroid/content/Context;ZLkotlin/jvm/functions/Function2;)V
-	public final fun getAudioDeviceChangeListener ()Lkotlin/jvm/functions/Function2;
-	public final fun getPreferSpeakerphone ()Z
+	public fun <init> (Landroid/content/Context;Lkotlin/jvm/functions/Function2;)V
 	public final fun selectDevice (Lcom/twilio/audioswitch/AudioDevice;)V
-	public final fun setAudioDeviceChangeListener (Lkotlin/jvm/functions/Function2;)V
 	public fun start ()V
 	public fun stop ()V
 }

diff --git a/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/Call.kt b/stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/Call.kt
@@ -900,17 +900,10 @@ public class Call(
 
     private fun updateMediaManagerFromSettings(callSettings: CallSettingsResponse) {
         // Speaker
-        if (speaker.status.value is DeviceStatus.NotSelected) {
-            val enableSpeaker =
-                if (callSettings.video.cameraDefaultOn || camera.status.value is DeviceStatus.Enabled) {
-                    // if camera is enabled then enable speaker. Eventually this should
-                    // be a new audio.defaultDevice setting returned from backend
-                    true
-                } else {
-                    callSettings.audio.defaultDevice == AudioSettingsResponse.DefaultDevice.Speaker
-                }
-            speaker.setEnabled(enableSpeaker)
-        }
+        speaker.setEnabled(
+            enabled = callSettings.audio.defaultDevice == AudioSettingsResponse.DefaultDevice.Speaker ||
+                callSettings.audio.speakerDefaultOn,
+        )
 
         // Camera
         if (camera.status.value is DeviceStatus.NotSelected) {

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
@@ -139,9 +139,9 @@ class SpeakerManager(
     fun setSpeakerPhone(enable: Boolean, defaultFallback: StreamAudioDevice? = null) {
         microphoneManager.setup()
         val devices = devices.value
+        val selectedBeforeSpeaker = selectedDevice.value
         if (enable) {
             val speaker = devices.filterIsInstance<StreamAudioDevice.Speakerphone>().firstOrNull()
-            selectedBeforeSpeaker = selectedDevice.value
             _speakerPhoneEnabled.value = true
             microphoneManager.select(speaker)
         } else {
@@ -328,7 +328,6 @@ class ScreenShareManager(
  */
 class MicrophoneManager(
     val mediaManager: MediaManagerImpl,
-    val preferSpeakerphone: Boolean,
     val audioUsage: Int,
 ) {
     // Internal data
@@ -451,7 +450,7 @@ class MicrophoneManager(
 
         if (canHandleDeviceSwitch()) {
             audioHandler =
-                AudioSwitchHandler(mediaManager.context, preferSpeakerphone) { devices, selected ->
+                AudioSwitchHandler(mediaManager.context) { devices, selected ->
                     logger.i { "audio devices. selected $selected, available devices are $devices" }
                     _devices.value = devices.map { it.fromAudio() }
                     _selectedDevice.value = selected?.fromAudio()
@@ -858,7 +857,7 @@ class MediaManagerImpl(
     )
 
     internal val camera = CameraManager(this, eglBaseContext)
-    internal val microphone = MicrophoneManager(this, preferSpeakerphone = true, audioUsage)
+    internal val microphone = MicrophoneManager(this, audioUsage)
     internal val speaker = SpeakerManager(this, microphone)
     internal val screenShare = ScreenShareManager(this, eglBaseContext)
 

diff --git a/...-video-android-core/src/main/kotlin/io/getstream/video/android/core/audio/AudioHandler.kt b/...-video-android-core/src/main/kotlin/io/getstream/video/android/core/audio/AudioHandler.kt
@@ -41,10 +41,9 @@ public interface AudioHandler {
 /**
  * TODO: this class should be merged into the Microphone Manager
  */
-public class AudioSwitchHandler constructor(
+public class AudioSwitchHandler(
     private val context: Context,
-    val preferSpeakerphone: Boolean,
-    var audioDeviceChangeListener: AudioDeviceChangeListener,
+    private var audioDeviceChangeListener: AudioDeviceChangeListener,
 ) :
     AudioHandler {
 
@@ -65,13 +64,8 @@ public class AudioSwitchHandler constructor(
                 AudioDevice.BluetoothHeadset::class.java,
             )
 
-            if (preferSpeakerphone) {
-                devices.add(AudioDevice.Speakerphone::class.java)
-                devices.add(AudioDevice.Earpiece::class.java)
-            } else {
-                devices.add(AudioDevice.Earpiece::class.java)
-                devices.add(AudioDevice.Speakerphone::class.java)
-            }
+            devices.add(AudioDevice.Earpiece::class.java)
+            devices.add(AudioDevice.Speakerphone::class.java)
 
             handler.post {
                 val switch = AudioSwitch(

diff --git a/...deo-android-core/src/test/kotlin/io/getstream/video/android/core/MicrophoneManagerTest.kt b/...deo-android-core/src/test/kotlin/io/getstream/video/android/core/MicrophoneManagerTest.kt
@@ -35,7 +35,7 @@ class MicrophoneManagerTest {
     fun `Ensure setup is called prior to any action onto the microphone manager`() = runTest {
         // Given
         val mediaManager = mockk<MediaManagerImpl>(relaxed = true)
-        val actual = MicrophoneManager(mediaManager, false, audioUsage)
+        val actual = MicrophoneManager(mediaManager, audioUsage)
         val context = mockk<Context>(relaxed = true)
         val microphoneManager = spyk(actual)
         every { mediaManager.context } returns context
@@ -69,7 +69,6 @@ class MicrophoneManagerTest {
         val actual =
             MicrophoneManager(
                 mediaManager,
-                false,
                 audioUsage = AudioAttributes.USAGE_VOICE_COMMUNICATION,
             )
         val context = mockk<Context>(relaxed = true)
@@ -91,7 +90,7 @@ class MicrophoneManagerTest {
     fun `Ensure setup if ever the manager was cleaned`() {
         // Given
         val mediaManager = mockk<MediaManagerImpl>(relaxed = true)
-        val actual = MicrophoneManager(mediaManager, false, audioUsage)
+        val actual = MicrophoneManager(mediaManager, audioUsage)
         val context = mockk<Context>(relaxed = true)
         val microphoneManager = spyk(actual)
         every { mediaManager.context } returns context
@@ -119,7 +118,7 @@ class MicrophoneManagerTest {
     fun `Resume will call enable only if prior status was DeviceStatus#enabled`() {
         // Given
         val mediaManager = mockk<MediaManagerImpl>(relaxed = true)
-        val actual = MicrophoneManager(mediaManager, false, audioUsage)
+        val actual = MicrophoneManager(mediaManager, audioUsage)
         val context = mockk<Context>(relaxed = true)
         val microphoneManager = spyk(actual)
         every { mediaManager.context } returns context