@qusaieilouti99/call-manager 0.1.51 → 0.1.53

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

@@ -13,6 +13,7 @@ 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
@@ -53,6 +54,7 @@ object CallEngine {
     private var audioManager: AudioManager? = null
     private var wakeLock: PowerManager.WakeLock? = null
     private var appContext: Context? = null
+    private var audioFocusRequest: AudioFocusRequest? = null
 
     // Call State Management
     private val activeCalls = ConcurrentHashMap<String, CallInfo>()
@@ -63,6 +65,10 @@ object CallEngine {
     // Audio State Tracking
     private var lastAudioRoutesInfo: AudioRoutesInfo? = null
     private var lastMuteState: Boolean = false
+    private var hasAudioFocus: Boolean = false
+
+    // System Call State Tracking
+    private var isSystemCallActive: Boolean = false
 
     // Lock Screen Bypass
     private var lockScreenBypassActive = false
@@ -80,7 +86,8 @@ object CallEngine {
         val callData: String,
         var state: CallState,
         val callType: String = "Audio",
-        val timestamp: Long = System.currentTimeMillis()
+        val timestamp: Long = System.currentTimeMillis(),
+        var wasHeldBySystem: Boolean = false
     )
 
     enum class CallState {
@@ -91,8 +98,121 @@ object CallEngine {
         fun onLockScreenBypassChanged(shouldBypass: Boolean)
     }
 
-    interface ServerCallRejectCallback {
-        fun onRejectCall(callId: String, reason: String)
+    // --- Audio Focus Management ---
+    private val audioFocusChangeListener = AudioManager.OnAudioFocusChangeListener { focusChange ->
+        Log.d(TAG, "Audio focus changed: $focusChange")
+        when (focusChange) {
+            AudioManager.AUDIOFOCUS_LOSS -> {
+                handleAudioFocusLoss()
+            }
+            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> {
+                handleAudioFocusLoss()
+            }
+            AudioManager.AUDIOFOCUS_GAIN -> {
+                handleAudioFocusGain()
+            }
+            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> {
+                // Can duck audio - don't hold call
+                Log.d(TAG, "Audio focus loss - can duck, not holding call")
+            }
+        }
+    }
+
+    private fun handleAudioFocusLoss() {
+        Log.d(TAG, "Audio focus lost - likely system call active")
+        hasAudioFocus = false
+        isSystemCallActive = true
+
+        // Hold all active calls instead of ending them
+        activeCalls.values.filter { it.state == CallState.ACTIVE }.forEach { call ->
+            if (!call.wasHeldBySystem) {
+                call.wasHeldBySystem = true
+                call.state = CallState.HELD
+
+                val connection = telecomConnections[call.callId]
+                connection?.setOnHold()
+
+                emitEvent(CallEventType.CALL_HELD, JSONObject().apply {
+                    put("callId", call.callId)
+                })
+
+                notifySpecificCallStateChanged(appContext!!, call.callId, CallState.HELD)
+                Log.d(TAG, "Call ${call.callId} held by system due to audio focus loss")
+            }
+        }
+
+        stopRingback()
+        updateForegroundNotification(appContext!!)
+    }
+
+    private fun handleAudioFocusGain() {
+        Log.d(TAG, "Audio focus regained - system call likely ended")
+        hasAudioFocus = true
+        isSystemCallActive = false
+
+        // Automatically resume calls that were held by system after a short delay
+        Handler(Looper.getMainLooper()).postDelayed({
+            activeCalls.values.filter { it.state == CallState.HELD && it.wasHeldBySystem }.forEach { call ->
+                Log.d(TAG, "Auto-resuming call ${call.callId} after system call ended")
+                call.wasHeldBySystem = false
+                call.state = CallState.ACTIVE
+
+                val connection = telecomConnections[call.callId]
+                connection?.setActive()
+
+                emitEvent(CallEventType.CALL_UNHELD, JSONObject().apply {
+                    put("callId", call.callId)
+                })
+
+                notifySpecificCallStateChanged(appContext!!, call.callId, CallState.ACTIVE)
+            }
+            updateForegroundNotification(appContext!!)
+        }, 1000) // 1 second delay to ensure system is ready
+    }
+
+    private fun requestAudioFocus(): Boolean {
+        audioManager = audioManager ?: appContext?.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)
+                    .build()
+            }
+            val result = audioManager?.requestAudioFocus(audioFocusRequest!!)
+            hasAudioFocus = result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
+            Log.d(TAG, "Audio focus request result: $result")
+            hasAudioFocus
+        } else {
+            @Suppress("DEPRECATION")
+            val result = audioManager?.requestAudioFocus(
+                audioFocusChangeListener,
+                AudioManager.STREAM_VOICE_CALL,
+                AudioManager.AUDIOFOCUS_GAIN
+            )
+            hasAudioFocus = result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
+            Log.d(TAG, "Audio focus request result (legacy): $result")
+            hasAudioFocus
+        }
+    }
+
+    private fun abandonAudioFocus() {
+        audioManager = audioManager ?: appContext?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            audioFocusRequest?.let { request ->
+                audioManager?.abandonAudioFocusRequest(request)
+            }
+        } else {
+            @Suppress("DEPRECATION")
+            audioManager?.abandonAudioFocus(audioFocusChangeListener)
+        }
+        hasAudioFocus = false
+        Log.d(TAG, "Audio focus abandoned")
     }
 
     // --- Event System ---
