rns-nativecall 0.3.5 → 0.3.6

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

@@ -6,15 +6,15 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.jstasks.HeadlessJsTaskConfig
 
 class CallHeadlessTask : HeadlessJsTaskService() {
-    override fun getTaskConfig(intent: Intent): HeadlessJsTaskConfig? {
-        val extras = intent.extras
+    // Note: The '?' after Intent and the return type are specific in Kotlin
+    override fun getTaskConfig(intent: Intent?): HeadlessJsTaskConfig? {
+        val extras = intent?.extras
         return if (extras != null) {
-            // INCREASE timeout to 30000 (30s) so it covers your 18s delay
             HeadlessJsTaskConfig(
                 "ColdStartCallTask",
                 Arguments.fromBundle(extras),
                 30000, 
-                true // Allow in foreground
+                true 
             )
         } else {
             null

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

@@ -14,80 +14,67 @@ import com.facebook.react.HeadlessJsTaskService
 
 class CallMessagingService : FirebaseMessagingService() {
 
-    // This companion object allows the Cancel logic to find the active timer
     companion object {
         private val handler = Handler(Looper.getMainLooper())
         private val pendingNotifications = mutableMapOf<String, Runnable>()
+        // This is the standard ID used for the incoming call notification pill
+        private const val CALL_NOTIFICATION_ID = 123 
     }
 
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
         val data = remoteMessage.data
         val context = applicationContext
         
-        // Extract variables for logic
         val uuid = data["callUuid"] ?: return
         val type = data["type"] ?: ""
 
-        // CASE 1: CALLER HUNG UP / CANCELLED
         if (type == "CANCEL") {
-            // 1. Remove the pending 18s timer for this specific call
             pendingNotifications[uuid]?.let {
                 handler.removeCallbacks(it)
                 pendingNotifications.remove(uuid)
             }
             
-            // 2. Stop the ringtone/Pill if it had already started showing
+            // 1. Stop the ringtone
             NativeCallManager.stopRingtone()
-            CallHandler.destroyNativeCallUI(uuid) // Ensure native UI is killed
             
-            // 3. Show standard "Missed Call" notification
+            // 2. DISMISS THE PILL (Direct Native Way)
+            val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            notificationManager.cancel(CALL_NOTIFICATION_ID) 
+            
+            // 3. Show Missed Call
             showMissedCallNotification(context, data, uuid)
             return
         }
         
-        // CASE 2: NEW INCOMING CALL
         if (isAppInForeground(context)) {
-            // App is visible: Send event to active JS bridge immediately
             CallModule.sendEventToJS("onCallReceived", data)
         } else {
-    // 1. Wake the actual App process by launching the Intent
-    val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
-    launchIntent?.apply {
-        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        // This is key: it tells the app to boot the JS but stay minimized
-        putExtra("background_wake", true) 
-    }
-    context.startActivity(launchIntent)
-    
-    // You SHOULD see "Android Bundled..." now because the Activity is starting
-    
-    val showNotificationRunnable = Runnable {
-        if (!isAppInForeground(context)) {
-            NativeCallManager.handleIncomingPush(context, data)
-        }
-    }
-    handler.postDelayed(showNotificationRunnable, 18000)
-}
-    }
+            val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
+            launchIntent?.apply {
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                putExtra("background_wake", true) 
+            }
+            context.startActivity(launchIntent)
+            
+            val showNotificationRunnable = Runnable {
+                if (!isAppInForeground(context)) {
+                    NativeCallManager.handleIncomingPush(context, data)
+                }
+                pendingNotifications.remove(uuid)
+            }
 
-    private fun startHeadlessTask(context: Context, data: Map<String, String>) {
-        val serviceIntent = Intent(context, CallHeadlessTask::class.java)
-        val bundle = Bundle()
-        data.forEach { (key, value) -> bundle.putString(key, value) }
-        serviceIntent.putExtras(bundle)
-        
-        context.startService(serviceIntent)
-        HeadlessJsTaskService.acquireWakeLockNow(context)
+            pendingNotifications[uuid] = showNotificationRunnable
+            handler.postDelayed(showNotificationRunnable, 18000)
+        }
     }
 
     private fun showMissedCallNotification(context: Context, data: Map<String, String>, uuid: String) {
         val name = data["name"] ?: "Unknown"
         val callType = data["callType"] ?: "video"
-        val channelId = "missed_calls" // Ensure this channel is created in your MainApplication or CallManager
+        val channelId = "missed_calls" 
 
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-        // Use ic_launcher as fallback if ic_missed_call isn't found
         var iconResId = context.resources.getIdentifier("ic_missed_call", "drawable", context.packageName)
         if (iconResId == 0) iconResId = android.R.drawable.sym_call_missed
 
@@ -97,7 +84,7 @@ class CallMessagingService : FirebaseMessagingService() {
             .setContentText("You missed a call from $name")
             .setPriority(NotificationCompat.PRIORITY_HIGH)
             .setAutoCancel(true)
-            .setCategory(NotificationCompat.CATEGORY_MISS)
+            .setCategory(NotificationCompat.CATEGORY_MISSED_CALL) 
 
         notificationManager.notify(uuid.hashCode(), builder.build())
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "0.3.5",
+    "version": "0.3.6",
     "description": "RNS nativecall component with native Android/iOS for handling native call ui, when app is not open or open.",
     "main": "index.js",
     "types": "index.d.ts",