rns-nativecall 0.5.0 → 0.5.2

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

@@ -23,6 +23,15 @@ class CallMessagingService : FirebaseMessagingService() {
         private val pendingNotifications = mutableMapOf<String, Runnable>()
     }
 
+    // Helper to check app state
+    private fun isAppInForeground(context: Context): Boolean {
+        val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+        val appProcesses = activityManager.runningAppProcesses ?: return false
+        return appProcesses.any { 
+            it.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND && it.processName == context.packageName 
+        }
+    }
+
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
         val data = remoteMessage.data
         val context = applicationContext
@@ -42,25 +51,20 @@ class CallMessagingService : FirebaseMessagingService() {
         if (isAppInForeground(context)) {
             CallModule.sendEventToJS("onCallReceived", data)
         } else {
-            // 1. Show the Full Screen Notification IMMEDIATELY
             NativeCallManager.handleIncomingPush(context, data)
 
-            // 2. Start HeadlessJS Task as a Foreground Service
             try {
                 val headlessIntent = Intent(context, CallHeadlessTask::class.java).apply {
                     val bundle = Bundle()
                     data.forEach { (k, v) -> bundle.putString(k, v) }
                     putExtras(bundle)
                 }
-                
-                // CRITICAL: Must use startForegroundService for background starts on Android 8+
                 ContextCompat.startForegroundService(context, headlessIntent)
                 HeadlessJsTaskService.acquireWakeLockNow(context)
             } catch (e: Exception) { 
                 e.printStackTrace() 
             }
 
-            // 3. Backup Safety
             val showNotificationRunnable = Runnable {
                 if (!isAppInForeground(context)) {
                     NativeCallManager.handleIncomingPush(context, data)
@@ -109,12 +113,4 @@ class CallMessagingService : FirebaseMessagingService() {
 
         notificationManager.notify(uuid.hashCode(), builder.build())
     }
-
-    private fun isAppInForeground(context: Context): Boolean {
-        val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
-        val appProcesses = activityManager.runningAppProcesses ?: return false
-        return appProcesses.any { 
-            it.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND && it.processName == context.packageName 
-        }
-    }
 }

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

@@ -4,15 +4,15 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
-import android.content.Intent // CRITICAL IMPORT
+import android.content.Intent
 import android.os.Build
-import android.os.Bundle // CRITICAL IMPORT
+import android.os.Bundle
 import androidx.core.app.NotificationCompat
 import android.media.Ringtone
 import android.media.RingtoneManager
 import android.graphics.Color
 import androidx.core.app.Person
-import androidx.core.app.NotificationCompat.CallStyle
+import androidx.core.graphics.drawable.IconCompat
 
 object NativeCallManager {
 
@@ -32,10 +32,16 @@ object NativeCallManager {
             PendingIntent.FLAG_UPDATE_CURRENT
         }
 
-        // 1. Full Screen / 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,18 +51,16 @@ 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
         )
 
-        // 3. Answer Intent (Using your CallActionReceiver)
+        // 3. Answer Intent
         val answerIntent = Intent(context, CallActionReceiver::class.java).apply {
-            action = "ACTION_ACCEPT_$uuid" // Changed to match your Receiver logic
-            putExtra("EXTRA_CALL_UUID", uuid)
-            data.forEach { (key, value) -> putExtra(key, value) }
+            action = "ACTION_ACCEPT_$uuid"
+            putExtras(extras)
         }
         val answerPendingIntent = PendingIntent.getBroadcast(
             context, uuid.hashCode() + 2, answerIntent, pendingFlags
@@ -74,33 +78,24 @@ object NativeCallManager {
             notificationManager.createNotificationChannel(channel)
         }
 
-        val caller = Person.Builder()
-            .setName(name)
-            .setImportant(true)
-            .setIcon(context.applicationInfo.icon)
-            .build()
-
         val builder = NotificationCompat.Builder(context, CALL_CHANNEL_ID)
-            //.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
-                    rejectPendingIntent,
-                )
-            )
-   
+            // 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)
@@ -111,14 +106,9 @@ object NativeCallManager {
 
     fun stopRingtone() {
         try {
-            ringtone?.let {
-                if (it.isPlaying) it.stop()
-            }
-            ringtone = null
-        } catch (e: Exception) {
-            e.printStackTrace()
+            ringtone?.let { if (it.isPlaying) it.stop() }
             ringtone = null
-        }
+        } catch (e: Exception) { e.printStackTrace() }
     }
 
     fun dismissIncomingCall(context: Context, uuid: String?) {

package/package.json

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