rns-nativecall 1.0.6 → 1.0.8

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

@@ -2,20 +2,25 @@ package com.rnsnativecall
 
 import android.app.Activity
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.view.WindowManager
-import android.os.Build
 
 class AcceptCallActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            setShowWhenLocked(true)
+            setTurnScreenOn(true)
+        }
         val launchIntent = packageManager.getLaunchIntentForPackage(packageName)
         if (launchIntent != null) {
             launchIntent.apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or 
-                         Intent.FLAG_ACTIVITY_SINGLE_TOP or 
-                         Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
+                addFlags(
+                    Intent.FLAG_ACTIVITY_NEW_TASK or
+                        Intent.FLAG_ACTIVITY_SINGLE_TOP or
+                        Intent.FLAG_ACTIVITY_REORDER_TO_FRONT,
+                )
                 putExtras(intent.extras ?: Bundle())
                 putExtra("navigatingToCall", true)
             }
@@ -25,4 +30,4 @@ class AcceptCallActivity : Activity() {
         finish()
         overridePendingTransition(0, 0)
     }
-}
+}

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

@@ -1,7 +1,6 @@
 package com.rnsnativecall
 
 import android.app.*
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
@@ -15,29 +14,19 @@ import androidx.core.app.NotificationCompat
 import com.facebook.react.HeadlessJsTaskService
 
 class CallForegroundService : Service() {
-    private var unlockReceiver: UnlockReceiver? = null // Store reference for unregistering
+    private var unlockReceiver: UnlockReceiver? = null
 
     companion object {
-        private const val CHANNEL_ID = "CALL_CHANNEL_V14_URGENT"
-
         fun stop(context: Context) {
-            val intent = Intent(context, CallForegroundService::class.java)
-            context.stopService(intent)
+            context.stopService(Intent(context, CallForegroundService::class.java))
         }
     }
 
     override fun onCreate() {
         super.onCreate()
-
-        // --- DYNAMIC REGISTRATION FIX ---
-        // Registering here makes the system allow the USER_PRESENT broadcast
-        // because the app is already in the Foreground (via this service).
         unlockReceiver = UnlockReceiver()
         val filter = IntentFilter(Intent.ACTION_USER_PRESENT)
-
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            // Prefer NOT_EXPORTED for dynamically-registered receivers to avoid
-            // background delivery issues and to restrict broadcasts to our process.
             registerReceiver(unlockReceiver, filter, Context.RECEIVER_NOT_EXPORTED)
         } else {
             registerReceiver(unlockReceiver, filter)
@@ -50,43 +39,10 @@ class CallForegroundService : Service() {
         startId: Int,
     ): Int {
         val data = intent?.extras
-        val name = data?.getString("name") ?: "Someone"
-        val uuid = data?.getString("callUuid") ?: "default_uuid"
-
-        val notificationId = uuid.hashCode()
-
-        createNotificationChannel()
-
-        val notification =
-            NotificationCompat
-                .Builder(this, CHANNEL_ID)
-                .setContentTitle(name)
-                .setContentText("Connecting...")
-                .setSmallIcon(applicationInfo.icon)
-                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-                .setCategory(NotificationCompat.CATEGORY_SERVICE)
-                .setOngoing(true)
-                .build()
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            startForeground(
-                notificationId,
-                notification,
-                ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL,
-            )
-        } else {
-            startForeground(notificationId, notification)
-        }
-
-        // Launch the Headless Task
         val headlessIntent =
             Intent(this, CallHeadlessTask::class.java).apply {
                 val bundle = Bundle()
-                data?.let { b ->
-                    for (key in b.keySet()) {
-                        bundle.putString(key, b.get(key)?.toString())
-                    }
-                }
+                data?.let { b -> for (key in b.keySet()) bundle.putString(key, b.get(key)?.toString()) }
                 putExtras(bundle)
             }
 
@@ -97,50 +53,41 @@ class CallForegroundService : Service() {
             e.printStackTrace()
         }
 
-        // Auto-stop after 30s
-        // Handler(Looper.getMainLooper()).postDelayed({
-        //     try {
-        //         stopSelf()
-        //     } catch (e: Exception) {
-        //     }
-        // }, 30000)
-
+        Handler(Looper.getMainLooper()).postDelayed({ stopSelf() }, 30000)
         return START_NOT_STICKY
     }
 
     override fun onDestroy() {
-        // --- CLEANUP ---
-        // Unregister to prevent memory leaks once the call ends or service stops
         try {
             unlockReceiver?.let { unregisterReceiver(it) }
         } catch (e: Exception) {
-            e.printStackTrace()
-        }
-
-        try {
-            stopForeground(true)
-        } catch (_: Exception) {
         }
         super.onDestroy()
     }
 
-    private fun createNotificationChannel() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel =
-                NotificationChannel(
-                    CHANNEL_ID,
-                    "Call Service",
-                    NotificationManager.IMPORTANCE_DEFAULT,
-                ).apply {
-                    description = "Incoming call connection state"
-                    setSound(null, null)
-                    enableVibration(false)
-                    setBypassDnd(true)
-                    lockscreenVisibility = NotificationCompat.VISIBILITY_PUBLIC
-                }
-            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-            manager.createNotificationChannel(channel)
+    override fun onBind(intent: Intent?): IBinder? = null
+}
+
+class CallUiForegroundService : Service() {
+    override fun onStartCommand(
+        intent: Intent?,
+        flags: Int,
+        startId: Int,
+    ): Int {
+        val notification = NativeCallManager.pendingCallNotification ?: return START_NOT_STICKY
+        val id = NativeCallManager.pendingNotificationId ?: return START_NOT_STICKY
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            startForeground(id, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL)
+        } else {
+            startForeground(id, notification)
         }
+        return START_NOT_STICKY
+    }
+
+    override fun onDestroy() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) stopForeground(STOP_FOREGROUND_REMOVE)
+        super.onDestroy()
     }
 
     override fun onBind(intent: Intent?): IBinder? = null

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

