rns-nativecall 0.9.9 → 1.0.1

package/android/src/main/java/com/rnsnativecall/CallActionReceiver.kt

@@ -20,32 +20,35 @@ class CallActionReceiver : BroadcastReceiver() {
             intent.extras?.get(key)?.let { fullDataMap[key] = it.toString() }
         }
 
-        // --- HANDLE REJECT ---
-        if (action == "ACTION_REJECT") {
+        // --- HANDLE ANSWER ---
+        if (action == "ACTION_ANSWER") {
+            // 1. Kill the ringing notification and service immediately
             NativeCallManager.dismissIncomingCall(context, uuid)
-            CallForegroundService.stop(context)
 
+            // 2. Queue or Send the accept event
             if (CallModule.isReady()) {
-                CallModule.sendEventToJS("onCallRejected", fullDataMap)
+                CallModule.sendEventToJS("onCallAccepted", fullDataMap)
             } else {
-                CallModule.setPendingCallData("onCallRejected_pending", fullDataMap)
+                CallModule.setPendingCallData("onCallAccepted_pending", fullDataMap)
             }
-            // Just close the shade
+
+            // 3. Bring the app to the front
+            launchApp(context, intent.extras)
             collapseNotificationShade(context)
         }
 
-        // --- HANDLE ANSWER ---
-        if (action == "ACTION_ANSWER") {
+        // --- HANDLE REJECT ---
+        if (action == "ACTION_REJECT") {
+            // This kills the Notification AND the Foreground Service (via our updated Manager)
             NativeCallManager.dismissIncomingCall(context, uuid)
 
+            // Notify JS
             if (CallModule.isReady()) {
-                CallModule.sendEventToJS("onCallAccepted", fullDataMap)
+                CallModule.sendEventToJS("onCallRejected", fullDataMap)
             } else {
-                CallModule.setPendingCallData("onCallAccepted_pending", fullDataMap)
+                CallModule.setPendingCallData("onCallRejected_pending", fullDataMap)
             }
 
-            // This will open your app and the system usually collapses the shade automatically
-            launchApp(context, intent.extras)
             collapseNotificationShade(context)
         }
     }

package/android/src/main/java/com/rnsnativecall/CallForegroundService.kt

@@ -18,8 +18,7 @@ class CallForegroundService : Service() {
     private var unlockReceiver: UnlockReceiver? = null // Store reference for unregistering
 
     companion object {
-        private const val NOTIFICATION_ID = 101
-        private const val CHANNEL_ID = "incoming_call_service"
+        private const val CHANNEL_ID = "CALL_CHANNEL_V10_URGENT"
 
         fun stop(context: Context) {
             val intent = Intent(context, CallForegroundService::class.java)
@@ -52,6 +51,9 @@ class CallForegroundService : Service() {
     ): Int {
         val data = intent?.extras
         val name = data?.getString("name") ?: "Someone"
+        val uuid = data?.getString("callUuid") ?: "default_uuid"
+
+        val notificationId = uuid.hashCode()
 
         createNotificationChannel()
 
@@ -68,12 +70,12 @@ class CallForegroundService : Service() {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             startForeground(
-                NOTIFICATION_ID,
+                notificationId,
                 notification,
                 ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL,
             )
         } else {
-            startForeground(NOTIFICATION_ID, notification)
+            startForeground(notificationId, notification)
         }
 
         // Launch the Headless Task
@@ -95,26 +97,13 @@ class CallForegroundService : Service() {
             e.printStackTrace()
         }
 
-        // // Trigger the incoming call notification UI handled by NativeCallManager
-        // try {
-        //     val map = mutableMapOf<String, String>()
-        //     data?.let { b ->
-        //         for (key in b.keySet()) {
-        //             map[key] = b.get(key)?.toString() ?: ""
-        //         }
-        //     }
-        //     NativeCallManager.handleIncomingPush(this, map)
-        // } catch (e: Exception) {
-        //     e.printStackTrace()
-        // }
-
         // Auto-stop after 30s
-        Handler(Looper.getMainLooper()).postDelayed({
-            try {
-                stopSelf()
-            } catch (e: Exception) {
-            }
-        }, 30000)
+        // Handler(Looper.getMainLooper()).postDelayed({
+        //     try {
+        //         stopSelf()
+        //     } catch (e: Exception) {
+        //     }
+        // }, 30000)
 
         return START_NOT_STICKY
     }

package/android/src/main/java/com/rnsnativecall/CallMessagingService.kt

@@ -1,8 +1,8 @@
 package com.rnsnativecall
 
 import android.app.ActivityManager
-import android.app.NotificationManager
 import android.app.NotificationChannel
+import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
@@ -10,14 +10,12 @@ import android.os.Build
 import android.os.Bundle
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
+import com.facebook.react.HeadlessJsTaskService
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
-import com.facebook.react.HeadlessJsTaskService
-
 import com.rnsnativecall.CallState
 
 class CallMessagingService : FirebaseMessagingService() {
-
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
         val data = remoteMessage.data
         val context = applicationContext
@@ -26,78 +24,62 @@ class CallMessagingService : FirebaseMessagingService() {
         val type = data["type"] ?: ""
 
         if (type == "CANCEL") {
-    NativeCallManager.stopRingtone()
-    // Pass context here to persist the cancellation
-    CallState.markCanceled(uuid, context) 
-    
-    if (CallState.getCurrent() == uuid) {
-        CallState.clear(uuid, context) 
-    }
-    
-    NativeCallManager.dismissIncomingCall(context, uuid)
-    showMissedCallNotification(context, data, uuid)
-    return
-}
-
-        // Inside onMessageReceived
-if (!CallState.setCurrent(uuid)) {
-    // We are busy! Start a SILENT headless task to send the WebSocket busy msg
-    val busyIntent = Intent(context, CallHeadlessTask::class.java).apply {
-        putExtras(Bundle().apply { 
-            data.forEach { (k, v) -> putString(k, v) }
-            putBoolean("isBusySignal", true) 
-        })
-    }
-    context.startService(busyIntent)
-    return 
-}
+            NativeCallManager.stopRingtone()
+            // Pass context here to persist the cancellation
+            CallState.markCanceled(uuid, context)
 
+            if (CallState.getCurrent() == uuid) {
+                CallState.clear(uuid, context)
+            }
 
+            NativeCallManager.dismissIncomingCall(context, uuid)
+            showMissedCallNotification(context, data, uuid)
+            return
+        }
 
+        // Inside onMessageReceived
+        if (!CallState.setCurrent(uuid)) {
+            // We are busy! Start a SILENT headless task to send the WebSocket busy msg
+            val busyIntent =
+                Intent(context, CallHeadlessTask::class.java).apply {
+                    putExtras(
+                        Bundle().apply {
+                            data.forEach { (k, v) -> putString(k, v) }
+                            putBoolean("isBusySignal", true)
+                        },
+                    )
+                }
+            context.startService(busyIntent)
+            return
+        }
 
         if (isAppInForeground(context)) {
             // Foreground → send event directly
             CallModule.sendEventToJS("onCallReceived", data)
         } else {
-            // Show incoming call notification instantly 
-            //NativeCallManager.handleIncomingPush(context, data) /// i will use headless instead
-            // Background → start foreground service + headless task
-            // val serviceIntent = Intent(context, CallForegroundService::class.java).apply {
-            //     putExtras(Bundle().apply { data.forEach { (k, v) -> putString(k, v) } })
-            // }
-            // ContextCompat.startForegroundService(context, serviceIntent)
-
-            // val headlessIntent = Intent(context, CallHeadlessTask::class.java).apply {
-            //     putExtras(Bundle().apply { data.forEach { (k, v) -> putString(k, v) } })
-            // }
-            // try {
-            //     context.startService(headlessIntent)
-            //     HeadlessJsTaskService.acquireWakeLockNow(context)
-            // } catch (e: Exception) {
-            //     e.printStackTrace()
-            // }
-
-
-    // Background → start foreground service (which in turn starts headless)
-    val serviceIntent = Intent(context, CallForegroundService::class.java).apply {
-        putExtras(Bundle().apply { 
-            data.forEach { (k, v) -> putString(k, v) } 
-        })
-    }
-    
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        context.startForegroundService(serviceIntent)
-    } else {
-        context.startService(serviceIntent)
-    }
-
+            // Background → start foreground service (which in turn starts headless)
+            val serviceIntent =
+                Intent(context, CallForegroundService::class.java).apply {
+                    putExtra("callUuid", uuid) // Key: Pass the UUID here
+                    putExtras(
+                        Bundle().apply {
+                            data.forEach { (k, v) -> putString(k, v) }
+                        },
+                    )
+                }
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                context.startForegroundService(serviceIntent)
+            } else {
+                context.startService(serviceIntent)
+            }
         }
     }
 
     private fun showMissedCallNotification(
         context: Context,
         data: Map<String, String>,
-        uuid: String
+        uuid: String,
     ) {
         val name = data["name"] ?: "Unknown"
         val callType = data["callType"] ?: "video"
@@ -107,40 +89,46 @@ if (!CallState.setCurrent(uuid)) {
             context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(
-                channelId,
-                "Missed Calls",
-                NotificationManager.IMPORTANCE_DEFAULT
-            ).apply { description = "Missed call notifications" }
+            val channel =
+                NotificationChannel(
+                    channelId,
+                    "Missed Calls",
+                    NotificationManager.IMPORTANCE_DEFAULT,
+                ).apply { description = "Missed call notifications" }
             notificationManager.createNotificationChannel(channel)
         }
 
         val iconResId =
-            context.resources.getIdentifier("ic_missed_call", "drawable", context.packageName)
+            context.resources
+                .getIdentifier("ic_missed_call", "drawable", context.packageName)
                 .takeIf { it != 0 } ?: android.R.drawable.sym_call_missed
         val appName = context.applicationInfo.loadLabel(context.packageManager).toString()
 
         val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
         launchIntent?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-        val pendingIntent = PendingIntent.getActivity(
-            context,
-            uuid.hashCode(),
-            launchIntent,
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
-                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-            else
-                PendingIntent.FLAG_UPDATE_CURRENT
-        )
-
-        val builder = NotificationCompat.Builder(context, channelId)
-            .setSmallIcon(iconResId)
-            .setContentTitle("$appName • Missed $callType call")
-            .setContentText("You missed a call from $name")
-            .setPriority(NotificationCompat.PRIORITY_HIGH)
-            .setAutoCancel(true)
-            .setCategory(NotificationCompat.CATEGORY_MISSED_CALL)
-            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-            .setContentIntent(pendingIntent)
+        val pendingIntent =
+            PendingIntent.getActivity(
+                context,
+                uuid.hashCode(),
+                launchIntent,
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+                } else {
+                    PendingIntent.FLAG_UPDATE_CURRENT
+                },
+            )
+
+        val builder =
+            NotificationCompat
+                .Builder(context, channelId)
+                .setSmallIcon(iconResId)
+                .setContentTitle("$appName • Missed $callType call")
+                .setContentText("You missed a call from $name")
+                .setPriority(NotificationCompat.PRIORITY_HIGH)
+                .setAutoCancel(true)
+                .setCategory(NotificationCompat.CATEGORY_MISSED_CALL)
+                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                .setContentIntent(pendingIntent)
 
         notificationManager.notify(uuid.hashCode(), builder.build())
     }
@@ -152,7 +140,7 @@ if (!CallState.setCurrent(uuid)) {
         val packageName = context.packageName
         return appProcesses.any {
             it.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND &&
-            it.processName == packageName
+                it.processName == packageName
         }
     }
 }

