Merge pull request #14 from wazo-pbx/add_hold_action

Add hold action

Author: manuquentin

README.md

@@ -287,6 +287,20 @@ RNCallKeep.addEventListener('didPerformSetMutedCallAction', (muted) => {
 });
 
 ```
+### - didToggleHoldCallAction
+
+A call was held or unheld by the current user
+
+```js
+RNCallKeep.addEventListener('didToggleHoldCallAction', ({ hold, callUUID }) => {
+  
+});
+```
+
+- `hold` (boolean)
+- `callUUID` (string)
+  - The UUID of the call that is to be answered (iOS only).
+
 ### - didPerformDTMFAction
 
 Used type a number on his dialer
@@ -387,9 +401,12 @@ class RNCallKeepExample extends React.Component {
   render() {
   }
 }
-
 ```
 
+## Notes
+
+- On iOS, you should call `setup` each time you want to use callKeep.
+
 ## Contributing
 
 Any pull request, issue report and suggestion are highly welcome!

actions.js

@@ -9,8 +9,7 @@ const RNCallKeepPerformEndCallAction = 'RNCallKeepPerformEndCallAction';
 const RNCallKeepDidActivateAudioSession = 'RNCallKeepDidActivateAudioSession';
 const RNCallKeepDidDisplayIncomingCall = 'RNCallKeepDidDisplayIncomingCall';
 const RNCallKeepDidPerformSetMutedCallAction = 'RNCallKeepDidPerformSetMutedCallAction';
-const RNCallKeepDidPerformHoldAction = 'RNCallKeepDidPerformHoldAction';
-const RNCallKeepDidPerformUnHoldAction = 'RNCallKeepDidPerformUnHoldAction';
+const RNCallKeepDidToggleHoldAction = 'RNCallKeepDidToggleHoldAction';
 const RNCallKeepDidPerformDTMFAction = 'RNCallKeepDidPerformDTMFAction';
 const isIOS = Platform.OS === 'ios';
 
@@ -43,6 +42,9 @@ const didDisplayIncomingCall = handler =>
 const didPerformSetMutedCallAction = handler =>
   eventEmitter.addListener(RNCallKeepDidPerformSetMutedCallAction, (data) => handler(data.muted));
 
