rns-nativecall 1.2.2 → 1.2.4

package/README.md

@@ -133,16 +133,17 @@ export default function App() {
 | Method | Platform | Description |
 | :--- | :--- | :--- |
 | **registerHeadlessTask(callback)** | All | Registers the background task. `eventType` is 'INCOMING_CALL', 'BUSY', or 'ABORTED_CALL'. |
-| **displayCall(uuid, name, type)** | All | Android: Launches full-screen Activity. iOS: Reports incoming call to CallKit. |
-| **checkCallValidity(uuid)** | All | Android only: Returns {isValid, isCanceled} to prevent ghost/canceled calls. |
-| **checkCallStatus(uuid)** | All | Android only: Returns {isCanceled, isActive, shouldDisplay} for UI syncing. |
+| **displayCall(uuid, name, type)** | All |  Launches full-screen Activity. iOS: Reports incoming call to CallKit. |
+| **checkCallValidity(uuid)** | All | Returns {isValid, isCanceled} to prevent ghost/canceled calls. |
+| **checkCallStatus(uuid)** | All |  Returns {isCanceled, isActive, shouldDisplay} for UI syncing. |
+| **showMissedCall(uuid, name, type)** | All | Shows miss call on the deivce notification tray|
+| **destroyNativeCallUI(uuid)** | All |  Stops ringtone/Activity. iOS: Ends CallKit (Handoff vs Hangup logic). |
+| **getInitialCallData()** | All | Retrieves the call payload if the app was cold-started via a notification Answer. |
+| **subscribe(onAccept, onReject, onFailed)** | All | Listens for Answer/Decline button presses and system-level bridge errors. |
 | **checkOverlayPermission()** | Android | Android only: Returns true if app can draw over other apps while unlocked. |
 | **checkFullScreenPermission()** | Android | Android 14+: Checks if app can trigger full-screen intents on lockscreen. |
 | **requestOverlayPermission()** | Android | Android only: Navigates user to "Draw over other apps" system settings. |
 | **requestFullScreenSettings()** | Android | Android 14+: Navigates user to "Full Screen Intent" system settings. |
-| **destroyNativeCallUI(uuid)** | All | Android: Stops ringtone/Activity. iOS: Ends CallKit (Handoff vs Hangup logic). |
-| **getInitialCallData()** | All | Retrieves the call payload if the app was cold-started via a notification Answer. |
-| **subscribe(onAccept, onReject, onFailed)** | All | Listens for Answer/Decline button presses and system-level bridge errors. |
 ---
 
 # Implementation Notes

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

@@ -32,7 +32,7 @@ class CallMessagingService : FirebaseMessagingService() {
             }
 
             NativeCallManager.dismissIncomingCall(context, uuid)
-            showMissedCallNotification(context, data, uuid)
+            NativeCallManager.showMissedCallNotification(context, data)
             return
         }
 
@@ -73,63 +73,6 @@ class CallMessagingService : FirebaseMessagingService() {
         }
     }
 
