rns-nativecall 0.5.4 → 0.5.6

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

@@ -12,34 +12,46 @@ class AcceptCallActivity : Activity() {
         
         val extras = intent.extras
         val dataMap = mutableMapOf<String, String>()
+        
+        // Extract data into our map
         extras?.keySet()?.forEach { key ->
             extras.get(key)?.let { dataMap[key] = it.toString() }
         }
 
         val uuid = dataMap["callUuid"]
 
-        // 1. Stop UI/Ringtone immediately
-        NativeCallManager.stopRingtone()
-        val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        // FIX: Only call these if uuid is not null to satisfy the compiler
         if (uuid != null) {
+            // 1. Kill background tasks immediately
+            CallMessagingService.stopBackupTimer(uuid)
+            
+            val stopHeadlessIntent = Intent(this, CallHeadlessTask::class.java)
+            stopService(stopHeadlessIntent)
+
+            // 2. Stop UI/Ringtone and Notification
+            NativeCallManager.stopRingtone()
+            val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
             notificationManager.cancel(uuid.hashCode())
-        }
 
-        // 2. SYNC WITH CALLMODULE: Save data for getInitialCallData()
-        CallModule.setPendingCallData(dataMap)
+            // 3. SYNC WITH CALLMODULE: Save data for getInitialCallData()
+            CallModule.setPendingCallData(dataMap)
 
-        // 3. SYNC WITH CALLMODULE: Emit event for the active Bridge
-        CallModule.sendEventToJS("onCallAccepted", dataMap)
+            // 4. SYNC WITH CALLMODULE: Emit event for the active Bridge
+            CallModule.sendEventToJS("onCallAccepted", dataMap)
 
-        // 4. Launch Main App
-        val launchIntent = packageManager.getLaunchIntentForPackage(packageName)
-        launchIntent?.apply {
-            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-            putExtras(extras ?: Bundle())
-            putExtra("navigatingToCall", true)
+            // 5. Launch Main App with data
+            val launchIntent = packageManager.getLaunchIntentForPackage(packageName)
+            launchIntent?.apply {
+                // Using Intent.FLAG_ACTIVITY_NEW_TASK to ensure it opens correctly from a "killed" state
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+                putExtras(extras ?: Bundle())
+                putExtra("navigatingToCall", true)
+                putExtra("callUuid", uuid) // Explicitly pass uuid again for easy access in JS
+            }
+            startActivity(launchIntent)
         }
-        startActivity(launchIntent)
         
+        // Always finish the trampoline activity
         finish()
     }
 }

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

@@ -4,46 +4,43 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.app.NotificationManager
-import android.os.Bundle
 
 class CallActionReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
+        val uuid = intent.getStringExtra("EXTRA_CALL_UUID") ?: return
+        val action = intent.action ?: return
+
+        // 1. KILL THE BACKUP TIMER (Stop MessagingService from re-triggering)
+        CallMessagingService.stopBackupTimer(uuid)
+
+        // 2. STOP THE HEADLESS SERVICE (Stop JS from initializing WebRTC)
+        val stopHeadlessIntent = Intent(context, CallHeadlessTask::class.java)
+        context.stopService(stopHeadlessIntent)
+
+        // 3. STOP NATIVE UI
         NativeCallManager.stopRingtone()
-        
-        val extras = intent.extras
-        val uuid = intent.getStringExtra("EXTRA_CALL_UUID")
-        val action = intent.action
-        
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        if (uuid != null) {
-            notificationManager.cancel(uuid.hashCode())
-        }
+        notificationManager.cancel(uuid.hashCode())
 
         val dataMap = mutableMapOf<String, String>()
-        extras?.keySet()?.forEach { key ->
-            extras.get(key)?.let { dataMap[key] = it.toString() }
+        intent.extras?.keySet()?.forEach { key ->
+            intent.extras?.get(key)?.let { dataMap[key] = it.toString() }
         }
 
-        // Match the logic in your CallModule for Answer vs Reject
-        if (action?.contains("ACTION_ACCEPT") == true) {
-            // Save data for cold-start polling (getInitialCallData)
+        if (action.contains("ACTION_ACCEPT")) {
             CallModule.setPendingCallData(dataMap)
-            
-            // Emit to active bridge
             CallModule.sendEventToJS("onCallAccepted", dataMap)
 
-            // Open the app
             val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
             launchIntent?.apply {
                 addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-                putExtras(extras ?: Bundle())
+                putExtras(intent.extras ?: android.os.Bundle())
                 putExtra("navigatingToCall", true)
             }
             context.startActivity(launchIntent)
             
-        } else if (action?.contains("ACTION_REJECT") == true) {
-            // Only send the event. Rejection usually doesn't need setPendingCallData 
-            // as we don't open the app.
+        } else if (action.contains("ACTION_REJECT")) {
+            // Tell JS call is dead
             CallModule.sendEventToJS("onCallRejected", dataMap)
         }
     }

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

@@ -21,6 +21,14 @@ class CallMessagingService : FirebaseMessagingService() {
     companion object {
         private val handler = Handler(Looper.getMainLooper())
         private val pendingNotifications = mutableMapOf<String, Runnable>()
+
+        @JvmStatic
+        fun stopBackupTimer(uuid: String) {
+            pendingNotifications[uuid]?.let {
+                handler.removeCallbacks(it)
+                pendingNotifications.remove(uuid)
+            }
+        }
     }
 
     // Helper to check app state
@@ -76,6 +84,8 @@ class CallMessagingService : FirebaseMessagingService() {
         }
     }
 
+    
+
     private fun showMissedCallNotification(context: Context, data: Map<String, String>, uuid: String) {
         val name = data["name"] ?: "Unknown"
         val callType = data["callType"] ?: "video"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "0.5.4",
+    "version": "0.5.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",