@qusaieilouti99/call-manager 0.1.38 → 0.1.40

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

@@ -53,7 +53,7 @@ object CallEngine {
         val callId: String,
         val callData: String,
         var state: CallState,
-        val callType: String = "Audio" // "Audio" or "Video"
+        val callType: String = "Audio"
     )
 
     enum class CallState {
@@ -123,7 +123,6 @@ object CallEngine {
         return result
     }
 
-    // This is for INCOMING calls using TelecomManager.addNewIncomingCall
     fun reportIncomingCall(context: Context, callId: String, callData: String) {
         appContext = context.applicationContext
         Log.d(TAG, "reportIncomingCall: $callId, $callData")
@@ -150,7 +149,7 @@ object CallEngine {
         Log.d(TAG, "Call $callId added to activeCalls. State: INCOMING, callType: $parsedCallType")
 
         showIncomingCallUI(context, callId, callerName, parsedCallType)
-        registerPhoneAccount(context) // Register phone account so Telecom can handle incoming
+        registerPhoneAccount(context)
         val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle(context)
         val extras = Bundle().apply {
@@ -158,7 +157,6 @@ object CallEngine {
             putBoolean(MyConnectionService.EXTRA_IS_VIDEO_CALL_BOOLEAN, isVideoCallBoolean)
         }
         try {
-            // This API is fundamental for INCOMING call integration with Telecom.
             telecomManager.addNewIncomingCall(phoneAccountHandle, extras)
             startForegroundService(context)
             Log.d(TAG, "Successfully reported incoming call to TelecomManager for $callId")
@@ -198,25 +196,20 @@ object CallEngine {
         currentCallId = callId
         Log.d(TAG, "Call $callId added to activeCalls. State: DIALING, callType: $parsedCallType")
 
-        registerPhoneAccount(context) // Ensure PhoneAccount is registered for Telecom to recognize it
+        registerPhoneAccount(context)
         val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle(context)
 
-        // For `placeCall`, the address URI is usually required. Use a generic "tel:" scheme with callId or number.
-        val addressUri = Uri.fromParts(PhoneAccount.SCHEME_TEL, callId, null) // Using callId as a unique identifier for URI
+        val addressUri = Uri.fromParts(PhoneAccount.SCHEME_TEL, callId, null)
 
         val extras = Bundle().apply {
-            // Essential for self-managed apps using placeCall
             putParcelable(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle)
-            // Pass additional data for your ConnectionService to retrieve
             putString(MyConnectionService.EXTRA_CALL_DATA, callData)
             putBoolean(MyConnectionService.EXTRA_IS_VIDEO_CALL_BOOLEAN, isVideoCallBoolean)
-            // Hint for initial speakerphone state
             putBoolean(TelecomManager.EXTRA_START_CALL_WITH_SPEAKERPHONE, isVideoCallBoolean)
         }
 
         try {
-            // CORRECT API for self-managed outgoing calls that interact with Telecom
             telecomManager.placeCall(addressUri, extras)
             startForegroundService(context)
             Log.d(TAG, "Successfully reported outgoing call to TelecomManager via placeCall for $callId")
@@ -269,7 +262,6 @@ object CallEngine {
 
     fun holdCall(context: Context, callId: String) {
         Log.d(TAG, "holdCall: $callId")
-        // Always attempt to inform Telecom if a Connection object exists for this callId
         val connection = telecomConnections[callId]
         connection?.setOnHold()
         emitEvent(CallEventType.CALL_HELD, JSONObject().put("callId", callId))
@@ -279,7 +271,6 @@ object CallEngine {
     fun unholdCall(context: Context, callId: String) {
         Log.d(TAG, "unholdCall: $callId")
         activeCalls[callId]?.state = CallState.ACTIVE
-        // Always attempt to inform Telecom if a Connection object exists for this callId
         val connection = telecomConnections[callId]
         connection?.setActive()
         emitEvent(CallEventType.CALL_UNHELD, JSONObject().put("callId", callId))
@@ -317,7 +308,6 @@ object CallEngine {
 
         cancelIncomingCallUI(context)
 
-        // Only disconnect from Telecom if a Connection object exists for this callId
         val connection = telecomConnections[callId]
         if (connection != null) {
             connection.setDisconnected(DisconnectCause(DisconnectCause.LOCAL))
@@ -677,7 +667,7 @@ object CallEngine {
         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)
+                .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED)
                 .build()
             try {
                 telecomManager.registerPhoneAccount(phoneAccount)

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

@@ -51,20 +51,14 @@ class CallManager : HybridCallManagerSpec() {
     }
 
     override fun addListener(
-        listener: Func_void_CallEventType_std__string
-    ): Func_void {
+        listener: (event: CallEventType, payload: String) -> Unit
+    ): () -> Unit {
         Log.d(TAG, "addListener called with listener: $listener")
-        currentListener = listener
+        // Wrap the listener in your event system
         CallEngine.setEventHandler(listener)
-
-        return Func_void_java {
-            if (currentListener === listener) {
-                CallEngine.setEventHandler(null)
-                currentListener = null
-                Log.d(TAG, "Listener removed.")
-            } else {
-                Log.d(TAG, "Attempted to remove a listener that was not current.")
-            }
+        return {
+            CallEngine.setEventHandler(null)
+            Log.d(TAG, "Listener removed.")
         }
     }
 

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

@@ -2,12 +2,12 @@ package com.margelo.nitro.qusaieilouti99.callmanager
 
 import android.content.Context
 import android.net.Uri
-import android.os.Bundle // Explicit import
+import android.os.Bundle
 import android.telecom.Connection
 import android.telecom.DisconnectCause
-import android.telecom.CallAudioState // Explicit import
+import android.telecom.CallAudioState
 import android.telecom.VideoProfile
-import android.util.Log // Explicit import
+import android.util.Log
 import org.json.JSONObject
 import java.util.UUID
 
@@ -20,7 +20,6 @@ class MyConnection(
         const val TAG = "MyConnection"
     }
 
-    // Changed to internal val to allow access from MyConnectionService for logging
     internal val callId: String = try {
         JSONObject(callDataJson).optString("callId", UUID.randomUUID().toString())
     } catch (e: Exception) {
@@ -33,7 +32,9 @@ class MyConnection(
             JSONObject(callDataJson).optString("callType", "Audio")
         } catch (e: Exception) { "Audio" }
 
+        // Set connection properties and capabilities
         connectionProperties = Connection.PROPERTY_SELF_MANAGED
+        connectionCapabilities = Connection.CAPABILITY_SUPPORT_HOLD or Connection.CAPABILITY_MUTE // Added hold and mute capabilities
 
         if (currentCallType == "Video") {
             Log.d(TAG, "MyConnection for callId $callId initialized as VIDEO call.")
@@ -107,13 +108,13 @@ class MyConnection(
     override fun onPlayDtmfTone(digit: Char) {
         super.onPlayDtmfTone(digit)
         Log.d(TAG, "Playing DTMF tone: $digit for callId: $callId")
-        // NOTE: DTMF_TONE is not in your current CallEventType.ts enum.
+        // NOTE: DTMF_TONE is not in your current CallEventType enum.
         // If you need to emit this event, you MUST add 'DTMF_TONE' to your CallEventType.ts
         // and re-run nitro-codegen. For now, it's commented out to prevent compilation error.
-        // CallEngine.emitEvent(
-        //     CallEventType.DTMF_TONE,
-        //     JSONObject().put("callId", callId).put("digit", digit.toString())
-        // )
+        CallEngine.emitEvent(
+            CallEventType.DTMF_TONE,
+            JSONObject().put("callId", callId).put("digit", digit.toString())
+        )
     }
 
     override fun onStopDtmfTone() {
@@ -121,10 +122,8 @@ class MyConnection(
         Log.d(TAG, "Stopping DTMF tone for callId: $callId")
     }
 
-    override fun onConnectionEvent(event: String, extras: Bundle?) { // Resolved
-        super.onConnectionEvent(event, extras) // Correct super call
-        Log.d(TAG, "Connection event: $event, extras: $extras for callId: $callId")
-    }
+    // REMOVED: onConnectionEvent override since it doesn't exist in the base Connection class
+    // If you need connection events, you can send them via sendConnectionEvent() method
 
     override fun onShowIncomingCallUi() {
         super.onShowIncomingCallUi()

package/package.json

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