rns-nativecall 1.2.3 → 1.2.4

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

@@ -32,7 +32,7 @@ class CallMessagingService : FirebaseMessagingService() {
             }
 
             NativeCallManager.dismissIncomingCall(context, uuid)
-            showMissedCallNotification(context, data, uuid)
+            NativeCallManager.showMissedCallNotification(context, data)
             return
         }
 
@@ -73,63 +73,6 @@ class CallMessagingService : FirebaseMessagingService() {
         }
     }
 
-    private fun showMissedCallNotification(
-        context: Context,
-        data: Map<String, String>,
-        uuid: String,
-    ) {
-        val name = data["name"] ?: "Unknown"
-        val callType = data["callType"] ?: "video"
-        val channelId = "missed_calls"
-
-        val notificationManager =
-            context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel =
-                NotificationChannel(
-                    channelId,
-                    "Missed Calls",
-                    NotificationManager.IMPORTANCE_DEFAULT,
-                ).apply { description = "Missed call notifications" }
-            notificationManager.createNotificationChannel(channel)
-        }
-
-        val iconResId =
-            context.resources
-                .getIdentifier("ic_missed_call", "drawable", context.packageName)
-                .takeIf { it != 0 } ?: android.R.drawable.sym_call_missed
-        val appName = context.applicationInfo.loadLabel(context.packageManager).toString()
-
-        val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
-        launchIntent?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-        val pendingIntent =
-            PendingIntent.getActivity(
-                context,
-                uuid.hashCode(),
-                launchIntent,
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-                } else {
-                    PendingIntent.FLAG_UPDATE_CURRENT
-                },
-            )
-
-        val builder =
-            NotificationCompat
-                .Builder(context, channelId)
-                .setSmallIcon(iconResId)
-                .setContentTitle("$appName • Missed $callType call")
-                .setContentText("You missed a call from $name")
-                .setPriority(NotificationCompat.PRIORITY_HIGH)
-                .setAutoCancel(true)
-                .setCategory(NotificationCompat.CATEGORY_MISSED_CALL)
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                .setContentIntent(pendingIntent)
-
-        notificationManager.notify(uuid.hashCode(), builder.build())
-    }
-
     private fun isAppInForeground(context: Context): Boolean {
         val activityManager =
             context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager

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

@@ -14,7 +14,9 @@ import androidx.core.app.Person
 import androidx.core.content.ContextCompat
 
 object NativeCallManager {
-    const val channelId = "CALL_CHANNEL_V0_URGENT"
+    const val channelId = "CALL_CHANNEL_URGENT_V2"
+    private const val MISSED_CHANNEL_ID = "missed_calls"
+
     private var currentCallData: Map<String, String>? = null
 
     @JvmStatic internal var pendingCallNotification: Notification? = null
@@ -23,6 +25,37 @@ object NativeCallManager {
 
     fun getCurrentCallData(): Map<String, String>? = currentCallData
 
+    // --- REUSABLE HELPERS ---
+
+    private fun getPendingIntentFlags(): Int =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        } else {
+            PendingIntent.FLAG_UPDATE_CURRENT
+        }
+
+    private fun getResourceColor(context: Context): Int {
+        val colorId = context.resources.getIdentifier("notification_icon_color", "color", context.packageName)
+        return if (colorId != 0) ContextCompat.getColor(context, colorId) else Color.parseColor("#ffffff")
+    }
+
+    private fun createCallIntent(
+        context: Context,
+        targetClass: Class<*>,
+        actionName: String?,
+        uuid: String,
+        data: Map<String, String>,
+    ): Intent =
+        Intent(context, targetClass).apply {
+            action = actionName
+            putExtra("EXTRA_CALL_UUID", uuid)
+            data.forEach { (k, v) -> putExtra(k, v) }
+        }
+
+    private fun getNotificationManager(context: Context) = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+    // --- MAIN LOGIC ---
+
     fun handleIncomingPush(
         context: Context,
         data: Map<String, String>,
@@ -32,45 +65,33 @@ object NativeCallManager {
             val uuid = data["callUuid"] ?: return@post
             val name = data["name"] ?: "Someone"
             val callType = data["callType"] ?: "audio"
-            val isVideo = callType.equals("video", ignoreCase = true)
             val notificationId = uuid.hashCode()
+            val flags = getPendingIntentFlags()
 
-            val ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
-
-            val pendingFlags =
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-                } else {
-                    PendingIntent.FLAG_UPDATE_CURRENT
-                }
-
-            // Intents
+            // 1. Setup Intents using helper
             val overlayIntent =
-                Intent(context, NotificationOverlayActivity::class.java).apply {
-                    putExtra("EXTRA_CALL_UUID", uuid)
-                    data.forEach { (k, v) -> putExtra(k, v) }
+                createCallIntent(context, NotificationOverlayActivity::class.java, null, uuid, data).apply {
                     addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_NO_USER_ACTION)
                 }
-            val fullScreenPendingIntent = PendingIntent.getActivity(context, notificationId, overlayIntent, pendingFlags)
-
-            val answerIntent =
-                Intent(context, CallActionReceiver::class.java).apply {
-                    action = "ACTION_ANSWER"
-                    putExtra("EXTRA_CALL_UUID", uuid)
-                    data.forEach { (k, v) -> putExtra(k, v) }
-                }
-            val answerPendingIntent = PendingIntent.getBroadcast(context, notificationId + 1, answerIntent, pendingFlags)
+            val fullScreenPI = PendingIntent.getActivity(context, notificationId, overlayIntent, flags)
+
+            val answerPI =
+                PendingIntent.getBroadcast(
+                    context,
+                    notificationId + 1,
+                    createCallIntent(context, CallActionReceiver::class.java, "ACTION_ANSWER", uuid, data),
+                    flags,
+                )
 
-            val rejectIntent =
-                Intent(context, CallActionReceiver::class.java).apply {
-                    action = "ACTION_REJECT"
-                    putExtra("EXTRA_CALL_UUID", uuid)
-                    data.forEach { (k, v) -> putExtra(k, v) }
-                }
-            val rejectPendingIntent = PendingIntent.getBroadcast(context, notificationId + 2, rejectIntent, pendingFlags)
+            val rejectPI =
+                PendingIntent.getBroadcast(
+                    context,
+                    notificationId + 2,
+                    createCallIntent(context, CallActionReceiver::class.java, "ACTION_REJECT", uuid, data),
+                    flags,
+                )
 
-            // Channel
-            val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            // 2. Setup Urgent Channel
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 val channel =
                     NotificationChannel(channelId, "Incoming Calls", NotificationManager.IMPORTANCE_HIGH).apply {
@@ -78,7 +99,7 @@ object NativeCallManager {
                         enableVibration(true)
                         setBypassDnd(true)
                         setSound(
-                            ringtoneUri,
+                            RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE),
                             AudioAttributes
                                 .Builder()
                                 .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
@@ -86,31 +107,14 @@ object NativeCallManager {
                                 .build(),
                         )
                     }
-                notificationManager.createNotificationChannel(channel)
+                getNotificationManager(context).createNotificationChannel(channel)
             }
 
+            // 3. Resources & Style
             val iconId =
                 context.resources
                     .getIdentifier("notification_icon", "drawable", context.packageName)
-                    .let { id ->
-                        if (id != 0) {
-                            id // Found the one you saw in the folder!
-                        } else {
-                            // Fallback chain if notification_icon is missing
-                            val shellId = context.resources.getIdentifier("shell_notification_icon", "drawable", context.packageName)
-                            if (shellId != 0) shellId else context.applicationInfo.icon
-                        }
-                    }
-
-            val colorId = context.resources.getIdentifier("notification_icon_color", "color", context.packageName)
-
-            val iconColor =
-                if (colorId != 0) {
-                    ContextCompat.getColor(context, colorId)
-                } else {
-                    // Fallback to a default blue or grey if they didn't provide a color
-                    Color.parseColor("#ffffff")
-                }
+                    .let { if (it != 0) it else context.applicationInfo.icon }
 
             val caller =
                 Person
@@ -118,62 +122,42 @@ object NativeCallManager {
                     .setName(name)
                     .setImportant(true)
                     .build()
+            val incomingCallStyle = NotificationCompat.CallStyle.forIncomingCall(caller, rejectPI, answerPI)
 
-            val incomingCallTemplate =
-                NotificationCompat.CallStyle.forIncomingCall(
-                    caller,
-                    rejectPendingIntent,
-                    answerPendingIntent,
-                )
-
-            if (isVideo) {
+            if (callType.equals("video", ignoreCase = true)) {
                 try {
-                    incomingCallTemplate.setIsVideo(true)
+                    incomingCallStyle.setIsVideo(true)
                 } catch (e: Exception) {
-                    // Some versions of Android may throw here; ignore
+                    // No-op
                 }
             }
-
-            val builder =
+            // 4. Build Notification
+            val notification =
                 NotificationCompat
                     .Builder(context, channelId)
                     .setSmallIcon(iconId)
-                    // 1. FOR ANDROID 8/9: They prioritize ContentTitle over the Style's internal logic.
-                    // We include the name here so it's impossible to miss.
                     .setContentTitle("Incoming $callType Call from $name")
-                    // 2. FOR ALL VERSIONS: This helps fill the "Status" line below the name.
                     .setContentText("Incoming $callType Call")
-                    // 3. FOR ANDROID 12+: This places the text in the header next to the App Name.
                     .setSubText("Incoming $callType Call")
-                    .setColor(iconColor)
+                    .setColor(getResourceColor(context))
                     .setPriority(NotificationCompat.PRIORITY_MAX)
                     .setCategory(NotificationCompat.CATEGORY_CALL)
                     .setOngoing(true)
-                    .setFullScreenIntent(fullScreenPendingIntent, true)
-                    .setStyle(incomingCallTemplate)
+                    .setFullScreenIntent(fullScreenPI, true)
+                    .setStyle(incomingCallStyle)
                     .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
+                    .build()
 
-            val notification = builder.build()
             pendingCallNotification = notification
             pendingNotificationId = notificationId
 
-            // 1. Start the LOUD UI Service (Google allows this for PHONE_CALL)
-            val uiIntent = Intent(context, CallUiForegroundService::class.java)
-            ContextCompat.startForegroundService(context, uiIntent)
-
-            // 2. Stop the SILENT Wake service (which no longer needs DATA_SYNC)
+            // 5. Execution
+            getNotificationManager(context).notify(notificationId, notification)
+            ContextCompat.startForegroundService(context, Intent(context, CallUiForegroundService::class.java))
             CallForegroundService.stop(context)
         }
     }
 
-    fun refreshNotificationOnly(
-        context: Context,
-        uuid: String,
-    ) {
-        val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        manager.cancel(uuid.hashCode())
-    }
-
     fun showMissedCallNotification(
         context: Context,
         data: Map<String, String>,
@@ -181,57 +165,46 @@ object NativeCallManager {
         val uuid = data["callUuid"] ?: return
         val name = data["name"] ?: "Unknown"
         val callType = data["callType"] ?: "video"
-        val channelId = "missed_calls"
-
-        val notificationManager =
-            context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
+        // Setup Missed Channel
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel =
-                NotificationChannel(
-                    channelId,
-                    "Missed Calls",
-                    NotificationManager.IMPORTANCE_DEFAULT,
-                ).apply { description = "Missed call notifications" }
-            notificationManager.createNotificationChannel(channel)
+            val channel = NotificationChannel(MISSED_CHANNEL_ID, "Missed Calls", NotificationManager.IMPORTANCE_DEFAULT)
+            getNotificationManager(context).createNotificationChannel(channel)
         }
 
-        // Use your custom notification icon if available, fallback to system missed call icon
         val iconResId =
             context.resources
-                .getIdentifier("notification_icon", "drawable", context.packageName)
-                .takeIf { it != 0 } ?: android.R.drawable.sym_call_missed
-
-        val appName = context.applicationInfo.loadLabel(context.packageManager).toString()
-
-        val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
-        launchIntent?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-
-        val pendingIntent =
-            PendingIntent.getActivity(
-                context,
-                uuid.hashCode(),
-                launchIntent,
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-                } else {
-                    PendingIntent.FLAG_UPDATE_CURRENT
-                },
-            )
-
-        val builder =
+                .getIdentifier("ic_missed_call", "drawable", context.packageName)
+                .let { if (it != 0) it else android.R.drawable.sym_call_missed }
+
+        val launchIntent =
+            context.packageManager.getLaunchIntentForPackage(context.packageName)?.apply {
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+            }
+        val pendingIntent = PendingIntent.getActivity(context, uuid.hashCode(), launchIntent, getPendingIntentFlags())
+
+        val notification =
             NotificationCompat
-                .Builder(context, channelId)
+                .Builder(context, MISSED_CHANNEL_ID)
                 .setSmallIcon(iconResId)
-                .setContentTitle("Missed $callType call")
-                .setContentText("You missed a call from $name")
+                .setContentTitle(context.applicationInfo.loadLabel(context.packageManager).toString())
+                .setContentText("You missed a $callType call from $name")
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
+                .setColor(getResourceColor(context))
                 .setAutoCancel(true)
                 .setCategory(NotificationCompat.CATEGORY_MISSED_CALL)
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                 .setContentIntent(pendingIntent)
+                .build()
 
-        notificationManager.notify(uuid.hashCode(), builder.build())
+        getNotificationManager(context).notify(uuid.hashCode() + 10000, notification)
+    }
+
+    fun refreshNotificationOnly(
+        context: Context,
+        uuid: String,
+    ) {
+        getNotificationManager(context).cancel(uuid.hashCode())
     }
 
     fun dismissIncomingCall(
@@ -241,8 +214,7 @@ object NativeCallManager {
         pendingCallNotification = null
         pendingNotificationId = null
         currentCallData = null
-        val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        uuid?.let { manager.cancel(it.hashCode()) }
+        uuid?.let { getNotificationManager(context).cancel(it.hashCode()) }
         context.stopService(Intent(context, CallUiForegroundService::class.java))
     }
 }

package/index.d.ts

@@ -63,7 +63,7 @@ export interface CallHandlerType {
     ): Promise<boolean>;
 
     /**
-     * Displays the full-screen Native Incoming Call UI.
+     * Show showMissedCall on the device tray.
      */
     showMissedCall(
         uuid: string,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "description": "High-performance React Native module for handling native VoIP call UI on Android and iOS.",
     "main": "index.js",
     "types": "index.d.ts",

package/android/src/main/res/drawable/circle_background.xml

@@ -1,4 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#333333" />
-</shape>

package/android/src/main/res/drawable/ic_call_answer_white.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57a1.02,1.02 0,0 0,-1.02 0.24l-2.2,2.2a15.05,15.05 0,0 1,-6.59 -6.59l2.2,-2.2a1.02,1.02 0,0 0,0.24 -1.02A11.36,11.36 0,0 1,8.5 4c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1c0,9.39 7.61,17 17,17c0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1z" />
-</vector>

package/android/src/main/res/drawable/ic_call_end_white.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M12,9c-1.6,0 -3.15,0.25 -4.6,0.72v3.1c0,0.39 -0.23,0.74 -0.56,0.9 -0.98,0.49 -1.65,1.45 -1.65,2.58c0,1.65 1.34,3 3,3h2v-3H8.1c0.01,-0.99 0.87,-1.8 1.85,-1.8c0.51,0 1,-0.21 1.35,-0.56l1.8,-1.8C13.04,9.3 12.55,9 12,9z" />
-</vector>

package/android/src/main/res/layout/activity_incoming_call.xml

@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#212121">
-
-    <!-- Profile Section -->
-    <ImageView
-        android:id="@+id/profileImage"
-        android:layout_width="200dp"
-        android:layout_height="200dp"
-        android:scaleType="centerCrop"
-        android:background="@drawable/circle_background"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/usernameText"
-        app:layout_constraintVertical_chainStyle="packed"
-        app:layout_constraintVertical_bias="0.35"
-        tools:src="@drawable/ic_profile_placeholder" />
-
-    <!-- Optional: Blur effect for discreet mode (apply programmatically) -->
-    <!-- You can use RenderScript or BlurView library for real blur -->
-
-    <TextView
-        android:id="@+id/usernameText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="John Doe"
-        android:textColor="#FFFFFF"
-        android:textSize="32sp"
-        android:fontFamily="sans-serif-medium"
-        android:layout_marginTop="20dp"
-        app:layout_constraintTop_toBottomOf="@id/profileImage"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:text="John Doe" />
-
-    <TextView
-        android:id="@+id/callStatusText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Incoming Video Call..."
-        android:textColor="#FFFFFF"
-        android:textSize="18sp"
-        android:alpha="0.8"
-        android:layout_marginTop="10dp"
-        app:layout_constraintTop_toBottomOf="@id/usernameText"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-    <!-- Action Buttons Container -->
-    <LinearLayout
-        android:id="@+id/buttonContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:paddingBottom="100dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <!-- Decline Button -->
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:gravity="center"
-            android:layout_marginEnd="60dp">
-
-            <androidx.cardview.widget.CardView
-                android:layout_width="70dp"
-                android:layout_height="70dp"
-                app:cardCornerRadius="35dp"
-                app:cardElevation="8dp"
-                app:cardBackgroundColor="#FF3B30">
-
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:src="@drawable/ic_call_end_white"
-                    android:padding="18dp"
-                    android:tint="#FFFFFF" />
-
-            </androidx.cardview.widget.CardView>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Decline"
-                android:textColor="#FFFFFF"
-                android:textSize="16sp"
-                android:fontFamily="sans-serif-medium"
-                android:layout_marginTop="10dp" />
-
-        </LinearLayout>
-
-        <!-- Accept Button -->
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:gravity="center"
-            android:layout_marginStart="60dp">
-
-            <androidx.cardview.widget.CardView
-                android:layout_width="70dp"
-                android:layout_height="70dp"
-                app:cardCornerRadius="35dp"
-                app:cardElevation="8dp"
-                app:cardBackgroundColor="#4CD964">
-
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:src="@drawable/ic_call_answer_white"
-                    android:padding="18dp"
-                    android:tint="#FFFFFF" />
-
-            </androidx.cardview.widget.CardView>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Accept"
-                android:textColor="#FFFFFF"
-                android:textSize="16sp"
-                android:fontFamily="sans-serif-medium"
-                android:layout_marginTop="10dp" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>