@qusaieilouti99/call-manager 0.1.68 → 0.1.70

package/android/src/main/java/com/margelo/nitro/qusaieilouti99/callmanager/CallEngine.kt

@@ -30,9 +30,6 @@ import android.telecom.PhoneAccountHandle
 import android.telecom.TelecomManager
 import android.telecom.VideoProfile
 import android.util.Log
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.concurrent.ConcurrentHashMap
@@ -275,8 +272,11 @@ object CallEngine {
 
         val isVideoCall = callType == "Video"
         if (!canMakeMultipleCalls && activeCalls.isNotEmpty()) {
-            activeCalls.values.filter { it.state == CallState.ACTIVE }
-                .forEach { holdCallInternal(it.callId, heldBySystem = false) }
+            activeCalls.values.forEach {
+                if (it.state == CallState.ACTIVE) {
+                    holdCallInternal(it.callId, heldBySystem = false)
+                }
+            }
         }
 
         // Track dialing state
@@ -629,7 +629,7 @@ object CallEngine {
         })
     }
 
-    // --- Audio Management (SIMPLIFIED - NO MANUAL AUDIO FOCUS) ---
+    // --- Enhanced Audio Management ---
     fun getAudioDevices(): AudioRoutesInfo {
         val context = requireContext()
         audioManager = audioManager ?: context.getSystemService(Context.AUDIO_SERVICE) as? AudioManager ?: run {
@@ -637,8 +637,12 @@ object CallEngine {
         }
 
         val devices = mutableSetOf<String>()
-        var currentRoute = "Earpiece"
 
+        // ALWAYS include Speaker and Earpiece for phone calls
+        devices.add("Speaker")
+        devices.add("Earpiece")
+
+        // Check for additional connected devices
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             val audioDeviceInfoList = audioManager?.getDevices(AudioManager.GET_DEVICES_OUTPUTS)
             audioDeviceInfoList?.forEach { device ->
@@ -649,24 +653,26 @@ object CallEngine {
                     AudioDeviceInfo.TYPE_WIRED_HEADPHONES, AudioDeviceInfo.TYPE_WIRED_HEADSET -> {
                         devices.add("Headset")
                     }
-                    AudioDeviceInfo.TYPE_BUILTIN_SPEAKER -> {
-                        devices.add("Speaker")
-                    }
-                    AudioDeviceInfo.TYPE_BUILTIN_EARPIECE -> {
-                        devices.add("Earpiece")
-                    }
+                    // Speaker and Earpiece already added above if they are reported, but explicit add handles cases where they are not
                 }
             }
         } else {
-            devices.addAll(listOf("Speaker", "Earpiece"))
+            // For older versions, check for Bluetooth and Headset
+            @Suppress("DEPRECATION")
+            if (audioManager?.isBluetoothA2dpOn == true || audioManager?.isBluetoothScoOn == true) {
+                devices.add("Bluetooth")
+            }
+            @Suppress("DEPRECATION")
+            if (audioManager?.isWiredHeadsetOn == true) {
+                devices.add("Headset")
+            }
         }
 
-        currentRoute = when {
-            audioManager?.isBluetoothScoOn == true -> "Bluetooth"
-            audioManager?.isSpeakerphoneOn == true -> "Speaker"
-            audioManager?.isWiredHeadsetOn == true -> "Headset"
-            else -> "Earpiece"
-        }
+        val currentRoute = getCurrentAudioRoute()
+        Log.d(TAG, "Available audio devices: ${devices.toList()}, current route: $currentRoute")
+
+        // Update last known audio routes info
+        lastAudioRoutesInfo = AudioRoutesInfo(devices.toTypedArray(), currentRoute)
 
         return AudioRoutesInfo(devices.toTypedArray(), currentRoute)
     }
