rns-nativecall 0.1.6 → 0.1.7

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

@@ -0,0 +1,38 @@
+package com.rnsnativecall
+
+import android.app.Activity
+import android.app.NotificationManager
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+
+class AcceptCallActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // 1. CLEAR THE PILL IMMEDIATELY
+        val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.cancel(101)
+
+        // 2. PREPARE DATA FOR JS
+        val dataMap = mutableMapOf<String, String>()
+        intent.extras?.keySet()?.forEach { key ->
+            intent.getStringExtra(key)?.let { dataMap[key] = it }
+        }
+
+        // 3. SEND EVENT TO REACT NATIVE
+        CallModule.sendEventToJS("onCallAccepted", dataMap)
+
+        // 4. OPEN THE MAIN APP
+        val launchIntent = packageManager.getLaunchIntentForPackage(packageName)
+        launchIntent?.apply {
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+            putExtras(intent.extras ?: Bundle())
+            putExtra("navigatingToCall", true)
+        }
+        startActivity(launchIntent)
+
+        // 5. KILL THIS INVISIBLE WINDOW
+        finish()
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.rnsnativecall
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.app.NotificationManager
+import android.os.Bundle
+
+class CallActionReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        val uuid = intent.getStringExtra("EXTRA_CALL_UUID")
+        
+        // 1. Clear the notification
+        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.cancel(101)
+
+        if (intent.action == "ACTION_ACCEPT") {
+            // 2. Prepare the data for React Native
+            val dataMap = mutableMapOf<String, String>()
+            intent.extras?.keySet()?.forEach { key ->
+                intent.getStringExtra(key)?.let { dataMap[key] = it }
+            }
+
+            // 3. Send the event to JS if the app is already running in background
+            CallModule.sendEventToJS("onCallAccepted", dataMap)
+
+            // 4. Bring the app to foreground
+            val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
+            launchIntent?.apply {
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+                // Forward the extras so the App can read them on startup/resume
+                putExtras(intent.extras ?: Bundle())
+                putExtra("navigatingToCall", true)
+            }
+            context.startActivity(launchIntent)
+        } else {
+            // Logic for Reject
+            CallModule.sendEventToJS("onCallRejected", mapOf("callUUID" to uuid))
+        }
+    }
+}

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

@@ -1,55 +1,89 @@
 package com.rnsnativecall
 
-import android.content.ComponentName
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
 import android.content.Context
