rns-nativecall 0.5.5 → 0.5.6

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

@@ -12,39 +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"]
 
-        CallMessagingService.stopBackupTimer(uuid)
-val stopHeadlessIntent = Intent(this, CallHeadlessTask::class.java)
-stopService(stopHeadlessIntent)
-
-
-        // 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: 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)
+            // 3. SYNC WITH CALLMODULE: Save data for getInitialCallData()
+            CallModule.setPendingCallData(dataMap)
+
+            // 4. SYNC WITH CALLMODULE: Emit event for the active Bridge
+            CallModule.sendEventToJS("onCallAccepted", dataMap)
+
+            // 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/package.json

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