Merge branch 'master' into notification-payload

Author: Ricardo Corrie

README.md

@@ -85,6 +85,27 @@ RNCallKeep.setup(options);
       Any additional permissions you'd like your app to have at first launch. Can be used to simplify permission flows and avoid
       multiple popups to the user at different times.
 
+## Constants
+
+To make passing the right integer into methods easier, there are constants that are exported from the module.
+
+```
+const CONSTANTS = {
+  END_CALL_REASONS: {
+    FAILED: 1,
+    REMOTE_ENDED: 2,
+    UNANSWERED: 3,
+    ANSWERED_ELSEWHERE: 4,
+    DECLINED_ELSEWHERE: 5,
+    MISSED: 6
+  }
+};
+
+const { CONSTANTS as CK_CONSTANTS, RNCallKeep } from 'react-native-callkeep';
+
+console.log(CK_CONSTANTS.END_CALL_REASONS.FAILED) // outputs 1
+```
+
 ## Methods
 
 ### setAvailable
@@ -238,14 +259,14 @@ RNCallKeep.reportEndCallWithUUID(uuid, reason);
     - Call failed: 1
     - Remote user ended call: 2
     - Remote user did not answer: 3
-  - `CXCallEndedReason` constants used for iOS. `DisconnectCause` used for Android.
-  - Example enum for reasons
+    - Call Answered elsewhere: 4
+    - Call declined elsewhere: 5 (on Android this will map to Remote user ended call if you use the constants)
+    - Missed: 6 (on iOS this will map to remote user ended call)
+  - Access reasons as constants
   ```js
-  END_CALL_REASON = {
-    failed: 1,
-    remoteEnded: 2,
-    unanswered: 3
-  }
+  const { CONSTANTS as CK_CONSTANTS, RNCallKeep } from 'react-native-callkeep';
+
+  RNCallKeep.reportEndCallWithUUID(uuid, CK_CONSTANTS.END_CALL_REASONS.FAILED);
   ```
 
 ### setMutedCall
