Merge pull request #38 from aarkalyk/display-incoming-call-callback

Callback for displayIncomingCall method

Author: ianlin

README.md

@@ -134,6 +134,8 @@ Initialise RNCallKit with options
   - generic
   - number (default)
   - email
+- **hasVideo**: boolean (optional)
+  - false (default)
 - **localizedCallerName**: string (optional)
 
 Call when you receive incoming calls to display system UI
@@ -209,6 +211,12 @@ The `AudioSession` has been activated by **RNCallKit**, you might want to do fol
 
 - Start playing ringback if it is an outgoing call
 
+### - didDisplayIncomingCall
+
+Callback for `RNCallKit.displayIncomingCall`
+
+**error**: string (optional)
+
 ## Usage
 
 ```javascript
@@ -237,6 +245,7 @@ class RNCallKitExample extends React.Component {
     RNCallKit.addEventListener('answerCall', this.onRNCallKitPerformAnswerCallAction);
     RNCallKit.addEventListener('endCall', this.onRNCallKitPerformEndCallAction);
     RNCallKit.addEventListener('didActivateAudioSession', this.onRNCallKitDidActivateAudioSession);
+    RNCallKit.addEventListener('didDisplayIncomingCall', this.onRNCallKitDidDisplayIncomingCall);
   }
 
   onRNCallKitDidReceiveStartCallAction(data) {
@@ -277,6 +286,12 @@ class RNCallKitExample extends React.Component {
      */
   }
 
+  onRNCallKitDidDisplayIncomingCall(error) {
+    /* You will get this event after RNCallKit finishes showing incoming call UI
+     * You can check if there was an error while displaying
+     */
+  }
+
   // This is a fake function where you can receive incoming call notifications
   onIncomingCall() {
     // Store the generated uuid somewhere

index.js

@@ -15,6 +15,7 @@ const RNCallKitDidReceiveStartCallAction = 'RNCallKitDidReceiveStartCallAction';
 const RNCallKitPerformAnswerCallAction = 'RNCallKitPerformAnswerCallAction';
 const RNCallKitPerformEndCallAction = 'RNCallKitPerformEndCallAction';
 const RNCallKitDidActivateAudioSession = 'RNCallKitDidActivateAudioSession';
+const RNCallKitDidDisplayIncomingCall = 'RNCallKitDidDisplayIncomingCall';
 
 export default class RNCallKit {
     static addEventListener(type, handler) {
@@ -41,7 +42,13 @@ export default class RNCallKit {
                 RNCallKitDidActivateAudioSession,
                 () => { handler(); }
             );
+        } else if (type === 'didDisplayIncomingCall') {
+            listener = _RNCallKitEmitter.addListener(
+                RNCallKitDidDisplayIncomingCall,
+                (data) => { handler(data.error); }
+            );
         }
+
         _callkitEventHandlers.set(handler, listener);
     }
 

ios/RNCallKit/RNCallKit.m

@@ -22,6 +22,7 @@
 static NSString *const RNCallKitPerformAnswerCallAction = @"RNCallKitPerformAnswerCallAction";
 static NSString *const RNCallKitPerformEndCallAction = @"RNCallKitPerformEndCallAction";
 static NSString *const RNCallKitDidActivateAudioSession = @"RNCallKitDidActivateAudioSession";
+static NSString *const RNCallKitDidDisplayIncomingCall = @"RNCallKitDidDisplayIncomingCall";
 
 @implementation RNCallKit
 {
@@ -60,11 +61,12 @@ - (void)dealloc
 - (NSArray<NSString *> *)supportedEvents
 {
     return @[
-        RNCallKitDidReceiveStartCallAction,
-        RNCallKitPerformAnswerCallAction,
-        RNCallKitPerformEndCallAction,
-        RNCallKitDidActivateAudioSession
-    ];
+             RNCallKitDidReceiveStartCallAction,
+             RNCallKitPerformAnswerCallAction,
+             RNCallKitPerformEndCallAction,
+             RNCallKitDidActivateAudioSession,
+             RNCallKitDidDisplayIncomingCall
+             ];
 }
 
 RCT_EXPORT_METHOD(setup:(NSDictionary *)options)
@@ -104,6 +106,7 @@ - (void)dealloc
     callUpdate.localizedCallerName = localizedCallerName;
 
     [self.callKitProvider reportNewIncomingCallWithUUID:uuid update:callUpdate completion:^(NSError * _Nullable error) {
+        [self sendEventWithName:RNCallKitDidDisplayIncomingCall body:@{ @"error": error ? error.localizedDescription : @"" }];
         if (error == nil) {
             // Workaround per https://forums.developer.apple.com/message/169511
             if ([self lessThanIos10_2]) {
@@ -309,7 +312,7 @@ + (BOOL)application:(UIApplication *)application
 
 + (BOOL)application:(UIApplication *)application
 continueUserActivity:(NSUserActivity *)userActivity
-  restorationHandler:(void(^)(NSArray * __nullable restorableObjects))restorationHandler
+ restorationHandler:(void(^)(NSArray * __nullable restorableObjects))restorationHandler
 {
 #ifdef DEBUG
     NSLog(@"[RNCallKit][application:continueUserActivity]");
@@ -319,25 +322,25 @@ + (BOOL)application:(UIApplication *)application
     NSString *handle;
     BOOL isAudioCall = [userActivity.activityType isEqualToString:INStartAudioCallIntentIdentifier];
     BOOL isVideoCall = [userActivity.activityType isEqualToString:INStartVideoCallIntentIdentifier];
-    
+
     if (isAudioCall) {
         INStartAudioCallIntent *startAudioCallIntent = (INStartAudioCallIntent *)interaction.intent;
         contact = [startAudioCallIntent.contacts firstObject];
     } else if (isVideoCall) {
         INStartVideoCallIntent *startVideoCallIntent = (INStartVideoCallIntent *)interaction.intent;
         contact = [startVideoCallIntent.contacts firstObject];
     }
-    
+
     if (contact != nil) {
         handle = contact.personHandle.value;
     }
-    
+
     if (handle != nil && handle.length > 0 ){
         NSDictionary *userInfo = @{
                                    @"handle": handle,
                                    @"video": @(isVideoCall)
                                    };
-        
+
         [[NSNotificationCenter defaultCenter] postNotificationName:RNCallKitHandleStartCallNotification
                                                             object:self
                                                           userInfo:userInfo];