@qusaieilouti99/call-manager 0.1.66 → 0.1.67

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

@@ -31,6 +31,7 @@ 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
@@ -51,13 +52,16 @@ object CallEngine {
     private val isInitialized = AtomicBoolean(false)
     private val initializationLock = Any()
 
-    // Audio & Media - SIMPLIFIED
+    // Enhanced Audio & Media Management
     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>()
@@ -67,7 +71,7 @@ object CallEngine {
     private var currentCallId: String? = null
     private var canMakeMultipleCalls: Boolean = false
 
-    // Audio State Tracking - SIMPLIFIED
+    // Audio State Tracking
     private var lastAudioRoutesInfo: AudioRoutesInfo? = null
 
     // Lock Screen Bypass
@@ -82,6 +86,38 @@ 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) {
@@ -129,78 +165,88 @@ object CallEngine {
         }
     }
 
-    // --- SIMPLIFIED Audio Focus Management ---
-    private val audioFocusChangeListener = AudioManager.OnAudioFocusChangeListener { focusChange ->
-        Log.d(TAG, "Audio focus changed: $focusChange")
-        when (focusChange) {
-            AudioManager.AUDIOFOCUS_LOSS -> {
-                // Only hold calls on PERMANENT audio focus loss (like system calls)
-                Log.d(TAG, "Permanent audio focus loss - holding calls")
-                hasAudioFocus = false
-                holdAllActiveCalls(heldBySystem = true)
-            }
-            AudioManager.AUDIOFOCUS_GAIN -> {
-                Log.d(TAG, "Audio focus gained - resuming held calls")
-                hasAudioFocus = true
-                Handler(Looper.getMainLooper()).postDelayed({
-                    resumeSystemHeldCalls()
-                }, 1000)
-            }
-            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT,
-            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> {
-                // Don't hold calls for transient losses - just note we lost focus
-                Log.d(TAG, "Transient audio focus loss - keeping calls active")
-                hasAudioFocus = false
-            }
-        }
-    }
-
+    // --- Enhanced Audio Focus Management for Self-Managed Calls ---
     private fun requestAudioFocus(): Boolean {
         val context = requireContext()
         audioManager = audioManager ?: context.getSystemService(Context.AUDIO_SERVICE) as? AudioManager
 
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            if (audioFocusRequest == null) {
-                audioFocusRequest = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
-                    .setAudioAttributes(
-                        AudioAttributes.Builder()
-                            .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
-                            .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
-                            .build()
-                    )
-                    .setOnAudioFocusChangeListener(audioFocusChangeListener)
-                    .setAcceptsDelayedFocusGain(true)
-                    .build()
-            }
-            val result = audioManager?.requestAudioFocus(audioFocusRequest!!)
-            hasAudioFocus = result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
-            Log.d(TAG, "Audio focus request result: $result (granted: $hasAudioFocus)")
-            hasAudioFocus
+        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 {
-            @Suppress("DEPRECATION")
-            val result = audioManager?.requestAudioFocus(
-                audioFocusChangeListener,
-                AudioManager.STREAM_VOICE_CALL,
-                AudioManager.AUDIOFOCUS_GAIN
-            )
-            hasAudioFocus = result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
-            hasAudioFocus
+            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 ->
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            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
-        Log.d(TAG, "Audio focus abandoned")
+        audioFocusRetryCount = 0
+        audioFocusRetryHandler.removeCallbacksAndMessages(null)
     }
 
     private fun holdAllActiveCalls(heldBySystem: Boolean) {
@@ -341,7 +387,7 @@ object CallEngine {
         updateLockScreenBypass()
     }
 
-    // --- Outgoing Call Management ---
+    // --- Enhanced Outgoing Call Management ---
     fun startOutgoingCall(
         callId: String,
         callType: String,
@@ -373,6 +419,11 @@ object CallEngine {
         currentCallId = callId
         Log.d(TAG, "Call $callId added to activeCalls. State: DIALING")
 
+        // Set audio mode and request focus early for outgoing calls
+        setAudioMode()
+        val audioFocusGranted = requestAudioFocus()
+        Log.d(TAG, "Audio focus for outgoing call: $audioFocusGranted")
+
         registerPhoneAccount()
         val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle()
@@ -396,9 +447,10 @@ object CallEngine {
             telecomManager.placeCall(addressUri, extras)
             startForegroundService()
 
-            // SIMPLIFIED: Request audio focus and start ringback
-            requestAudioFocus()
-            startRingback()
+            // Start ringback only if audio focus is available
+            if (audioFocusGranted) {
+                startRingback()
+            }
 
             bringAppToForeground()
             keepScreenAwake(true)
@@ -441,6 +493,7 @@ object CallEngine {
         Log.d(TAG, "Call $callId started as ACTIVE")
 
         registerPhoneAccount()
+        setAudioMode()
         requestAudioFocus()
         bringAppToForeground()
         startForegroundService()
@@ -452,7 +505,7 @@ object CallEngine {
         emitOutgoingCallAnsweredWithMetadata(callId)
     }
 
-    // --- Call Answer Management - SIMPLIFIED ---
+    // --- Enhanced Call Answer Management ---
     fun callAnsweredFromJS(callId: String) {
         Log.d(TAG, "callAnsweredFromJS: $callId - remote party answered")
         coreCallAnswered(callId, isLocalAnswer = false)
@@ -463,7 +516,7 @@ object CallEngine {
         coreCallAnswered(callId, isLocalAnswer = true)
     }
 
-    // SIMPLIFIED: Always succeed call answer, handle audio focus gracefully
+    // Enhanced call answer flow with proper audio focus timing
     private fun coreCallAnswered(callId: String, isLocalAnswer: Boolean) {
         Log.d(TAG, "coreCallAnswered: $callId, isLocalAnswer: $isLocalAnswer")
 
@@ -473,19 +526,26 @@ object CallEngine {
             return
         }
 
-        // ALWAYS set call to ACTIVE - don't fail due to audio focus
+        // Set audio mode BEFORE requesting 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
         activeCalls[callId] = callInfo.copy(state = CallState.ACTIVE)
         currentCallId = callId
-        Log.d(TAG, "Call $callId set to ACTIVE state")
+        Log.d(TAG, "Call $callId set to ACTIVE state (audio focus: $audioFocusGranted)")
 
         // Clean up media and UI
         stopRingtone()
         stopRingback()
         cancelIncomingCallUI()
 
-        // Request audio focus (but don't fail if not granted)
-        requestAudioFocus()
-
+        // Handle multiple calls
         if (!canMakeMultipleCalls) {
             activeCalls.filter { it.key != callId }.values.forEach { otherCall ->
                 if (otherCall.state == CallState.ACTIVE) {
@@ -497,10 +557,9 @@ object CallEngine {
         bringAppToForeground()
         startForegroundService()
         keepScreenAwake(true)
-        setAudioMode()
         updateLockScreenBypass()
 
-        // Always emit events based on call direction
+        // Emit events based on call direction
         if (isLocalAnswer) {
             emitCallAnsweredWithMetadata(callId)
         } else {
@@ -601,6 +660,11 @@ object CallEngine {
             return
         }
 
+        // Request audio focus when resuming a call
+        if (resumedBySystem) {
+            requestAudioFocus()
+        }
+
         activeCalls[callId] = callInfo.copy(
             state = CallState.ACTIVE,
             wasHeldBySystem = false
@@ -1028,7 +1092,7 @@ object CallEngine {
         stopRingtone()
     }
 
-    // --- Service Management - SIMPLIFIED ---
+    // --- Service Management ---
     private fun startForegroundService() {
         val context = requireContext()
         val currentCall = activeCalls.values.find {
@@ -1161,7 +1225,7 @@ object CallEngine {
         }
     }
 
-    // --- Cleanup - SIMPLIFIED ---
+    // --- Cleanup ---
     private fun cleanup() {
         Log.d(TAG, "Performing cleanup")
         stopForegroundService()

package/package.json

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