@@ -57,10 +57,10 @@ class CallMessagingService : FirebaseMessagingService() {
             // Foreground → send event directly
             CallModule.sendEventToJS("onCallReceived", data)
         } else {
-            // Background → start foreground service (which in turn starts headless)
+            // Background → start the SILENT wake service
             val serviceIntent =
                 Intent(context, CallForegroundService::class.java).apply {
-                    putExtra("callUuid", uuid) // Key: Pass the UUID here
+                    putExtra("callUuid", uuid)
                     putExtras(
                         Bundle().apply {
                             data.forEach { (k, v) -> putString(k, v) }
@@ -68,11 +68,9 @@ class CallMessagingService : FirebaseMessagingService() {
                     )
                 }
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                context.startForegroundService(serviceIntent)
-            } else {
-                context.startService(serviceIntent)
-            }
+            // FIX: Always use startService here now.
+            // We are no longer making this a "Foreground Service" at the wake stage.
+            context.startService(serviceIntent)
         }
     }
 

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

@@ -1,8 +1,6 @@
 package com.rnsnativecall
 
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
+import android.app.*
 import android.content.Context
 import android.content.Intent
 import android.graphics.Color
@@ -13,12 +11,15 @@ import android.os.Handler
 import android.os.Looper
 import androidx.core.app.NotificationCompat
 import androidx.core.app.Person
