rns-nativecall 0.7.4 → 0.7.6

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

@@ -9,132 +9,72 @@ import android.os.Build
 import android.media.Ringtone
 import android.media.RingtoneManager
 import android.graphics.Color
-
 import androidx.core.app.Person
 import androidx.core.app.NotificationCompat
+import android.app.KeyguardManager
 
 object NativeCallManager {
 
     private var ringtone: Ringtone? = null
     const val channelId = "CALL_CHANNEL_ID"
 
-    // fun handleIncomingPush(context: Context, data: Map<String, String>) {
-    //     val uuid = data["callUuid"] ?: return
-    //     stopRingtone()
-
-    //     val name = data["name"] ?: "Incoming Call"
-    //     val callType = data["callType"] ?: "audio"
-    //     val notificationId = uuid.hashCode()
-
-    //     val pendingFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-    //         PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
-    //     } else {
-    //         PendingIntent.FLAG_UPDATE_CURRENT
-    //     }
-
-    //     val noOpIntent = PendingIntent.getActivity(
-    //         context,
-    //         notificationId + 1,
-    //         Intent(), 
-    //         pendingFlags
-    //     )
-
-    //     val intentToActivity = Intent(context, AcceptCallActivity::class.java).apply {
-    //         this.action = "ACTION_SHOW_UI_$uuid"
-    //         data.forEach { (key, value) -> this.putExtra(key, value) }
-    //         this.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
-    //     }
-
-    //     val fullScreenPendingIntent = PendingIntent.getActivity(
-    //         context,
-    //         notificationId,
-    //         intentToActivity,
-    //         pendingFlags
-    //     )
-
-    //     val rejectIntent = Intent(context, CallActionReceiver::class.java).apply {
-    //         this.action = "ACTION_REJECT_$uuid"
-    //         this.putExtra("EXTRA_CALL_UUID", uuid)
-    //         data.forEach { (key, value) -> this.putExtra(key, value) }
-    //     }
-
-    //     val rejectPendingIntent = PendingIntent.getBroadcast(
-    //         context,
-    //         notificationId,
-    //         rejectIntent,
-    //         pendingFlags
-    //     )
-
-    //     val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-    //     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-    //         val channel = NotificationChannel(
-    //             channelId,
-    //             "Incoming Calls",
-    //             NotificationManager.IMPORTANCE_HIGH // NotificationManager.IMPORTANCE_HIGH
-    //         ).apply {
-    //             enableVibration(true)
-    //             vibrationPattern = longArrayOf(0, 500, 500, 500)
-    //             lightColor = Color.GREEN
-    //             setBypassDnd(true)
-    //             lockscreenVisibility = NotificationCompat.VISIBILITY_PUBLIC
-    //             setSound(null, null)
-    //         }
-    //         notificationManager.createNotificationChannel(channel)
-    //     }
-
-    //     val builder = NotificationCompat.Builder(context, channelId)
-    //         .setSmallIcon(context.applicationInfo.icon)
-    //         .setContentTitle("Incoming $callType call")
-    //         .setContentText(name)
-    //         .setPriority(NotificationCompat.PRIORITY_MAX) // PRIORITY_HIGH
-    //         .setCategory(NotificationCompat.CATEGORY_CALL) // CATEGORY_CALL
-    //         .setOngoing(true)
-    //         .setAutoCancel(false)
-    //         .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-    //         .setFullScreenIntent(fullScreenPendingIntent, true)
-    //         .setContentIntent(noOpIntent)
-    //         .addAction(0, "Answer", fullScreenPendingIntent)
-    //         .addAction(0, "Decline", rejectPendingIntent)
+    // ✅ ADDED: stopRingtone definition
+    fun stopRingtone() {
+        try {
+            ringtone?.let { if (it.isPlaying) it.stop() }
+            ringtone = null
+        } catch (e: Exception) {
+            ringtone = null
+        }
+    }
 
-    //     notificationManager.notify(notificationId, builder.build())
+    // ✅ ADDED: showMissedCallNotification definition
+    fun showMissedCallNotification(context: Context, data: Map<String, String>, uuid: String) {
+        val name = data["name"] ?: "Unknown Caller"
+        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        
+        val builder = NotificationCompat.Builder(context, channelId)
+            .setSmallIcon(context.applicationInfo.icon)
+            .setContentTitle("Missed Call")
+            .setContentText("Incoming call from $name")
+            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setAutoCancel(true)
 
-    //     try {
-    //         val ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
-    //         ringtone = RingtoneManager.getRingtone(context, ringtoneUri)
-    //         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-    //             ringtone?.isLooping = true
-    //         }
-    //         ringtone?.play()
-    //     } catch (e: Exception) {
-    //         e.printStackTrace()
-    //     }
-    // }
+        notificationManager.notify(uuid.hashCode(), builder.build())
+    }
 
- fun handleIncomingPush(context: Context, data: Map<String, String>) {
+    fun handleIncomingPush(context: Context, data: Map<String, String>) {
         val uuid = data["callUuid"] ?: return
         stopRingtone()
 
         val name = data["name"] ?: "Incoming Call"
         val callType = data["callType"] ?: "audio"
-        val notificationId = uuid.hashCode()
 
+        // --- LOCK SCREEN GATEKEEPER ---
+        val keyguardManager = context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+        if (keyguardManager.isKeyguardLocked) {
+             // Device is locked? We bounce it!
+             CallState.markCanceled(uuid, context) 
+             showMissedCallNotification(context, data, uuid)
+             return // 🛑 Flow stops here
+        }
+
+        val notificationId = uuid.hashCode()
         val pendingFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
         } else {
             PendingIntent.FLAG_UPDATE_CURRENT
         }
 
-        // 1. Setup the Intents
+        val noOpIntent = PendingIntent.getActivity(context, notificationId + 1, Intent(), pendingFlags)
+
         val intentToActivity = Intent(context, AcceptCallActivity::class.java).apply {
-            this.action = "ACTION_ANSWER_$uuid"
+            this.action = "ACTION_SHOW_UI_$uuid"
             data.forEach { (key, value) -> this.putExtra(key, value) }
             this.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
         }
 
-        val fullScreenPendingIntent = PendingIntent.getActivity(
-            context, notificationId, intentToActivity, pendingFlags
-        )
+        val fullScreenPendingIntent = PendingIntent.getActivity(context, notificationId, intentToActivity, pendingFlags)
 
         val rejectIntent = Intent(context, CallActionReceiver::class.java).apply {
             this.action = "ACTION_REJECT_$uuid"
@@ -142,55 +82,38 @@ object NativeCallManager {
             data.forEach { (key, value) -> this.putExtra(key, value) }
         }
 
-        // Fix: Define the missing rejectPendingIntent
-        val rejectPendingIntent = PendingIntent.getBroadcast(
-            context, notificationId, rejectIntent, pendingFlags
-        )
-
-        // 2. Create the Person object for CallStyle
-        val caller = Person.Builder()
-            .setName(name)
-            .setImportant(true)
-            .build()
+        val rejectPendingIntent = PendingIntent.getBroadcast(context, notificationId, rejectIntent, pendingFlags)
 
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-        // 3. Setup Channel
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(
-                channelId,
-                "Incoming Calls",
-                NotificationManager.IMPORTANCE_HIGH
-            ).apply {
+            val channel = NotificationChannel(channelId, "Incoming Calls", NotificationManager.IMPORTANCE_HIGH).apply {
                 enableVibration(true)
                 vibrationPattern = longArrayOf(0, 500, 500, 500)
                 lightColor = Color.GREEN
                 setBypassDnd(true)
+                lockscreenVisibility = NotificationCompat.VISIBILITY_PUBLIC
                 setSound(null, null)
             }
             notificationManager.createNotificationChannel(channel)
         }
 
-        // 4. Build with CallStyle
         val builder = NotificationCompat.Builder(context, channelId)
             .setSmallIcon(context.applicationInfo.icon)
+            .setContentTitle("Incoming $callType call")
+            .setContentText(name)
             .setPriority(NotificationCompat.PRIORITY_MAX)
             .setCategory(NotificationCompat.CATEGORY_CALL)
             .setOngoing(true)
             .setAutoCancel(false)
             .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
             .setFullScreenIntent(fullScreenPendingIntent, true)
-            .setStyle(
-                NotificationCompat.CallStyle.forIncomingCall(
-                    caller,
-                    rejectPendingIntent, 
-                    fullScreenPendingIntent
-                )
-            )
+            .setContentIntent(noOpIntent)
+            .addAction(0, "Answer", fullScreenPendingIntent)
+            .addAction(0, "Decline", rejectPendingIntent)
 
         notificationManager.notify(notificationId, builder.build())
 
-        // 5. Start Ringtone
         try {
             val ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
             ringtone = RingtoneManager.getRingtone(context, ringtoneUri)
@@ -203,53 +126,35 @@ object NativeCallManager {
         }
     }
 
-
-    fun stopRingtone() {
-        try {
-            ringtone?.let { if (it.isPlaying) it.stop() }
-            ringtone = null
-        } catch (e: Exception) {
-            ringtone = null
-        }
+    fun connecting(context: Context, uuid: String, name: String, callType: String) {
+        val notificationId = uuid.hashCode()
+        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        val builder = NotificationCompat.Builder(context, channelId)
+            .setSmallIcon(context.applicationInfo.icon)
+            .setContentTitle("Incoming $callType call")
+            .setContentText("Connecting…")
+            .setPriority(NotificationCompat.PRIORITY_MAX)
+            .setCategory(NotificationCompat.CATEGORY_CALL)
+            .setOngoing(true)
+            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+            .setProgress(0, 0, true)
+        notificationManager.notify(notificationId, builder.build())
     }
 
-fun connecting(context: Context, uuid: String, name: String, callType: String) {
-    val notificationId = uuid.hashCode()
-    val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-    val builder = NotificationCompat.Builder(context, channelId)
-        .setSmallIcon(context.applicationInfo.icon)
-        .setContentTitle("Incoming $callType call")
-        .setContentText("Connecting…") // ✅ show connecting text
-        .setSubText("Connecting…") // status line
-        .setPriority(NotificationCompat.PRIORITY_MAX)
-        .setCategory(NotificationCompat.CATEGORY_CALL)
-        .setOngoing(true)
-        .setAutoCancel(false)
-        .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-        .setProgress(0, 0, true) // ✅ system activity indicator (indeterminate progress bar)
-
-    notificationManager.notify(notificationId, builder.build())
-}
-
-fun aborting(context: Context, uuid: String, name: String, callType: String) {
-    val notificationId = uuid.hashCode()
-    val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-    val builder = NotificationCompat.Builder(context, channelId)
-        .setSmallIcon(context.applicationInfo.icon)
-        .setContentTitle("Incoming $callType call")
-        .setContentText("Aborting…") // ✅ show aborting text
-        .setSubText("Aborting…") // status line
-        .setPriority(NotificationCompat.PRIORITY_MAX)
-        .setCategory(NotificationCompat.CATEGORY_CALL)
-        .setOngoing(true)
-        .setAutoCancel(false)
-        .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-        .setProgress(0, 0, true) // ✅ indeterminate progress indicator
-
-    notificationManager.notify(notificationId, builder.build())
-}
+    fun aborting(context: Context, uuid: String, name: String, callType: String) {
+        val notificationId = uuid.hashCode()
+        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        val builder = NotificationCompat.Builder(context, channelId)
+            .setSmallIcon(context.applicationInfo.icon)
+            .setContentTitle("Incoming $callType call")
+            .setContentText("Aborting…")
+            .setPriority(NotificationCompat.PRIORITY_MAX)
+            .setCategory(NotificationCompat.CATEGORY_CALL)
+            .setOngoing(true)
+            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+            .setProgress(0, 0, true)
+        notificationManager.notify(notificationId, builder.build())
+    }
 
     fun dismissIncomingCall(context: Context, uuid: String?) {
         stopRingtone()

package/package.json

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