voice-react-native-sdk 2.0.0-preview.fork.4 → 2.0.0-preview.fork.6

package/android/src/main/java/com/twiliovoicereactnative/CallListenerProxy.java

@@ -54,11 +54,14 @@ class CallListenerProxy implements Call.Listener {
 
     // stop sound and routing
     getMediaPlayerManager().stop();
-    getAudioSwitchManager().getAudioSwitch().deactivate();
 
     // find call record & remove
     CallRecord callRecord = Objects.requireNonNull(getCallRecordDatabase().remove(new CallRecord(uuid)));
 
+    if (getCallRecordDatabase().getCollection().isEmpty()) {
+      getAudioSwitchManager().getAudioSwitch().deactivate();
+    }
+
     // take down notification
     getVoiceServiceApi().cancelActiveCallNotification(callRecord);
 
@@ -147,7 +150,9 @@ class CallListenerProxy implements Call.Listener {
     // stop audio & cancel notification
     getMediaPlayerManager().stop();
     getMediaPlayerManager().play(MediaPlayerManager.SoundTable.DISCONNECT);
-    getAudioSwitchManager().getAudioSwitch().deactivate();
+    if (getCallRecordDatabase().getCollection().isEmpty()) {
+      getAudioSwitchManager().getAudioSwitch().deactivate();
+    }
     getVoiceServiceApi().cancelActiveCallNotification(callRecord);
 
     // notify JS layer

package/ios/TwilioVoiceReactNative+CallInvite.m

@@ -36,7 +36,12 @@
             break;
         }
     }
-    NSAssert(uuid, @"No matching call invite");
+
+    if (!uuid) {
+        NSLog(@"No matching call invite for cancelled call SID %@. The invite may have already been accepted or removed.", cancelledCallInvite.callSid);
+        return;
+    }
+
     self.cancelledCallInviteMap[uuid] = cancelledCallInvite;
 
     [self sendEventWithName:kTwilioVoiceReactNativeScopeCallInvite
@@ -47,9 +52,9 @@
                          kTwilioVoiceReactNativeVoiceErrorKeyError: @{
                            kTwilioVoiceReactNativeVoiceErrorKeyCode: @(error.code),
                            kTwilioVoiceReactNativeVoiceErrorKeyMessage: [error localizedDescription]}}];
-    
+
     [self.callInviteMap removeObjectForKey:uuid];
-    
+
     [self endCallWithUuid:[[NSUUID alloc] initWithUUIDString:uuid]];
 }
 

package/ios/TwilioVoiceReactNative+CallKit.m

@@ -194,9 +194,14 @@ NSString * const kDefaultCallKitConfigurationName = @"Twilio Voice React Native"
 
 - (void)performAnswerVoiceCallWithUUID:(NSUUID *)uuid
                             completion:(void(^)(BOOL success))completionHandler {
-    NSAssert(self.callInviteMap[uuid.UUIDString], @"No call invite");
-    
     TVOCallInvite *callInvite = self.callInviteMap[uuid.UUIDString];
+
+    if (!callInvite) {
+        NSLog(@"Call invite for UUID %@ not found. The invite was likely cancelled before the answer could be processed.", uuid.UUIDString);
+        completionHandler(NO);
+        return;
+    }
+
     TVOAcceptOptions *acceptOptions = [TVOAcceptOptions optionsWithCallInvite:callInvite block:^(TVOAcceptOptionsBuilder *builder) {
         builder.uuid = uuid;
         builder.callMessageDelegate = self;
@@ -292,7 +297,13 @@ NSString * const kDefaultCallKitConfigurationName = @"Twilio Voice React Native"
 - (void)provider:(CXProvider *)provider performAnswerCallAction:(CXAnswerCallAction *)action {
     [TwilioVoiceReactNative twilioAudioDevice].enabled = NO;
     [TwilioVoiceReactNative twilioAudioDevice].block();
-    
+
+    if (!self.callInviteMap[action.callUUID.UUIDString]) {
+        NSLog(@"Cannot answer call: invite for UUID %@ no longer exists (likely cancelled).", action.callUUID.UUIDString);
+        [action fail];
+        return;
+    }
+
     [self performAnswerVoiceCallWithUUID:action.callUUID completion:^(BOOL success) {
         if (success) {
             NSLog(@"performAnswerVoiceCallWithUUID successful");
@@ -300,7 +311,7 @@ NSString * const kDefaultCallKitConfigurationName = @"Twilio Voice React Native"
             NSLog(@"performAnswerVoiceCallWithUUID failed");
         }
     }];
-        
+
     [action fulfill];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "voice-react-native-sdk",
-  "version": "2.0.0-preview.fork.4",
+  "version": "2.0.0-preview.fork.6",
   "description": "Twilio Voice React Native SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",