Skip to content
This repository has been archived by the owner on May 26, 2019. It is now read-only.

Fix / CallKit uppercasing callUUID #27

Closed
wants to merge 2 commits into from
Closed

Fix / CallKit uppercasing callUUID #27

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2993ee5
callUUID string lowercased on answer and end callbacks.
Feb 3, 2018
76eec11
lowercases callUUID only if there's no lowercase letters.
Feb 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ios/RNCallKit/RNCallKit.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,12 @@ - (int)getHandleType:(NSString *)handleType
return _handleType;
}

- (BOOL)containsLowerCaseLetter:(NSString *)callUUID
{
NSRegularExpression* regex = [[NSRegularExpression alloc] initWithPattern:@"[a-z]" options:0 error:nil];
return [regex numberOfMatchesInString:callUUID options:0 range:NSMakeRange(0, [callUUID length])] > 0;
}

- (CXProviderConfiguration *)getProviderConfiguration
{
#ifdef DEBUG
Expand Down Expand Up @@ -366,7 +372,8 @@ - (void)provider:(CXProvider *)provider performAnswerCallAction:(CXAnswerCallAct
if (![self lessThanIos10_2]) {
[self configureAudioSession];
}
[self sendEventWithName:RNCallKitPerformAnswerCallAction body:@{ @"callUUID": action.callUUID.UUIDString }];
NSString *callUUID = [self containsLowerCaseLetter:action.callUUID.UUIDString] ? action.callUUID.UUIDString : [action.callUUID.UUIDString lowercaseString];
[self sendEventWithName:RNCallKitPerformAnswerCallAction body:@{ @"callUUID": callUUID }];
[action fulfill];
}

Expand All @@ -376,7 +383,8 @@ - (void)provider:(CXProvider *)provider performEndCallAction:(CXEndCallAction *)
#ifdef DEBUG
NSLog(@"[RNCallKit][CXProviderDelegate][provider:performEndCallAction]");
#endif
[self sendEventWithName:RNCallKitPerformEndCallAction body:@{ @"callUUID": action.callUUID.UUIDString }];
NSString *callUUID = [self containsLowerCaseLetter:action.callUUID.UUIDString] ? action.callUUID.UUIDString : [action.callUUID.UUIDString lowercaseString];
[self sendEventWithName:RNCallKitPerformEndCallAction body:@{ @"callUUID": callUUID }];
[action fulfill];
}

Expand Down