@qusaieilouti99/call-manager 0.1.34 → 0.1.35

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

@@ -12,10 +12,10 @@ import android.media.MediaPlayer
 import android.media.RingtoneManager
 import android.net.Uri
 import android.os.Build
-import android.os.Bundle
+import android.os.Bundle // Added import
 import android.os.PowerManager
 import android.telecom.*
-import android.util.Log
+import android.util.Log // Added import
 import android.graphics.Color
 import android.app.Person
 import org.json.JSONArray
@@ -205,7 +205,7 @@ object CallEngine {
         }
 
         try {
-            telecomManager.addNewOutgoingCall(phoneAccountHandle, extras)
+            telecomManager.addNewOutgoingCall(phoneAccountHandle, extras) // Resolved
             startForegroundService(context)
             Log.d(TAG, "Successfully reported outgoing call to TelecomManager for $callId")
             startRingback()
@@ -358,6 +358,7 @@ object CallEngine {
         Log.d(TAG, "Showing incoming call UI for $callId, caller: $callerName, callType: $callType")
         createNotificationChannel(context)
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        // Resolved by `getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager`
 
         val answerIntent = Intent(context, CallNotificationActionReceiver::class.java).apply {
             action = "com.qusaieilouti99.callmanager.ANSWER_CALL"
@@ -443,7 +444,7 @@ object CallEngine {
     // Returns the generated AudioRoutesInfo data class
     fun getAudioDevices(): AudioRoutesInfo {
         audioManager = audioManager ?: appContext?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager ?: run {
-            Log.e(TAG, "getAudioDevices: AudioManager is null or appContext is not set.")
+            Log.e(TAG, "getAudioDevices: AudioManager is null or appContext is not set. Returning default.")
             return AudioRoutesInfo(emptyArray(), "Unknown") // Return default empty info
         }
         val devices = mutableListOf<String>()
@@ -455,21 +456,21 @@ object CallEngine {
                 when (device.type) {
                     AudioDeviceInfo.TYPE_BLUETOOTH_A2DP, AudioDeviceInfo.TYPE_BLUETOOTH_SCO -> {
                         devices.add("Bluetooth")
-                        if (audioManager?.isBluetoothScoOn == true && device.isSource == false) currentRoute = "Bluetooth" // check if output device
+                        if (audioManager?.isBluetoothScoOn == true && !device.isSource) currentRoute = "Bluetooth" // check if output device
                     }
                     AudioDeviceInfo.TYPE_WIRED_HEADPHONES, AudioDeviceInfo.TYPE_WIRED_HEADSET -> {
                         devices.add("Headset")
-                        if (audioManager?.isWiredHeadsetOn == true && device.isSource == false) currentRoute = "Headset"
+                        if (audioManager?.isWiredHeadsetOn == true && !device.isSource) currentRoute = "Headset"
                     }
                     AudioDeviceInfo.TYPE_BUILTIN_SPEAKER -> {
                         devices.add("Speaker")
-                        if (audioManager?.isSpeakerphoneOn == true && device.isSource == false) currentRoute = "Speaker"
+                        if (audioManager?.isSpeakerphoneOn == true && !device.isSource) currentRoute = "Speaker"
                     }
                     AudioDeviceInfo.TYPE_BUILTIN_EARPIECE -> {
                         devices.add("Earpiece")
                         // Earpiece is active if speaker, bluetooth, and headset are off
-                        if (audioManager?.isSpeakerphoneOn == false && audioManager?.isWiredHeadsetOn == false && audioManager?.isBluetoothScoOn == false && device.isSource == false) {
-                             // This heuristic is tricky, relies on other routes being 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"
                         }
                     }
@@ -658,7 +659,7 @@ object CallEngine {
                 channel.setSound(null, null)
                 channel.importance = NotificationManager.IMPORTANCE_HIGH
             }
-            val manager = context.getSystemService(NotificationManager::class.java)
+            val manager = context.getSystemService(NotificationManager::class.java) // Corrected type inference
             manager.createNotificationChannel(channel)
             Log.d(TAG, "Notification channel '$NOTIF_CHANNEL_ID' created/updated.")
         }
@@ -669,7 +670,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 or PhoneAccount.CAPABILITY_SUPPORTS_HOLD) // Resolved
                 .build()
             try {
                 telecomManager.registerPhoneAccount(phoneAccount)
@@ -725,19 +726,19 @@ object CallEngine {
     }
 
     // --- Ringback Tone Management (for outgoing calls) ---
-    // Requires `res/raw/ringback_tone.wav` for custom outgoing ringback.
+    // 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.wav` in your project for this to work.
+            // 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) {
-                Log.e(TAG, "Failed to create MediaPlayer for ringback. Check raw/ringback_tone.wav exists.")
+                Log.e(TAG, "Failed to create MediaPlayer for ringback. Check raw/ringback_tone.mp3 exists.")
                 return
             }
             ringbackPlayer?.apply {

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

@@ -3,6 +3,7 @@ package com.margelo.nitro.qusaieilouti99.callmanager
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.Service
+import android.content.Context // Added import
 import android.content.Intent
 import android.os.Build
 import android.os.IBinder
@@ -59,7 +60,7 @@ class CallForegroundService : Service() {
                 NotificationManager.IMPORTANCE_LOW
             )
             channel.description = "Notification for ongoing calls"
-            val manager = getSystemService(NotificationManager::class.java)
+            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager // Corrected type inference
             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,6 +1,7 @@
 package com.margelo.nitro.qusaieilouti99.callmanager
 
 import com.facebook.proguard.annotations.DoNotStrip
+import android.util.Log // Added import
 import org.json.JSONArray
 import org.json.JSONObject
 
@@ -9,7 +10,8 @@ class CallManager : HybridCallManagerSpec() {
 
     private val TAG = "CallManager"
 
-    private var currentListener: ((CallEventType, String) -> Unit)? = null
+    // 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) {
         Log.d(TAG, "endCall requested for callId: $callId")
@@ -50,24 +52,24 @@ class CallManager : HybridCallManagerSpec() {
         } ?: Log.e(TAG, "App context not set for keepScreenAwake.")
     }
 
-    // Listener type changed to generated Func_void_CallEventType_std__string
+    // Corrected addListener signature to match generated HybridCallManagerSpec
     override fun addListener(
-        listener: Func_void_CallEventType_std__string // Use generated type
+        listener: Func_void_CallEventType_std__string // Use generated type directly
     ): Func_void { // Return generated type
-        Log.d(TAG, "addListener called.")
-        // Cast the generated listener (which implements (CallEventType, String) -> Unit)
-        // to our internal functional type for CallEngine.
-        currentListener = { event: CallEventType, payload: String ->
-            listener.invoke(event, payload) // Invoke the generated listener
-        }
-        CallEngine.setEventHandler(currentListener)
+        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 generated Func_void for the remove function
+        // 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.")
             }
         }
     }

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

@@ -2,24 +2,26 @@ package com.margelo.nitro.qusaieilouti99.callmanager
 
 import android.content.Context
 import android.net.Uri
+import android.os.Bundle // Added import
 import android.telecom.Connection
 import android.telecom.DisconnectCause
-import android.telecom.CallAudioState
+import android.telecom.CallAudioState // Added import
 import android.telecom.VideoProfile
-import android.util.Log
+import android.util.Log // Added import
 import org.json.JSONObject
 import java.util.UUID
 
 class MyConnection(
     private val context: Context,
-    callDataJson: String // Only callDataJson parameter
+    callDataJson: String
 ) : Connection() {
 
     companion object {
         const val TAG = "MyConnection"
     }
 
-    private val callId: String = try {
+    // Changed to internal val to allow access from MyConnectionService
+    internal val callId: String = try {
         JSONObject(callDataJson).optString("callId", UUID.randomUUID().toString())
     } catch (e: Exception) {
         UUID.randomUUID().toString()
@@ -105,8 +107,11 @@ 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.
+        // 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, // Assuming DTMF_TONE is a valid CallEventType
+            CallEventType.DTMF_TONE,
             JSONObject().put("callId", callId).put("digit", digit.toString())
         )
     }
@@ -116,7 +121,8 @@ class MyConnection(
         Log.d(TAG, "Stopping DTMF tone for callId: $callId")
     }
 
-    override fun onConnectionEvent(event: String, extras: Bundle?) {
+    // @Suppress("Override") // Suppress if minSdkVersion < 26 and you want to keep the method
+    override fun onConnectionEvent(event: String, extras: Bundle?) { // Resolved
         super.onConnectionEvent(event, extras)
         Log.d(TAG, "Connection event: $event, extras: $extras for callId: $callId")
     }

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

@@ -6,7 +6,8 @@ import android.telecom.ConnectionService
 import android.telecom.PhoneAccountHandle
 import android.telecom.TelecomManager
 import android.telecom.VideoProfile
-import android.util.Log
+import android.telecom.CallAudioState // Added import
+import android.util.Log // Added import
 
 class MyConnectionService : ConnectionService() {
 
@@ -30,7 +31,7 @@ class MyConnectionService : ConnectionService() {
         val videoState = if (isVideoCallBoolean) VideoProfile.STATE_BIDIRECTIONAL else VideoProfile.STATE_AUDIO_ONLY
         connection.setVideoState(videoState)
         connection.setRinging()
-        Log.d(TAG, "Created incoming connection for callId: ${connection.callId}. Status: RINGING, VideoState: $videoState")
+        Log.d(TAG, "Created incoming connection for callId: ${connection.callId}. Status: RINGING, VideoState: $videoState") // Accesses internal callId
         return connection
     }
 
@@ -48,11 +49,11 @@ class MyConnectionService : ConnectionService() {
         val videoState = if (isVideoCallBoolean) VideoProfile.STATE_BIDIRECTIONAL else VideoProfile.STATE_AUDIO_ONLY
         connection.setVideoState(videoState)
         connection.setDialing()
-        Log.d(TAG, "Created outgoing connection for callId: ${connection.callId}. Status: DIALING, VideoState: $videoState")
+        Log.d(TAG, "Created outgoing connection for callId: ${connection.callId}. Status: DIALING, VideoState: $videoState") // Accesses internal callId
 
         if (request.extras?.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_SPEAKERPHONE, false) == true) {
             Log.d(TAG, "Hinting Telecom to start outgoing call with speakerphone as per request extras.")
-            connection.setAudioRoute(CallAudioState.ROUTE_SPEAKER)
+            connection.setAudioRoute(CallAudioState.ROUTE_SPEAKER) // Resolved
         }
 
         return connection

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';
+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';
 //# 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,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,YAAY,GACZ,cAAc,GACd,eAAe,GACf,eAAe,GACf,YAAY,GACZ,WAAW,CAAC"}

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

@@ -52,6 +52,7 @@ namespace margelo::nitro::qusaieilouti99_callmanager {
       static const auto fieldCALL_ANSWERED = clazz->getStaticField<JCallEventType>("CALL_ANSWERED");
       static const auto fieldCALL_REJECTED = clazz->getStaticField<JCallEventType>("CALL_REJECTED");
       static const auto fieldCALL_ENDED = clazz->getStaticField<JCallEventType>("CALL_ENDED");
+      static const auto fieldDTMF_TONE = clazz->getStaticField<JCallEventType>("DTMF_TONE");
       
       switch (value) {
         case CallEventType::INITIAL_CALL_STATE:
@@ -76,6 +77,8 @@ namespace margelo::nitro::qusaieilouti99_callmanager {
           return clazz->getStaticFieldValue(fieldCALL_REJECTED);
         case CallEventType::CALL_ENDED:
           return clazz->getStaticFieldValue(fieldCALL_ENDED);
+        case CallEventType::DTMF_TONE:
+          return clazz->getStaticFieldValue(fieldDTMF_TONE);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));
           throw std::invalid_argument("Invalid enum value (" + stringValue + "!");

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

@@ -26,7 +26,8 @@ enum class CallEventType {
   CALL_UNMUTED,
   CALL_ANSWERED,
   CALL_REJECTED,
-  CALL_ENDED;
+  CALL_ENDED,
+  DTMF_TONE;
 
   @DoNotStrip
   @Keep

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

@@ -39,6 +39,8 @@ public extension CallEventType {
         self = .callRejected
       case "CALL_ENDED":
         self = .callEnded
+      case "DTMF_TONE":
+        self = .dtmfTone
       default:
         return nil
     }
@@ -71,6 +73,8 @@ public extension CallEventType {
         return "CALL_REJECTED"
       case .callEnded:
         return "CALL_ENDED"
+      case .dtmfTone:
+        return "DTMF_TONE"
     }
   }
 }

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

@@ -40,6 +40,7 @@ namespace margelo::nitro::qusaieilouti99_callmanager {
     CALL_ANSWERED      SWIFT_NAME(callAnswered) = 8,
     CALL_REJECTED      SWIFT_NAME(callRejected) = 9,
     CALL_ENDED      SWIFT_NAME(callEnded) = 10,
+    DTMF_TONE      SWIFT_NAME(dtmfTone) = 11,
   } CLOSED_ENUM;
 
 } // namespace margelo::nitro::qusaieilouti99_callmanager
@@ -65,6 +66,7 @@ namespace margelo::nitro {
         case hashString("CALL_ANSWERED"): return CallEventType::CALL_ANSWERED;
         case hashString("CALL_REJECTED"): return CallEventType::CALL_REJECTED;
         case hashString("CALL_ENDED"): return CallEventType::CALL_ENDED;
+        case hashString("DTMF_TONE"): return CallEventType::DTMF_TONE;
         default: [[unlikely]]
           throw std::invalid_argument("Cannot convert \"" + unionValue + "\" to enum CallEventType - invalid value!");
       }
@@ -82,6 +84,7 @@ namespace margelo::nitro {
         case CallEventType::CALL_ANSWERED: return JSIConverter<std::string>::toJSI(runtime, "CALL_ANSWERED");
         case CallEventType::CALL_REJECTED: return JSIConverter<std::string>::toJSI(runtime, "CALL_REJECTED");
         case CallEventType::CALL_ENDED: return JSIConverter<std::string>::toJSI(runtime, "CALL_ENDED");
+        case CallEventType::DTMF_TONE: return JSIConverter<std::string>::toJSI(runtime, "DTMF_TONE");
         default: [[unlikely]]
           throw std::invalid_argument("Cannot convert CallEventType to JS - invalid value: "
                                     + std::to_string(static_cast<int>(arg)) + "!");
@@ -104,6 +107,7 @@ namespace margelo::nitro {
         case hashString("CALL_ANSWERED"):
         case hashString("CALL_REJECTED"):
         case hashString("CALL_ENDED"):
+        case hashString("DTMF_TONE"):
           return true;
         default:
           return false;

package/package.json

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

package/src/CallEventType.ts

@@ -10,4 +10,5 @@ export type CallEventType =
   | 'CALL_UNMUTED'
   | 'CALL_ANSWERED'
   | 'CALL_REJECTED'
-  | 'CALL_ENDED';
+  | 'CALL_ENDED'
+  | 'DTMF_TONE'; // ADD THIS LINE IF YOU NEED DTMF EVENTS