voice-react-native-sdk 2.0.0-preview.fork.3 → 2.0.0-preview.fork.5

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.m

@@ -6,6 +6,7 @@
 //
 
 @import AVKit;
+@import CallKit;
 
 #import "TwilioVoicePushRegistry.h"
 #import "TwilioVoiceReactNative.h"
@@ -780,9 +781,21 @@ RCT_EXPORT_METHOD(call_hold:(NSString *)uuid
 {
     TVOCall *call = [self getCallFromMap:uuid resolver:resolver];
     if (!call) return;
-    
-    [call setOnHold:onHold];
-    [self resolvePromise:resolver value:@(call.isOnHold)];
+
+    // Persist the hold state to CallKit
+    // This is to fix a bug where when ending a call, if there was another call on hold, the call would not allow voice input/output.
+    CXSetHeldCallAction *holdAction = [[CXSetHeldCallAction alloc] initWithCallUUID:call.uuid onHold:onHold];
+    CXTransaction *transaction = [[CXTransaction alloc] initWithAction:holdAction];
+
+    [self.callKitCallController requestTransaction:transaction completion:^(NSError *error) {
+        if (error) {
+            [call setOnHold:onHold];
+            if (!onHold) {
+                [TwilioVoiceReactNative twilioAudioDevice].enabled = YES;
+            }
+        }
+        [self resolvePromise:resolver value:@(call.isOnHold)];
+    }];
 }
 
 RCT_EXPORT_METHOD(call_isOnHold:(NSString *)uuid

package/package.json

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