@qusaieilouti99/call-manager 0.1.37 → 0.1.39

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

@@ -12,16 +12,16 @@ import android.media.MediaPlayer
 import android.media.RingtoneManager
 import android.net.Uri
 import android.os.Build
-import android.os.Bundle // Explicit import for Bundle
+import android.os.Bundle
 import android.os.PowerManager
-import android.telecom.CallAudioState // Explicit import
-import android.telecom.Connection // Explicit import
-import android.telecom.DisconnectCause // Explicit import
-import android.telecom.PhoneAccount // Explicit import
-import android.telecom.PhoneAccountHandle // Explicit import
-import android.telecom.TelecomManager // Explicit import
-import android.telecom.VideoProfile // Explicit import
-import android.util.Log // Explicit import for Log
+import android.telecom.CallAudioState
+import android.telecom.Connection
+import android.telecom.DisconnectCause
+import android.telecom.PhoneAccount
+import android.telecom.PhoneAccountHandle
+import android.telecom.TelecomManager
+import android.telecom.VideoProfile
+import android.util.Log
 import android.graphics.Color
 import android.app.Person
 import org.json.JSONArray
@@ -38,22 +38,22 @@ object CallEngine {
     private const val FOREGROUND_NOTIF_ID = 1001
 
     private var ringtone: android.media.Ringtone? = null
-    private var ringbackPlayer: MediaPlayer? = null // For outgoing call ringback
+    private var ringbackPlayer: MediaPlayer? = null
     private var audioManager: AudioManager? = null
     private var wakeLock: PowerManager.WakeLock? = null
     private var appContext: Context? = null
 
     // --- Multi-call state ---
-    private val activeCalls = ConcurrentHashMap<String, CallInfo>() // callId -> CallInfo
-    private val telecomConnections = ConcurrentHashMap<String, Connection>() // callId -> Telecom Connection
-    private var currentCallId: String? = null // The call currently in foreground (active/ringing/dialing)
+    private val activeCalls = ConcurrentHashMap<String, CallInfo>()
+    private val telecomConnections = ConcurrentHashMap<String, Connection>()
+    private var currentCallId: String? = null
     private var canMakeMultipleCalls: Boolean = true
 
     data class CallInfo(
         val callId: String,
         val callData: String,
         var state: CallState,
-        val callType: String = "Audio" // "Audio" or "Video"
+        val callType: String = "Audio"
     )
 
     enum class CallState {
@@ -62,12 +62,11 @@ object CallEngine {
 
     // --- Event handler for JS ---
     private var eventHandler: ((CallEventType, String) -> Unit)? = null
-    private val cachedEvents = mutableListOf<Pair<CallEventType, String>>() // For caching events
+    private val cachedEvents = mutableListOf<Pair<CallEventType, String>>()
 
     fun setEventHandler(handler: ((CallEventType, String) -> Unit)?) {
         Log.d(TAG, "setEventHandler called. Handler present: ${handler != null}")
         eventHandler = handler
-        // Emit cached events if a handler is now available
         handler?.let { h ->
             if (cachedEvents.isNotEmpty()) {
                 Log.d(TAG, "Emitting ${cachedEvents.size} cached events.")
@@ -133,12 +132,12 @@ object CallEngine {
             json.optString("name", "Unknown")
         } catch (e: Exception) { "Unknown" }
 
-        val parsedCallType = try { // Extract callType from callData
+        val parsedCallType = try {
             val json = JSONObject(callData)
             json.optString("callType", "Audio")
         } catch (e: Exception) { "Audio" }
 
-        val isVideoCallBoolean = parsedCallType == "Video" // Convert to boolean for Telecom API
+        val isVideoCallBoolean = parsedCallType == "Video"
 
         if (!canMakeMultipleCalls && activeCalls.isNotEmpty()) {
             Log.d(TAG, "Can't make multiple calls, holding existing calls.")
@@ -154,8 +153,8 @@ object CallEngine {
         val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle(context)
         val extras = Bundle().apply {
-            putString(MyConnectionService.EXTRA_CALL_DATA, callData) // Pass raw callData
-            putBoolean(MyConnectionService.EXTRA_IS_VIDEO_CALL_BOOLEAN, isVideoCallBoolean) // Pass boolean for Telecom
+            putString(MyConnectionService.EXTRA_CALL_DATA, callData)
+            putBoolean(MyConnectionService.EXTRA_IS_VIDEO_CALL_BOOLEAN, isVideoCallBoolean)
         }
         try {
             telecomManager.addNewIncomingCall(phoneAccountHandle, extras)
@@ -171,6 +170,7 @@ object CallEngine {
         notifyCallStateChanged(context)
     }
 
+    // CORRECTED: Uses TelecomManager.placeCall for outgoing calls.
     fun startOutgoingCall(context: Context, callId: String, callData: String) {
         appContext = context.applicationContext
         Log.d(TAG, "startOutgoingCall: $callId, $callData")
@@ -180,12 +180,12 @@ object CallEngine {
             json.optString("name", "Unknown")
         } catch (e: Exception) { "Unknown" }
 
-        val parsedCallType = try { // Extract callType from callData
+        val parsedCallType = try {
             val json = JSONObject(callData)
             json.optString("callType", "Audio")
         } catch (e: Exception) { "Audio" }
 
-        val isVideoCallBoolean = parsedCallType == "Video" // Convert to boolean for Telecom API
+        val isVideoCallBoolean = parsedCallType == "Video"
 
         if (!canMakeMultipleCalls && activeCalls.isNotEmpty()) {
             Log.d(TAG, "Can't make multiple calls, holding existing calls before outgoing.")
@@ -199,33 +199,33 @@ object CallEngine {
         registerPhoneAccount(context)
         val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle(context)
+
+        val addressUri = Uri.fromParts(PhoneAccount.SCHEME_TEL, callId, null)
+
         val extras = Bundle().apply {
-            putString(MyConnectionService.EXTRA_CALL_DATA, callData) // Pass raw callData
-            putBoolean(MyConnectionService.EXTRA_IS_VIDEO_CALL_BOOLEAN, isVideoCallBoolean) // Pass boolean for Telecom
-            // Set speaker for video calls initially in Telecom's extras
+            putParcelable(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle)
+            putString(MyConnectionService.EXTRA_CALL_DATA, callData)
+            putBoolean(MyConnectionService.EXTRA_IS_VIDEO_CALL_BOOLEAN, isVideoCallBoolean)
             putBoolean(TelecomManager.EXTRA_START_CALL_WITH_SPEAKERPHONE, isVideoCallBoolean)
         }
 
         try {
-            // Error: Unresolved reference 'addNewOutgoingCall'. This usually means TelecomManager is not correctly imported
-            // or the minSdkVersion is too low for this method (requires API 23+).
-            // Imports already checked; assuming minSdkVersion 26+.
-            telecomManager.addNewOutgoingCall(phoneAccountHandle, extras)
+            telecomManager.placeCall(addressUri, extras)
             startForegroundService(context)
-            Log.d(TAG, "Successfully reported outgoing call to TelecomManager for $callId")
+            Log.d(TAG, "Successfully reported outgoing call to TelecomManager via placeCall for $callId")
             startRingback()
             bringAppToForeground(context)
             keepScreenAwake(context, true)
-            if (parsedCallType == "Video") { // Initial audio route for video calls
+            if (parsedCallType == "Video") {
                 setAudioRoute(context, "Speaker")
             } else {
-                setAudioRoute(context, "Earpiece") // Initial audio route for audio calls
+                setAudioRoute(context, "Earpiece")
             }
         } catch (e: SecurityException) {
-            Log.e(TAG, "SecurityException: Failed to start outgoing call. Check MANAGE_OWN_CALLS permission: ${e.message}", e)
+            Log.e(TAG, "SecurityException: Failed to start outgoing call via placeCall. Check MANAGE_OWN_CALLS permission: ${e.message}", e)
             endCall(context, callId)
         } catch (e: Exception) {
-            Log.e(TAG, "Failed to start outgoing call: ${e.message}", e)
+            Log.e(TAG, "Failed to start outgoing call via placeCall: ${e.message}", e)
             endCall(context, callId)
         }
         notifyCallStateChanged(context)
@@ -262,7 +262,6 @@ object CallEngine {
 
     fun holdCall(context: Context, callId: String) {
         Log.d(TAG, "holdCall: $callId")
-        activeCalls[callId]?.state = CallState.HELD
         val connection = telecomConnections[callId]
         connection?.setOnHold()
         emitEvent(CallEventType.CALL_HELD, JSONObject().put("callId", callId))
@@ -316,7 +315,7 @@ object CallEngine {
             removeTelecomConnection(callId)
             Log.d(TAG, "Telecom Connection for $callId disconnected and destroyed.")
         } else {
-            Log.w(TAG, "No Telecom Connection found for callId=$callId. It might have already been handled by Telecom.")
+            Log.d(TAG, "No Telecom Connection found for callId=$callId. Likely an outgoing call not initially handled by Telecom.")
         }
 
         if (activeCalls.isEmpty()) {
@@ -445,11 +444,10 @@ object CallEngine {
 
     // --- Audio Device Management ---
 
-    // Returns the generated AudioRoutesInfo data class
     fun getAudioDevices(): AudioRoutesInfo {
-        audioManager = audioManager ?: appContext?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager ?: run {
+        audioManager = appContext?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager ?: run {
             Log.e(TAG, "getAudioDevices: AudioManager is null or appContext is not set. Returning default.")
-            return AudioRoutesInfo(emptyArray(), "Unknown") // Return default empty info
+            return AudioRoutesInfo(emptyArray(), "Unknown")
         }
         val devices = mutableListOf<String>()
         var currentRoute: String = "Unknown"
@@ -460,7 +458,7 @@ object CallEngine {
                 when (device.type) {
                     AudioDeviceInfo.TYPE_BLUETOOTH_A2DP, AudioDeviceInfo.TYPE_BLUETOOTH_SCO -> {
                         devices.add("Bluetooth")
-                        if (audioManager?.isBluetoothScoOn == true && !device.isSource) currentRoute = "Bluetooth" // check if output device
+                        if (audioManager?.isBluetoothScoOn == true && !device.isSource) currentRoute = "Bluetooth"
                     }
                     AudioDeviceInfo.TYPE_WIRED_HEADPHONES, AudioDeviceInfo.TYPE_WIRED_HEADSET -> {
                         devices.add("Headset")
@@ -472,8 +470,6 @@ object CallEngine {
                     }
                     AudioDeviceInfo.TYPE_BUILTIN_EARPIECE -> {
                         devices.add("Earpiece")
-                        // Earpiece is active if speaker, bluetooth, and headset are off
-                        // This heuristic is tricky, relies on other routes being off
                         if (audioManager?.isSpeakerphoneOn == false && audioManager?.isWiredHeadsetOn == false && audioManager?.isBluetoothScoOn == false && !device.isSource) {
                             currentRoute = "Earpiece"
                         }
@@ -482,17 +478,15 @@ object CallEngine {
                 }
             }
         } else {
-            // Fallback for older APIs. Detection is less reliable.
             devices.add("Speaker")
             devices.add("Earpiece")
             if (audioManager?.isSpeakerphoneOn == true) currentRoute = "Speaker"
-            else currentRoute = "Earpiece" // Best guess for older API
+            else currentRoute = "Earpiece"
         }
 
         val distinctDevices = devices.distinct().toTypedArray()
 
-        // Final check/refinement for currentRoute based on AudioManager flags
-        if (currentRoute == "Unknown" || currentRoute == "Earpiece") { // If still unknown or defaulted to earpiece
+        if (currentRoute == "Unknown" || currentRoute == "Earpiece") {
             if (audioManager?.isBluetoothScoOn == true) {
                 currentRoute = "Bluetooth"
             } else if (audioManager?.isSpeakerphoneOn == true) {
@@ -500,7 +494,7 @@ object CallEngine {
             } else if (audioManager?.isWiredHeadsetOn == true) {
                 currentRoute = "Headset"
             } else {
-                currentRoute = "Earpiece" // Assume earpiece as last resort
+                currentRoute = "Earpiece"
             }
         }
 
@@ -542,8 +536,6 @@ object CallEngine {
                 Log.w(TAG, "Unknown audio route: $route. No action taken.")
             }
         }
-        // Emit event immediately with the requested route.
-        // The actual route change will be confirmed by onCallAudioStateChanged callback.
         emitEvent(CallEventType.AUDIO_ROUTE_CHANGED, JSONObject().put("route", route))
     }
 
@@ -615,12 +607,12 @@ object CallEngine {
             Log.w(TAG, "Cannot emit AudioDevicesChanged: appContext is null.")
             return
         }
-        val audioInfo = getAudioDevices() // Get AudioRoutesInfo data class
-        val jsonPayload = JSONObject().apply { // Convert to JSONObject for emitEvent
+        val audioInfo = getAudioDevices()
+        val jsonPayload = JSONObject().apply {
             put("devices", JSONArray(audioInfo.devices.toList()))
             put("currentRoute", audioInfo.currentRoute)
         }
-        emitEvent(CallEventType.AUDIO_DEVICES_CHANGED, jsonPayload) // Emit the full JSON object
+        emitEvent(CallEventType.AUDIO_DEVICES_CHANGED, jsonPayload)
     }
 
     // --- Call State Change Notification ---
@@ -669,12 +661,13 @@ object CallEngine {
         }
     }
 
+    // PhoneAccount registration is used for both INCOMING and OUTGOING calls when interacting with Telecom
     private fun registerPhoneAccount(context: Context) {
         val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle(context)
         if (telecomManager.getPhoneAccount(phoneAccountHandle) == null) {
             val phoneAccount = PhoneAccount.builder(phoneAccountHandle, "PingMe Call")
-                .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED or PhoneAccount.CAPABILITY_SUPPORTS_HOLD) // Resolved
+                .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED or PhoneAccount.CAPABILITY_HOLD)
                 .build()
             try {
                 telecomManager.registerPhoneAccount(phoneAccount)
@@ -697,7 +690,6 @@ object CallEngine {
     }
 
     // --- Ringtone Management (for incoming calls, pre-Android S) ---
-    // Can rely on default ringtone without adding custom file for incoming calls.
     fun playRingtone(context: Context) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             Log.d(TAG, "playRingtone: Android S+ detected, system will handle ringtone via Telecom.")
@@ -730,15 +722,12 @@ object CallEngine {
     }
 
     // --- Ringback Tone Management (for outgoing calls) ---
-    // Requires `res/raw/ringback_tone.mp3` for custom outgoing ringback.
     private fun startRingback() {
         if (ringbackPlayer != null && ringbackPlayer!!.isPlaying) {
             Log.d(TAG, "Ringback tone already playing.")
             return
         }
         try {
-            // Ensure you have `res/raw/ringback_tone.mp3` in your project for this to work.
-            // If you don't want a custom ringback, you can play a silent audio file or do nothing here.
             val ringbackUri = Uri.parse("android.resource://${appContext?.packageName}/raw/ringback_tone")
             ringbackPlayer = MediaPlayer.create(appContext, ringbackUri)
             if (ringbackPlayer == null) {

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

@@ -8,7 +8,7 @@ import android.content.Intent
 import android.os.Build
 import android.util.Log
 import android.os.IBinder
-import android.app.NotificationManager // Explicit import
+import android.app.NotificationManager
 
 class CallForegroundService : Service() {
 
@@ -61,7 +61,7 @@ class CallForegroundService : Service() {
                 NotificationManager.IMPORTANCE_LOW
             )
             channel.description = "Notification for ongoing calls"
-            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager // Corrected type inference and explicit import
+            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
             manager.createNotificationChannel(channel)
             Log.d(TAG, "Foreground notification channel '$CHANNEL_ID' created/updated.")
         }

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

@@ -1,7 +1,7 @@
 package com.margelo.nitro.qusaieilouti99.callmanager
 
 import com.facebook.proguard.annotations.DoNotStrip
-import android.util.Log // Explicit import
+import android.util.Log
 import org.json.JSONArray
 import org.json.JSONObject
 
@@ -10,7 +10,6 @@ class CallManager : HybridCallManagerSpec() {
 
     private val TAG = "CallManager"
 
-    // Listener type now directly matches the generated Func_void_CallEventType_std__string
     private var currentListener: Func_void_CallEventType_std__string? = null
 
     override fun endCall(callId: String) {
@@ -27,14 +26,13 @@ class CallManager : HybridCallManagerSpec() {
         } ?: Log.e(TAG, "App context not set for silenceRingtone.")
     }
 
-    // Return type changed to AudioRoutesInfo from String
     override fun getAudioDevices(): AudioRoutesInfo {
         Log.d(TAG, "getAudioDevices requested.")
         return CallEngine.getAppContext()?.let {
-            CallEngine.getAudioDevices() // This now directly returns AudioRoutesInfo
+            CallEngine.getAudioDevices()
         } ?: run {
             Log.e(TAG, "App context not set for getAudioDevices. Returning empty AudioRoutesInfo.")
-            AudioRoutesInfo(emptyArray(), "Unknown") // Return default empty data class
+            AudioRoutesInfo(emptyArray(), "Unknown")
         }
     }
 
@@ -52,29 +50,18 @@ class CallManager : HybridCallManagerSpec() {
         } ?: Log.e(TAG, "App context not set for keepAwake.")
     }
 
-    // Corrected addListener signature to match generated HybridCallManagerSpec
     override fun addListener(
-        listener: Func_void_CallEventType_std__string // Use generated type directly
-    ): Func_void { // Return generated type
+        listener: (event: CallEventType, payload: String) -> Unit
+    ): () -> Unit {
         Log.d(TAG, "addListener called with listener: $listener")
-        // Store the incoming Nitro-generated listener.
-        // It already implements the (CallEventType, String) -> Unit interface.
-        currentListener = listener
-        CallEngine.setEventHandler(listener) // Pass it directly to CallEngine
-
-        // Return a Nitro-generated Func_void for the remove function
-        return Func_void_java {
-            if (currentListener === listener) { // Compare against the original listener passed
-                CallEngine.setEventHandler(null)
-                currentListener = null
-                Log.d(TAG, "Listener removed.")
-            } else {
-                Log.d(TAG, "Attempted to remove a listener that was not current.")
-            }
+        // Wrap the listener in your event system
+        CallEngine.setEventHandler(listener)
+        return {
+            CallEngine.setEventHandler(null)
+            Log.d(TAG, "Listener removed.")
         }
     }
 
-    // Removed callType param, now extracted from callData
     override fun startOutgoingCall(callId: String, callData: String) {
         Log.d(TAG, "startOutgoingCall requested: callId=$callId, callData=$callData")
         CallEngine.getAppContext()?.let {

package/package.json

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