@qusaieilouti99/call-manager 0.1.66 → 0.1.68

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
@@ -51,13 +50,11 @@ object CallEngine {
     private val isInitialized = AtomicBoolean(false)
     private val initializationLock = Any()
 
-    // Audio & Media - SIMPLIFIED
+    // 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
 
     // Call State Management
     private val activeCalls = ConcurrentHashMap<String, CallInfo>()
@@ -67,7 +64,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
@@ -129,92 +126,6 @@ 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
-            }
-        }
-    }
-
-    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
-        } else {
-            @Suppress("DEPRECATION")
-            val result = audioManager?.requestAudioFocus(
-                audioFocusChangeListener,
-                AudioManager.STREAM_VOICE_CALL,
-                AudioManager.AUDIOFOCUS_GAIN
-            )
-            hasAudioFocus = result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
-            hasAudioFocus
-        }
-    }
-
-    private fun abandonAudioFocus() {
-        audioManager?.let { am ->
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                audioFocusRequest?.let { request ->
-                    am.abandonAudioFocusRequest(request)
-                }
-            } else {
-                @Suppress("DEPRECATION")
-                am.abandonAudioFocus(audioFocusChangeListener)
-            }
-        }
-        hasAudioFocus = false
-        Log.d(TAG, "Audio focus abandoned")
-    }
-
-    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)
@@ -373,6 +284,9 @@ object CallEngine {
         currentCallId = callId
         Log.d(TAG, "Call $callId added to activeCalls. State: DIALING")
 
+        // ONLY set audio mode - let system handle audio focus for self-managed calls
+        setAudioMode()
+
         registerPhoneAccount()
         val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle()
@@ -396,8 +310,7 @@ object CallEngine {
             telecomManager.placeCall(addressUri, extras)
             startForegroundService()
 
-            // SIMPLIFIED: Request audio focus and start ringback
-            requestAudioFocus()
+            // Start ringback (system will handle audio focus)
             startRingback()
 
             bringAppToForeground()
@@ -441,7 +354,7 @@ object CallEngine {
         Log.d(TAG, "Call $callId started as ACTIVE")
 
         registerPhoneAccount()
-        requestAudioFocus()
+        setAudioMode()
         bringAppToForeground()
         startForegroundService()
         keepScreenAwake(true)
@@ -452,7 +365,7 @@ object CallEngine {
         emitOutgoingCallAnsweredWithMetadata(callId)
     }
 
-    // --- Call Answer Management - SIMPLIFIED ---
+    // --- Call Answer Management (SIMPLIFIED - NO MANUAL AUDIO FOCUS) ---
     fun callAnsweredFromJS(callId: String) {
         Log.d(TAG, "callAnsweredFromJS: $callId - remote party answered")
         coreCallAnswered(callId, isLocalAnswer = false)
@@ -463,7 +376,7 @@ object CallEngine {
         coreCallAnswered(callId, isLocalAnswer = true)
     }
 
-    // SIMPLIFIED: Always succeed call answer, handle audio focus gracefully
+    // SIMPLIFIED: Let system handle audio focus for self-managed calls
     private fun coreCallAnswered(callId: String, isLocalAnswer: Boolean) {
         Log.d(TAG, "coreCallAnswered: $callId, isLocalAnswer: $isLocalAnswer")
 
@@ -473,19 +386,20 @@ object CallEngine {
             return
         }
 
-        // ALWAYS set call to ACTIVE - don't fail due to audio focus
+        // Set audio mode and let system handle audio focus
+        setAudioMode()
+
+        // 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 (system manages audio focus)")
 
         // 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 +411,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 {
@@ -716,7 +629,7 @@ object CallEngine {
         })
     }
 
-    // --- Audio Management ---
+    // --- Audio Management (SIMPLIFIED - NO MANUAL AUDIO FOCUS) ---
     fun getAudioDevices(): AudioRoutesInfo {
         val context = requireContext()
         audioManager = audioManager ?: context.getSystemService(Context.AUDIO_SERVICE) as? AudioManager ?: run {
@@ -822,6 +735,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() {
@@ -830,7 +744,7 @@ object CallEngine {
             audioManager?.stopBluetoothSco()
             audioManager?.isBluetoothScoOn = false
             audioManager?.isSpeakerphoneOn = false
-            abandonAudioFocus()
+            Log.d(TAG, "Audio mode reset to MODE_NORMAL")
         }
     }
 
@@ -1028,7 +942,7 @@ object CallEngine {
         stopRingtone()
     }
 
-    // --- Service Management - SIMPLIFIED ---
+    // --- Service Management ---
     private fun startForegroundService() {
         val context = requireContext()
         val currentCall = activeCalls.values.find {
@@ -1161,7 +1075,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.68",
   "description": "Call manager",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",