rns-nativecall 0.1.7 → 0.1.9

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

@@ -9,30 +9,46 @@ import android.os.Bundle
 class AcceptCallActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        // 1. CLEAR THE PILL IMMEDIATELY
+        NativeCallManager.stopRingtone()
+        // 1. CLEAR THE NOTIFICATION
+        // Use the same ID (101) used in NativeCallManager
         val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         notificationManager.cancel(101)
 
-        // 2. PREPARE DATA FOR JS
+        // 2. EXTRACT DATA SAFELY
+        // We iterate through all extras and convert them to Strings for the JS Map
         val dataMap = mutableMapOf<String, String>()
-        intent.extras?.keySet()?.forEach { key ->
-            intent.getStringExtra(key)?.let { dataMap[key] = it }
+        val extras = intent.extras
+        extras?.keySet()?.forEach { key ->
+            val value = extras.get(key)
+            if (value != null) {
+                dataMap[key] = value.toString()
+            }
         }
 
-        // 3. SEND EVENT TO REACT NATIVE
+        // 3. EMIT EVENT TO REACT NATIVE
+        // This handles the case where the app is already in the background/foreground
         CallModule.sendEventToJS("onCallAccepted", dataMap)
 
-        // 4. OPEN THE MAIN APP
+        // 4. LAUNCH OR BRING MAIN APP TO FOREGROUND
         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)
+        if (launchIntent != null) {
+            launchIntent.apply {
+                // FLAG_ACTIVITY_SINGLE_TOP: Updates the app if it's already open
+                // FLAG_ACTIVITY_NEW_TASK: Required when starting from a non-activity context
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+                
+                // Copy all call data to the launch intent
+                putExtras(extras ?: Bundle())
+                
+                // Helper flag for your React Native logic
+                putExtra("navigatingToCall", true)
+            }
+            startActivity(launchIntent)
         }
-        startActivity(launchIntent)
 
-        // 5. KILL THIS INVISIBLE WINDOW
+        // 5. FINISH TRAMPOLINE
+        // This ensures this invisible activity doesn't stay in the "Recent Apps" list
         finish()
     }
 }

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

@@ -8,6 +8,7 @@ import android.os.Bundle
 
 class CallActionReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
+        NativeCallManager.stopRingtone()
         val uuid = intent.getStringExtra("EXTRA_CALL_UUID")
         
         // 1. Clear the notification