-    private fun showMissedCallNotification(
-        context: Context,
-        data: Map<String, String>,
-        uuid: String,
-    ) {
-        val name = data["name"] ?: "Unknown"
-        val callType = data["callType"] ?: "video"
-        val channelId = "missed_calls"
-
-        val notificationManager =
-            context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel =
-                NotificationChannel(
-                    channelId,
-                    "Missed Calls",
-                    NotificationManager.IMPORTANCE_DEFAULT,
-                ).apply { description = "Missed call notifications" }
-            notificationManager.createNotificationChannel(channel)
-        }
-
-        val iconResId =
-            context.resources
-                .getIdentifier("ic_missed_call", "drawable", context.packageName)
-                .takeIf { it != 0 } ?: android.R.drawable.sym_call_missed
-        val appName = context.applicationInfo.loadLabel(context.packageManager).toString()
-
-        val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
-        launchIntent?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-        val pendingIntent =
-            PendingIntent.getActivity(
-                context,
-                uuid.hashCode(),
-                launchIntent,
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-                } else {
-                    PendingIntent.FLAG_UPDATE_CURRENT
-                },
-            )
-
-        val builder =
-            NotificationCompat
-                .Builder(context, channelId)
-                .setSmallIcon(iconResId)
-                .setContentTitle("$appName • Missed $callType call")
-                .setContentText("You missed a call from $name")
-                .setPriority(NotificationCompat.PRIORITY_HIGH)
-                .setAutoCancel(true)
-                .setCategory(NotificationCompat.CATEGORY_MISSED_CALL)
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                .setContentIntent(pendingIntent)
-
-        notificationManager.notify(uuid.hashCode(), builder.build())
-    }
-
     private fun isAppInForeground(context: Context): Boolean {
         val activityManager =
             context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager

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

@@ -162,6 +162,27 @@ class CallModule(
         promise.resolve(map)
     }
 
+    @ReactMethod
+    fun showMissedCall(
+        uuid: String,
+        name: String,
+        callType: String,
+        promise: Promise,
+    ) {
+        try {
+            val data =
+                mapOf(
+                    "callUuid" to uuid,
+                    "name" to name,
+                    "callType" to callType,
+                )
+            NativeCallManager.showMissedCallNotification(reactApplicationContext, data)
+            promise.resolve(true)
+        } catch (e: Exception) {
+            promise.reject("MISSED_CALL_ERROR", e.message)
+        }
+    }
+
     @ReactMethod
     fun endNativeCall(uuid: String) {
         NativeCallManager.dismissIncomingCall(reactApplicationContext, uuid)

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

@@ -14,7 +14,9 @@ import androidx.core.app.Person
 import androidx.core.content.ContextCompat
 
 object NativeCallManager {
-    const val channelId = "CALL_CHANNEL_V15_URGENT"
+    const val channelId = "CALL_CHANNEL_URGENT_V2"
+    private const val MISSED_CHANNEL_ID = "missed_calls"
+
     private var currentCallData: Map<String, String>? = null
 
     @JvmStatic internal var pendingCallNotification: Notification? = null
@@ -23,51 +25,73 @@ object NativeCallManager {
 
     fun getCurrentCallData(): Map<String, String>? = currentCallData
 
+    // --- REUSABLE HELPERS ---
+
+    private fun getPendingIntentFlags(): Int =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        } else {
+            PendingIntent.FLAG_UPDATE_CURRENT
+        }
+
+    private fun getResourceColor(context: Context): Int {
+        val colorId = context.resources.getIdentifier("notification_icon_color", "color", context.packageName)
+        return if (colorId != 0) ContextCompat.getColor(context, colorId) else Color.parseColor("#ffffff")
+    }
+
+    private fun createCallIntent(
+        context: Context,
+        targetClass: Class<*>,
+        actionName: String?,
+        uuid: String,
+        data: Map<String, String>,
+    ): Intent =
+        Intent(context, targetClass).apply {
+            action = actionName
+            putExtra("EXTRA_CALL_UUID", uuid)
+            data.forEach { (k, v) -> putExtra(k, v) }
+        }
+
+    private fun getNotificationManager(context: Context) = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+    // --- MAIN LOGIC ---
+
     fun handleIncomingPush(
         context: Context,
         data: Map<String, String>,
     ) {
         Handler(Looper.getMainLooper()).post {
-            val uuid = data["callUuid"] ?: return@post
             this.currentCallData = data
-            val name = data["name"] ?: "Incoming Call"
+            val uuid = data["callUuid"] ?: return@post
+            val name = data["name"] ?: "Someone"
+            val callType = data["callType"] ?: "audio"
             val notificationId = uuid.hashCode()
-            val ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
-
-            val pendingFlags =
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-                } else {
-                    PendingIntent.FLAG_UPDATE_CURRENT
-                }
+            val flags = getPendingIntentFlags()
 
-            // Intents
+            // 1. Setup Intents using helper
             val overlayIntent =
-                Intent(context, NotificationOverlayActivity::class.java).apply {
-                    putExtra("EXTRA_CALL_UUID", uuid)
-                    data.forEach { (k, v) -> putExtra(k, v) }
+                createCallIntent(context, NotificationOverlayActivity::class.java, null, uuid, data).apply {
                     addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_NO_USER_ACTION)
                 }
-            val fullScreenPendingIntent = PendingIntent.getActivity(context, notificationId, overlayIntent, pendingFlags)
-
-            val answerIntent =
-                Intent(context, CallActionReceiver::class.java).apply {
-                    action = "ACTION_ANSWER"
-                    putExtra("EXTRA_CALL_UUID", uuid)
-                    data.forEach { (k, v) -> putExtra(k, v) }
-                }
-            val answerPendingIntent = PendingIntent.getBroadcast(context, notificationId + 1, answerIntent, pendingFlags)
-
-            val rejectIntent =
-                Intent(context, CallActionReceiver::class.java).apply {
-                    action = "ACTION_REJECT"
-                    putExtra("EXTRA_CALL_UUID", uuid)
-                    data.forEach { (k, v) -> putExtra(k, v) }
-                }
-            val rejectPendingIntent = PendingIntent.getBroadcast(context, notificationId + 2, rejectIntent, pendingFlags)
-
-            // Channel
-            val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            val fullScreenPI = PendingIntent.getActivity(context, notificationId, overlayIntent, flags)
+
+            val answerPI =
+                PendingIntent.getBroadcast(
+                    context,
+                    notificationId + 1,
+                    createCallIntent(context, CallActionReceiver::class.java, "ACTION_ANSWER", uuid, data),
+                    flags,
+                )
+
+            val rejectPI =
+                PendingIntent.getBroadcast(
+                    context,
+                    notificationId + 2,
+                    createCallIntent(context, CallActionReceiver::class.java, "ACTION_REJECT", uuid, data),
+                    flags,
+                )
+
+            // 2. Setup Urgent Channel
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 val channel =
                     NotificationChannel(channelId, "Incoming Calls", NotificationManager.IMPORTANCE_HIGH).apply {
@@ -75,7 +99,7 @@ object NativeCallManager {
                         enableVibration(true)
                         setBypassDnd(true)
                         setSound(
-                            ringtoneUri,
+                            RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE),
                             AudioAttributes
                                 .Builder()
                                 .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
@@ -83,46 +107,104 @@ object NativeCallManager {
                                 .build(),
                         )
                     }
-                notificationManager.createNotificationChannel(channel)
+                getNotificationManager(context).createNotificationChannel(channel)
             }
 
+            // 3. Resources & Style
+            val iconId =
+                context.resources
+                    .getIdentifier("notification_icon", "drawable", context.packageName)
+                    .let { if (it != 0) it else context.applicationInfo.icon }
+
             val caller =
                 Person
                     .Builder()
                     .setName(name)
                     .setImportant(true)
                     .build()
+            val incomingCallStyle = NotificationCompat.CallStyle.forIncomingCall(caller, rejectPI, answerPI)
 
-            val builder =
+            if (callType.equals("video", ignoreCase = true)) {
+                try {
+                    incomingCallStyle.setIsVideo(true)
+                } catch (e: Exception) {
+                    // No-op
+                }
+            }
+            // 4. Build Notification
+            val notification =
                 NotificationCompat
                     .Builder(context, channelId)
-                    .setSmallIcon(context.applicationInfo.icon)
+                    .setSmallIcon(iconId)
+                    .setContentTitle("Incoming $callType Call from $name")
+                    .setContentText("Incoming $callType Call")
+                    .setSubText("Incoming $callType Call")
+                    .setColor(getResourceColor(context))
                     .setPriority(NotificationCompat.PRIORITY_MAX)
                     .setCategory(NotificationCompat.CATEGORY_CALL)
                     .setOngoing(true)
-                    .setFullScreenIntent(fullScreenPendingIntent, true)
-                    .setStyle(NotificationCompat.CallStyle.forIncomingCall(caller, rejectPendingIntent, answerPendingIntent))
+                    .setFullScreenIntent(fullScreenPI, true)
+                    .setStyle(incomingCallStyle)
                     .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
+                    .build()
 
-            val notification = builder.build()
             pendingCallNotification = notification
             pendingNotificationId = notificationId
 
-            // 1. Start the LOUD UI Service (Google allows this for PHONE_CALL)
-            val uiIntent = Intent(context, CallUiForegroundService::class.java)
-            ContextCompat.startForegroundService(context, uiIntent)
-
-            // 2. Stop the SILENT Wake service (which no longer needs DATA_SYNC)
+            // 5. Execution
+            getNotificationManager(context).notify(notificationId, notification)
+            ContextCompat.startForegroundService(context, Intent(context, CallUiForegroundService::class.java))
             CallForegroundService.stop(context)
         }
     }
 
+    fun showMissedCallNotification(
+        context: Context,
+        data: Map<String, String>,
+    ) {
+        val uuid = data["callUuid"] ?: return
+        val name = data["name"] ?: "Unknown"
+        val callType = data["callType"] ?: "video"
+
+        // Setup Missed Channel
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel = NotificationChannel(MISSED_CHANNEL_ID, "Missed Calls", NotificationManager.IMPORTANCE_DEFAULT)
+            getNotificationManager(context).createNotificationChannel(channel)
+        }
+
+        val iconResId =
+            context.resources
+                .getIdentifier("ic_missed_call", "drawable", context.packageName)
+                .let { if (it != 0) it else android.R.drawable.sym_call_missed }
+
+        val launchIntent =
+            context.packageManager.getLaunchIntentForPackage(context.packageName)?.apply {
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+            }
+        val pendingIntent = PendingIntent.getActivity(context, uuid.hashCode(), launchIntent, getPendingIntentFlags())
+
+        val notification =
+            NotificationCompat
+                .Builder(context, MISSED_CHANNEL_ID)
+                .setSmallIcon(iconResId)
+                .setContentTitle(context.applicationInfo.loadLabel(context.packageManager).toString())
+                .setContentText("You missed a $callType call from $name")
+                .setPriority(NotificationCompat.PRIORITY_HIGH)
+                .setColor(getResourceColor(context))
+                .setAutoCancel(true)
+                .setCategory(NotificationCompat.CATEGORY_MISSED_CALL)
+                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                .setContentIntent(pendingIntent)
+                .build()
+
+        getNotificationManager(context).notify(uuid.hashCode() + 10000, notification)
+    }
+
     fun refreshNotificationOnly(
         context: Context,
         uuid: String,
     ) {
-        val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        manager.cancel(uuid.hashCode())
+        getNotificationManager(context).cancel(uuid.hashCode())
     }
 
     fun dismissIncomingCall(
@@ -132,8 +214,7 @@ object NativeCallManager {
         pendingCallNotification = null
         pendingNotificationId = null
         currentCallData = null
-        val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        uuid?.let { manager.cancel(it.hashCode()) }
+        uuid?.let { getNotificationManager(context).cancel(it.hashCode()) }
         context.stopService(Intent(context, CallUiForegroundService::class.java))
     }
 }

package/index.d.ts

@@ -62,6 +62,15 @@ export interface CallHandlerType {
         callType?: 'audio' | 'video',
     ): Promise<boolean>;
 
+    /**
+     * Show showMissedCall on the device tray.
+     */
+    showMissedCall(
+        uuid: string,
+        name: string,
+        callType?: 'audio' | 'video',
+    ): Promise<boolean>;
+
     /** * Checks if a call is still valid and has not been canceled.
      */
     checkCallValidity(uuid: string): Promise<ValidityStatus>;

package/index.js

@@ -78,6 +78,11 @@ export const CallHandler = {
         return await CallModule.checkCallStatus(uuid.toLowerCase().trim());
     },
 
+    showMissedCall: async (uuid, name, callType) => {
+        if (!CallModule?.showMissedCall) return false;
+        return await CallModule.showMissedCall(uuid.toLowerCase().trim(), name, callType);
+    },
+
     //--------------------------------------------------------------------------------------
 
     requestOverlayPermission: async () => {

package/ios/CallModule.m

@@ -4,7 +4,8 @@
 @interface CallModule ()
 @property (nonatomic, strong) NSString *pendingCallUuid;
 @property (nonatomic, strong) NSMutableDictionary *pendingEvents;
-@property (nonatomic, assign) BOOL isCallActive; // Track state for handoff vs hangup
+@property (nonatomic, assign) BOOL isCallActive;
+@property (nonatomic, strong) CXCallObserver *callObserver;
 @end
 
 @implementation CallModule
@@ -21,9 +22,10 @@ RCT_EXPORT_MODULE();
     self = [super init];
     if (self) {
         self.pendingEvents = [NSMutableDictionary new];
+        self.callObserver = [[CXCallObserver alloc] init];
+        
         NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] ?: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
 
-        // Corrected initialization for modern iOS
         CXProviderConfiguration *config = [[CXProviderConfiguration alloc] initWithLocalizedName:appName];
         config.supportsVideo = YES;
         config.maximumCallGroups = 1;
@@ -38,65 +40,47 @@ RCT_EXPORT_MODULE();
     return self;
 }
 
-/**
- * Modern helper to find the active UIWindow without using deprecated .keyWindow or .windows
- */
 - (UIWindow *)getActiveWindow {
     if (@available(iOS 13.0, *)) {
         NSSet<UIScene *> *scenes = [[UIApplication sharedApplication] connectedScenes];
         for (UIScene *scene in scenes) {
-            // We look for a foreground active window scene
             if (scene.activationState == UISceneActivationStateForegroundActive &&
                 [scene isKindOfClass:[UIWindowScene class]]) {
                 UIWindowScene *windowScene = (UIWindowScene *)scene;
-                
-                // On iOS 15+, we use windowScene.keyWindow if available,
-                // otherwise iterate the windows array of that scene
                 if (@available(iOS 15.0, *)) {
                     if (windowScene.keyWindow) return windowScene.keyWindow;
                 }
-                
                 for (UIWindow *window in windowScene.windows) {
                     if (window.isKeyWindow) return window;
                 }
             }
         }
     }
-    
-    // Fallback for older devices or edge cases where scene is not yet active
     #pragma clang diagnostic push
     #pragma clang diagnostic ignored "-Wdeprecated-declarations"
     return [UIApplication sharedApplication].keyWindow;
     #pragma clang diagnostic pop
 }
 
-// MARK: - Unified Export Method
+// MARK: - Exported Methods
 
 RCT_EXPORT_METHOD(endNativeCall:(NSString *)uuidString) {
     NSUUID *uuid = [[NSUUID alloc] initWithUUIDString:uuidString];
     if (!uuid) return;
-
+    
     dispatch_async(dispatch_get_main_queue(), ^{
         if (self.isCallActive) {
-            // REAL HANG UP
-            [self.provider reportCallWithUUID:uuid
-                                  endedAtDate:[NSDate date]
-                                       reason:CXCallEndedReasonRemoteEnded];
+            [self.provider reportCallWithUUID:uuid endedAtDate:[NSDate date] reason:CXCallEndedReasonRemoteEnded];
             self.isCallActive = NO;
         } else {
-            // HANDOFF (Hide the CallKit banner/UI)
-            [self.provider reportCallWithUUID:uuid
-                                  endedAtDate:[NSDate date]
-                                       reason:CXCallEndedReasonAnsweredElsewhere];
+            [self.provider reportCallWithUUID:uuid endedAtDate:[NSDate date] reason:CXCallEndedReasonAnsweredElsewhere];
             self.isCallActive = YES;
         }
         self.currentCallUUID = nil;
         self.pendingCallUuid = nil;
-    });
+    }); // <--- FIXED: Added the missing ');' here
 }
 