@@ -678,6 +684,7 @@ object CallEngine {
 
         val previousRoute = getCurrentAudioRoute()
 
+        // Reset all routes first
         audioManager?.isSpeakerphoneOn = false
         audioManager?.stopBluetoothSco()
         audioManager?.isBluetoothScoOn = false
@@ -689,6 +696,7 @@ object CallEngine {
             }
             "Earpiece" -> {
                 audioManager?.mode = AudioManager.MODE_IN_COMMUNICATION
+                // Earpiece is the default - just ensure speaker and bluetooth are off
             }
             "Bluetooth" -> {
                 audioManager?.startBluetoothSco()
@@ -697,6 +705,7 @@ object CallEngine {
             }
             "Headset" -> {
                 audioManager?.mode = AudioManager.MODE_IN_COMMUNICATION
+                // Headset routing is automatic when connected
             }
             else -> {
                 Log.w(TAG, "Unknown audio route: $route")
@@ -706,7 +715,8 @@ object CallEngine {
 
         val newRoute = getCurrentAudioRoute()
         if (previousRoute != newRoute) {
-            emitEvent(CallEventType.AUDIO_ROUTE_CHANGED, JSONObject().put("route", newRoute))
+            // Emit unified event with full context
+            emitAudioRouteChanged()
         }
     }
 
@@ -720,7 +730,7 @@ object CallEngine {
     }
 
     private fun setInitialAudioRoute(callType: String) {
-        val availableDevices = getAudioDevices()
+        val availableDevices = getAudioDevices() // This will update lastAudioRoutesInfo
 
         val defaultRoute = when {
             availableDevices.devices.contains("Bluetooth") -> "Bluetooth"
@@ -748,17 +758,44 @@ object CallEngine {
         }
     }
 
+    // UNIFIED event emission - always sends full audio context
+    private fun emitAudioRouteChanged() {
+        // Re-calculate latest state to ensure accuracy
+        val audioInfo = getAudioDevices() // This updates lastAudioRoutesInfo internally
+        val jsonPayload = JSONObject().apply {
+            put("devices", JSONArray(audioInfo.devices.toList()))
+            put("currentRoute", audioInfo.currentRoute)
+        }
+        emitEvent(CallEventType.AUDIO_ROUTE_CHANGED, jsonPayload)
+        Log.d(TAG, "Audio route changed: ${audioInfo.currentRoute}, available: ${audioInfo.devices.toList()}")
+    }
+
     // --- Audio Device Callback ---
     private val audioDeviceCallback = object : AudioDeviceCallback() {
         override fun onAudioDevicesAdded(addedDevices: Array<out AudioDeviceInfo>?) {
-            emitAudioDevicesChangedIfNeeded()
+            Log.d(TAG, "Audio devices added")
+            emitAudioDevicesChanged()
         }
 
         override fun onAudioDevicesRemoved(removedDevices: Array<out AudioDeviceInfo>?) {
-            emitAudioDevicesChangedIfNeeded()
+            Log.d(TAG, "Audio devices removed")
+            emitAudioDevicesChanged()
+        }
+    }
+
+    // Event for when physical devices are added/removed - includes full audio context
+    private fun emitAudioDevicesChanged() {
+        // Re-calculate latest state to ensure accuracy
+        val audioInfo = getAudioDevices() // This updates lastAudioRoutesInfo internally
+        val jsonPayload = JSONObject().apply {
+            put("devices", JSONArray(audioInfo.devices.toList()))
+            put("currentRoute", audioInfo.currentRoute)
         }
+        emitEvent(CallEventType.AUDIO_DEVICES_CHANGED, jsonPayload)
+        Log.d(TAG, "Audio devices changed: available: ${audioInfo.devices.toList()}")
     }
 
+
     fun registerAudioDeviceCallback() {
         val context = requireContext()
         audioManager = audioManager ?: context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
@@ -771,22 +808,6 @@ object CallEngine {
         audioManager?.unregisterAudioDeviceCallback(audioDeviceCallback)
     }
 
-    private fun emitAudioDevicesChangedIfNeeded() {
-        val currentAudioInfo = getAudioDevices()
-
-        if (lastAudioRoutesInfo == null ||
-            !currentAudioInfo.devices.contentEquals(lastAudioRoutesInfo!!.devices) ||
-            currentAudioInfo.currentRoute != lastAudioRoutesInfo!!.currentRoute) {
-
-            lastAudioRoutesInfo = currentAudioInfo
-            val jsonPayload = JSONObject().apply {
-                put("devices", JSONArray(currentAudioInfo.devices.toList()))
-                put("currentRoute", currentAudioInfo.currentRoute)
-            }
-            emitEvent(CallEventType.AUDIO_DEVICES_CHANGED, jsonPayload)
-        }
-    }
-
     // --- Screen Management ---
     fun keepScreenAwake(keepAwake: Boolean) {
         val context = requireContext()

package/android/src/main/java/com/margelo/nitro/qusaieilouti99/callmanager/MyConnection.kt

@@ -25,8 +25,8 @@ class MyConnection(
     init {
         connectionProperties = Connection.PROPERTY_SELF_MANAGED
         connectionCapabilities = Connection.CAPABILITY_SUPPORT_HOLD or
-                Connection.CAPABILITY_MUTE or
-                Connection.CAPABILITY_HOLD
+            Connection.CAPABILITY_MUTE or
+            Connection.CAPABILITY_HOLD
 
         if (callType == "Video") {
             Log.d(TAG, "MyConnection for callId $callId initialized as VIDEO call.")
@@ -84,19 +84,11 @@ class MyConnection(
             }
         }
 
+        // Only react to route change if it's different.
+        // DO NOT emit AUDIO_ROUTE_CHANGED from here, let CallEngine's
+        // AudioDeviceCallback handle it for consistency and to avoid duplication.
         if (lastAudioState == null || lastAudioState!!.route != state.route) {
-            val routeName = when (state.route) {
-                CallAudioState.ROUTE_SPEAKER -> "Speaker"
-                CallAudioState.ROUTE_EARPIECE -> "Earpiece"
-                CallAudioState.ROUTE_BLUETOOTH -> "Bluetooth"
-                CallAudioState.ROUTE_WIRED_HEADSET -> "Headset"
-                else -> "Unknown"
-            }
-
-            CallEngine.emitEvent(
-                CallEventType.AUDIO_ROUTE_CHANGED,
-                JSONObject().put("callId", callId).put("route", routeName)
-            )
+            Log.d(TAG, "System audio route changed for callId: $callId. Telecom route: ${state.route}")
         }
 
         lastAudioState = state

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qusaieilouti99/call-manager",
-  "version": "0.1.68",
+  "version": "0.1.70",
   "description": "Call manager",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",