rns-nativecall 0.5.1 → 0.5.3

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

@@ -32,10 +32,16 @@ object NativeCallManager {
             PendingIntent.FLAG_UPDATE_CURRENT
         }
 
-        // 1. UI Intent
+        // Prepare Common Bundle
+        val extras = Bundle().apply {
+            data.forEach { (k, v) -> putString(k, v) }
+            putString("EXTRA_CALL_UUID", uuid)
+        }
+
+        // 1. UI Intent (When tapping the notification body)
         val intentToActivity = Intent(context, AcceptCallActivity::class.java).apply {
             action = "ACTION_SHOW_UI_$uuid"
-            data.forEach { (key, value) -> putExtra(key, value) }
+            putExtras(extras)
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
         }
         val fullScreenPendingIntent = PendingIntent.getActivity(
@@ -45,8 +51,7 @@ object NativeCallManager {
         // 2. Reject Intent
         val rejectIntent = Intent(context, CallActionReceiver::class.java).apply {
             action = "ACTION_REJECT_$uuid"
-            putExtra("EXTRA_CALL_UUID", uuid)
-            data.forEach { (key, value) -> putExtra(key, value) }
+            putExtras(extras)
         }
         val rejectPendingIntent = PendingIntent.getBroadcast(
             context, uuid.hashCode() + 1, rejectIntent, pendingFlags
@@ -55,8 +60,7 @@ object NativeCallManager {
         // 3. Answer Intent
         val answerIntent = Intent(context, CallActionReceiver::class.java).apply {
             action = "ACTION_ACCEPT_$uuid"
-            putExtra("EXTRA_CALL_UUID", uuid)
-            data.forEach { (key, value) -> putExtra(key, value) }
+            putExtras(extras)
         }
         val answerPendingIntent = PendingIntent.getBroadcast(
             context, uuid.hashCode() + 2, answerIntent, pendingFlags
@@ -74,34 +78,25 @@ object NativeCallManager {
             notificationManager.createNotificationChannel(channel)
         }
 
-        // FIX: Use IconCompat.createWithResource instead of raw Int
-        val caller = Person.Builder()
-            .setName(name)
-            .setImportant(true)
-            .setIcon(IconCompat.createWithResource(context, context.applicationInfo.icon))
-            .build()
-
         val builder = NotificationCompat.Builder(context, CALL_CHANNEL_ID)
-            .setSmallIcon(context.applicationInfo.icon) // Ensure small icon is set
+            .setSmallIcon(context.applicationInfo.icon)
             .setContentTitle("Incoming $callType call")
             .setContentText(name)
             .setPriority(NotificationCompat.PRIORITY_MAX)
             .setCategory(NotificationCompat.CATEGORY_CALL)
             .setOngoing(true) 
             .setAutoCancel(false)
-            .setFullScreenIntent(fullScreenPendingIntent, true)
+            .setFullScreenIntent(fullScreenPendingIntent, true) // Essential for waking screen
             .setColor(Color.parseColor("#28a745"))
             .setColorized(true)
-            .setStyle(
-                NotificationCompat.CallStyle.forIncomingCall(
-                    caller,
-                    answerPendingIntent,  // Slot 2: Answer
-                    rejectPendingIntent, // Slot 1: Decline
-                )
-            )
-   
+            // ADDING ACTIONS MANUALLY TO CONTROL ORDER
+            // First Action added = Leftmost button
+            .addAction(0, "Answer", answerPendingIntent) 
+            .addAction(0, "Decline", rejectPendingIntent)
+
         notificationManager.notify(uuid.hashCode(), builder.build())
 
+        // Start Ringtone
         try {
             val ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
             ringtone = RingtoneManager.getRingtone(context, ringtoneUri)
@@ -112,13 +107,9 @@ object NativeCallManager {
 
     fun stopRingtone() {
         try {
-            ringtone?.let {
-                if (it.isPlaying) it.stop()
-            }
+            ringtone?.let { if (it.isPlaying) it.stop() }
             ringtone = null
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
+        } catch (e: Exception) { e.printStackTrace() }
     }
 
     fun dismissIncomingCall(context: Context, uuid: String?) {

package/package.json

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