@qusaieilouti99/call-manager 0.1.69 → 0.1.71

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
@@ -653,14 +653,16 @@ object CallEngine {
                     AudioDeviceInfo.TYPE_WIRED_HEADPHONES, AudioDeviceInfo.TYPE_WIRED_HEADSET -> {
                         devices.add("Headset")
                     }
-                    // Speaker and Earpiece already added above
+                    // Speaker and Earpiece already added above if they are reported, but explicit add handles cases where they are not
                 }
             }
         } else {
             // 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")
             }
@@ -669,6 +671,9 @@ object CallEngine {
         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)
     }
 
@@ -715,23 +720,6 @@ object CallEngine {
         }
     }
 
-        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"
@@ -742,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"
@@ -770,7 +758,19 @@ object CallEngine {
         }
     }
 
-    // --- Audio Device Callback (simplified) ---
+    // 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>?) {
             Log.d(TAG, "Audio devices added")
@@ -783,9 +783,10 @@ object CallEngine {
         }
     }
 
-    // Separate event for when physical devices are added/removed
+    // Event for when physical devices are added/removed - includes full audio context
     private fun emitAudioDevicesChanged() {
-        val audioInfo = getAudioDevices()
+        // 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)
@@ -794,6 +795,7 @@ object CallEngine {
         Log.d(TAG, "Audio devices changed: available: ${audioInfo.devices.toList()}")
     }
 
+
     fun registerAudioDeviceCallback() {
         val context = requireContext()
         audioManager = audioManager ?: context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
@@ -994,7 +996,35 @@ object CallEngine {
         startForegroundService() // Just restart the service with updated info
     }
 
+    private fun isMainActivityInForeground(): Boolean {
+        val context = requireContext()
+        val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            val tasks = activityManager.getAppTasks()
+            if (tasks.isNotEmpty()) {
+                val taskInfo = tasks[0].taskInfo
+                return taskInfo.topActivity?.className?.contains("MainActivity") == true
+            }
+        } else {
+            @Suppress("DEPRECATION")
+            val tasks = activityManager.getRunningTasks(1)
+            if (tasks.isNotEmpty()) {
+                return tasks[0].topActivity?.className?.contains("MainActivity") == true
+            }
+        }
+        return false
+    }
+
     private fun bringAppToForeground() {
+        // Check if MainActivity is already in foreground
+        if (isMainActivityInForeground()) {
+            Log.d(TAG, "MainActivity is already in foreground, skipping bringAppToForeground()")
+            return
+        }
+
+        Log.d(TAG, "MainActivity is not in foreground, bringing to foreground")
+
         val context = requireContext()
         val packageName = context.packageName
         val launchIntent = context.packageManager.getLaunchIntentForPackage(packageName)

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,11 +84,11 @@ class MyConnection(
             }
         }
 
-        // Only emit route change if route actually changed
+        // 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) {
-            // 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")
+            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.69",
+  "version": "0.1.71",
   "description": "Call manager",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",