Merge pull request #542 from react-native-webrtc/allow_multiple_handle_types

Add handleType as array in setup method for iOS

Author: manuquentin

README.md

@@ -113,6 +113,11 @@ Alternative on iOS you can perform setup in `AppDelegate.m`. Doing this allows c
       If provided, it will be displayed on system UI during the call
     - `ringtoneSound`: string (optional)
       If provided, it will be played when incoming calls received; the system will use the default ringtone if this is not provided
+    - `handleType`: string|array (optional)
+      If provided, it will tell iOS what kind of handle(s) (number) your app can handle.
+      - `generic`
+      - `number` (default)
+      - `email`
     - `includesCallsInRecents`: boolean (optional)
       If provided, calls will be shown in the recent calls when true and not when false (ios 11 and above) (Default: true)
     - `maximumCallGroups`: string (optional)

ios/RNCallKeep/RNCallKeep.m

@@ -790,19 +790,39 @@ - (BOOL)lessThanIos10_2
     }
 }
 
++ (NSSet *) getSupportedHandleTypes:(id) handleType {
+    if(handleType){
+        if([handleType isKindOfClass:[NSArray class]]) {
+            NSSet *types = [NSSet set];
+
+            for (NSString* type in handleType) {
+                types = [types setByAddingObject:[NSNumber numberWithInteger:[RNCallKeep getHandleType:type]]];
+            }
+
+            return types;
+        } else {
+            int _handleType = [RNCallKeep getHandleType:handleType];
+
+            return [NSSet setWithObjects:[NSNumber numberWithInteger:_handleType], nil];
+        }
+    } else {
+        return [NSSet setWithObjects:[NSNumber numberWithInteger:CXHandleTypePhoneNumber], nil];
+    }
+}
+
 + (int)getHandleType:(NSString *)handleType
 {
-    int _handleType;
     if ([handleType isEqualToString:@"generic"]) {
-        _handleType = CXHandleTypeGeneric;
+        return CXHandleTypeGeneric;
     } else if ([handleType isEqualToString:@"number"]) {
-        _handleType = CXHandleTypePhoneNumber;
+        return CXHandleTypePhoneNumber;
+    } else if ([handleType isEqualToString:@"phone"]) {
+        return CXHandleTypePhoneNumber;
     } else if ([handleType isEqualToString:@"email"]) {
-        _handleType = CXHandleTypeEmailAddress;
+        return CXHandleTypeEmailAddress;
     } else {
-        _handleType = CXHandleTypeGeneric;
+        return CXHandleTypeGeneric;
     }
-    return _handleType;
 }
 
 + (CXProviderConfiguration *)getProviderConfiguration:(NSDictionary*)settings
@@ -814,12 +834,8 @@ + (CXProviderConfiguration *)getProviderConfiguration:(NSDictionary*)settings
     providerConfiguration.supportsVideo = YES;
     providerConfiguration.maximumCallGroups = 3;
     providerConfiguration.maximumCallsPerCallGroup = 1;
-    if(settings[@"handleType"]){
-        int _handleType = [RNCallKeep getHandleType:settings[@"handleType"]];
-        providerConfiguration.supportedHandleTypes = [NSSet setWithObjects:[NSNumber numberWithInteger:_handleType], nil];
-    }else{
-        providerConfiguration.supportedHandleTypes = [NSSet setWithObjects:[NSNumber numberWithInteger:CXHandleTypePhoneNumber], nil];
-    }
+    providerConfiguration.supportedHandleTypes = [RNCallKeep getSupportedHandleTypes:settings[@"handleType"]];
+
     if (settings[@"supportsVideo"]) {
         providerConfiguration.supportsVideo = [settings[@"supportsVideo"] boolValue];
     }