rns-nativecall 0.4.2 → 0.4.3

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

@@ -1,23 +1,53 @@
 package com.rnsnativecall
 
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
 import android.content.Intent
+import android.content.pm.ServiceInfo
+import android.os.Build
+import androidx.core.app.NotificationCompat
 import com.facebook.react.HeadlessJsTaskService
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.jstasks.HeadlessJsTaskConfig
+import com.facebook.react.jstasks.LinearCountingRetryPolicy
 
 class CallHeadlessTask : HeadlessJsTaskService() {
-    // Note: The '?' after Intent and the return type are specific in Kotlin
+
+    override fun onCreate() {
+        super.onCreate()
+        val channelId = "call_service"
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel = NotificationChannel(channelId, "Call Service", NotificationManager.IMPORTANCE_LOW)
+            val manager = getSystemService(NotificationManager::class.java)
+            manager.createNotificationChannel(channel)
+        }
+
+        val notification: Notification = NotificationCompat.Builder(this, channelId)
+            .setContentTitle("Incoming Call")
+            .setSmallIcon(android.R.drawable.sym_call_incoming)
+            .setPriority(NotificationCompat.PRIORITY_LOW)
+            .build()
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            startForeground(1, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL)
+        } else {
+            startForeground(1, notification)
+        }
+    }
+
     override fun getTaskConfig(intent: Intent?): HeadlessJsTaskConfig? {
         val extras = intent?.extras
         return if (extras != null) {
+            val retryPolicy = LinearCountingRetryPolicy(3, 1000)
             HeadlessJsTaskConfig(
                 "ColdStartCallTask",
                 Arguments.fromBundle(extras),
-                30000, 
-                true 
+                60000, 
+                true,
+                retryPolicy
             )
-        } else {
-            null
-        }
+        } else null
     }
 }

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

