rns-nativecall 0.3.3 → 0.3.4

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

@@ -0,0 +1,22 @@
+package com.rnsnativecall
+
+import android.content.Intent
+import com.facebook.react.HeadlessJsTaskService
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.jstasks.HeadlessJsTaskConfig
+
+class CallHeadlessTask : HeadlessJsTaskService() {
+    override fun getTaskConfig(intent: Intent): HeadlessJsTaskConfig? {
+        val extras = intent.extras
+        return if (extras != null) {
+            HeadlessJsTaskConfig(
+                "ColdStartCallTask", // This name must match JS registration
+                Arguments.fromBundle(extras),
+                5000, // Timeout for the task
+                true  // Allowed in foreground
+            )
+        } else {
+            null
+        }
+    }
+}

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

@@ -3,10 +3,12 @@ package com.rnsnativecall
 import android.app.ActivityManager
 import android.content.Context
 import android.content.Intent
+import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
+import com.facebook.react.HeadlessJsTaskService
 
 class CallMessagingService : FirebaseMessagingService() {
 
@@ -15,18 +17,18 @@ class CallMessagingService : FirebaseMessagingService() {
         val context = applicationContext
         
         if (isAppInForeground(context)) {
+            // App is visible: Send event to active JS bridge
             CallModule.sendEventToJS("onCallReceived", data)
         } else {
-            // 1. START WAKING THE APP IMMEDIATELY
-            // We launch the "AcceptCallActivity" with a special flag 
-            // OR just trigger the Bridge via an Intent.
-            wakeUpReactContext(context, data)
+            // App is killed/background: Start the Headless JS Task
+            // This wakes up the JS engine and connects your WebSocket
+            startHeadlessTask(context, data)
 
-            // 2. Start the 18-second "Safety" timer
+            // Start the 18-second "System Pill" backup timer
             val handler = Handler(Looper.getMainLooper())
             handler.postDelayed({
-                // Re-check: If the bridge woke up and the user navigated in-app, 
-                // isAppInForeground will now be true.
+                // Final safety check: if the user hasn't brought the app to foreground,
+                // show the native full-screen notification (The Pill)
                 if (!isAppInForeground(context)) {
                     NativeCallManager.handleIncomingPush(context, data)
                 }
@@ -34,24 +36,17 @@ class CallMessagingService : FirebaseMessagingService() {
         }
     }
 
-    private fun wakeUpReactContext(context: Context, data: Map<String, String>) {
-        try {
-            // We use the Launch Intent to trigger the splash/main activity boot sequence
-            // but we don't bring it to the front yet (it stays in background process)
-            val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
-            launchIntent?.apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                // Add a hidden flag so your Splash screen knows it's a "silent boot"
-                putExtra("silent_wake", true) 
-                data.forEach { (key, value) -> putExtra(key, value) }
-            }
-            
-            // This starts the process and the React Native Bridge
-            // Note: On Android 10+, this won't show the UI, but it WILL start the process.
-            context.startActivity(launchIntent)
-        } catch (e: Exception) {
-            // Log error
-        }
+    private fun startHeadlessTask(context: Context, data: Map<String, String>) {
+        val serviceIntent = Intent(context, CallHeadlessTask::class.java)
+        val bundle = Bundle()
+        
+        // Pass all FCM data to the JS task
+        data.forEach { (key, value) -> bundle.putString(key, value) }
+        serviceIntent.putExtras(bundle)
+        
+        // Start the service. This triggers the 'ColdStartCallTask' in index.js
+        context.startService(serviceIntent)
+        HeadlessJsTaskService.acquireWakeLockNow(context)
     }
 
     private fun isAppInForeground(context: Context): Boolean {
@@ -60,6 +55,9 @@ class CallMessagingService : FirebaseMessagingService() {
         val packageName = context.packageName
         
         for (appProcess in appProcesses) {
+            // IMPORTANCE_FOREGROUND only triggers if a real Activity is on screen.
+            // Running a Headless Task counts as IMPORTANCE_VISIBLE or lower, 
+            // so this check remains accurate.
             if (appProcess.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND && 
                 appProcess.processName == packageName) {
                 return true

package/package.json

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

package/withNativeCallVoip.js

@@ -50,37 +50,29 @@ function withAndroidConfig(config) {
             }
         });
 
-        // 2. Activity Cleanup & Setup
+        // 2. Activity Setup
         application.activity = application.activity || [];
 
-        // Remove old/redundant activities
-        application.activity = application.activity.filter(a =>
-            a.$['android:name'] !== 'com.rnsnativecall.IncomingCallActivity' &&
-            a.$['android:name'] !== 'com.rnsnativecall.AcceptCallActivity'
-        );
-
-        // Add the specific AcceptCallActivity (Trampoline)
-        application.activity.push({
-            $: {
-                'android:name': 'com.rnsnativecall.AcceptCallActivity',
-                'android:theme': '@android:style/Theme.Translucent.NoTitleBar',
-                'android:excludeFromRecents': 'true',
-                'android:noHistory': 'true',
-                'android:exported': 'false',
-                'android:launchMode': 'singleInstance',
-                'android:showWhenLocked': 'true',
-                'android:turnScreenOn': 'true'
-            }
-        });
+        // Add AcceptCallActivity (The Trampoline)
+        if (!application.activity.some(a => a.$['android:name'] === 'com.rnsnativecall.AcceptCallActivity')) {
+            application.activity.push({
+                $: {
+                    'android:name': 'com.rnsnativecall.AcceptCallActivity',
+                    'android:theme': '@android:style/Theme.Translucent.NoTitleBar',
+                    'android:excludeFromRecents': 'true',
+                    'android:noHistory': 'true',
+                    'android:exported': 'false',
+                    'android:launchMode': 'singleInstance',
+                    'android:showWhenLocked': 'true',
+                    'android:turnScreenOn': 'true'
+                }
+            });
+        }
 
-        // 3. Service Cleanup & Setup (Firebase only)
+        // 3. Service Setup (Firebase + Headless Task)
         application.service = application.service || [];
 
-        // Explicitly remove Telecom Service
-        application.service = application.service.filter(
-            s => s.$['android:name'] !== 'com.rnsnativecall.MyConnectionService'
-        );
-
+        // Add Firebase Messaging Service
         const firebaseServiceName = 'com.rnsnativecall.CallMessagingService';
         if (!application.service.some(s => s.$['android:name'] === firebaseServiceName)) {
             application.service.push({
@@ -92,6 +84,17 @@ function withAndroidConfig(config) {
             });
         }
 
+        // Add Headless JS Task Service
+        const headlessServiceName = 'com.rnsnativecall.CallHeadlessTask';
+        if (!application.service.some(s => s.$['android:name'] === headlessServiceName)) {
+            application.service.push({
+                $: {
+                    'android:name': headlessServiceName,
+                    'android:exported': 'false'
+                }
+            });
+        }
+
         // 4. Receiver Setup
         application.receiver = application.receiver || [];
         const receiverName = 'com.rnsnativecall.CallActionReceiver';