Merge pull request #133 from nimbleape/add-more-end-reasons

Add more end reasons

Author: manuquentin

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
@@ -471,7 +492,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 +632,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,12 +647,12 @@ 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";
-  
+
   [RNCallKeep reportNewIncomingCall:uuid handle:handle handleType:@"generic" hasVideo:false localizedCallerName:callerName fromPushKit: YES];
 
   completion();

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;
         }

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;
     }