@@ -29,47 +29,47 @@ class CallMessagingService : FirebaseMessagingService() {
         val type = data["type"] ?: ""
 
         if (type == "CANCEL") {
-    pendingNotifications[uuid]?.let {
-        handler.removeCallbacks(it)
-        pendingNotifications.remove(uuid)
-    }
-    
-    // Pass the uuid so the manager knows exactly which notification to remove
-    NativeCallManager.dismissIncomingCall(context, uuid)
-    
-    showMissedCallNotification(context, data, uuid)
-    return
-}
+            pendingNotifications[uuid]?.let {
+                handler.removeCallbacks(it)
+                pendingNotifications.remove(uuid)
+            }
+            NativeCallManager.dismissIncomingCall(context, uuid)
+            showMissedCallNotification(context, data, uuid)
+            return
+        }
         
         if (isAppInForeground(context)) {
             CallModule.sendEventToJS("onCallReceived", data)
         } else {
-    // 1. Prepare the Intent
-    val headlessIntent = Intent(context, CallHeadlessTask::class.java)
-    val bundle = Bundle()
-    data.forEach { (k, v) -> bundle.putString(k, v) }
-    headlessIntent.putExtras(bundle)
-    
-    // 2. Start the Service
-    context.startService(headlessIntent)
-    
-    // 3. Acquire WakeLock to prevent the CPU from sleeping during bundling
-    try {
-        HeadlessJsTaskService.acquireWakeLockNow(context)
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
+            // 1. Prepare Intent
+            val headlessIntent = Intent(context, CallHeadlessTask::class.java).apply {
+                putExtras(Bundle().apply {
+                    data.forEach { (k, v) -> putString(k, v) }
+                })
+            }
 
-    // 4. Start the 18s backup timer
-    val showNotificationRunnable = Runnable {
-        if (!isAppInForeground(context)) {
-            NativeCallManager.handleIncomingPush(context, data)
+            // 2. Start Service correctly based on SDK
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                context.startForegroundService(headlessIntent)
+            } else {
+                context.startService(headlessIntent)
+            }
+            
+            // 3. WakeLock
+            try {
+                HeadlessJsTaskService.acquireWakeLockNow(context)
+            } catch (e: Exception) { e.printStackTrace() }
+
+            // 4. Backup Timer
+            val showNotificationRunnable = Runnable {
+                if (!isAppInForeground(context)) {
+                    NativeCallManager.handleIncomingPush(context, data)
+                }
+                pendingNotifications.remove(uuid)
+            }
+            pendingNotifications[uuid] = showNotificationRunnable
+            handler.postDelayed(showNotificationRunnable, 18000) 
         }
-        pendingNotifications.remove(uuid)
-    }
-    pendingNotifications[uuid] = showNotificationRunnable
-    handler.postDelayed(showNotificationRunnable, 18000) 
-}
     }
 
     private fun showMissedCallNotification(context: Context, data: Map<String, String>, uuid: String) {
@@ -77,9 +77,8 @@ class CallMessagingService : FirebaseMessagingService() {
         val callType = data["callType"] ?: "video"
         val channelId = "missed_calls" 
         val article = if (callType.startsWith("a", ignoreCase = true)) "an" else "a"
-        // 1. Format App Name: Capitalized
         val appName = context.applicationInfo.loadLabel(context.packageManager).toString()
-        val capitalizedAppName = appName.replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
+        val capitalizedAppName = appName.replaceFirstChar { it.uppercase() }
 
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
@@ -88,7 +87,6 @@ class CallMessagingService : FirebaseMessagingService() {
             notificationManager.createNotificationChannel(channel)
         }
 
-        // 2. Create Intent to open app when clicking missed call
         val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
         val pendingFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
@@ -106,10 +104,9 @@ class CallMessagingService : FirebaseMessagingService() {
             .setContentText("You missed $article $callType call from $name")
             .setPriority(NotificationCompat.PRIORITY_HIGH)
             .setAutoCancel(true)
-            .setContentIntent(contentIntent) // Opens app on click
+            .setContentIntent(contentIntent)
             .setCategory(NotificationCompat.CATEGORY_MISSED_CALL) 
 
-        // 3. Use unique hashCode so multiple missed calls are stacked separately
         notificationManager.notify(uuid.hashCode(), builder.build())
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "0.4.2",
+    "version": "0.4.3",
     "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",
@@ -43,8 +43,6 @@
         "react-native.config.js",
         "README.md",
         "rns-nativecall.podspec",
-        "withCallNativeConfig.js",
-        "withCallPermissions.js",
         "withNativeCallVoip.js"
     ],
     "peerDependencies": {

package/withNativeCallVoip.js

@@ -5,20 +5,20 @@ function withMainActivityDataFix(config) {
     return withMainActivity(config, (config) => {
         let contents = config.modResults.contents;
 
-        // 1. Add required imports
         const imports = [
             'import android.view.WindowManager',
             'import android.os.Build',
             'import android.os.Bundle',
             'import android.content.Intent'
         ];
+
         imports.forEach(imp => {
             if (!contents.includes(imp)) {
                 contents = contents.replace(/package .*/, (match) => `${match}\n${imp}`);
             }
         });
 
-        // 2. Add the Lockscreen / Wake logic inside onCreate
+        // FIXED: Corrected Kotlin bitwise OR syntax and logic check
         const wakeLogic = `super.onCreate(savedInstanceState)
     if (intent?.getBooleanExtra("navigatingToCall", false) == true) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
@@ -33,7 +33,6 @@ function withMainActivityDataFix(config) {
             contents = contents.replace(/super\.onCreate\(.*\)/, wakeLogic);
         }
 
-        // 3. Ensure onNewIntent is present 
         if (!contents.includes('override fun onNewIntent')) {
             const onNewIntentCode = `
   override fun onNewIntent(intent: Intent) {
@@ -55,14 +54,14 @@ function withAndroidConfig(config) {
         const androidManifest = config.modResults.manifest;
         const mainApplication = androidManifest.application[0];
 
-        // 1. Configure MainActivity flags in Manifest
+        // 1. MainActivity flags
         const mainActivity = mainApplication.activity.find(a => a.$["android:name"] === ".MainActivity");
         if (mainActivity) {
             mainActivity.$["android:showWhenLocked"] = "true";
             mainActivity.$["android:turnScreenOn"] = "true";
         }
 
-        // 2. Unified Permissions
+        // 2. Permissions
         const permissions = [
             'android.permission.USE_FULL_SCREEN_INTENT',
             'android.permission.VIBRATE',
@@ -70,7 +69,9 @@ function withAndroidConfig(config) {
             'android.permission.FOREGROUND_SERVICE_PHONE_CALL',
             'android.permission.POST_NOTIFICATIONS',
             'android.permission.WAKE_LOCK',
+            'android.permission.MANAGE_OWN_CALLS',
             'android.permission.DISABLE_KEYGUARD',
+            'android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS',
             'android.permission.RECEIVE_BOOT_COMPLETED'
         ];
 
@@ -81,7 +82,7 @@ function withAndroidConfig(config) {
             }
         });
 
-        // 3. AcceptCallActivity Registration
+        // 3. Activity/Service/Receiver registration (Cleaned up duplicates)
         mainApplication.activity = mainApplication.activity || [];
         if (!mainApplication.activity.some(a => a.$['android:name'] === 'com.rnsnativecall.AcceptCallActivity')) {
             mainApplication.activity.push({
@@ -95,48 +96,34 @@ function withAndroidConfig(config) {
             });
         }
 
-        // 4. Service Setup
         mainApplication.service = mainApplication.service || [];
 
-        const services = [
-            {
-                name: 'com.rnsnativecall.CallMessagingService',
-                intentFilter: 'com.google.firebase.MESSAGING_EVENT'
-            },
-            {
-                name: 'com.rnsnativecall.CallHeadlessTask'
-            }
-        ];
+        // Messaging Service
+        if (!mainApplication.service.some(s => s.$['android:name'] === 'com.rnsnativecall.CallMessagingService')) {
+            mainApplication.service.push({
+                $: { 'android:name': 'com.rnsnativecall.CallMessagingService', 'android:exported': 'false' },
+                'intent-filter': [{ action: [{ $: { 'android:name': 'com.google.firebase.MESSAGING_EVENT' } }] }]
+            });
+        }
 
-        services.forEach(svc => {
-            if (!mainApplication.service.some(s => s.$['android:name'] === svc.name)) {
-                const serviceEntry = {
-                    $: {
-                        'android:name': svc.name,
-                        'android:exported': 'false',
-                        'android:foregroundServiceType': 'phoneCall'
-                    }
-                };
-                if (svc.intentFilter) {
-                    serviceEntry['intent-filter'] = [{ action: [{ $: { 'android:name': svc.intentFilter } }] }];
-                }
-                mainApplication.service.push(serviceEntry);
+        // Headless Task Service (Fixed for Android 14)
+        const headlessName = 'com.rnsnativecall.CallHeadlessTask';
+        const headlessIndex = mainApplication.service.findIndex(s => s.$['android:name'] === headlessName);
+        const headlessEntry = {
+            $: {
+                'android:name': headlessName,
+                'android:exported': 'false',
+                'android:foregroundServiceType': 'phoneCall'
             }
-        });
+        };
 
-        // 5. Receiver Setup
-        mainApplication.receiver = mainApplication.receiver || [];
-        if (!mainApplication.receiver.some(r => r.$['android:name'] === 'com.rnsnativecall.CallActionReceiver')) {
-            mainApplication.receiver.push({
-                $: { 'android:name': 'com.rnsnativecall.CallActionReceiver', 'android:exported': 'false' }
-            });
-        }
+        if (headlessIndex > -1) mainApplication.service[headlessIndex] = headlessEntry;
+        else mainApplication.service.push(headlessEntry);
 
         return config;
     });
 }
 
-/** 3. IOS CONFIG **/
 function withIosConfig(config) {
     return withInfoPlist(config, (config) => {
         const infoPlist = config.modResults;

package/withCallNativeConfig.js

@@ -1,148 +0,0 @@
-///withCallNativeConfig.js
-const { withAndroidManifest, withInfoPlist, withPlugins, withMainActivity } = require('@expo/config-plugins');
-
-/** 1. ANDROID MAIN ACTIVITY MODS **/
-function withMainActivityDataFix(config) {
-    return withMainActivity(config, (config) => {
-        let contents = config.modResults.contents;
-
-        // Ensure necessary Imports
-        if (!contents.includes('import android.content.Intent')) {
-            contents = contents.replace(/package .*/, (match) => `${match}\n\nimport android.content.Intent`);
-        }
-        if (!contents.includes('import android.os.Bundle')) {
-            contents = contents.replace(/package .*/, (match) => `${match}\n\nimport android.os.Bundle`);
-        }
-
-        const onNewIntentCode = `
-  override fun onNewIntent(intent: Intent) {
-    super.onNewIntent(intent)
-    setIntent(intent)
-  }
-`;
-
-        const onCreateCode = `
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    // If woken up by a background task, push to back immediately
-    if (intent.getBooleanExtra("background_wake", false)) {
-        moveTaskToBack(true)
-    }
-  }
-`;
-
-        // Insertion logic
-        if (!contents.includes('override fun onNewIntent')) {
-            contents = contents.replace(/class MainActivity : .*/, (match) => `${match}\n${onNewIntentCode}`);
-        }
-
-        if (!contents.includes('override fun onCreate')) {
-            // Find the end of the class or after onNewIntent
-            const lastBraceIndex = contents.lastIndexOf('}');
-            contents = contents.slice(0, lastBraceIndex) + onCreateCode + contents.slice(lastBraceIndex);
-        }
-
-        config.modResults.contents = contents;
-        return config;
-    });
-}
-
-/** 2. ANDROID MANIFEST CONFIG **/
-function withAndroidConfig(config) {
-    return withAndroidManifest(config, (config) => {
-        const manifest = config.modResults.manifest;
-        const application = manifest.application[0];
-
-        // 1. Permissions (Updated for Android 14 compatibility)
-        const permissions = [
-            'android.permission.USE_FULL_SCREEN_INTENT',
-            'android.permission.VIBRATE',
-            'android.permission.FOREGROUND_SERVICE',
-            'android.permission.FOREGROUND_SERVICE_PHONE_CALL',
-            'android.permission.POST_NOTIFICATIONS',
-            'android.permission.WAKE_LOCK',
-            'android.permission.DISABLE_KEYGUARD',
-            'android.permission.RECEIVE_BOOT_COMPLETED'
-        ];
-
-        manifest['uses-permission'] = manifest['uses-permission'] || [];
-        permissions.forEach((perm) => {
-            if (!manifest['uses-permission'].some((p) => p.$['android:name'] === perm)) {
-                manifest['uses-permission'].push({ $: { 'android:name': perm } });
-            }
-        });
-
-        // 2. Activity Setup (AcceptCallActivity)
-        application.activity = application.activity || [];
-        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 Registration (The Headless Enforcer)
-        application.service = application.service || [];
-
-        // Firebase Messaging Service
-        if (!application.service.some(s => s.$['android:name'] === 'com.rnsnativecall.CallMessagingService')) {
-            application.service.push({
-                $: {
-                    'android:name': 'com.rnsnativecall.CallMessagingService',
-                    'android:exported': 'false'
-                },
-                'intent-filter': [{
-                    action: [{ $: { 'android:name': 'com.google.firebase.MESSAGING_EVENT' } }]
-                }]
-            });
-        }
-
-        // Headless Task Service
-        if (!application.service.some(s => s.$['android:name'] === 'com.rnsnativecall.CallHeadlessTask')) {
-            application.service.push({
-                $: {
-                    'android:name': 'com.rnsnativecall.CallHeadlessTask',
-                    'android:exported': 'false' // Headless JS should be internal only
-                }
-            });
-        }
-
-        // 4. Action Receiver
-        application.receiver = application.receiver || [];
-        if (!application.receiver.some(r => r.$['android:name'] === 'com.rnsnativecall.CallActionReceiver')) {
-            application.receiver.push({
-                $: { 'android:name': 'com.rnsnativecall.CallActionReceiver', 'android:exported': 'false' }
-            });
-        }
-
-        return config;
-    });
-}
-
-/** 3. IOS CONFIG **/
-function withIosConfig(config) {
-    return withInfoPlist(config, (config) => {
-        const infoPlist = config.modResults;
-        if (!infoPlist.UIBackgroundModes) infoPlist.UIBackgroundModes = [];
-        ['voip', 'audio', 'remote-notification'].forEach(mode => {
-            if (!infoPlist.UIBackgroundModes.includes(mode)) infoPlist.UIBackgroundModes.push(mode);
-        });
-        return config;
-    });
-}
-
-module.exports = (config) => {
-    return withPlugins(config, [
-        withAndroidConfig,
-        withMainActivityDataFix,
-        withIosConfig
-    ]);
-};

package/withCallPermissions.js

@@ -1,42 +0,0 @@
-//withCallPermissions.js
-const { withPlugins, withAndroidManifest } = require('@expo/config-plugins');
-
-
-/** 2. ANDROID MANIFEST MOD **/
-function withCallPermissions(config) {
-    return withAndroidManifest(config, async (config) => {
-        const androidManifest = config.modResults.manifest;
-
-        // 1. Add the Full Screen Intent Permission
-        if (!androidManifest["uses-permission"]) {
-            androidManifest["uses-permission"] = [];
-        }
-
-        const hasPermission = androidManifest["uses-permission"].some(
-            (p) => p.$["android:name"] === "android.permission.USE_FULL_SCREEN_INTENT"
-        );
-
-        if (!hasPermission) {
-            androidManifest["uses-permission"].push({
-                $: { "android:name": "android.permission.USE_FULL_SCREEN_INTENT" },
-            });
-        }
-
-        // 2. Ensure the Activity has the correct flags to appear over lockscreen
-        const mainApplication = androidManifest.application[0];
-        const mainActivity = mainApplication.activity.find(
-            (a) => a.$["android:name"] === ".MainActivity"
-        );
-
-        if (mainActivity) {
-            mainActivity.$["android:showOnLockScreen"] = "true";
-            mainActivity.$["android:lockTaskMode"] = "if_whitelisted";
-        }
-
-        return config;
-    });
-}
-
-module.exports = (config) => {
-    return withPlugins(config, [withCallPermissions]);
-};