@@ -192,15 +312,13 @@ object CallEngine {
         val incomingCall = activeCalls.values.find { it.state == CallState.INCOMING }
         if (incomingCall != null && incomingCall.callId != callId) {
             Log.d(TAG, "Incoming call collision detected. Auto-rejecting new call: $callId")
-
-            // Auto-reject the new call
             rejectIncomingCallCollision(callId, "Another call is already incoming")
             return
         }
 
         // Check if there's an active call when receiving incoming
-        val activeCall = activeCalls.values.find { it.state == CallState.ACTIVE }
-        if (activeCall != null) {
+        val activeCall = activeCalls.values.find { it.state == CallState.ACTIVE || it.state == CallState.HELD }
+        if (activeCall != null && !canMakeMultipleCalls) {
             Log.d(TAG, "Active call exists when receiving incoming call. Auto-rejecting: $callId")
             rejectIncomingCallCollision(callId, "Another call is already active")
             return
@@ -212,7 +330,11 @@ object CallEngine {
 
         if (!canMakeMultipleCalls && activeCalls.isNotEmpty()) {
             Log.d(TAG, "Can't make multiple calls, holding existing calls.")
-            activeCalls.values.forEach { it.state = CallState.HELD }
+            activeCalls.values.forEach {
+                if (it.state == CallState.ACTIVE) {
+                    it.state = CallState.HELD
+                }
+            }
         }
 
         activeCalls[callId] = CallInfo(callId, callData, CallState.INCOMING, parsedCallType)
@@ -266,7 +388,11 @@ object CallEngine {
 
         if (!canMakeMultipleCalls && activeCalls.isNotEmpty()) {
             Log.d(TAG, "Can't make multiple calls, holding existing calls before outgoing.")
-            activeCalls.values.forEach { it.state = CallState.HELD }
+            activeCalls.values.forEach {
+                if (it.state == CallState.ACTIVE) {
+                    it.state = CallState.HELD
+                }
+            }
         }
 
         activeCalls[callId] = CallInfo(callId, callData, CallState.DIALING, parsedCallType)
@@ -290,7 +416,10 @@ object CallEngine {
             startForegroundService(context)
             Log.d(TAG, "Successfully reported outgoing call to TelecomManager via placeCall for $callId")
 
+            // Request audio focus and start ringback
+            requestAudioFocus()
             startRingback()
+
             bringAppToForeground(context)
             keepScreenAwake(context, true)
             setInitialAudioRoute(context, parsedCallType)
@@ -331,12 +460,19 @@ object CallEngine {
         stopRingback()
         cancelIncomingCallUI(context)
 
+        // Request audio focus when answering
+        requestAudioFocus()
+
         // Update call state
         activeCalls[callId]?.state = CallState.ACTIVE
         currentCallId = callId
 
         if (!canMakeMultipleCalls) {
-            activeCalls.filter { it.key != callId }.values.forEach { it.state = CallState.HELD }
+            activeCalls.filter { it.key != callId }.values.forEach {
+                if (it.state == CallState.ACTIVE) {
+                    it.state = CallState.HELD
+                }
+            }
         }
 
         // Bring app to foreground when call is answered
@@ -366,7 +502,7 @@ object CallEngine {
         Log.d(TAG, "holdCall: $callId")
         val callInfo = activeCalls[callId]
         if (callInfo?.state != CallState.ACTIVE) {
-            Log.w(TAG, "Cannot hold call $callId - not in active state")
+            Log.w(TAG, "Cannot hold call $callId - not in active state (current: ${callInfo?.state})")
             return
         }
 
@@ -384,11 +520,19 @@ object CallEngine {
         Log.d(TAG, "unholdCall: $callId")
         val callInfo = activeCalls[callId]
         if (callInfo?.state != CallState.HELD) {
-            Log.w(TAG, "Cannot unhold call $callId - not in held state")
+            Log.w(TAG, "Cannot unhold call $callId - not in held state (current: ${callInfo?.state})")
             return
         }
 
+        // Try to request audio focus, but don't fail if we can't get it immediately
+        // The system will handle audio routing properly
+        if (!hasAudioFocus) {
+            Log.d(TAG, "Attempting to request audio focus for unhold")
+            requestAudioFocus()
+        }
+
         activeCalls[callId]?.state = CallState.ACTIVE
+        activeCalls[callId]?.wasHeldBySystem = false
         val connection = telecomConnections[callId]
         connection?.setActive()
 
@@ -396,6 +540,8 @@ object CallEngine {
         emitEvent(CallEventType.CALL_UNHELD, JSONObject().put("callId", callId))
         updateLockScreenBypass()
         notifySpecificCallStateChanged(context, callId, CallState.ACTIVE)
+
+        Log.d(TAG, "Call $callId successfully unheld")
     }
 
     fun muteCall(context: Context, callId: String) {
@@ -622,6 +768,7 @@ object CallEngine {
             audioManager?.stopBluetoothSco()
             audioManager?.isBluetoothScoOn = false
             audioManager?.isSpeakerphoneOn = false
+            abandonAudioFocus()
         } else {
             Log.d(TAG, "Audio mode not reset; ${activeCalls.size} calls still active.")
         }
@@ -700,7 +847,8 @@ object CallEngine {
     fun isCallActive(): Boolean = activeCalls.any {
         it.value.state == CallState.ACTIVE ||
         it.value.state == CallState.INCOMING ||
-        it.value.state == CallState.DIALING
+        it.value.state == CallState.DIALING ||
+        it.value.state == CallState.HELD
     }
 
     private fun validateOutgoingCallRequest(): Boolean {
@@ -730,8 +878,6 @@ object CallEngine {
         CoroutineScope(Dispatchers.IO).launch {
             try {
                 // TODO: Add your server HTTP request here
-                // Example:
-                // ApiService.rejectCall(callId, reason)
                 Log.d(TAG, "Server rejection request would be made here for callId: $callId, reason: $reason")
             } catch (e: Exception) {
                 Log.e(TAG, "Failed to send rejection to server", e)
@@ -857,7 +1003,8 @@ object CallEngine {
 
         // Find the current active call to pass its info
         val currentCall = activeCalls.values.find {
-            it.state == CallState.ACTIVE || it.state == CallState.INCOMING || it.state == CallState.DIALING
+            it.state == CallState.ACTIVE || it.state == CallState.INCOMING ||
+            it.state == CallState.DIALING || it.state == CallState.HELD
         }
 
         val intent = Intent(context, CallForegroundService::class.java)
@@ -1053,5 +1200,6 @@ object CallEngine {
         stopForegroundService(context)
         keepScreenAwake(context, false)
         resetAudioMode(context)
+        isSystemCallActive = false
     }
 }

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

@@ -33,7 +33,9 @@ class MyConnection(
         } catch (e: Exception) { "Audio" }
 
         connectionProperties = Connection.PROPERTY_SELF_MANAGED
-        connectionCapabilities = Connection.CAPABILITY_SUPPORT_HOLD or Connection.CAPABILITY_MUTE
+        connectionCapabilities = Connection.CAPABILITY_SUPPORT_HOLD or
+                                Connection.CAPABILITY_MUTE or
+                                Connection.CAPABILITY_HOLD
 
         if (currentCallType == "Video") {
             Log.d(TAG, "MyConnection for callId $callId initialized as VIDEO call.")
@@ -70,12 +72,18 @@ class MyConnection(
     override fun onHold() {
         super.onHold()
         Log.d(TAG, "Call held via Telecom for callId: $callId")
+
+        // This is called by the system when it wants to hold our call
+        // Usually happens when a phone call comes in
         CallEngine.holdCall(context, callId)
     }
 
     override fun onUnhold() {
         super.onUnhold()
         Log.d(TAG, "Call unheld via Telecom for callId: $callId")
+
+        // This is called by the system when it's safe to resume our call
+        // Usually happens when a phone call ends
         CallEngine.unholdCall(context, callId)
     }
 
@@ -130,4 +138,22 @@ class MyConnection(
         Log.d(TAG, "onShowIncomingCallUi for callId: $callId")
         // Don't bring app to foreground for incoming calls automatically
     }
+
+    override fun onStateChanged(state: Int) {
+        super.onStateChanged(state)
+        Log.d(TAG, "Connection state changed for callId: $callId. New state: $state")
+
+        when (state) {
+            STATE_HOLDING -> {
+                Log.d(TAG, "Connection is now holding for callId: $callId")
+            }
+            STATE_ACTIVE -> {
+                Log.d(TAG, "Connection is now active for callId: $callId")
+            }
+            STATE_DISCONNECTED -> {
+                Log.d(TAG, "Connection is now disconnected for callId: $callId")
+                CallEngine.removeTelecomConnection(callId)
+            }
+        }
+    }
 }

package/lib/typescript/src/CallEventType.d.ts

@@ -1,2 +1,2 @@
-export type CallEventType = 'INITIAL_CALL_STATE' | 'CALL_STATE_CHANGED' | 'AUDIO_DEVICES_CHANGED' | 'AUDIO_ROUTE_CHANGED' | 'CALL_HELD' | 'CALL_UNHELD' | 'CALL_MUTED' | 'CALL_UNMUTED' | 'CALL_ANSWERED' | 'CALL_REJECTED' | 'CALL_ENDED' | 'DTMF_TONE';
+export type CallEventType = 'INITIAL_CALL_STATE' | 'CALL_STATE_CHANGED' | 'AUDIO_DEVICES_CHANGED' | 'AUDIO_ROUTE_CHANGED' | 'CALL_HELD' | 'CALL_UNHELD' | 'CALL_UNHOLD_FAILED' | 'CALL_MUTED' | 'CALL_UNMUTED' | 'CALL_ANSWERED' | 'CALL_REJECTED' | 'CALL_ENDED' | 'DTMF_TONE';
 //# sourceMappingURL=CallEventType.d.ts.map

package/lib/typescript/src/CallEventType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CallEventType.d.ts","sourceRoot":"","sources":["../../../src/CallEventType.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,aAAa,GACrB,oBAAoB,GACpB,oBAAoB,GACpB,uBAAuB,GACvB,qBAAqB,GACrB,WAAW,GACX,aAAa,GACb,YAAY,GACZ,cAAc,GACd,eAAe,GACf,eAAe,GACf,YAAY,GACZ,WAAW,CAAC"}
+{"version":3,"file":"CallEventType.d.ts","sourceRoot":"","sources":["../../../src/CallEventType.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,aAAa,GACrB,oBAAoB,GACpB,oBAAoB,GACpB,uBAAuB,GACvB,qBAAqB,GACrB,WAAW,GACX,aAAa,GACb,oBAAoB,GACpB,YAAY,GACZ,cAAc,GACd,eAAe,GACf,eAAe,GACf,YAAY,GACZ,WAAW,CAAC"}

package/nitrogen/generated/android/c++/JCallEventType.hpp

@@ -47,6 +47,7 @@ namespace margelo::nitro::qusaieilouti99_callmanager {
       static const auto fieldAUDIO_ROUTE_CHANGED = clazz->getStaticField<JCallEventType>("AUDIO_ROUTE_CHANGED");
       static const auto fieldCALL_HELD = clazz->getStaticField<JCallEventType>("CALL_HELD");
       static const auto fieldCALL_UNHELD = clazz->getStaticField<JCallEventType>("CALL_UNHELD");
+      static const auto fieldCALL_UNHOLD_FAILED = clazz->getStaticField<JCallEventType>("CALL_UNHOLD_FAILED");
       static const auto fieldCALL_MUTED = clazz->getStaticField<JCallEventType>("CALL_MUTED");
       static const auto fieldCALL_UNMUTED = clazz->getStaticField<JCallEventType>("CALL_UNMUTED");
       static const auto fieldCALL_ANSWERED = clazz->getStaticField<JCallEventType>("CALL_ANSWERED");
@@ -67,6 +68,8 @@ namespace margelo::nitro::qusaieilouti99_callmanager {
           return clazz->getStaticFieldValue(fieldCALL_HELD);
         case CallEventType::CALL_UNHELD:
           return clazz->getStaticFieldValue(fieldCALL_UNHELD);
+        case CallEventType::CALL_UNHOLD_FAILED:
+          return clazz->getStaticFieldValue(fieldCALL_UNHOLD_FAILED);
         case CallEventType::CALL_MUTED:
           return clazz->getStaticFieldValue(fieldCALL_MUTED);
         case CallEventType::CALL_UNMUTED:

package/nitrogen/generated/android/kotlin/com/margelo/nitro/qusaieilouti99/callmanager/CallEventType.kt

@@ -22,6 +22,7 @@ enum class CallEventType {
   AUDIO_ROUTE_CHANGED,
   CALL_HELD,
   CALL_UNHELD,
+  CALL_UNHOLD_FAILED,
   CALL_MUTED,
   CALL_UNMUTED,
   CALL_ANSWERED,

package/nitrogen/generated/ios/swift/CallEventType.swift

@@ -29,6 +29,8 @@ public extension CallEventType {
         self = .callHeld
       case "CALL_UNHELD":
         self = .callUnheld
+      case "CALL_UNHOLD_FAILED":
+        self = .callUnholdFailed
       case "CALL_MUTED":
         self = .callMuted
       case "CALL_UNMUTED":
@@ -63,6 +65,8 @@ public extension CallEventType {
         return "CALL_HELD"
       case .callUnheld:
         return "CALL_UNHELD"
+      case .callUnholdFailed:
+        return "CALL_UNHOLD_FAILED"
       case .callMuted:
         return "CALL_MUTED"
       case .callUnmuted:

package/nitrogen/generated/shared/c++/CallEventType.hpp

@@ -35,12 +35,13 @@ namespace margelo::nitro::qusaieilouti99_callmanager {
     AUDIO_ROUTE_CHANGED      SWIFT_NAME(audioRouteChanged) = 3,
     CALL_HELD      SWIFT_NAME(callHeld) = 4,
     CALL_UNHELD      SWIFT_NAME(callUnheld) = 5,
-    CALL_MUTED      SWIFT_NAME(callMuted) = 6,
-    CALL_UNMUTED      SWIFT_NAME(callUnmuted) = 7,
-    CALL_ANSWERED      SWIFT_NAME(callAnswered) = 8,
-    CALL_REJECTED      SWIFT_NAME(callRejected) = 9,
-    CALL_ENDED      SWIFT_NAME(callEnded) = 10,
-    DTMF_TONE      SWIFT_NAME(dtmfTone) = 11,
+    CALL_UNHOLD_FAILED      SWIFT_NAME(callUnholdFailed) = 6,
+    CALL_MUTED      SWIFT_NAME(callMuted) = 7,
+    CALL_UNMUTED      SWIFT_NAME(callUnmuted) = 8,
+    CALL_ANSWERED      SWIFT_NAME(callAnswered) = 9,
+    CALL_REJECTED      SWIFT_NAME(callRejected) = 10,
+    CALL_ENDED      SWIFT_NAME(callEnded) = 11,
+    DTMF_TONE      SWIFT_NAME(dtmfTone) = 12,
   } CLOSED_ENUM;
 
 } // namespace margelo::nitro::qusaieilouti99_callmanager
@@ -61,6 +62,7 @@ namespace margelo::nitro {
         case hashString("AUDIO_ROUTE_CHANGED"): return CallEventType::AUDIO_ROUTE_CHANGED;
         case hashString("CALL_HELD"): return CallEventType::CALL_HELD;
         case hashString("CALL_UNHELD"): return CallEventType::CALL_UNHELD;
+        case hashString("CALL_UNHOLD_FAILED"): return CallEventType::CALL_UNHOLD_FAILED;
         case hashString("CALL_MUTED"): return CallEventType::CALL_MUTED;
         case hashString("CALL_UNMUTED"): return CallEventType::CALL_UNMUTED;
         case hashString("CALL_ANSWERED"): return CallEventType::CALL_ANSWERED;
@@ -79,6 +81,7 @@ namespace margelo::nitro {
         case CallEventType::AUDIO_ROUTE_CHANGED: return JSIConverter<std::string>::toJSI(runtime, "AUDIO_ROUTE_CHANGED");
         case CallEventType::CALL_HELD: return JSIConverter<std::string>::toJSI(runtime, "CALL_HELD");
         case CallEventType::CALL_UNHELD: return JSIConverter<std::string>::toJSI(runtime, "CALL_UNHELD");
+        case CallEventType::CALL_UNHOLD_FAILED: return JSIConverter<std::string>::toJSI(runtime, "CALL_UNHOLD_FAILED");
         case CallEventType::CALL_MUTED: return JSIConverter<std::string>::toJSI(runtime, "CALL_MUTED");
         case CallEventType::CALL_UNMUTED: return JSIConverter<std::string>::toJSI(runtime, "CALL_UNMUTED");
         case CallEventType::CALL_ANSWERED: return JSIConverter<std::string>::toJSI(runtime, "CALL_ANSWERED");
@@ -102,6 +105,7 @@ namespace margelo::nitro {
         case hashString("AUDIO_ROUTE_CHANGED"):
         case hashString("CALL_HELD"):
         case hashString("CALL_UNHELD"):
+        case hashString("CALL_UNHOLD_FAILED"):
         case hashString("CALL_MUTED"):
         case hashString("CALL_UNMUTED"):
         case hashString("CALL_ANSWERED"):

package/package.json

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

package/src/CallEventType.ts

@@ -6,6 +6,7 @@ export type CallEventType =
   | 'AUDIO_ROUTE_CHANGED'
   | 'CALL_HELD'
   | 'CALL_UNHELD'
+  | 'CALL_UNHOLD_FAILED'
   | 'CALL_MUTED'
   | 'CALL_UNMUTED'
   | 'CALL_ANSWERED'