-import android.net.Uri
-import android.os.Bundle
-import android.telecom.PhoneAccountHandle
-import android.telecom.TelecomManager
-import android.telecom.VideoProfile
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
 
 object NativeCallManager {
 
- // Inside NativeCallManager.kt
-fun handleIncomingPush(context: Context, data: Map<String, String>) {
-    val uuid = data["callId"] ?: ""
-    val name = data["name"] ?: "Unknown"
-    
-    // Create the Intent for the FullScreen Activity
-    val fullScreenIntent = Intent(context, IncomingCallActivity::class.java).apply {
-        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_NO_USER_ACTION
-        putExtra("EXTRA_CALL_UUID", uuid)
-        putExtra("EXTRA_CALLER_NAME", name)
-    }
+    fun handleIncomingPush(context: Context, data: Map<String, String>) {
+        val uuid = data["callId"] ?: return
+        val name = data["name"] ?: "Incoming Call"
+        val callType = data["callType"] ?: "audio"
 
-    val fullScreenPendingIntent = PendingIntent.getActivity(context, 0,
-        fullScreenIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
-
-    // Build the Notification
-    val notificationBuilder = NotificationCompat.Builder(context, "CALL_CHANNEL_ID")
-        .setSmallIcon(context.applicationInfo.icon)
-        .setContentTitle("Incoming Call")
-        .setContentText(name)
-        .setPriority(NotificationCompat.PRIORITY_MAX)
-        .setCategory(NotificationCompat.CATEGORY_CALL)
-        .setFullScreenIntent(fullScreenPendingIntent, true) // High Priority HUN
-        .setOngoing(true)
-        .setAutoCancel(false)
-
-    val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-    
-    // Create Channel for Android O+
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        val channel = NotificationChannel("CALL_CHANNEL_ID", "Incoming Calls", NotificationManager.IMPORTANCE_HIGH)
-        notificationManager.createNotificationChannel(channel)
-    }
+        val pendingFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        } else {
+            PendingIntent.FLAG_UPDATE_CURRENT
+        }
 
-    notificationManager.notify(101, notificationBuilder.build())
+        // 1. DUMMY INTENT: This is the key to making the Pill "Sticky".
+        // It prevents the notification from disappearing but doesn't open a screen.
+        val dummyIntent = PendingIntent.getActivity(
+            context, 
+            0, 
+            Intent(), 
+            pendingFlags
+        )
+
+// 2. Accept Action
+val acceptIntent = Intent(context, AcceptCallActivity::class.java).apply {
+    action = "ACTION_ACCEPT"
+    putExtra("EXTRA_CALL_UUID", uuid)
+    data.forEach { (key, value) -> putExtra(key, value) }
+    // Crucial for launching from a notification
+    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
 }
- 
 
-    private fun getPhoneAccountHandle(context: Context): PhoneAccountHandle {
-        val componentName = ComponentName(context, MyConnectionService::class.java)
-        return PhoneAccountHandle(componentName, "${context.packageName}.voip")
+// Keep this as getActivity
+val acceptPendingIntent = PendingIntent.getActivity(
+    context, 
+    1001, 
+    acceptIntent, 
+    pendingFlags
+)
+        // 3. Reject Action
+        val rejectIntent = Intent(context, CallActionReceiver::class.java).apply {
+            action = "ACTION_REJECT"
+            putExtra("EXTRA_CALL_UUID", uuid)
+        }
+        val rejectPendingIntent = PendingIntent.getBroadcast(context, 1002, rejectIntent, pendingFlags)
+
+        // 4. Setup Channel (Ensure Importance is HIGH)
+        val channelId = "CALL_CHANNEL_ID"
+        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 {
+                description = "Shows incoming call notifications"
+                enableVibration(true)
+                // Critical for bypassing "Do Not Disturb"
+                setBypassDnd(true)
+                lockscreenVisibility = NotificationCompat.VISIBILITY_PUBLIC
+            }
+            notificationManager.createNotificationChannel(channel)
+        }
+
+        // 5. Build the Notification
+        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) // Prevents user from swiping it away
+            .setAutoCancel(false)
+            
+            // This is what keeps the Heads-Up "Pill" visible indefinitely:
+            .setFullScreenIntent(dummyIntent, true) 
+            
+            .addAction(0, "Answer", acceptPendingIntent)
+            .addAction(0, "Decline", rejectPendingIntent)
+
+        notificationManager.notify(101, builder.build())
     }
 }

package/android/src/main/res/values/styles.xml

@@ -1,3 +1,12 @@
-<style name="CircleImage">
-    <item name="cornerSize">50%</item>
-</style>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="CircleImage" parent="">
+        <item name="cornerSize">50%</item>
+    </style>
+
+    <style name="Theme.IncomingCall" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
+    </style>
+</resources>

package/index.js

