@qusaieilouti99/call-manager 0.1.67 → 0.1.69

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

@@ -13,7 +13,6 @@ import android.graphics.Color
 import android.media.AudioAttributes
 import android.media.AudioDeviceCallback
 import android.media.AudioDeviceInfo
-import android.media.AudioFocusRequest
 import android.media.AudioManager
 import android.media.MediaPlayer
 import android.media.RingtoneManager
@@ -31,7 +30,6 @@ import android.telecom.PhoneAccountHandle
 import android.telecom.TelecomManager
 import android.telecom.VideoProfile
 import android.util.Log
-import androidx.annotation.RequiresApi
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -52,16 +50,11 @@ object CallEngine {
     private val isInitialized = AtomicBoolean(false)
     private val initializationLock = Any()
 
-    // Enhanced Audio & Media Management
+    // Simplified Audio & Media Management (NO MANUAL AUDIO FOCUS)
     private var ringtone: android.media.Ringtone? = null
     private var ringbackPlayer: MediaPlayer? = null
     private var audioManager: AudioManager? = null
     private var wakeLock: PowerManager.WakeLock? = null
-    private var audioFocusRequest: AudioFocusRequest? = null
-    private var hasAudioFocus: Boolean = false
-    private val audioFocusRetryHandler = Handler(Looper.getMainLooper())
-    private var audioFocusRetryCount = 0
-    private val MAX_AUDIO_FOCUS_RETRIES = 3
 
     // Call State Management
     private val activeCalls = ConcurrentHashMap<String, CallInfo>()
@@ -86,38 +79,6 @@ object CallEngine {
         fun onLockScreenBypassChanged(shouldBypass: Boolean)
     }
 
-    // Enhanced Audio Focus Change Listener for Self-Managed Calls
-    private val audioFocusChangeListener = AudioManager.OnAudioFocusChangeListener { focusChange ->
-        Log.d(TAG, "Audio focus changed: $focusChange")
-        when (focusChange) {
-            AudioManager.AUDIOFOCUS_GAIN -> {
-                Log.d(TAG, "Audio focus gained")
-                hasAudioFocus = true
-                audioFocusRetryCount = 0
-
-                // Resume any system-held calls after a short delay
-                Handler(Looper.getMainLooper()).postDelayed({
-                    resumeSystemHeldCalls()
-                }, 500)
-            }
-            AudioManager.AUDIOFOCUS_LOSS -> {
-                Log.d(TAG, "Permanent audio focus loss - holding active calls")
-                hasAudioFocus = false
-                holdAllActiveCalls(heldBySystem = true)
-            }
-            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> {
-                Log.d(TAG, "Transient audio focus loss - holding calls temporarily")
-                hasAudioFocus = false
-                holdAllActiveCalls(heldBySystem = true)
-            }
-            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> {
-                Log.d(TAG, "Transient audio focus loss (can duck) - keeping calls active")
-                hasAudioFocus = false
-                // Don't hold calls for ducking scenarios in self-managed calls
-            }
-        }
-    }
-
     // --- INITIALIZATION ---
     fun initialize(context: Context) {
         synchronized(initializationLock) {
@@ -165,102 +126,6 @@ object CallEngine {
         }
     }
 
-    // --- Enhanced Audio Focus Management for Self-Managed Calls ---
-    private fun requestAudioFocus(): Boolean {
-        val context = requireContext()
-        audioManager = audioManager ?: context.getSystemService(Context.AUDIO_SERVICE) as? AudioManager
-
-        if (hasAudioFocus) {
-            Log.d(TAG, "Audio focus already granted")
-            return true
-        }
-
-        Log.d(TAG, "Requesting audio focus for self-managed call (attempt ${audioFocusRetryCount + 1})")
-
-        val result = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            requestAudioFocusApi26Plus()
-        } else {
-            requestAudioFocusLegacy()
-        }
-
-        val success = result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
-        hasAudioFocus = success
-
-        Log.d(TAG, "Audio focus request result: $result (granted: $success)")
-
-        if (!success && audioFocusRetryCount < MAX_AUDIO_FOCUS_RETRIES) {
-            // Retry after a short delay
-            audioFocusRetryCount++
-            audioFocusRetryHandler.postDelayed({
-                Log.d(TAG, "Retrying audio focus request...")
-                requestAudioFocus()
-            }, 200)
-        }
-
-        return success
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    private fun requestAudioFocusApi26Plus(): Int {
-        if (audioFocusRequest == null) {
-            audioFocusRequest = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE)
-                .setAudioAttributes(
-                    AudioAttributes.Builder()
-                        .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION_SIGNALLING)
-                        .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
-                        .setFlags(AudioAttributes.FLAG_AUDIBILITY_ENFORCED)
-                        .build()
-                )
-                .setOnAudioFocusChangeListener(audioFocusChangeListener)
-                .setAcceptsDelayedFocusGain(true)
-                .setWillPauseWhenDucked(false)
-                .build()
-        }
-
-        return audioManager?.requestAudioFocus(audioFocusRequest!!) ?: AudioManager.AUDIOFOCUS_REQUEST_FAILED
-    }
-
-    @Suppress("DEPRECATION")
-    private fun requestAudioFocusLegacy(): Int {
-        return audioManager?.requestAudioFocus(
-            audioFocusChangeListener,
-            AudioManager.STREAM_VOICE_CALL,
-            AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE
-        ) ?: AudioManager.AUDIOFOCUS_REQUEST_FAILED
-    }
-
-    private fun abandonAudioFocus() {
-        if (!hasAudioFocus) return
-
-        audioManager?.let { am ->
-            val result = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                audioFocusRequest?.let { request ->
-                    am.abandonAudioFocusRequest(request)
-                } ?: AudioManager.AUDIOFOCUS_REQUEST_FAILED
-            } else {
-                @Suppress("DEPRECATION")
-                am.abandonAudioFocus(audioFocusChangeListener)
-            }
-            Log.d(TAG, "Audio focus abandoned, result: $result")
-        }
-
-        hasAudioFocus = false
-        audioFocusRetryCount = 0
-        audioFocusRetryHandler.removeCallbacksAndMessages(null)
-    }
-
-    private fun holdAllActiveCalls(heldBySystem: Boolean) {
-        activeCalls.values.filter { it.state == CallState.ACTIVE }.forEach { call ->
-            holdCallInternal(call.callId, heldBySystem = heldBySystem)
-        }
-    }
-
-    private fun resumeSystemHeldCalls() {
-        activeCalls.values.filter { it.state == CallState.HELD && it.wasHeldBySystem }.forEach { call ->
-            unholdCallInternal(call.callId, resumedBySystem = true)
-        }
-    }
-
     // --- Lock Screen Bypass Management ---
     fun registerLockScreenBypassCallback(callback: LockScreenBypassCallback) {
         lockScreenBypassCallbacks.add(callback)
@@ -387,7 +252,7 @@ object CallEngine {
         updateLockScreenBypass()
     }
 
-    // --- Enhanced Outgoing Call Management ---
+    // --- Outgoing Call Management ---
     fun startOutgoingCall(
         callId: String,
         callType: String,
@@ -419,10 +284,8 @@ object CallEngine {
         currentCallId = callId
         Log.d(TAG, "Call $callId added to activeCalls. State: DIALING")
 
-        // Set audio mode and request focus early for outgoing calls
+        // ONLY set audio mode - let system handle audio focus for self-managed calls
         setAudioMode()
-        val audioFocusGranted = requestAudioFocus()
-        Log.d(TAG, "Audio focus for outgoing call: $audioFocusGranted")
 
         registerPhoneAccount()
         val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
@@ -447,10 +310,8 @@ object CallEngine {
             telecomManager.placeCall(addressUri, extras)
             startForegroundService()
 
-            // Start ringback only if audio focus is available
-            if (audioFocusGranted) {
-                startRingback()
-            }
+            // Start ringback (system will handle audio focus)
+            startRingback()
 
             bringAppToForeground()
             keepScreenAwake(true)
@@ -494,7 +355,6 @@ object CallEngine {
 
         registerPhoneAccount()
         setAudioMode()
-        requestAudioFocus()
         bringAppToForeground()
         startForegroundService()
         keepScreenAwake(true)
@@ -505,7 +365,7 @@ object CallEngine {
         emitOutgoingCallAnsweredWithMetadata(callId)
     }
 
-    // --- Enhanced Call Answer Management ---
+    // --- Call Answer Management (SIMPLIFIED - NO MANUAL AUDIO FOCUS) ---
     fun callAnsweredFromJS(callId: String) {
         Log.d(TAG, "callAnsweredFromJS: $callId - remote party answered")
         coreCallAnswered(callId, isLocalAnswer = false)
@@ -516,7 +376,7 @@ object CallEngine {
         coreCallAnswered(callId, isLocalAnswer = true)
     }
 
-    // Enhanced call answer flow with proper audio focus timing
+    // SIMPLIFIED: Let system handle audio focus for self-managed calls
     private fun coreCallAnswered(callId: String, isLocalAnswer: Boolean) {
         Log.d(TAG, "coreCallAnswered: $callId, isLocalAnswer: $isLocalAnswer")
 
@@ -526,19 +386,13 @@ object CallEngine {
             return
         }
 
-        // Set audio mode BEFORE requesting audio focus
+        // Set audio mode and let system handle audio focus
         setAudioMode()
 
-        // Request audio focus BEFORE setting call to active
-        val audioFocusGranted = requestAudioFocus()
-        if (!audioFocusGranted) {
-            Log.w(TAG, "Audio focus not granted for call $callId, but proceeding anyway")
-        }
-
-        // Now set call to ACTIVE
+        // Set call to ACTIVE
         activeCalls[callId] = callInfo.copy(state = CallState.ACTIVE)
         currentCallId = callId
-        Log.d(TAG, "Call $callId set to ACTIVE state (audio focus: $audioFocusGranted)")
+        Log.d(TAG, "Call $callId set to ACTIVE state (system manages audio focus)")
 
         // Clean up media and UI
         stopRingtone()
@@ -660,11 +514,6 @@ object CallEngine {
             return
         }
 
-        // Request audio focus when resuming a call
-        if (resumedBySystem) {
-            requestAudioFocus()
-        }
-
         activeCalls[callId] = callInfo.copy(
             state = CallState.ACTIVE,
             wasHeldBySystem = false
@@ -780,7 +629,7 @@ object CallEngine {
         })
     }
 
-    // --- Audio Management ---
+    // --- Enhanced Audio Management ---
     fun getAudioDevices(): AudioRoutesInfo {
         val context = requireContext()
         audioManager = audioManager ?: context.getSystemService(Context.AUDIO_SERVICE) as? AudioManager ?: run {
@@ -788,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 ->
@@ -800,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)
     }
@@ -829,6 +679,7 @@ object CallEngine {
 
         val previousRoute = getCurrentAudioRoute()
 
+        // Reset all routes first
         audioManager?.isSpeakerphoneOn = false
         audioManager?.stopBluetoothSco()
         audioManager?.isBluetoothScoOn = false
@@ -840,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()
@@ -848,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")
@@ -855,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"
@@ -886,6 +757,7 @@ object CallEngine {
 
     private fun setAudioMode() {
         audioManager?.mode = AudioManager.MODE_IN_COMMUNICATION
+        Log.d(TAG, "Audio mode set to MODE_IN_COMMUNICATION (system handles audio focus)")
     }
 
     private fun resetAudioMode() {
@@ -894,21 +766,34 @@ object CallEngine {
             audioManager?.stopBluetoothSco()
             audioManager?.isBluetoothScoOn = false
             audioManager?.isSpeakerphoneOn = false
-            abandonAudioFocus()
+            Log.d(TAG, "Audio mode reset to MODE_NORMAL")
         }
     }
 
-    // --- 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() {
         val context = requireContext()
         audioManager = audioManager ?: context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
@@ -921,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.67",
+  "version": "0.1.69",
   "description": "Call manager",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",