@@ -15,6 +16,7 @@ class CallActionReceiver : BroadcastReceiver() {
         notificationManager.cancel(101)
 
         if (intent.action == "ACTION_ACCEPT") {
+            NativeCallManager.stopRingtone()
             // 2. Prepare the data for React Native
             val dataMap = mutableMapOf<String, String>()
             intent.extras?.keySet()?.forEach { key ->
@@ -34,6 +36,7 @@ class CallActionReceiver : BroadcastReceiver() {
             }
             context.startActivity(launchIntent)
         } else {
+            NativeCallManager.stopRingtone()
             // Logic for Reject
             CallModule.sendEventToJS("onCallRejected", mapOf("callUUID" to uuid))
         }

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

@@ -1,14 +1,34 @@
-///
-// Users/bush/Desktop/Packages/rns-nativecall/android/src/main/java/com/rnsnativecall/CallMessagingService.kt
 package com.rnsnativecall
 
+import android.app.ActivityManager
+import android.content.Context
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 
 class CallMessagingService : FirebaseMessagingService() {
 
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
-        // Directly forward to your native call manager
-        NativeCallManager.handleIncomingPush(applicationContext, remoteMessage.data)
+        if (isAppInForeground(applicationContext)) {
+            // 1. App is OPEN: Don't show the system pill.
+            // Just send the data to your React Native listeners.
+            CallModule.sendEventToJS("onCallReceived", remoteMessage.data)
+        } else {
+            // 2. App is CLOSED/BACKGROUND: Show the sticky system pill.
+            NativeCallManager.handleIncomingPush(applicationContext, remoteMessage.data)
+        }
     }
-}
+
+    private fun isAppInForeground(context: Context): Boolean {
+        val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+        val appProcesses = activityManager.runningAppProcesses ?: return false
+        val packageName = context.packageName
+        
+        for (appProcess in appProcesses) {
+            if (appProcess.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND && 
+                appProcess.processName == packageName) {
+                return true
+            }
+        }
+        return false
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.rnsnativecall
 
+import android.app.NotificationManager
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
@@ -9,11 +10,9 @@ import android.telecom.DisconnectCause
 import android.telecom.PhoneAccount
 import android.telecom.PhoneAccountHandle
 import android.telecom.TelecomManager
+import android.widget.Toast
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
-import android.widget.Toast
-import com.google.android.material.snackbar.Snackbar
-import android.view.View
 
 class CallModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
@@ -30,45 +29,33 @@ class CallModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
     }
 
     private fun registerPhoneAccount() {
-    val telecomManager = reactApplicationContext.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
-    val phoneAccountHandle = getPhoneAccountHandle()
-
-    val appName = reactApplicationContext.applicationInfo.loadLabel(reactApplicationContext.packageManager).toString()
-
-    // ✅ FIXED: Removed CAPABILITY_CALL_PROVIDER
-    // Self-managed apps only need these specific flags
-    val capabilities = PhoneAccount.CAPABILITY_VIDEO_CALLING or
-                          PhoneAccount.CAPABILITY_SUPPORTS_VIDEO_CALLING
-
-    val phoneAccount = PhoneAccount.builder(phoneAccountHandle, appName)
-        .setCapabilities(capabilities)
-        .setShortDescription(appName)
-        .addSupportedUriScheme("sip")
-        .addSupportedUriScheme("tel")
-        .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED)
-        .setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER)
-        .build()
-
-    telecomManager.registerPhoneAccount(phoneAccount)
-}
-
-    @ReactMethod
-    fun displayIncomingCall(uuid: String, number: String, name: String, hasVideo: Boolean, playRing: Boolean, promise: Promise) {
         val telecomManager = reactApplicationContext.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle()
+        val appName = reactApplicationContext.applicationInfo.loadLabel(reactApplicationContext.packageManager).toString()
 
-         val extras = Bundle().apply {
-            putParcelable(TelecomManager.EXTRA_INCOMING_CALL_ADDRESS, Uri.fromParts("sip", number, null))
-            putString("EXTRA_CALL_UUID", uuid)
+        val capabilities = PhoneAccount.CAPABILITY_VIDEO_CALLING or
+                PhoneAccount.CAPABILITY_SUPPORTS_VIDEO_CALLING or
+                PhoneAccount.CAPABILITY_SELF_MANAGED
 
-            putString("EXTRA_CALLER_NAME", name)
-            putString(TelecomManager.EXTRA_CALL_SUBJECT, number)
-            putBoolean("EXTRA_PLAY_RING", false)
-            putBoolean(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, hasVideo)
+        val phoneAccount = PhoneAccount.builder(phoneAccountHandle, appName)
+            .setCapabilities(capabilities)
+            .setShortDescription(appName)
+            .addSupportedUriScheme("sip")
+            .addSupportedUriScheme("tel")
+            .build()
 
-        }
+        telecomManager.registerPhoneAccount(phoneAccount)
+    }
+
+    @ReactMethod
+    fun displayIncomingCall(uuid: String, name: String, callType: String, promise: Promise) {
         try {
-            telecomManager.addNewIncomingCall(phoneAccountHandle, extras)
+            val data = mapOf(
+                "callUuid" to uuid,
+                "name" to name,
+                "callType" to callType
+            )
+            NativeCallManager.handleIncomingPush(reactApplicationContext, data)
             promise.resolve(true)
         } catch (e: Exception) {
             promise.reject("CALL_ERROR", e.message)
@@ -77,68 +64,57 @@ class CallModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
 
     @ReactMethod
     fun endNativeCall(uuid: String) {
+        NativeCallManager.stopRingtone()
+        val notificationManager = reactApplicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.cancel(101)
+
         val connection = MyConnectionService.getConnection(uuid)
         connection?.let {
-            it.setDisconnected(DisconnectCause(DisconnectCause.LOCAL))
+            it.setDisconnected(DisconnectCause(DisconnectCause.MISSED))
             it.destroy()
             MyConnectionService.removeConnection(uuid)
         }
     }
 
-    //done             //     val fallbackIntent = Intent(Intent.ACTION_MAIN).apply {
-            //     addCategory(Intent.CATEGORY_LAUNCHER)
-            //     component = ComponentName("com.android.phone", "com.android.phone.CallFeaturesSetting")
-            //     addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            //    }
-            // reactApplicationContext.startActivity(fallbackIntent)
-
     @ReactMethod
-  fun checkTelecomPermissions(promise: Promise) {
-    val telecomManager = reactApplicationContext.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
-    val phoneAccountHandle = getPhoneAccountHandle()
-    val appName = reactApplicationContext.applicationInfo.loadLabel(reactApplicationContext.packageManager).toString()
-
-    val account = telecomManager.getPhoneAccount(phoneAccountHandle)
-    if (account != null && account.isEnabled) {
-        promise.resolve(true)
-    } else {
-        try {
-            // Show a quick message to guide the user
-            val text = "Tap 'Active calling accounts' and then enable $appName"
-val duration = Toast.LENGTH_LONG
-val toast = Toast.makeText(reactApplicationContext, text, duration)
-
-toast.show()
-
-// Show again after 3.5s
-android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
-    toast.show()
-}, 3500)
-
-
-            // Open Calling Accounts settings
-            val intent = Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            reactApplicationContext.startActivity(intent)
+    fun checkTelecomPermissions(promise: Promise) {
+        val telecomManager = reactApplicationContext.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
+        val phoneAccountHandle = getPhoneAccountHandle()
+        val appName = reactApplicationContext.applicationInfo.loadLabel(reactApplicationContext.packageManager).toString()
 
-            promise.resolve(false)
-        } catch (e: Exception) {
-            promise.reject("PERMISSION_ERROR", "Could not open settings: ${e.message}")
+        val account = telecomManager.getPhoneAccount(phoneAccountHandle)
+        if (account != null && account.isEnabled) {
+            promise.resolve(true)
+        } else {
+            try {
+                Toast.makeText(reactApplicationContext, "Tap 'Active calling accounts' and then enable $appName", Toast.LENGTH_LONG).show()
+                val intent = Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS)
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                reactApplicationContext.startActivity(intent)
+                promise.resolve(false)
+            } catch (e: Exception) {
+                promise.reject("PERMISSION_ERROR", e.message)
+            }
         }
     }
-}
 
+    @ReactMethod
+    fun getInitialCallData(promise: Promise) {
+        promise.resolve(pendingCallData)
+        pendingCallData = null // Clear after consumption
+    }
 
     @ReactMethod fun addListener(eventName: String) {}
     @ReactMethod fun removeListeners(count: Int) {}
 
     companion object {
         private var instance: CallModule? = null
+        private var pendingCallData: WritableMap? = null
 
         @JvmStatic
         fun sendEventToJS(eventName: String, params: Any?) {
-            val reactContext = instance?.reactApplicationContext ?: return
-            
+            val reactContext = instance?.reactApplicationContext
+
             val bridgeData = when (params) {
                 is Map<*, *> -> {
                     val map = Arguments.createMap()
@@ -148,14 +124,21 @@ android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
                     map
                 }
                 is String -> {
-                    Arguments.createMap().apply { putString("callUUID", params) }
+                    Arguments.createMap().apply { putString("callUuid", params) }
                 }
                 else -> null
             }
 
-            reactContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                ?.emit(eventName, bridgeData)
+            if (reactContext != null && reactContext.hasActiveCatalystInstance()) {
+                reactContext
+                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                    ?.emit(eventName, bridgeData)
+            } else {
+                // If app is dead/cold-starting, cache the accept event
+                if (eventName == "onCallAccepted") {
+                    pendingCallData = bridgeData
+                }
+            }
         }
     }
 }

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