@@ -38,10 +38,10 @@ export const CallHandler = {
     displayCall: async (uuid, number, name, hasVideo = false, shouldRing = true) => {
         if (!CallModule) return false;
 
-        if (Platform.OS === 'android') {
-            const hasPerms = await ensureAndroidPermissions();
-            if (!hasPerms) return false;
-        }
+        // if (Platform.OS === 'android') {
+        //     const hasPerms = await ensureAndroidPermissions();
+        //     if (!hasPerms) return false;
+        // }
 
         try {
             return await CallModule.displayIncomingCall(

package/package.json

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

@@ -1,14 +1,11 @@
 const { withAndroidManifest, withInfoPlist, withPlugins } = require('@expo/config-plugins');
 
-/**
- * ANDROID CONFIGURATION
- */
 function withAndroidConfig(config) {
     return withAndroidManifest(config, (config) => {
         const manifest = config.modResults;
         const application = manifest.manifest.application[0];
 
-        // 1. Unified Permissions List
+        // 1. Permissions
         const permissions = [
             'android.permission.READ_PHONE_NUMBERS',
             'android.permission.CALL_PHONE',
@@ -26,84 +23,73 @@ function withAndroidConfig(config) {
             }
         });
 
-        // 2. Register IncomingCallActivity
+        // 2. Activities (UI Components)
         application.activity = application.activity || [];
-        const activityName = 'com.rnsnativecall.IncomingCallActivity';
-        if (!application.activity.some(a => a.$['android:name'] === activityName)) {
+
+        // IncomingCallActivity (Optional lock screen UI)
+        if (!application.activity.some(a => a.$['android:name'] === 'com.rnsnativecall.IncomingCallActivity')) {
             application.activity.push({
                 $: {
-                    'android:name': activityName,
+                    'android:name': 'com.rnsnativecall.IncomingCallActivity',
                     'android:showOnLockScreen': 'true',
                     'android:launchMode': 'singleInstance',
-                    'android:excludeFromRecents': 'true',
-                    'android:screenOrientation': 'portrait',
                     'android:theme': '@style/Theme.AppCompat.Light.NoActionBar'
                 }
             });
         }
 
-        // 3. Services (ConnectionService & FCM)
-        application.service = application.service || [];
+        // AcceptCallActivity (The "Trampoline" that fixes the Answer button)
+        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'
+                }
+            });
+        }
 
+        // 3. Services (FCM and Telecom)
+        application.service = application.service || [];
         const services = [
-            {
-                name: 'com.rnsnativecall.MyConnectionService',
-                permission: 'android.permission.BIND_CONNECTION_SERVICE',
-                action: 'android.telecom.ConnectionService',
-                exported: 'true'
-            },
-            {
-                name: 'com.rnsnativecall.CallMessagingService',
-                action: 'com.google.firebase.MESSAGING_EVENT',
-                exported: 'false'
-            }
+            { name: 'com.rnsnativecall.MyConnectionService', permission: 'android.permission.BIND_CONNECTION_SERVICE', action: 'android.telecom.ConnectionService' },
+            { name: 'com.rnsnativecall.CallMessagingService', action: 'com.google.firebase.MESSAGING_EVENT' }
         ];
 
         services.forEach(svc => {
             if (!application.service.some(s => s.$['android:name'] === svc.name)) {
-                const serviceObj = {
-                    $: { 'android:name': svc.name, 'android:exported': svc.exported },
+                application.service.push({
+                    $: { 'android:name': svc.name, 'android:exported': svc.permission ? 'true' : 'false', 'android:permission': svc.permission },
                     'intent-filter': [{ action: [{ $: { 'android:name': svc.action } }] }]
-                };
-                if (svc.permission) serviceObj.$['android:permission'] = svc.permission;
-                application.service.push(serviceObj);
+                });
             }
         });
 
+        // 4. Receivers (The Decline Button)
+        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;
     });
 }
 
-/**
- * IOS CONFIGURATION
- */
+/** IOS Config remains the same **/
 function withIosConfig(config) {
     return withInfoPlist(config, (config) => {
         const infoPlist = config.modResults;
-
-        // 1. Add background modes
-        if (!infoPlist.UIBackgroundModes) {
-            infoPlist.UIBackgroundModes = [];
-        }
-
-        ['voip', 'audio'].forEach((mode) => {
-            if (!infoPlist.UIBackgroundModes.includes(mode)) {
-                infoPlist.UIBackgroundModes.push(mode);
-            }
-        });
-
-        // 2. Dynamic Microphone Description
-        const appName = config.name || 'this app';
-        infoPlist.NSMicrophoneUsageDescription =
-            infoPlist.NSMicrophoneUsageDescription || `Allow ${appName} to access your microphone for calls.`;
-
+        if (!infoPlist.UIBackgroundModes) infoPlist.UIBackgroundModes = [];
+        ['voip', 'audio'].forEach(mode => { if (!infoPlist.UIBackgroundModes.includes(mode)) infoPlist.UIBackgroundModes.push(mode); });
         return config;
     });
 }
 
 module.exports = (config) => {
-    return withPlugins(config, [
-        withAndroidConfig,
-        withIosConfig,
-    ]);
-};
+    return withPlugins(config, [withAndroidConfig, withIosConfig]);
+};