+import androidx.core.content.ContextCompat
 
 object NativeCallManager {
-    const val channelId = "CALL_CHANNEL_V14_URGENT"
+    const val channelId = "CALL_CHANNEL_V15_URGENT"
     private var currentCallData: Map<String, String>? = null
 
-    fun getCurrentCallData(): Map<String, String>? = currentCallData
+    @JvmStatic internal var pendingCallNotification: Notification? = null
+
+    @JvmStatic internal var pendingNotificationId: Int? = null
 
     fun handleIncomingPush(
         context: Context,
@@ -27,7 +28,6 @@ object NativeCallManager {
         Handler(Looper.getMainLooper()).post {
             val uuid = data["callUuid"] ?: return@post
             this.currentCallData = data
-
             val name = data["name"] ?: "Incoming Call"
             val notificationId = uuid.hashCode()
             val ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
@@ -39,15 +39,7 @@ object NativeCallManager {
                     PendingIntent.FLAG_UPDATE_CURRENT
                 }
 
-            // 1. Content Intent (Tap notification)
-            val noOpIntent =
-                Intent("com.rnsnativecall.ACTION_NOTIFICATION_TAP_NOOP").apply {
-                    `package` = context.packageName
-                    putExtra("EXTRA_CALL_UUID", uuid)
-                }
-            val contentIntent = PendingIntent.getBroadcast(context, notificationId + 3, noOpIntent, pendingFlags)
-
-            // 2. Full Screen Intent (Wake lockscreen)
+            // Intents
             val overlayIntent =
                 Intent(context, NotificationOverlayActivity::class.java).apply {
                     putExtra("EXTRA_CALL_UUID", uuid)
@@ -56,7 +48,6 @@ object NativeCallManager {
                 }
             val fullScreenPendingIntent = PendingIntent.getActivity(context, notificationId, overlayIntent, pendingFlags)
 
-            // 3. Answer Action
             val answerIntent =
                 Intent(context, CallActionReceiver::class.java).apply {
                     action = "ACTION_ANSWER"
@@ -65,7 +56,6 @@ object NativeCallManager {
                 }
             val answerPendingIntent = PendingIntent.getBroadcast(context, notificationId + 1, answerIntent, pendingFlags)
 
-            // 4. Reject Action
             val rejectIntent =
                 Intent(context, CallActionReceiver::class.java).apply {
                     action = "ACTION_REJECT"
@@ -74,15 +64,14 @@ object NativeCallManager {
                 }
             val rejectPendingIntent = PendingIntent.getBroadcast(context, notificationId + 2, rejectIntent, pendingFlags)
 
-            // Setup Channel with System-Managed Sound
+            // Channel
             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).apply {
-                        lockscreenVisibility = NotificationCompat.VISIBILITY_PUBLIC
+                        lockscreenVisibility = Notification.VISIBILITY_PUBLIC
                         enableVibration(true)
                         setBypassDnd(true)
-                        // System-managed sound ensures the "pill" pops up correctly
                         setSound(
                             ringtoneUri,
                             AudioAttributes
@@ -109,80 +98,31 @@ object NativeCallManager {
                     .setPriority(NotificationCompat.PRIORITY_MAX)
                     .setCategory(NotificationCompat.CATEGORY_CALL)
                     .setOngoing(true)
-                    .setAutoCancel(false)
-                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                    .setContentIntent(contentIntent)
                     .setFullScreenIntent(fullScreenPendingIntent, true)
-                    .setStyle(
-                        NotificationCompat.CallStyle
-                            .forIncomingCall(caller, rejectPendingIntent, answerPendingIntent)
-                            .setAnswerButtonColorHint(Color.GREEN)
-                            .setDeclineButtonColorHint(Color.RED),
-                    ).setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
-
-            // Sending this notification will now trigger the system ringtone automatically
-            notificationManager.notify(notificationId, builder.build())
-        }
-    }
+                    .setStyle(NotificationCompat.CallStyle.forIncomingCall(caller, rejectPendingIntent, answerPendingIntent))
+                    .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
 
-    fun dismissIncomingCall(
-        context: Context,
-        uuid: String?,
-    ) {
-        this.currentCallData = null
-        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            val notification = builder.build()
+            pendingCallNotification = notification
+            pendingNotificationId = notificationId
 
-        if (uuid != null) {
-            // 1. Kill the notification UI
-            notificationManager.cancel(uuid.hashCode())
+            // 1. Start the LOUD UI Service (Google allows this for PHONE_CALL)
+            val uiIntent = Intent(context, CallUiForegroundService::class.java)
+            ContextCompat.startForegroundService(context, uiIntent)
 
-            // 2. IMPORTANT: Stop the Foreground Service process
-            // This ensures the "Pill" in the status bar goes away
-            val serviceIntent = Intent(context, CallForegroundService::class.java)
-            context.stopService(serviceIntent)
+            // 2. Stop the SILENT Wake service (which no longer needs DATA_SYNC)
+            CallForegroundService.stop(context)
         }
     }
 
-    fun connecting(
-        context: Context,
-        uuid: String,
-        name: String,
-        callType: String,
-    ) {
-        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        val builder =
-            NotificationCompat
-                .Builder(context, channelId)
-                .setSmallIcon(context.applicationInfo.icon)
-                .setContentTitle(name)
-                .setContentText("Connecting…")
-                .setPriority(NotificationCompat.PRIORITY_MAX)
-                .setCategory(NotificationCompat.CATEGORY_CALL)
-                .setOngoing(true)
-                .setStyle(NotificationCompat.BigTextStyle().bigText("Connecting…"))
-        notificationManager.notify(uuid.hashCode(), builder.build())
-    }
-
-    fun aborting(
+    fun dismissIncomingCall(
         context: Context,
-        uuid: String,
-        name: String,
-        callType: String,
+        uuid: String?,
     ) {
-        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        val builder =
-            NotificationCompat
-                .Builder(context, channelId)
-                .setSmallIcon(context.applicationInfo.icon)
-                .setContentTitle(name)
-                .setContentText("Aborting…")
-                .setPriority(NotificationCompat.PRIORITY_MAX)
-                .setCategory(NotificationCompat.CATEGORY_CALL)
-                .setOngoing(true)
-        notificationManager.notify(uuid.hashCode(), builder.build())
-    }
-
-    fun stopRingtone() {
-        // No-op: Sound is now managed by the Notification Channel life-cycle
+        pendingCallNotification = null
+        pendingNotificationId = null
+        val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        uuid?.let { manager.cancel(it.hashCode()) }
+        context.stopService(Intent(context, CallUiForegroundService::class.java))
     }
 }

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

@@ -1,6 +1,8 @@
 package com.rnsnativecall
 
 import android.app.Activity
+import android.app.KeyguardManager
+import android.content.Context
 import android.os.Build
 import android.os.Bundle
 import android.view.WindowManager
@@ -10,17 +12,21 @@ class NotificationOverlayActivity : Activity() {
         super.onCreate(savedInstanceState)
 
         // These flags allow the notification pill to show over the lockscreen
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
             setShowWhenLocked(true)
             setTurnScreenOn(true)
+            val km = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+            km.requestDismissKeyguard(this, null)
         } else {
             @Suppress("DEPRECATION")
             window.addFlags(
                 WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
-                WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
-                WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+                    WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
+                    WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or
+                    WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD,
             )
         }
         finish()
     }
-}
+}

package/package.json

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

package/withNativeCallVoip.js

@@ -86,9 +86,9 @@ function withAndroidConfig(config) {
         const permissions = [
             'android.permission.VIBRATE',
             'android.permission.FOREGROUND_SERVICE',
-            'android.permission.FOREGROUND_SERVICE_PHONE_CALL', // ADDED THIS
-            'android.permission.USE_FULL_SCREEN_INTENT', // ADDED THIS
-            'android.permission.MANAGE_ONGOING_CALLS', // ADDED THIS
+            'android.permission.FOREGROUND_SERVICE_PHONE_CALL',
+            'android.permission.USE_FULL_SCREEN_INTENT',
+            'android.permission.MANAGE_ONGOING_CALLS',
             'android.permission.POST_NOTIFICATIONS',
             'android.permission.WAKE_LOCK',
             'android.permission.DISABLE_KEYGUARD',
@@ -107,7 +107,8 @@ function withAndroidConfig(config) {
 
         const services = [
             { name: 'com.rnsnativecall.CallMessagingService', exported: 'false', filter: 'com.google.firebase.MESSAGING_EVENT' },
-            { name: 'com.rnsnativecall.CallForegroundService', type: 'phoneCall' },
+            { name: 'com.rnsnativecall.CallForegroundService' },
+            { name: 'com.rnsnativecall.CallUiForegroundService', type: 'phoneCall' },
             { name: 'com.rnsnativecall.CallHeadlessTask' }
         ];