rns-nativecall 0.5.2 → 0.5.4

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

@@ -10,48 +10,36 @@ class AcceptCallActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         
-        // 1. EXTRACT DATA SAFELY
         val extras = intent.extras
         val dataMap = mutableMapOf<String, String>()
         extras?.keySet()?.forEach { key ->
-            val value = extras.get(key)
-            if (value != null) {
-                dataMap[key] = value.toString()
-            }
+            extras.get(key)?.let { dataMap[key] = it.toString() }
         }
 
         val uuid = dataMap["callUuid"]
 
-        // 2. STOP RINGING & CLEAR THE SPECIFIC NOTIFICATION
+        // 1. Stop UI/Ringtone immediately
         NativeCallManager.stopRingtone()
         val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        
         if (uuid != null) {
-            // MATCHING THE NEW HASHCODE LOGIC
             notificationManager.cancel(uuid.hashCode())
-        } else {
-            // Fallback for safety
-            notificationManager.cancel(101) 
         }
 
-        // 3. EMIT EVENT TO REACT NATIVE
-        CallModule.sendEventToJS("onCallAccepted", dataMap)
-        
-        // Ensure the data is available for the JS bridge even if it's just waking up
+        // 2. SYNC WITH CALLMODULE: Save data for getInitialCallData()
         CallModule.setPendingCallData(dataMap)
 
-        // 4. LAUNCH OR BRING MAIN APP TO FOREGROUND
+        // 3. SYNC WITH CALLMODULE: Emit event for the active Bridge
+        CallModule.sendEventToJS("onCallAccepted", dataMap)
+
+        // 4. Launch Main App
         val launchIntent = packageManager.getLaunchIntentForPackage(packageName)
-        if (launchIntent != null) {
-            launchIntent.apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-                putExtras(extras ?: Bundle())
-                putExtra("navigatingToCall", true)
-            }
-            startActivity(launchIntent)
+        launchIntent?.apply {
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+            putExtras(extras ?: Bundle())
+            putExtra("navigatingToCall", true)
         }
+        startActivity(launchIntent)
         
-        // 5. FINISH TRAMPOLINE
         finish()
     }
 }

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

@@ -8,47 +8,43 @@ import android.os.Bundle
 
 class CallActionReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
-        // 1. Always stop the ringtone immediately
         NativeCallManager.stopRingtone()
         
+        val extras = intent.extras
         val uuid = intent.getStringExtra("EXTRA_CALL_UUID")
-        
         val action = intent.action
         
-        // 2. Clear the specific notification using the hash code
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         if (uuid != null) {
             notificationManager.cancel(uuid.hashCode())
-        } else {
-            notificationManager.cancel(101) // Fallback for safety
         }
 
-        // 3. Handle Actions
-        // We check for .contains or .startsWith because our actions are "ACTION_REJECT_$uuid"
-        if (action?.contains("ACTION_ACCEPT") == true || action?.contains("ACTION_SHOW_UI") == true) {
-            val dataMap = mutableMapOf<String, String>()
-            intent.extras?.keySet()?.forEach { key ->
-                intent.extras?.get(key)?.let { dataMap[key] = it.toString() }
-            }
+        val dataMap = mutableMapOf<String, String>()
+        extras?.keySet()?.forEach { key ->
+            extras.get(key)?.let { dataMap[key] = it.toString() }
+        }
 
-            // Store data for the JS Bridge "Holding Gate"
+        // Match the logic in your CallModule for Answer vs Reject
+        if (action?.contains("ACTION_ACCEPT") == true) {
+            // Save data for cold-start polling (getInitialCallData)
             CallModule.setPendingCallData(dataMap)
-
-            // Emit event for active JS bridge
+            
+            // Emit to active bridge
             CallModule.sendEventToJS("onCallAccepted", dataMap)
 
-            // Bring app to foreground
+            // 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(intent.extras ?: Bundle())
+                putExtras(extras ?: Bundle())
                 putExtra("navigatingToCall", true)
             }
             context.startActivity(launchIntent)
             
         } else if (action?.contains("ACTION_REJECT") == true) {
-            // Logic for Reject
-            CallModule.sendEventToJS("onCallRejected", mapOf("callUuid" to (uuid ?: "")))
+            // Only send the event. Rejection usually doesn't need setPendingCallData 
+            // as we don't open the app.
+            CallModule.sendEventToJS("onCallRejected", dataMap)
         }
     }
 }

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

@@ -79,6 +79,7 @@ object NativeCallManager {
         }
 
         val builder = NotificationCompat.Builder(context, CALL_CHANNEL_ID)
+            .setSmallIcon(context.applicationInfo.icon)
             .setContentTitle("Incoming $callType call")
             .setContentText(name)
             .setPriority(NotificationCompat.PRIORITY_MAX)

package/package.json

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