rns-nativecall 0.8.5 → 0.8.7

package/ios/CallModule.m

@@ -79,6 +79,7 @@ RCT_EXPORT_METHOD(displayIncomingCall:(NSString *)uuidString
     
     self.currentCallUUID = uuid;
 
+    // Pre-configure audio session
     AVAudioSession *session = [AVAudioSession sharedInstance];
     [session setCategory:AVAudioSessionCategoryPlayAndRecord
                     mode:AVAudioSessionModeVoiceChat
@@ -98,17 +99,14 @@ RCT_EXPORT_METHOD(displayIncomingCall:(NSString *)uuidString
     }];
 }
 
-// Handles programmatic ending (e.g., via FCM "CANCEL")
 RCT_EXPORT_METHOD(reportRemoteEnded:(NSString *)uuidString reason:(NSInteger)reason) {
     NSUUID *uuid = [[NSUUID alloc] initWithUUIDString:uuidString];
     if (!uuid) return;
 
-    // Report to CallKit that the remote user ended the call
     [self.provider reportCallWithUUID:uuid
                           endedAtDate:[NSDate date]
                                reason:(CXCallEndedReason)reason];
     
-    // Clear local tracking
     if ([uuid isEqual:self.currentCallUUID]) {
         self.currentCallUUID = nil;
         self.pendingCallUuid = nil;
@@ -123,29 +121,38 @@ RCT_EXPORT_METHOD(endNativeCall:(NSString *)uuidString)
 // MARK: - CXProviderDelegate
 
 - (void)provider:(CXProvider *)provider performAnswerCallAction:(CXAnswerCallAction *)action {
+    // 1. Force the Audio Session active immediately so the system hands off the hardware
     AVAudioSession *session = [AVAudioSession sharedInstance];
+    NSError *audioError = nil;
     [session setCategory:AVAudioSessionCategoryPlayAndRecord
                     mode:AVAudioSessionModeVoiceChat
                  options:AVAudioSessionCategoryOptionAllowBluetoothHFP | AVAudioSessionCategoryOptionDefaultToSpeaker
                    error:nil];
-    [session setActive:YES error:nil];
+    [session setActive:YES error:&audioError];
 
+    // 2. Fulfill the system action
     [action fulfill];
 
     NSString *uuidStr = [action.callUUID.UUIDString lowercaseString];
     self.pendingCallUuid = uuidStr;
 
-    // Switch from system UI to App UI
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    // 3. Move to Main Queue for UI Handoff
+    dispatch_async(dispatch_get_main_queue(), ^{
+        
+        // This is the trigger that "destroys" the CallKit UI without failing the call
+        // It tells iOS the call is being handled by another device/interface (the app)
         [self.provider reportCallWithUUID:action.callUUID
                           endedAtDate:[NSDate date]
                                 reason:CXCallEndedReasonAnsweredElsewhere];
         
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [[[UIApplication sharedApplication] keyWindow] makeKeyAndVisible];
-        });
+        // Ensure the app window is visible/active
+        [[[UIApplication sharedApplication] keyWindow] makeKeyAndVisible];
         
+        // Notify React Native that the call is accepted
         [self sendEventWithName:@"onCallAccepted" body:@{@"callUuid": uuidStr}];
+        
+        // Clear local tracking so displayIncomingCall can be used again
+        self.currentCallUUID = nil;
     });
 }
 
@@ -157,7 +164,7 @@ RCT_EXPORT_METHOD(endNativeCall:(NSString *)uuidString)
 }
 
 - (void)providerDidReset:(CXProvider *)provider {
-    [[AVAudioSession sharedInstance] setActive:NO error:nil];
+    // Important: Do NOT deactivate audio if a call is transitioning to the app
     self.currentCallUUID = nil;
     self.pendingCallUuid = nil;
 }

package/package.json

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

@@ -169,16 +169,16 @@ function withIosConfig(config, props = {}) {
         // Explicit check: only disable if strictly false
         const enableAudio = iosBackgroundAudio !== false;
 
-        if (enableAudio) {
-            if (!infoPlist.UIBackgroundModes.includes('audio')) {
-                infoPlist.UIBackgroundModes.push('audio');
-            }
-        } else {
-            infoPlist.UIBackgroundModes = infoPlist.UIBackgroundModes.filter(
-                (mode) => mode !== 'audio'
-            );
-            console.log(`[rns-nativecall] 'audio' background mode removed.`);
-        }
+        // if (enableAudio) {
+        //     if (!infoPlist.UIBackgroundModes.includes('audio')) {
+        //         infoPlist.UIBackgroundModes.push('audio');
+        //     }
+        // } else {
+        //     infoPlist.UIBackgroundModes = infoPlist.UIBackgroundModes.filter(
+        //         (mode) => mode !== 'audio'
+        //     );
+        //     console.log(`[rns-nativecall] 'audio' background mode removed.`);
+        // }
 
         ['voip', 'remote-notification'].forEach(mode => {
             if (!infoPlist.UIBackgroundModes.includes(mode)) {