+const didToggleHoldCallAction = handler =>
+  eventEmitter.addListener(RNCallKeepDidToggleHoldAction, handler);
+
 const didPerformDTMFAction = handler =>
   eventEmitter.addListener(RNCallKeepDidPerformDTMFAction, (data) => {
     const payload = isIOS ? { dtmf: data.digits, callUUID: data.callUUID } : data;
@@ -57,6 +59,7 @@ export const listeners = {
   didActivateAudioSession,
   didDisplayIncomingCall,
   didPerformSetMutedCallAction,
+  didToggleHoldCallAction,
   didPerformDTMFAction,
 };
 

android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java

@@ -308,10 +308,12 @@ public void onReceive(Context context, Intent intent) {
                     sendEventToJS("RNCallKeepPerformAnswerCallAction", null);
                     break;
                 case ACTION_HOLD_CALL:
-                    sendEventToJS("RNCallKeepDidPerformHoldAction", null);
+                    args.putBoolean("hold", true);
+                    sendEventToJS("RNCallKeepDidToggleHoldAction", args);
                     break;
                 case ACTION_UNHOLD_CALL:
-                    sendEventToJS("RNCallKeepDidPerformUnHoldAction", null);
+                    args.putBoolean("hold", false);
+                    sendEventToJS("RNCallKeepDidToggleHoldAction", args);
                     break;
                 case ACTION_MUTE_CALL:
                     args.putBoolean("muted", true);

android/src/main/java/io/wazo/callkeep/VoiceConnectionService.java

@@ -155,13 +155,15 @@ public void onAbort() {
             @Override
             public void onHold() {
                 super.onHold();
+                connection.setOnHold();
 
                 sendCallRequestToActivity(ACTION_HOLD_CALL, null);
             }
 
             @Override
             public void onUnhold() {
                 super.onUnhold();
+                connection.setActive();
 
                 sendCallRequestToActivity(ACTION_UNHOLD_CALL, null);
             }

ios/RNCallKeep/RNCallKeep.m

@@ -25,6 +25,7 @@
 static NSString *const RNCallKeepDidDisplayIncomingCall = @"RNCallKeepDidDisplayIncomingCall";
 static NSString *const RNCallKeepDidPerformSetMutedCallAction = @"RNCallKeepDidPerformSetMutedCallAction";
 static NSString *const RNCallKeepPerformPlayDTMFCallAction = @"RNCallKeepDidPerformDTMFAction";
+static NSString *const RNCallKeepDidToggleHoldAction = @"RNCallKeepDidToggleHoldAction";
 
 @implementation RNCallKeep
 {
@@ -69,7 +70,8 @@ - (void)dealloc
              RNCallKeepDidActivateAudioSession,
              RNCallKeepDidDisplayIncomingCall,
              RNCallKeepDidPerformSetMutedCallAction,
-             RNCallKeepPerformPlayDTMFCallAction
+             RNCallKeepPerformPlayDTMFCallAction,
+             RNCallKeepDidToggleHoldAction
              ];
 }
 
@@ -123,11 +125,10 @@ - (void)dealloc
     CXCallUpdate *callUpdate = [[CXCallUpdate alloc] init];
     callUpdate.remoteHandle = [[CXHandle alloc] initWithType:_handleType value:handle];
     callUpdate.supportsDTMF = YES;
-    // TODO: Holding
-    callUpdate.supportsHolding = NO;
-    callUpdate.supportsGrouping = NO;
-    callUpdate.supportsUngrouping = NO;
-    callUpdate.hasVideo = hasVideo;
+    callUpdate.supportsHolding = YES;
+    callUpdate.supportsGrouping = YES;
+    callUpdate.supportsUngrouping = YES;
+    callUpdate.hasVideo = NO;
     callUpdate.localizedCallerName = localizedCallerName;
 
     [self.callKeepProvider reportNewIncomingCallWithUUID:uuid update:callUpdate completion:^(NSError * _Nullable error) {
@@ -243,9 +244,9 @@ - (void)requestTransaction:(CXTransaction *)transaction
                 CXCallUpdate *callUpdate = [[CXCallUpdate alloc] init];
                 callUpdate.remoteHandle = startCallAction.handle;
                 callUpdate.supportsDTMF = YES;
-                callUpdate.supportsHolding = NO;
-                callUpdate.supportsGrouping = NO;
-                callUpdate.supportsUngrouping = NO;
+                callUpdate.supportsHolding = YES;
+                callUpdate.supportsGrouping = YES;
+                callUpdate.supportsUngrouping = YES;
                 callUpdate.hasVideo = NO;
                 [self.callKeepProvider reportCallWithUUID:startCallAction.callUUID updated:callUpdate];
             }
@@ -292,7 +293,7 @@ - (CXProviderConfiguration *)getProviderConfiguration
 #endif
     CXProviderConfiguration *providerConfiguration = [[CXProviderConfiguration alloc] initWithLocalizedName:_settings[@"appName"]];
     providerConfiguration.supportsVideo = YES;
-    providerConfiguration.maximumCallGroups = 1;
+    providerConfiguration.maximumCallGroups = 3;
     providerConfiguration.maximumCallsPerCallGroup = 1;
     providerConfiguration.supportedHandleTypes = [NSSet setWithObjects:[NSNumber numberWithInteger:CXHandleTypePhoneNumber], [NSNumber numberWithInteger:CXHandleTypeEmailAddress], [NSNumber numberWithInteger:CXHandleTypeGeneric], nil];
     if (_settings[@"imageName"]) {
@@ -448,16 +449,20 @@ - (void)provider:(CXProvider *)provider performEndCallAction:(CXEndCallAction *)
     [action fulfill];
 }
 
-- (void)provider:(CXProvider *)provider performSetHeldCallAction:(CXSetHeldCallAction *)action
+-(void)provider:(CXProvider *)provider performSetHeldCallAction:(CXSetHeldCallAction *)action
 {
 #ifdef DEBUG
     NSLog(@"[RNCallKeep][CXProviderDelegate][provider:performSetHeldCallAction]");
 #endif
+    NSString *callUUID = [self containsLowerCaseLetter:action.callUUID.UUIDString] ? action.callUUID.UUIDString : [action.callUUID.UUIDString lowercaseString];
+
+    [self sendEventWithName:RNCallKeepDidToggleHoldAction body:@{ @"hold": @(action.onHold), @"callUUID": callUUID }];
+    [action fulfill];
 }
 
 - (void)provider:(CXProvider *)provider performPlayDTMFCallAction:(CXPlayDTMFCallAction *)action {
 #ifdef DEBUG
-    NSLog(@"[RNCallKit][CXProviderDelegate][provider:performPlayDTMFCallAction]");
+    NSLog(@"[RNCallKeep][CXProviderDelegate][provider:performPlayDTMFCallAction]");
 #endif
     NSString *callUUID = [self containsLowerCaseLetter:action.callUUID.UUIDString] ? action.callUUID.UUIDString : [action.callUUID.UUIDString lowercaseString];
     [self sendEventWithName:RNCallKeepPerformPlayDTMFCallAction body:@{ @"digits": action.digits, @"callUUID": callUUID }];