ensure the "onAudioChanged" event fires when the device list changes

Author: oliverlaz

packages/react-native-sdk/android/src/main/java/com/streamvideo/reactnative/audio/AudioDeviceManager.kt

@@ -66,14 +66,7 @@ class AudioDeviceManager(
         EndpointMaps(bluetoothEndpoints, nonBluetoothEndpoints)
     }
 
-    private var _cachedAvailableEndpointNamesSet = setOf<String>()
-    private var cachedAvailableEndpointNamesSet: Set<String>
-        get() = _cachedAvailableEndpointNamesSet
-        set(value) {
-            _cachedAvailableEndpointNamesSet = value
-            // send an event to the frontend everytime the list of available endpoints changes
-            sendAudioStatusEvent();
-        }
+    private var cachedAvailableEndpointNamesSet = setOf<String>()
 
     /** Returns the currently selected audio device. */
     private var _selectedAudioDeviceEndpoint: AudioDeviceEndpoint? = null
@@ -384,6 +377,11 @@ class AudioDeviceManager(
                 ))
             )
 
+            if (devicesChanged) {
+                // notify the frontend that the available devices changed
+                this.sendAudioStatusEvent();
+            }
+
             // Double-check if any Bluetooth headset is connected once again (useful for older android platforms)
             // TODO: we can possibly remove this, to be tested on older platforms
             if (bluetoothManager.bluetoothState == BluetoothManager.State.HEADSET_AVAILABLE || bluetoothManager.bluetoothState == BluetoothManager.State.HEADSET_UNAVAILABLE) {
@@ -511,7 +509,7 @@ class AudioDeviceManager(
                 if (audioFocusLost) {
                     // removing the currently selected device store, as its untrue
                     selectedAudioDeviceEndpoint = null
-                    // removing the currectly selected device store will make sure a device selection is made
+                    // removing the currently selected device store will make sure a device selection is made
                     updateAudioDeviceState()
                 }
                 audioFocusLost = false
@@ -524,7 +522,7 @@ class AudioDeviceManager(
         }
     }
 
-    fun audioStatusMap(): WritableMap {
+    private fun audioStatusMap(): WritableMap {
         val endpoint = this.selectedAudioDeviceEndpoint
         val availableEndpoints = Arguments.fromList(getCurrentDeviceEndpoints().map { it.name })
 
@@ -535,7 +533,7 @@ class AudioDeviceManager(
         return data
     }
 
-    fun sendAudioStatusEvent() {
+    private fun sendAudioStatusEvent() {
         try {
             if (mReactContext.hasActiveReactInstance()) {
                 val payload = audioStatusMap()

packages/react-native-sdk/android/src/main/java/com/streamvideo/reactnative/callmanager/StreamInCallManagerModule.kt

@@ -4,16 +4,13 @@ import android.util.Log
 import android.view.WindowManager
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.UiThreadUtil
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.streamvideo.reactnative.audio.AudioDeviceManager
 import com.streamvideo.reactnative.audio.utils.CallAudioRole
-import com.streamvideo.reactnative.model.AudioDeviceEndpoint
 import com.streamvideo.reactnative.audio.utils.WebRtcAudioUtils
+import com.streamvideo.reactnative.model.AudioDeviceEndpoint
 import java.util.Locale
 
 
@@ -47,24 +44,6 @@ class StreamInCallManagerModule(reactContext: ReactApplicationContext) :
         super.invalidate()
     }
 
-    fun sendEvent(eventName: String, params: WritableMap?) {
-        try {
-            val reactContext: ReactContext? = reactApplicationContext
-            if (reactContext != null && reactContext.hasActiveReactInstance()) {
-                reactContext.getJSModule(
-                    DeviceEventManagerModule.RCTDeviceEventEmitter::class.java
-                ).emit(eventName, params)
-            } else {
-                Log.e(TAG, "sendEvent(): reactContext is null or not having CatalystInstance yet.")
-            }
-        } catch (e: RuntimeException) {
-            Log.e(
-                TAG,
-                "sendEvent(): java.lang.RuntimeException: Trying to invoke JS before CatalystInstance has been set!"
-            )
-        }
-    }
-
     @ReactMethod
     fun setAudioRole(audioRole: String) {
         AudioDeviceManager.runInAudioThread {