rns-nativecall 0.5.8 → 0.6.0

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

@@ -10,46 +10,46 @@ class AcceptCallActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         
-        val extras = intent.extras
         val dataMap = mutableMapOf<String, String>()
-        
+        val extras = intent.extras
+
+        // Extract every single extra passed in from NativeCallManager
         extras?.keySet()?.forEach { key ->
-            extras.get(key)?.let { dataMap[key] = it.toString() }
+            val value = extras.get(key)
+            if (value != null) {
+                dataMap[key] = value.toString()
+            }
         }
 
         val uuid = dataMap["callUuid"]
 
         if (uuid != null) {
-            // 1. IMMEDIATELY KILL THE GHOSTS
-            // This stops the 18s timer in MessagingService
+            // Kill background processes
             CallMessagingService.stopBackupTimer(uuid)
-            
-            // This kills the Headless JS task so it stops running in background
             val stopHeadlessIntent = Intent(applicationContext, CallHeadlessTask::class.java)
             applicationContext.stopService(stopHeadlessIntent)
 
-            // 2. STOP NATIVE RINGTONE & NOTIFICATION PILL
+            // Stop Ringtone & Notification
             NativeCallManager.stopRingtone()
             val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
             notificationManager.cancel(uuid.hashCode())
 
-            // 3. PREPARE DATA FOR REACT NATIVE
+            // SYNC WITH JS
             CallModule.setPendingCallData(dataMap)
             CallModule.sendEventToJS("onCallAccepted", dataMap)
 
-            // 4. LAUNCH MAIN APP
+            // OPEN THE APP
             val launchIntent = packageManager.getLaunchIntentForPackage(packageName)
             launchIntent?.apply {
-                // IMPORTANT: Use these flags to wake up the app from any state
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                // Pass ALL data forward to the main app
                 putExtras(extras ?: Bundle())
                 putExtra("navigatingToCall", true)
-                putExtra("callUuid", uuid)
+                
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
             }
             startActivity(launchIntent)
         }
         
-        // Kill this trampoline activity immediately
         finish()
     }
 }

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

@@ -61,9 +61,7 @@ class CallMessagingService : FirebaseMessagingService() {
         if (isAppInForeground(context)) {
             CallModule.sendEventToJS("onCallReceived", data)
         } else {
-            // 1. Trigger Notification UI immediately
-            NativeCallManager.handleIncomingPush(context, data)
-
+       
             // 2. Start Headless Task
             try {
                 val headlessIntent = Intent(context, CallHeadlessTask::class.java).apply {
@@ -85,6 +83,9 @@ class CallMessagingService : FirebaseMessagingService() {
                 if (!isAppInForeground(context)) {
                     Log.d("CallMessagingService", "Backup timer triggered for: $uuid")
                     NativeCallManager.handleIncomingPush(context, data)
+                         // 1. Trigger Notification UI immediately
+                   // NativeCallManager.handleIncomingPush(context, data)
+
                 }
                 pendingNotifications.remove(uuid)
             }

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

@@ -94,6 +94,32 @@ object NativeCallManager {
             .addAction(0, "Answer", answerPendingIntent) 
             .addAction(0, "Decline", rejectPendingIntent)
 
+
+
+val acceptIntent = Intent(context, AcceptCallActivity::class.java).apply {
+    // THIS IS THE CRITICAL PART:
+    // You must map the FCM data (Map<String, String>) into the Intent Extras
+    data.forEach { (key, value) ->
+        this.putExtra(key, value)
+    }
+    // Ensure we have a unique action so the system doesn't cache old data
+    action = "ACTION_ACCEPT_CALL_${System.currentTimeMillis()}"
+    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_NO_USER_ACTION)
+}
+
+val pendingFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE // MUST BE MUTABLE to carry data
+} else {
+    PendingIntent.FLAG_UPDATE_CURRENT
+}
+
+val acceptPendingIntent = PendingIntent.getActivity(
+    context, 
+    1001, 
+    acceptIntent, 
+    pendingFlags
+)
+
         notificationManager.notify(uuid.hashCode(), builder.build())
 
         // Start Ringtone

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "0.5.8",
+    "version": "0.6.0",
     "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",
@@ -46,10 +46,11 @@
         "withNativeCallVoip.js"
     ],
     "peerDependencies": {
-        "react-native": "*",
-        "expo": "*"
+        "expo": "*",
+        "react-native": "*"
     },
     "dependencies": {
-        "@expo/config-plugins": "~10.1.1"
+        "@expo/config-plugins": "~10.1.1",
+        "rns-nativecall": "^0.5.9"
     }
 }

package/withNativeCallVoip.js

@@ -85,9 +85,10 @@ function withAndroidConfig(config) {
                 $: {
                     'android:name': 'com.rnsnativecall.AcceptCallActivity',
                     'android:theme': '@android:style/Theme.Translucent.NoTitleBar',
-                    'android:exported': 'false',
-                    'android:showWhenLocked': 'true', // Changed to true for calling
-                    'android:turnScreenOn': 'true'     // Changed to true for calling
+                    'android:exported': 'true', // CHANGE TO TRUE
+                    'android:showWhenLocked': 'true',
+                    'android:turnScreenOn': 'true',
+                    'android:launchMode': 'singleInstance' // Add this to prevent multiple instances
                 }
             });
         }