-// MARK: - Core Logic
-
 RCT_EXPORT_METHOD(displayIncomingCall:(NSString *)uuidString
                   name:(NSString *)name
                   callType:(NSString *)callType
@@ -128,15 +112,6 @@ RCT_EXPORT_METHOD(displayIncomingCall:(NSString *)uuidString
     }];
 }
 
-RCT_EXPORT_METHOD(getInitialCallData:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-    NSMutableDictionary *result = [NSMutableDictionary new];
-    if (self.pendingCallUuid) {
-        result[@"default"] = @{@"callUuid": self.pendingCallUuid};
-        self.pendingCallUuid = nil;
-    }
-    resolve(result.count > 0 ? result : [NSNull null]);
-}
-
 RCT_EXPORT_METHOD(checkCallValidity:(NSString *)uuidString
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
@@ -147,12 +122,9 @@ RCT_EXPORT_METHOD(checkCallValidity:(NSString *)uuidString
         return;
     }
 
-    // On iOS, we check if the call is currently known to the system observer
-    CXCallObserver *callObserver = [[CXCallObserver alloc] init];
     BOOL found = NO;
-    
-    for (CXCall *call in callObserver.calls) {
-        if ([call.uuid.UUIDString isEqualToString:uuid.UUIDString]) {
+    for (CXCall *call in self.callObserver.calls) {
+        if ([call.UUID.UUIDString.lowercaseString isEqualToString:uuidString.lowercaseString]) {
             if (!call.hasEnded) {
                 found = YES;
                 break;
@@ -160,8 +132,6 @@ RCT_EXPORT_METHOD(checkCallValidity:(NSString *)uuidString
         }
     }
 
-    // isValid: True if CallKit is currently tracking this call
-    // isCanceled: False if the call is active and valid
     resolve(@{
         @"isValid": @(found),
         @"isCanceled": @(!found)
@@ -172,22 +142,11 @@ RCT_EXPORT_METHOD(checkCallStatus:(NSString *)uuidString
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 {
-    NSUUID *uuid = [[NSUUID alloc] initWithUUIDString:uuidString];
-    if (!uuid) {
-        resolve(@{
-            @"isCanceled": @YES,
-            @"isActive": @NO,
-            @"shouldDisplay": @NO
-        });
-        return;
-    }
-
-    CXCallObserver *callObserver = [[CXCallObserver alloc] init];
     BOOL isActive = NO;
     BOOL isCanceled = YES;
 
-    for (CXCall *call in callObserver.calls) {
-        if ([call.uuid.UUIDString isEqualToString:uuid.UUIDString]) {
+    for (CXCall *call in self.callObserver.calls) {
+        if ([call.UUID.UUIDString.lowercaseString isEqualToString:uuidString.lowercaseString]) {
             if (!call.hasEnded) {
                 isActive = YES;
                 isCanceled = NO;
@@ -206,22 +165,13 @@ RCT_EXPORT_METHOD(checkCallStatus:(NSString *)uuidString
 // MARK: - CXProviderDelegate
 
 - (void)provider:(CXProvider *)provider performAnswerCallAction:(CXAnswerCallAction *)action {
-    AVAudioSession *session = [AVAudioSession sharedInstance];
-    [session setCategory:AVAudioSessionCategoryPlayAndRecord mode:AVAudioSessionModeVoiceChat options:AVAudioSessionCategoryOptionAllowBluetoothHFP | AVAudioSessionCategoryOptionDefaultToSpeaker error:nil];
-    [session setActive:YES error:nil];
-
     [action fulfill];
-
     NSString *uuidStr = [action.callUUID.UUIDString lowercaseString];
     self.pendingCallUuid = uuidStr;
 
     dispatch_async(dispatch_get_main_queue(), ^{
-        // Use our non-deprecated helper to bring app to front
         UIWindow *window = [self getActiveWindow];
-        if (window) {
-            [window makeKeyAndVisible];
-        }
-        
+        if (window) [window makeKeyAndVisible];
         [self sendEventWithName:@"onCallAccepted" body:@{@"callUuid": uuidStr}];
     });
 }

package/package.json

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

@@ -1,4 +1,4 @@
-const { withAndroidManifest, withInfoPlist, withPlugins, withMainActivity, withAppDelegate } = require('@expo/config-plugins');
+const { withAndroidStyles, AndroidConfig, withAndroidManifest, withInfoPlist, withPlugins, withMainActivity, withAppDelegate } = require('@expo/config-plugins');
 
 function withMainActivityDataFix(config) {
     return withMainActivity(config, (config) => {
@@ -69,6 +69,21 @@ function withMainActivityDataFix(config) {
         return config;
     });
 }
+function withNotificationColor(config) {
+    // 1. Find the color in app.json (fallback to #218aff)
+    const notificationPlugin = config.plugins?.find(p => Array.isArray(p) && p[0] === 'expo-notifications');
+    const iconColor = notificationPlugin?.[1]?.color || '#218aff';
+
+    return withAndroidStyles(config, (config) => {
+        config.modResults = AndroidConfig.Styles.assignStylesValue(config.modResults, {
+            name: 'notification_icon_color',
+            value: iconColor,
+            parent: 'AppTheme', // or your primary theme
+            type: 'color',
+        });
+        return config;
+    });
+}
 /** 2. ANDROID MANIFEST CONFIG **/
 function withAndroidConfig(config) {
     return withAndroidManifest(config, (config) => {
@@ -210,7 +225,8 @@ module.exports = (config, props) => {
     return withPlugins(config, [
         withAndroidConfig,
         withMainActivityDataFix,
-        withIosAppDelegateMod, // <--- ADDED THIS HERE
+        withNotificationColor,
+        withIosAppDelegateMod,
         [withIosConfig, props]
     ]);
 };

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

@@ -1,4 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#333333" />
-</shape>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57a1.02,1.02 0,0 0,-1.02 0.24l-2.2,2.2a15.05,15.05 0,0 1,-6.59 -6.59l2.2,-2.2a1.02,1.02 0,0 0,0.24 -1.02A11.36,11.36 0,0 1,8.5 4c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1c0,9.39 7.61,17 17,17c0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1z" />
-</vector>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M12,9c-1.6,0 -3.15,0.25 -4.6,0.72v3.1c0,0.39 -0.23,0.74 -0.56,0.9 -0.98,0.49 -1.65,1.45 -1.65,2.58c0,1.65 1.34,3 3,3h2v-3H8.1c0.01,-0.99 0.87,-1.8 1.85,-1.8c0.51,0 1,-0.21 1.35,-0.56l1.8,-1.8C13.04,9.3 12.55,9 12,9z" />
-</vector>

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

@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#212121">
-
-    <!-- Profile Section -->
-    <ImageView
-        android:id="@+id/profileImage"
-        android:layout_width="200dp"
-        android:layout_height="200dp"
-        android:scaleType="centerCrop"
-        android:background="@drawable/circle_background"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/usernameText"
-        app:layout_constraintVertical_chainStyle="packed"
-        app:layout_constraintVertical_bias="0.35"
-        tools:src="@drawable/ic_profile_placeholder" />
-
-    <!-- Optional: Blur effect for discreet mode (apply programmatically) -->
-    <!-- You can use RenderScript or BlurView library for real blur -->
-
-    <TextView
-        android:id="@+id/usernameText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="John Doe"
-        android:textColor="#FFFFFF"
-        android:textSize="32sp"
-        android:fontFamily="sans-serif-medium"
-        android:layout_marginTop="20dp"
-        app:layout_constraintTop_toBottomOf="@id/profileImage"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:text="John Doe" />
-
-    <TextView
-        android:id="@+id/callStatusText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Incoming Video Call..."
-        android:textColor="#FFFFFF"
-        android:textSize="18sp"
-        android:alpha="0.8"
-        android:layout_marginTop="10dp"
-        app:layout_constraintTop_toBottomOf="@id/usernameText"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-    <!-- Action Buttons Container -->
-    <LinearLayout
-        android:id="@+id/buttonContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:paddingBottom="100dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <!-- Decline Button -->
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:gravity="center"
-            android:layout_marginEnd="60dp">
-
-            <androidx.cardview.widget.CardView
-                android:layout_width="70dp"
-                android:layout_height="70dp"
-                app:cardCornerRadius="35dp"
-                app:cardElevation="8dp"
-                app:cardBackgroundColor="#FF3B30">
-
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:src="@drawable/ic_call_end_white"
-                    android:padding="18dp"
-                    android:tint="#FFFFFF" />
-
-            </androidx.cardview.widget.CardView>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Decline"
-                android:textColor="#FFFFFF"
-                android:textSize="16sp"
-                android:fontFamily="sans-serif-medium"
-                android:layout_marginTop="10dp" />
-
-        </LinearLayout>
-
-        <!-- Accept Button -->
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:gravity="center"
-            android:layout_marginStart="60dp">
-
-            <androidx.cardview.widget.CardView
-                android:layout_width="70dp"
-                android:layout_height="70dp"
-                app:cardCornerRadius="35dp"
-                app:cardElevation="8dp"
-                app:cardBackgroundColor="#4CD964">
-
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:src="@drawable/ic_call_answer_white"
-                    android:padding="18dp"
-                    android:tint="#FFFFFF" />
-
-            </androidx.cardview.widget.CardView>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Accept"
-                android:textColor="#FFFFFF"
-                android:textSize="16sp"
-                android:fontFamily="sans-serif-medium"
-                android:layout_marginTop="10dp" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>