package/android/src/main/java/com/rnsnativecall/NativeCallManager.kt

@@ -19,7 +19,7 @@ object NativeCallManager {
     // because the system NotificationManager handles the sound.
 
     // Incrementing version to V3 to force fresh channel settings on the device
-    const val channelId = "CALL_CHANNEL_V6_URGENT"
+    const val channelId = "CALL_CHANNEL_V10_URGENT"
     private var currentCallData: Map<String, String>? = null
 
     fun getCurrentCallData(): Map<String, String>? = currentCallData
@@ -129,18 +129,21 @@ object NativeCallManager {
         }
     }
 
-    /**
-     * Stop the ringtone by canceling the notification itself.
-     * The system manages the sound, so when the notification dies, the sound dies.
-     */
     fun dismissIncomingCall(
         context: Context,
         uuid: String?,
     ) {
         this.currentCallData = null
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
         if (uuid != null) {
+            // 1. Kill the notification UI
             notificationManager.cancel(uuid.hashCode())
+
+            // 2. IMPORTANT: Stop the Foreground Service process
+            // This ensures the "Pill" in the status bar goes away
+            val serviceIntent = Intent(context, CallForegroundService::class.java)
+            context.stopService(serviceIntent)
         }
     }
 
@@ -183,7 +186,6 @@ object NativeCallManager {
         notificationManager.notify(uuid.hashCode(), builder.build())
     }
 
-    // Deprecated manual method - kept for signature compatibility but does nothing
     fun stopRingtone() {
         // No-op: Sound is now managed by the Notification Channel life-cycle
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "0.9.9",
+    "version": "1.0.1",
     "description": "High-performance React Native module for handling native VoIP call UI on Android and iOS.",
     "main": "index.js",
     "types": "index.d.ts",