@qusaieilouti99/call-manager 0.1.159 → 0.1.161

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

@@ -389,9 +389,7 @@ object CallEngine {
     updateLockScreenBypass()
     setAudioMode()
     registerAudioDeviceCallback()
-    mainHandler.postDelayed({
-      setInitialAudioRoute(callInfo.callType)
-    }, 500L)
+    // The initial audio route will be set automatically by the onStateChanged(STATE_ACTIVE) callback
     if (isLocalAnswer) {
       emitCallAnsweredWithMetadata(callId)
     } else {
@@ -489,7 +487,6 @@ object CallEngine {
   /**
    * FIX: This is the correct way to handle mute requests from the app's UI.
    * It uses the AudioManager, which is the source of truth for microphone state.
-   * There is no `setMuted` method on the Connection object.
    */
   fun setMuted(callId: String, muted: Boolean) {
     if (!activeCalls.containsKey(callId)) {
@@ -513,7 +510,9 @@ object CallEngine {
       return
     }
     // Ensure our audio manager state is consistent with the system's request
-    audioManager?.isMicrophoneMute = isMuted
+    if (audioManager?.isMicrophoneMute != isMuted) {
+        audioManager?.isMicrophoneMute = isMuted
+    }
     Log.d(TAG, "Telecom reported mute state for $callId is now: $isMuted. Emitting event.")
     val eventType = if (isMuted) CallEventType.CALL_MUTED else CallEventType.CALL_UNMUTED
     emitEvent(eventType, JSONObject().put("callId", callId))
@@ -675,8 +674,11 @@ object CallEngine {
     }
   }
 
-  private fun setInitialAudioRoute(callType: String) {
-    Log.d(TAG, "Determining initial audio route for call type: $callType")
+  /**
+   * FIX: This is now called from MyConnection when the call becomes active.
+   */
+  fun setInitialAudioRouteForCall(callId: String, callType: String) {
+    Log.d(TAG, "Setting initial audio route for call $callId, type: $callType")
     val defaultRoute = when {
       isBluetoothDeviceConnected() -> "Bluetooth"
       isWiredHeadsetConnected() -> "Headset"

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

@@ -1,12 +1,18 @@
 package com.margelo.nitro.qusaieilouti99.callmanager
 
 import android.content.Context
+import android.os.Build
+import android.os.OutcomeReceiver
 import android.telecom.CallAudioState
+import android.telecom.CallEndpoint
+import android.telecom.CallEndpointException
 import android.telecom.Connection
 import android.telecom.DisconnectCause
 import android.telecom.VideoProfile
 import android.util.Log
+import androidx.annotation.RequiresApi
 import org.json.JSONObject
+import java.util.concurrent.Executor
 
 class MyConnection(
     private val context: Context,
@@ -21,6 +27,8 @@ class MyConnection(
     }
 
     private var lastAudioState: CallAudioState? = null
+    // FIX: We must store the list of available endpoints when the system gives it to us.
+    private var availableCallEndpoints: List<CallEndpoint> = emptyList()
 
     init {
         connectionProperties = PROPERTY_SELF_MANAGED
@@ -41,6 +49,14 @@ class MyConnection(
         Log.d(TAG, "MyConnection for callId $callId created and added to CallEngine. Type: $callType")
     }
 
+    // FIX: Override the callback to receive endpoint updates from the system.
+    @RequiresApi(Build.VERSION_CODES.P)
+    override fun onAvailableCallEndpointsChanged(endpoints: List<CallEndpoint>) {
+        super.onAvailableCallEndpointsChanged(endpoints)
+        Log.d(TAG, "Available call endpoints changed. Count: ${endpoints.size}")
+        this.availableCallEndpoints = endpoints
+    }
+
     override fun onSilence() {
         super.onSilence()
         Log.d(TAG, "onSilence called by system for callId: $callId. Silencing ringtone.")
@@ -103,42 +119,57 @@ class MyConnection(
         )
     }
 
-    override fun onStopDtmfTone() {
-        super.onStopDtmfTone()
-        Log.d(TAG, "Stopping DTMF tone for callId: $callId")
+    override fun onStateChanged(state: Int) {
+        super.onStateChanged(state)
+        if (state == Connection.STATE_ACTIVE) {
+            CallEngine.setInitialAudioRouteForCall(callId, callType)
+        } else if (state == Connection.STATE_DISCONNECTED) {
+            CallEngine.removeTelecomConnection(callId)
+        }
     }
 
-    override fun onShowIncomingCallUi() {
-        super.onShowIncomingCallUi()
-        Log.d(TAG, "onShowIncomingCallUi for callId: $callId")
+    fun requestAudioRoute(route: Int) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            requestCallEndpointChange(route)
+        } else {
+            Log.d(TAG, "Using deprecated setAudioRoute for API < 34")
+            @Suppress("DEPRECATION")
+            setAudioRoute(route)
+        }
     }
 
-    override fun onStateChanged(state: Int) {
-        super.onStateChanged(state)
-        val stateString = when (state) {
-            STATE_INITIALIZING -> "INITIALIZING"
-            STATE_NEW -> "NEW"
-            STATE_RINGING -> "RINGING"
-            STATE_DIALING -> "DIALING"
-            STATE_ACTIVE -> "ACTIVE"
-            STATE_HOLDING -> "HOLDING"
-            STATE_DISCONNECTED -> "DISCONNECTED"
-            else -> "UNKNOWN"
+    @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
+    private fun requestCallEndpointChange(route: Int) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            return // Should not happen if we are on UDC+, but a good safeguard.
         }
-        Log.d(TAG, "Connection state changed for callId: $callId. New state: $stateString ($state)")
 
-        if (state == STATE_DISCONNECTED) {
-            CallEngine.removeTelecomConnection(callId)
+        val endpointType = when (route) {
+            CallAudioState.ROUTE_EARPIECE -> CallEndpoint.TYPE_EARPIECE
+            CallAudioState.ROUTE_SPEAKER -> CallEndpoint.TYPE_SPEAKER
+            CallAudioState.ROUTE_BLUETOOTH -> CallEndpoint.TYPE_BLUETOOTH
+            CallAudioState.ROUTE_WIRED_HEADSET -> CallEndpoint.TYPE_WIRED_HEADSET
+            else -> {
+                Log.w(TAG, "Unsupported route requested: $route")
+                return
+            }
         }
-    }
 
-    /**
-     * Requests a change to the audio route using the deprecated `setAudioRoute` method.
-     * This is guaranteed to be available in your build environment.
-     */
-    fun requestAudioRoute(route: Int) {
-        Log.d(TAG, "Requesting audio route change to $route using deprecated setAudioRoute.")
-        @Suppress("DEPRECATION")
-        setAudioRoute(route)
+        // FIX: Use the locally stored list that the system gave us.
+        val targetEndpoint = this.availableCallEndpoints.find { it.type == endpointType }
+
+        if (targetEndpoint != null) {
+            Log.d(TAG, "Requesting CallEndpoint change to: ${targetEndpoint.name} (Type: $endpointType)")
+            requestCallEndpointChange(targetEndpoint, context.mainExecutor, object : OutcomeReceiver<Void, CallEndpointException> {
+                override fun onResult(result: Void?) {
+                    Log.d(TAG, "CallEndpoint change request successful.")
+                }
+                override fun onError(error: CallEndpointException) {
+                    Log.e(TAG, "CallEndpoint change request failed.", error)
+                }
+            })
+        } else {
+            Log.w(TAG, "Could not find an available CallEndpoint for type: $endpointType")
+        }
     }
 }

package/package.json

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