@@ -7,53 +7,64 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import androidx.core.app.NotificationCompat
+import android.media.Ringtone
+import android.media.RingtoneManager
 
 object NativeCallManager {
 
+private var ringtone: Ringtone? = null
+
     fun handleIncomingPush(context: Context, data: Map<String, String>) {
-        val uuid = data["callId"] ?: return
+        val uuid = data["callUuid"] ?: return
+        stopRingtone()
         val name = data["name"] ?: "Incoming Call"
         val callType = data["callType"] ?: "audio"
 
-        val pendingFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        // Use MUTABLE flag to ensure extras are properly passed on Android 12+
+        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. DUMMY INTENT: This is the key to making the Pill "Sticky".
-        // It prevents the notification from disappearing but doesn't open a screen.
+        // 1. DUMMY INTENT: Keeps the notification "Sticky" (Persistent)
         val dummyIntent = PendingIntent.getActivity(
             context, 
             0, 
             Intent(), 
-            pendingFlags
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0
         )
 
-// 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
-}
+        // 2. Accept Action - Use unique action and requestCode
+        val acceptIntent = Intent(context, AcceptCallActivity::class.java).apply {
+            // Unique action string prevents intent caching issues
+            action = "ACTION_ACCEPT_$uuid" 
+            putExtra("EXTRA_CALL_UUID", uuid)
+            // Flatten the map into the intent extras
+            data.forEach { (key, value) -> putExtra(key, value) }
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+        }
+
+        val acceptPendingIntent = PendingIntent.getActivity(
+            context, 
+            uuid.hashCode(), // Unique RequestCode
+            acceptIntent, 
+            pendingFlags
+        )
 
-// Keep this as getActivity
-val acceptPendingIntent = PendingIntent.getActivity(
-    context, 
-    1001, 
-    acceptIntent, 
-    pendingFlags
-)
-        // 3. Reject Action
+        // 3. Reject Action - Use unique action and requestCode
         val rejectIntent = Intent(context, CallActionReceiver::class.java).apply {
-            action = "ACTION_REJECT"
+            action = "ACTION_REJECT_$uuid"
             putExtra("EXTRA_CALL_UUID", uuid)
         }
-        val rejectPendingIntent = PendingIntent.getBroadcast(context, 1002, rejectIntent, pendingFlags)
+        val rejectPendingIntent = PendingIntent.getBroadcast(
+            context, 
+            uuid.hashCode() + 1, // Unique RequestCode
+            rejectIntent, 
+            pendingFlags
+        )
 
-        // 4. Setup Channel (Ensure Importance is HIGH)
+        // 4. Setup Channel
         val channelId = "CALL_CHANNEL_ID"
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
@@ -61,7 +72,6 @@ val acceptPendingIntent = PendingIntent.getActivity(
             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
             }
@@ -75,15 +85,28 @@ val acceptPendingIntent = PendingIntent.getActivity(
             .setContentText(name)
             .setPriority(NotificationCompat.PRIORITY_MAX)
             .setCategory(NotificationCompat.CATEGORY_CALL)
-            .setOngoing(true) // Prevents user from swiping it away
+            .setOngoing(true) 
             .setAutoCancel(false)
+            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
             
-            // This is what keeps the Heads-Up "Pill" visible indefinitely:
+            // This hack keeps the Heads-Up "Pill" visible until action is taken
             .setFullScreenIntent(dummyIntent, true) 
             
             .addAction(0, "Answer", acceptPendingIntent)
             .addAction(0, "Decline", rejectPendingIntent)
 
         notificationManager.notify(101, builder.build())
+
+        try {
+            val ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
+            ringtone = RingtoneManager.getRingtone(context, ringtoneUri)
+            ringtone?.play()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+    fun stopRingtone() {
+        ringtone?.stop()
+        ringtone = null
     }
 }

package/index.d.ts

@@ -1,49 +1,41 @@
-///Users/bush/Desktop/Apps/Raiidr/package/index.d.ts
-
 export interface CallData {
-    callUUID: string;
+    callUuid: string;
+    name?: string;
+    callType?: 'audio' | 'video';
+    [key: string]: any; // To allow for custom FCM payload data
 }
 
 export type CallAcceptedCallback = (data: CallData) => void;
 export type CallRejectedCallback = (data: CallData) => void;
-export type CallFailedCallback = (data: CallData) => void;
+export type CallFailedCallback = (data: any) => void;
 
 /**
  * Manually request/check Android permissions for Telecom.
- * @returns Promise resolving to true if granted
  */
 export function ensureAndroidPermissions(): Promise<boolean>;
 
 export interface CallHandlerType {
     /**
-     * Display an incoming call UI using ConnectionService (Android) or CallKit (iOS).
+     * Display the Sticky Pill notification UI.
      * @param uuid Unique call identifier
-     * @param number Caller number (or URI)
      * @param name Caller display name
-     * @param hasVideo True if video call (default: false)
-     * @param shouldRing True to play native ringtone (default: true)
-     * @returns Promise resolving to true if successfully displayed
+     * @param callType 'audio' or 'video'
      */
     displayCall(
         uuid: string,
-        number: string,
         name: string,
-        hasVideo?: boolean,
-        shouldRing?: boolean
+        callType: 'audio' | 'video',
     ): Promise<boolean>;
 
     /**
-     * Dismiss the native call UI (e.g., if the caller hangs up before the user answers).
-     * @param uuid Call identifier
+     * Dismiss the native call UI (Sticky Pill).
      */
     destroyNativeCallUI(uuid: string): void;
 
     /**
-     * Subscribe to call events from the native side.
-     * @param onAccept Callback when user presses Answer
-     * @param onReject Callback when user presses Decline
-     * @param onFailed Optional callback for system-level failures
-     * @returns Function to unsubscribe all listeners
+     * Subscribe to call events. Automatically checks for cold-start data 
+     * if the app was opened via the Answer button.
+     * @returns Function to unsubscribe
      */
     subscribe(
         onAccept: CallAcceptedCallback,

package/index.js

@@ -1,4 +1,3 @@
-///Users/bush/Desktop/Apps/Raiidr/package/index.js
 import {
     NativeModules,
     NativeEventEmitter,
@@ -8,11 +7,10 @@ import {
 
 const { CallModule } = NativeModules;
 
-// Safety check for the Native Module
 if (!CallModule && __DEV__) {
     console.warn(
         "rns-nativecall: NativeModule.CallModule is undefined. " +
-        "Make sure you have rebuilt your native project (npx expo run:android / ios)."
+        "Make sure you have rebuilt your native project."
     );
 }
 
@@ -25,59 +23,68 @@ const REQUIRED_PERMISSIONS = Platform.OS === 'android' ? [
 
 export async function ensureAndroidPermissions() {
     if (Platform.OS !== 'android') return true;
-    const result = await PermissionsAndroid.requestMultiple(REQUIRED_PERMISSIONS);
-
-    // This triggers the "Calling Accounts" system settings if not enabled
-    const isAccountEnabled = await CallModule.checkTelecomPermissions();
-    if (!isAccountEnabled) return false;
-
-    return Object.values(result).every(status => status === PermissionsAndroid.RESULTS.GRANTED);
+    try {
+        const result = await PermissionsAndroid.requestMultiple(REQUIRED_PERMISSIONS);
+        const isAccountEnabled = await CallModule.checkTelecomPermissions();
+        if (!isAccountEnabled) return false;
+        return Object.values(result).every(status => status === PermissionsAndroid.RESULTS.GRANTED);
+    } catch (e) {
+        return false;
+    }
 }
 
 export const CallHandler = {
-    displayCall: async (uuid, number, name, hasVideo = false, shouldRing = true) => {
+    displayCall: async (uuid, name, callType = "audio") => {
         if (!CallModule) return false;
-
-        // if (Platform.OS === 'android') {
-        //     const hasPerms = await ensureAndroidPermissions();
-        //     if (!hasPerms) return false;
-        // }
-
         try {
             return await CallModule.displayIncomingCall(
                 uuid.toLowerCase().trim(),
-                number,
                 name,
-                hasVideo,
-                shouldRing
+                callType
             );
         } catch (e) {
-            // console.log("Native Call Error:", e);
             return false;
         }
     },
 
     destroyNativeCallUI: (uuid) => {
         if (CallModule?.endNativeCall) {
-            CallModule.endNativeCall(uuid.toLowerCase());
+            CallModule.endNativeCall(uuid.toLowerCase().trim());
         }
     },
 
+    /**
+     * Subscribes to call events and checks for initial cold-start data.
+     */
     subscribe: (onAccept, onReject, onFailed) => {
         if (!callEventEmitter) return () => { };
 
         const subs = [
-            callEventEmitter.addListener('onCallAccepted', onAccept),
-            callEventEmitter.addListener('onCallRejected', onReject),
+            callEventEmitter.addListener('onCallAccepted', (data) => {
+                onAccept(data);
+            }),
+            callEventEmitter.addListener('onCallRejected', (data) => {
+                onReject(data);
+            }),
         ];
 
         if (onFailed) {
             subs.push(callEventEmitter.addListener('onCallFailed', onFailed));
         }
 
+        // --- COLD START LOGIC ---
+        // If the app was killed and opened via the Answer button, 
+        // the event might have fired before this listener was ready.
+        if (Platform.OS === 'android' && CallModule.getInitialCallData) {
+            CallModule.getInitialCallData().then((data) => {
+                if (data) {
+                    onAccept(data);
+                }
+            });
+        }
+
         return () => subs.forEach(s => s.remove());
     }
 };
 
-// IMPORTANT: Exporting as default ensures "import CallHandler from '...'" works
 export default CallHandler;

package/ios/CallModule.h

@@ -1,6 +1,10 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 #import <CallKit/CallKit.h>
+#import <AVFoundation/AVFoundation.h>
+
 @interface CallModule : RCTEventEmitter <RCTBridgeModule, CXProviderDelegate>
 @property(nonatomic, strong) CXProvider *provider;
+// Add this property
+@property(nonatomic, strong) NSUUID *currentCallUUID;
 @end

package/ios/CallModule.m

@@ -4,6 +4,11 @@
 
 RCT_EXPORT_MODULE();
 
+// Crucial: This keeps the module alive and on the main thread
++ (BOOL)requiresMainQueueSetup {
+    return YES;
+}
+
 - (NSArray<NSString *> *)supportedEvents {
     return @[ @"onCallAccepted", @"onCallRejected", @"onCallFailed" ];
 }
@@ -11,22 +16,15 @@ RCT_EXPORT_MODULE();
 - (instancetype)init {
     self = [super init];
     if (self) {
-        // Dynamically get the App Name from the bundle so it's not hardcoded
-        NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"];
-        if (!appName) {
-            appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
-        }
+        NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] ?: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         CXProviderConfiguration *config = [[CXProviderConfiguration alloc] initWithLocalizedName:appName];
-#pragma clang diagnostic pop
-
         config.supportsVideo = YES;
         config.maximumCallGroups = 1;
         config.maximumCallsPerCallGroup = 1;
         config.supportedHandleTypes = [NSSet setWithObject:@(CXHandleTypeGeneric)];
-        config.includesCallsInRecents = NO;
+        // Add this to prevent system confusion
+        config.ringtoneSound = @"Ringtone.caf"; 
 
         self.provider = [[CXProvider alloc] initWithConfiguration:config];
         [self.provider setDelegate:self queue:nil];
@@ -34,32 +32,33 @@ RCT_EXPORT_MODULE();
     return self;
 }
 
-// Matches the 5 arguments in your JS/Android implementation
 RCT_EXPORT_METHOD(displayIncomingCall:(NSString *)uuidString
-                  number:(NSString *)number
                   name:(NSString *)name
-                  hasVideo:(BOOL)hasVideo
-                  showRing:(BOOL)showRing
+                  callType:(NSString *)callType
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 {
     NSUUID *uuid = [[NSUUID alloc] initWithUUIDString:uuidString];
     if (!uuid) {
-        reject(@"INVALID_UUID", @"The provided UUID string is invalid", nil);
+        reject(@"INVALID_UUID", @"Invalid UUID", nil);
         return;
     }
+    
+    self.currentCallUUID = uuid;
+
+    // 1. CONFIGURE AUDIO SESSION FIRST (Prevents Auto-Drop)
+    AVAudioSession *session = [AVAudioSession sharedInstance];
+    NSError *error = nil;
+    [session setCategory:AVAudioSessionCategoryPlayAndRecord 
+                    mode:AVAudioSessionModeVoiceChat 
+                 options:AVAudioSessionCategoryOptionAllowBluetooth 
+                   error:&error];
 
     CXCallUpdate *update = [[CXCallUpdate alloc] init];
-    // We use 'name' here so the system UI shows the caller's name instead of just their number
     update.remoteHandle = [[CXHandle alloc] initWithType:CXHandleTypeGeneric value:name];
-    update.hasVideo = hasVideo;
-    update.supportsGrouping = NO;
-    update.supportsUngrouping = NO;
-    update.supportsHolding = NO;
-
-    [self.provider reportNewIncomingCallWithUUID:uuid
-                                          update:update
-                                      completion:^(NSError *_Nullable error) {
+    update.hasVideo = [callType isEqualToString:@"video"];
+
+    [self.provider reportNewIncomingCallWithUUID:uuid update:update completion:^(NSError * _Nullable error) {
         if (error) {
             reject(@"CALL_ERROR", error.localizedDescription, error);
         } else {
@@ -68,35 +67,25 @@ RCT_EXPORT_METHOD(displayIncomingCall:(NSString *)uuidString
     }];
 }
 
-RCT_EXPORT_METHOD(endNativeCall:(NSString *)uuidString) {
-    NSUUID *uuid = [[NSUUID alloc] initWithUUIDString:uuidString];
-    if (uuid) {
-        [self.provider reportCallWithUUID:uuid
-                              endedAtDate:[NSDate date]
-                                   reason:CXCallEndedReasonRemoteEnded];
-    }
-}
-
-// Placeholder for Android parity
-RCT_EXPORT_METHOD(checkTelecomPermissions:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject) {
-    resolve(@YES); 
-}
-
 // MARK: - CXProviderDelegate
 
 - (void)provider:(CXProvider *)provider performAnswerCallAction:(CXAnswerCallAction *)action {
+    // 2. ACTIVATE AUDIO SESSION (Crucial for CallKit)
+    [[AVAudioSession sharedInstance] setActive:YES error:nil];
+    
     [action fulfill];
-    [self sendEventWithName:@"onCallAccepted"
-                       body:@{@"callUUID" : [action.callUUID.UUIDString lowercaseString]}];
+    [self sendEventWithName:@"onCallAccepted" body:@{@"callUuid": [action.callUUID.UUIDString lowercaseString]}];
 }
 
 - (void)provider:(CXProvider *)provider performEndCallAction:(CXEndCallAction *)action {
     [action fulfill];
-    [self sendEventWithName:@"onCallRejected"
-                       body:@{@"callUUID" : [action.callUUID.UUIDString lowercaseString]}];
+    self.currentCallUUID = nil;
+    [self sendEventWithName:@"onCallRejected" body:@{@"callUuid": [action.callUUID.UUIDString lowercaseString]}];
 }
 
-- (void)providerDidReset:(CXProvider *)provider { }
+- (void)providerDidReset:(CXProvider *)provider {
+    // Stop all audio if provider resets
+    [[AVAudioSession sharedInstance] setActive:NO error:nil];
+}
 
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "0.1.7",
+    "version": "0.1.9",
     "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",
@@ -19,6 +19,7 @@
         "p": "npm publish --access public"
     },
     "expo": {
+        "autolink": true,
         "plugins": [
             "./app.plugin.js"
         ]

package/withNativeCallVoip.js

@@ -1,11 +1,40 @@
-const { withAndroidManifest, withInfoPlist, withPlugins } = require('@expo/config-plugins');
+const { withAndroidManifest, withInfoPlist, withPlugins, withMainActivity } = require('@expo/config-plugins');
 
+/** 1. ANDROID MAIN ACTIVITY MOD **/
+function withMainActivityDataFix(config) {
+    return withMainActivity(config, (config) => {
+        let contents = config.modResults.contents;
+
+        // Ensure Intent import exists
+        if (!contents.includes('import android.content.Intent')) {
+            contents = contents.replace(/package .*/, (match) => `${match}\n\nimport android.content.Intent`);
+        }
+
+        // Add onNewIntent to catch data when app is open
+        const onNewIntentCode = `
+  override fun onNewIntent(intent: Intent) {
+    super.onNewIntent(intent)
+    setIntent(intent)
+  }
+`;
+
+        if (!contents.includes('override fun onNewIntent')) {
+            const lastBraceIndex = contents.lastIndexOf('}');
+            contents = contents.slice(0, lastBraceIndex) + onNewIntentCode + contents.slice(lastBraceIndex);
+        }
+
+        config.modResults.contents = contents;
+        return config;
+    });
+}
+
+/** 2. ANDROID MANIFEST CONFIG **/
 function withAndroidConfig(config) {
     return withAndroidManifest(config, (config) => {
         const manifest = config.modResults;
         const application = manifest.manifest.application[0];
 
-        // 1. Permissions
+        // Permissions
         const permissions = [
             'android.permission.READ_PHONE_NUMBERS',
             'android.permission.CALL_PHONE',
@@ -23,22 +52,16 @@ function withAndroidConfig(config) {
             }
         });
 
-        // 2. Activities (UI Components)
+        // Activities
         application.activity = application.activity || [];
 
-        // IncomingCallActivity (Optional lock screen UI)
-        if (!application.activity.some(a => a.$['android:name'] === 'com.rnsnativecall.IncomingCallActivity')) {
-            application.activity.push({
-                $: {
-                    'android:name': 'com.rnsnativecall.IncomingCallActivity',
-                    'android:showOnLockScreen': 'true',
-                    'android:launchMode': 'singleInstance',
-                    'android:theme': '@style/Theme.AppCompat.Light.NoActionBar'
-                }
-            });
+        // Ensure MainActivity is singleTask
+        const mainActivity = application.activity.find(a => a.$['android:name'] === '.MainActivity');
+        if (mainActivity) {
+            mainActivity.$['android:launchMode'] = 'singleTask';
         }
 
-        // AcceptCallActivity (The "Trampoline" that fixes the Answer button)
+        // AcceptCallActivity (The Trampoline - Must remain in Manifest)
         if (!application.activity.some(a => a.$['android:name'] === 'com.rnsnativecall.AcceptCallActivity')) {
             application.activity.push({
                 $: {
@@ -52,7 +75,7 @@ function withAndroidConfig(config) {
             });
         }
 
-        // 3. Services (FCM and Telecom)
+        // Services
         application.service = application.service || [];
         const services = [
             { name: 'com.rnsnativecall.MyConnectionService', permission: 'android.permission.BIND_CONNECTION_SERVICE', action: 'android.telecom.ConnectionService' },
@@ -62,13 +85,13 @@ function withAndroidConfig(config) {
         services.forEach(svc => {
             if (!application.service.some(s => s.$['android:name'] === svc.name)) {
                 application.service.push({
-                    $: { 'android:name': svc.name, 'android:exported': svc.permission ? 'true' : 'false', 'android:permission': svc.permission },
+                    $: { 'android:name': svc.name, 'android:exported': 'true', 'android:permission': svc.permission },
                     'intent-filter': [{ action: [{ $: { 'android:name': svc.action } }] }]
                 });
             }
         });
 
-        // 4. Receivers (The Decline Button)
+        // Receivers
         application.receiver = application.receiver || [];
         if (!application.receiver.some(r => r.$['android:name'] === 'com.rnsnativecall.CallActionReceiver')) {
             application.receiver.push({
@@ -80,7 +103,7 @@ function withAndroidConfig(config) {
     });
 }
 
-/** IOS Config remains the same **/
+/** 3. IOS CONFIG **/
 function withIosConfig(config) {
     return withInfoPlist(config, (config) => {
         const infoPlist = config.modResults;
@@ -91,5 +114,5 @@ function withIosConfig(config) {
 }
 
 module.exports = (config) => {
-    return withPlugins(config, [withAndroidConfig, withIosConfig]);
+    return withPlugins(config, [withAndroidConfig, withMainActivityDataFix, withIosConfig]);
 };

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

@@ -1,74 +0,0 @@
-package com.rnsnativecall
-
-import android.app.NotificationManager
-import android.content.Context
-import android.os.Bundle
-import android.view.View
-import android.view.WindowManager
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import com.bumptech.glide.Glide
-
-class IncomingCallActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        // 1. Show over lockscreen
-        window.addFlags(
-            WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
-            WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
-            WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or
-            WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
-        )
-
-        // 2. Set the layout FIRST
-        setContentView(R.layout.activity_incoming_call)
-
-        // 3. Extract data from Intent
-        val uuid = intent.getStringExtra("EXTRA_CALL_UUID")
-        val name = intent.getStringExtra("EXTRA_CALLER_NAME") ?: "Unknown"
-        val profileUrl = intent.getStringExtra("profile")
-        val callType = intent.getStringExtra("callType") ?: "audio"
-
-        // 4. Initialize Views
-        val imageView = findViewById<ImageView>(R.id.caller_image)
-        val nameText = findViewById<TextView>(R.id.caller_name)
-        val typeText = findViewById<TextView>(R.id.call_type)
-
-        nameText.text = name
-        typeText.text = if (callType == "video") "Incoming Video..." else "Incoming Audio..."
-
-        // 5. Load Image with Glide
-        if (!profileUrl.isNullOrEmpty()) {
-            Glide.with(this)
-                .load(profileUrl)
-                .circleCrop()
-                .into(imageView)
-        }
-
-        // 6. Handle buttons
-        findViewById<View>(R.id.btn_accept).setOnClickListener {
-            dismissCall()
-            CallModule.sendEventToJS("onCallAccepted", mapOf("callUUID" to uuid))
-            finish()
-        }
-
-        findViewById<View>(R.id.btn_reject).setOnClickListener {
-            dismissCall()
-            CallModule.sendEventToJS("onCallRejected", mapOf("callUUID" to uuid))
-            finish()
-        }
-    }
-
-    private fun dismissCall() {
-        // This removes the "Pill" notification from the status bar
-        val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        notificationManager.cancel(101) // Use the same ID you used in NativeCallManager
-    }
-    
-    override fun onBackPressed() {
-        // Disable back button so they have to click Accept or Reject
-    }
-}

package/android/src/main/res/drawable/circle_green.xml

@@ -1,4 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#34C759" />
-    <corners android:radius="21dp" />
-</shape>

package/android/src/main/res/drawable/circle_red.xml

@@ -1,4 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#FF3B30" />
-    <corners android:radius="21dp" />
-</shape>

package/android/src/main/res/drawable/pill_background.xml

@@ -1,5 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#212121" />
-    <corners android:radius="100dp" />
-    <stroke android:width="1dp" android:color="#33FFFFFF" />
-</shape>

package/android/src/main/res/layout/activity_incoming_call.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#00000000">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="8dp"
-        android:layout_marginTop="30dp"
-        android:background="@drawable/pill_background"
-        android:elevation="15dp"
-        android:orientation="horizontal"
-        android:padding="12dp"
-        android:gravity="center_vertical">
-
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/caller_image"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:background="#ccc"
-            app:shapeAppearanceOverlay="@style/CircleImage" />
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginStart="15dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/caller_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Caller Name"
-                android:textColor="#FFFFFF"
-                android:textSize="16sp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/call_type"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Incoming Audio..."
-                android:textColor="#FFFFFF"
-                android:textSize="13sp" />
-        </LinearLayout>
-
-        <ImageButton
-            android:id="@+id/btn_accept"
-            android:layout_width="42dp"
-            android:layout_height="42dp"
-            android:background="@drawable/circle_green"
-            android:src="@android:drawable/ic_menu_call"
-            android:layout_marginEnd="12dp"
-            android:tint="#FFFFFF" />
-
-        <ImageButton
-            android:id="@+id/btn_reject"
-            android:layout_width="42dp"
-            android:layout_height="42dp"
-            android:background="@drawable/circle_red"
-            android:src="@android:drawable/ic_menu_close_clear_cancel"
-            android:tint="#FFFFFF" />
-    </LinearLayout>
-</FrameLayout>

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

@@ -1,12 +0,0 @@
-<?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>