@@ -420,14 +441,26 @@ RNCallKeep.addEventListener('didActivateAudioSession', () => {
 Callback for `RNCallKeep.displayIncomingCall`
 
 ```js
-RNCallKeep.addEventListener('didDisplayIncomingCall', ({ error, uuid, handle, localizedCallerName, fromPushKit }) => {
+RNCallKeep.addEventListener('didDisplayIncomingCall', ({ error, callUUID, handle, localizedCallerName, hasVideo, fromPushKit }) => {
   // you might want to do following things when receiving this event:
   // - Start playing ringback if it is an outgoing call
 });
 ```
 
 - `error` (string)
   - iOS only.
+- `callUUID` (string)
+  - The UUID of the call.
+- `handle` (string)
+  - Phone number of the caller
+- `localizedCallerName` (string)
+  - Name of the caller to be displayed on the native UI
+- `hasVideo` (string)
+  - `1` (video enabled)
+  - `0` (video not enabled)
+- `fromPushKit` (string)
+  - `1` (call triggered from PushKit)
+  - `0` (call not triggered from PushKit)
 
 ### - didPerformSetMutedCallAction
 
@@ -471,7 +504,7 @@ RNCallKeep.addEventListener('didPerformDTMFAction', ({ digits, callUUID }) => {
   - The digits that emit the dtmf tone
 - `callUUID` (string)
   - The UUID of the call.
-  
+
 ### - checkReachability
 
 On Android when the application is in background, after a certain delay the OS will close every connection with informing about it.
@@ -611,7 +644,7 @@ class RNCallKeepExample extends React.Component {
 ## Receiving a call when the application is not reachable.
 
 In some case your application can be unreachable :
-- when the user kill the application 
+- when the user kill the application
 - when it's in background since a long time (eg: after ~5mn the os will kill all connections).
 
 To be able to wake up your application to display the incoming call, you can use [https://github.com/ianlin/react-native-voip-push-notification](react-native-voip-push-notification) on iOS or BackgroundMessaging from [react-native-firebase](https://rnfirebase.io/docs/v5.x.x/messaging/receiving-messages#4)-(Optional)(Android-only)-Listen-for-FCM-messages-in-the-background).
@@ -626,13 +659,13 @@ Since iOS 13, you'll have to report the incoming calls that wakes up your applic
 - (void)pushRegistry:(PKPushRegistry *)registry didReceiveIncomingPushWithPayload:(PKPushPayload *)payload forType:(PKPushType)type withCompletionHandler:(void (^)(void))completion {
   // Process the received push
   [RNVoipPushNotificationManager didReceiveIncomingPushWithPayload:payload forType:(NSString *)type];
-  
+
   // Retrieve information like handle and callerName here
   // NSString *uuid = /* fetch for payload or ... */ [[[NSUUID UUID] UUIDString] lowercaseString];
   // NSString *callerName = @"caller name here";
   // NSString *handle = @"caller number here";
   // NSDictionary *extra = [payload.dictionaryPayload valueForKeyPath:@"custom.path.to.data"]; /* use this to pass any special data (ie. from your notification) down to RN. Can also be `nil` */
-  
+
   [RNCallKeep reportNewIncomingCall:uuid handle:handle handleType:@"generic" hasVideo:false localizedCallerName:callerName fromPushKit: YES payload:extra];
 
   completion();
@@ -647,6 +680,9 @@ Since iOS 13, you'll have to report the incoming calls that wakes up your applic
 adb logcat *:S RNCallKeepModule:V
 ```
 
+## Troubleshooting
+- Ensure that you construct a valid `uuid` by importing the `uuid` library and running `uuid.v4()` as shown in the examples. If you don't do this and use a custom string, the incoming call screen will never be shown on iOS.
+
 ## Contributing
 
 Any pull request, issue report and suggestion are highly welcome!

RNCallKeep.podspec

@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.requires_arc        = true
   s.platform            = :ios, "8.0"
   s.source_files        = "ios/RNCallKeep/*.{h,m}"
-  s.dependency 'React/Core'
+  s.dependency 'React'
 end
 

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

@@ -135,11 +135,18 @@ public void reportDisconnect(int reason) {
                 setDisconnected(new DisconnectCause(DisconnectCause.ERROR));
                 break;
             case 2:
+            case 5:
                 setDisconnected(new DisconnectCause(DisconnectCause.REMOTE));
                 break;
             case 3:
                 setDisconnected(new DisconnectCause(DisconnectCause.BUSY));
                 break;
+            case 4:
+                setDisconnected(new DisconnectCause(DisconnectCause.ANSWERED_ELSEWHERE));
+                break;
+            case 6:
+                setDisconnected(new DisconnectCause(DisconnectCause.MISSED));
+                break;
             default:
                 break;
         }

example/package.json

@@ -11,7 +11,7 @@
     "react-dom": "^16.8.6",
     "react-native": "0.59.8",
     "react-native-background-timer": "^2.1.1",
-    "react-native-callkeep": "https://github.com/react-native-webrtc/react-native-callkeep#fix_outgoing_call_ios",
+    "react-native-callkeep": "3.0.7",
     "react-native-device-info": "^2.3.2",
     "react-native-gesture-handler": "~1.3.0",
     "react-native-reanimated": "~1.1.0",

example/yarn.lock

@@ -4132,9 +4132,10 @@ react-native-branch@~3.0.1:
   resolved "https://registry.yarnpkg.com/react-native-branch/-/react-native-branch-3.0.1.tgz#5b07b61cbd290168cd3c3662e017ebe0f356d2ca"
   integrity sha512-vbcYxPZlpF5f39GAEUF8kuGQqCNeD3E6zEdvtOq8oCGZunHXlWlKgAS6dgBKCvsHvXgHuMtpvs39VgOp8DaKig==
 
-"react-native-callkeep@https://github.com/react-native-webrtc/react-native-callkeep#fix_outgoing_call_ios":
-  version "3.0.1"
-  resolved "https://github.com/react-native-webrtc/react-native-callkeep#22a3f2d9f8ede5e83f88d9a16c3786efe249ce1f"
+[email protected]:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/react-native-callkeep/-/react-native-callkeep-3.0.7.tgz#3e9afbfaaf795e74d2b92750d14f144792278467"
+  integrity sha512-T0BiCmE2/egDCc4tlVjna5YpQ/4YdUH4uv8e3WlCcM80SpUyKLY6cPwbLXTXhBgF08l260oVUFSNfQX6snUQbg==
 
 react-native-device-info@^2.3.2:
   version "2.3.2"

index.d.ts

@@ -17,9 +17,9 @@ interface IOptions {
   ios: {
     appName: string,
     imageName?: string,
-    supportsVideo: false,
-    maximumCallGroups: '1',
-    maximumCallsPerCallGroup: '1'
+    supportsVideo?: boolean,
+    maximumCallGroups?: string,
+    maximumCallsPerCallGroup?: string,
     ringtoneSound?: string,
   },
   android: {

index.js

@@ -6,6 +6,18 @@ const RNCallKeepModule = NativeModules.RNCallKeep;
 const isIOS = Platform.OS === 'ios';
 const supportConnectionService = !isIOS && Platform.Version >= 23;
 
+const CONSTANTS = {
+  END_CALL_REASONS: {
+    FAILED: 1,
+    REMOTE_ENDED: 2,
+    UNANSWERED: 3,
+    ANSWERED_ELSEWHERE: 4,
+    DECLINED_ELSEWHERE: isIOS ? 5 : 2, // make declined elsewhere link to "Remote ended" on android because that's kinda true
+    MISSED: isIOS ? 2 : 6  }
+};
+
+export { CONSTANTS };
+
 class RNCallKeep {
 
   constructor() {

ios/RNCallKeep/RNCallKeep.m

@@ -236,15 +236,22 @@ + (void)initCallKitProvider {
 #endif
     NSUUID *uuid = [[NSUUID alloc] initWithUUIDString:uuidString];
     switch (reason) {
-        case CXCallEndedReasonFailed:
+        case 1:
             [self.callKeepProvider reportCallWithUUID:uuid endedAtDate:[NSDate date] reason:CXCallEndedReasonFailed];
             break;
-        case CXCallEndedReasonRemoteEnded:
+        case 2:
+        case 6:
             [self.callKeepProvider reportCallWithUUID:uuid endedAtDate:[NSDate date] reason:CXCallEndedReasonRemoteEnded];
             break;
-        case CXCallEndedReasonUnanswered:
+        case 3:
             [self.callKeepProvider reportCallWithUUID:uuid endedAtDate:[NSDate date] reason:CXCallEndedReasonUnanswered];
             break;
+        case 4:
+            [self.callKeepProvider reportCallWithUUID:uuid endedAtDate:[NSDate date] reason:CXCallEndedReasonAnsweredElsewhere];
+            break;
+        case 5:
+            [self.callKeepProvider reportCallWithUUID:uuid endedAtDate:[NSDate date] reason:CXCallEndedReasonDeclinedElsewhere];
+            break;
         default:
             break;
     }
@@ -345,7 +352,7 @@ + (void)reportNewIncomingCall:(NSString *)uuidString
     [RNCallKeep initCallKitProvider];
     [sharedProvider reportNewIncomingCallWithUUID:uuid update:callUpdate completion:^(NSError * _Nullable error) {
         RNCallKeep *callKeep = [RNCallKeep allocWithZone: nil];
-        [callKeep sendEventWithName:RNCallKeepDidDisplayIncomingCall body:@{ @"error": error ? error.localizedDescription : @"", @"callUUID": uuidString, @"handle": handle, @"localizedCallerName": localizedCallerName, @"fromPushKit": fromPushKit ? @"1" : @"0", @"payload": payload }];
+        [callKeep sendEventWithName:RNCallKeepDidDisplayIncomingCall body:@{ @"error": error ? error.localizedDescription : @"", @"callUUID": uuidString, @"handle": handle, @"localizedCallerName": localizedCallerName, @"hasVideo": hasVideo ? @"1" : @"0", @"fromPushKit": fromPushKit ? @"1" : @"0", @"payload": payload }];
         if (error == nil) {
             // Workaround per https://forums.developer.apple.com/message/169511
             if ([callKeep lessThanIos10_2]) {
@@ -472,8 +479,14 @@ + (BOOL)application:(UIApplication *)application
     // iOS 13 returns an INStartCallIntent userActivity type
     if (@available(iOS 13, *)) {
         INStartCallIntent *intent = (INStartCallIntent*)interaction.intent;
-        isAudioCall = intent.callCapability == INCallCapabilityAudioCall;
-        isVideoCall = intent.callCapability == INCallCapabilityVideoCall;
+        // callCapability is not available on iOS > 13.2, but it is in 13.1 weirdly...
+        if ([intent respondsToSelector:@selector(callCapability)]) {
+            isAudioCall = intent.callCapability == INCallCapabilityAudioCall;
+            isVideoCall = intent.callCapability == INCallCapabilityVideoCall;
+        } else {
+            isAudioCall = [userActivity.activityType isEqualToString:INStartAudioCallIntentIdentifier];
+            isVideoCall = [userActivity.activityType isEqualToString:INStartVideoCallIntentIdentifier];
+        }
     } else {
 #endif
         //XCode 10 and below

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-callkeep",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "iOS 10 CallKit and Android ConnectionService Framework For React Native",
   "main": "index.js",
   "scripts": {},