@qusaieilouti99/call-manager 0.1.49 → 0.1.51

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

@@ -108,7 +108,7 @@ object CallEngine {
         }
     }
 
-    private fun emitEvent(type: CallEventType, data: JSONObject) {
+    fun emitEvent(type: CallEventType, data: JSONObject) {
         Log.d(TAG, "Emitting event: $type, data: $data")
         val dataString = data.toString()
         if (eventHandler != null) {
@@ -347,6 +347,9 @@ object CallEngine {
 
         updateLockScreenBypass()
 
+        // Update foreground notification with call info
+        updateForegroundNotification(context)
+
         // Emit event with full call data instead of just callId
         emitEvent(CallEventType.CALL_ANSWERED, JSONObject().apply {
             put("callId", callId)
@@ -851,7 +854,21 @@ object CallEngine {
     // --- Service Management ---
     fun startForegroundService(context: Context) {
         Log.d(TAG, "Starting CallForegroundService.")
+
+        // 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
+        }
+
         val intent = Intent(context, CallForegroundService::class.java)
+
+        if (currentCall != null) {
+            intent.putExtra("callId", currentCall.callId)
+            intent.putExtra("callData", currentCall.callData)
+            intent.putExtra("state", currentCall.state.name)
+            Log.d(TAG, "Starting foreground service with call info: ${currentCall.callId}")
+        }
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             context.startForegroundService(intent)
         } else {

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

@@ -30,20 +30,20 @@ class CallForegroundService : Service() {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         Log.d(TAG, "Service onStartCommand")
 
-        if (intent?.getBooleanExtra("UPDATE_NOTIFICATION", false) == true) {
-            // Update existing notification with new call data
-            val callId = intent.getStringExtra("callId") ?: ""
-            val callData = intent.getStringExtra("callData") ?: ""
-            val state = intent.getStringExtra("state") ?: "ACTIVE"
-
-            val notification = buildEnhancedNotification(callId, callData, state)
-            startForeground(NOTIFICATION_ID, notification)
+        // Check if we have call info in the intent
+        val callId = intent?.getStringExtra("callId")
+        val callData = intent?.getStringExtra("callData")
+        val state = intent?.getStringExtra("state")
+
+        val notification = if (callId != null && callData != null && state != null) {
+            Log.d(TAG, "Building enhanced notification with call info: $callId")
+            buildEnhancedNotification(callId, callData, state)
         } else {
-            // Start with basic notification, will be updated when call info is available
-            val notification = buildBasicNotification()
-            startForeground(NOTIFICATION_ID, notification)
+            Log.d(TAG, "Building basic notification - no call info available")
+            buildBasicNotification()
         }
 
+        startForeground(NOTIFICATION_ID, notification)
         return START_STICKY
     }
 
@@ -56,12 +56,12 @@ class CallForegroundService : Service() {
         Log.d(TAG, "Building basic foreground notification.")
 
         return NotificationCompat.Builder(this, CHANNEL_ID)
-            .setContentTitle("Call in Progress")
-            .setContentText("Managing call...")
+            .setContentTitle("Call Service")
+            .setContentText("Call service is running...")
             .setSmallIcon(android.R.drawable.sym_call_incoming)
             .setOngoing(true)
             .setCategory(NotificationCompat.CATEGORY_CALL)
-            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
             .setWhen(System.currentTimeMillis())
             .build()
     }
@@ -117,37 +117,58 @@ class CallForegroundService : Service() {
         }
 
         val statusText = when (state) {
-            "ACTIVE" -> "In call with $callerName"
+            "ACTIVE" -> "$callerName"
             "HELD" -> "$callerName (on hold)"
             "DIALING" -> "Calling $callerName..."
-            else -> "Call with $callerName"
+            "INCOMING" -> "Incoming call from $callerName"
+            else -> callerName
+        }
+
+        val titleText = when (state) {
+            "ACTIVE" -> "$callType Call Active"
+            "HELD" -> "$callType Call Held"
+            "DIALING" -> "Outgoing $callType Call"
+            "INCOMING" -> "Incoming $callType Call"
+            else -> "$callType Call"
         }
 
-        val notification = NotificationCompat.Builder(this, CHANNEL_ID)
-            .setContentTitle("$callType Call")
+        val notificationBuilder = NotificationCompat.Builder(this, CHANNEL_ID)
+            .setContentTitle(titleText)
             .setContentText(statusText)
             .setSmallIcon(android.R.drawable.sym_call_incoming)
             .setOngoing(true)
             .setCategory(NotificationCompat.CATEGORY_CALL)
             .setPriority(NotificationCompat.PRIORITY_HIGH)
             .setWhen(System.currentTimeMillis())
-            .addAction(
-                android.R.drawable.ic_menu_call,
-                holdText,
-                holdPendingIntent
-            )
-            .addAction(
+
+        // Add actions for ACTIVE and HELD calls only
+        if (state == "ACTIVE" || state == "HELD") {
+            notificationBuilder
+                .addAction(
+                    if (isHeld) android.R.drawable.ic_media_play else android.R.drawable.ic_media_pause,
+                    holdText,
+                    holdPendingIntent
+                )
+                .addAction(
+                    android.R.drawable.sym_call_outgoing,
+                    "End Call",
+                    endCallPendingIntent
+                )
+        } else if (state == "DIALING") {
+            // For dialing calls, only show end call
+            notificationBuilder.addAction(
                 android.R.drawable.sym_call_outgoing,
                 "End Call",
                 endCallPendingIntent
             )
+        }
 
         // Set content intent to open the main app
         mainPendingIntent?.let {
-            notification.setContentIntent(it)
+            notificationBuilder.setContentIntent(it)
         }
 
-        return notification.build()
+        return notificationBuilder.build()
     }
 
     private fun createNotificationChannel() {

package/package.json

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