@qusaieilouti99/call-manager 0.1.68 → 0.1.69

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

@@ -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,21 @@ 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
                 }
             }
         } else {
-            devices.addAll(listOf("Speaker", "Earpiece"))
+            // For older versions, check for Bluetooth and Headset
+            if (audioManager?.isBluetoothA2dpOn == true || audioManager?.isBluetoothScoOn == true) {
+                devices.add("Bluetooth")
+            }
+            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")
 
         return AudioRoutesInfo(devices.toTypedArray(), currentRoute)
     }
@@ -678,6 +679,7 @@ object CallEngine {
 
         val previousRoute = getCurrentAudioRoute()
 
+        // Reset all routes first
         audioManager?.isSpeakerphoneOn = false
         audioManager?.stopBluetoothSco()
         audioManager?.isBluetoothScoOn = false
@@ -689,6 +691,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 +700,7 @@ object CallEngine {
             }
             "Headset" -> {
                 audioManager?.mode = AudioManager.MODE_IN_COMMUNICATION
+                // Headset routing is automatic when connected
             }
             else -> {
                 Log.w(TAG, "Unknown audio route: $route")
@@ -704,12 +708,30 @@ object CallEngine {
             }
         }
 
+        val newRoute = getCurrentAudioRoute()
+        if (previousRoute != newRoute) {
+            // Emit unified event with full context
+            emitAudioRouteChanged()
+        }
+    }
+
         val newRoute = getCurrentAudioRoute()
         if (previousRoute != newRoute) {
             emitEvent(CallEventType.AUDIO_ROUTE_CHANGED, JSONObject().put("route", newRoute))
         }
     }
 
+    // UNIFIED event emission - always sends full audio context
+    private fun emitAudioRouteChanged() {
+        val audioInfo = getAudioDevices()
+        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()}")
+    }
+
     private fun getCurrentAudioRoute(): String {
         return when {
             audioManager?.isBluetoothScoOn == true -> "Bluetooth"
@@ -748,15 +770,28 @@ object CallEngine {
         }
     }
 
-    // --- Audio Device Callback ---
+    // --- Audio Device Callback (simplified) ---
     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()
+        }
+    }
+
+    // Separate event for when physical devices are added/removed
+    private fun emitAudioDevicesChanged() {
+        val audioInfo = getAudioDevices()
+        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() {
@@ -771,22 +806,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

@@ -84,19 +84,11 @@ class MyConnection(
             }
         }
 
+        // Only emit route change if route actually changed
         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)
-            )
+            // Don't emit here - let CallEngine handle it to avoid duplication
+            // The system audio state change will be detected by CallEngine's audio management
+            Log.d(TAG, "System audio route changed to: ${state.route} for callId: $callId")
         }
 
         lastAudioState = state

package/package.json

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