oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve handling of call intents.

This commit is contained in:
Matthew Chen 2019-03-21 14:48:23 -04:00
parent 76ac745f8b
commit 85d58d3396
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Signal/src/AppDelegate.m
View File

@ -852,13 +852,10 @@ static NSTimeInterval launchStartedAt;
return;
}
NSString *_Nullable phoneNumber = handle;
if ([handle hasPrefix:CallKitCallManager.kAnonymousCallHandlePrefix]) {
phoneNumber = [self.primaryStorage phoneNumberForCallKitId:handle];
if (phoneNumber.length < 1) {
OWSLogWarn(@"ignoring attempt to initiate video call to unknown anonymous signal user.");
return;
}
NSString *_Nullable phoneNumber = [self phoneNumberForIntentHandle:handle];
if (phoneNumber.length < 1) {
OWSLogWarn(@"ignoring attempt to initiate video call to unknown user.");
return;
}
// This intent can be received from more than one user interaction.
@ -914,13 +911,10 @@ static NSTimeInterval launchStartedAt;
return;
}
NSString *_Nullable phoneNumber = handle;
if ([handle hasPrefix:CallKitCallManager.kAnonymousCallHandlePrefix]) {
phoneNumber = [self.primaryStorage phoneNumberForCallKitId:handle];
if (phoneNumber.length < 1) {
OWSLogWarn(@"ignoring attempt to initiate audio call to unknown anonymous signal user.");
return;
}
NSString *_Nullable phoneNumber = [self phoneNumberForIntentHandle:handle];
if (phoneNumber.length < 1) {
OWSLogWarn(@"ignoring attempt to initiate audio call to unknown user.");
return;
}
if (AppEnvironment.shared.callService.call != nil) {
@ -962,6 +956,27 @@ static NSTimeInterval launchStartedAt;
return NO;
}
- (nullable NSString *)phoneNumberForIntentHandle:(NSString *)handle
{
OWSAssertDebug(handle.length > 0);
if ([handle hasPrefix:CallKitCallManager.kAnonymousCallHandlePrefix]) {
NSString *_Nullable phoneNumber = [self.primaryStorage phoneNumberForCallKitId:handle];
if (phoneNumber.length < 1) {
OWSLogWarn(@"ignoring attempt to initiate audio call to unknown anonymous signal user.");
return nil;
}
return phoneNumber;
}
for (PhoneNumber *phoneNumber in
[PhoneNumber tryParsePhoneNumbersFromsUserSpecifiedText:handle
clientPhoneNumber:[TSAccountManager localNumber]]) {
return phoneNumber.toE164;
}
return nil;
}
#pragma mark - Orientation
- (UIInterfaceOrientationMask)application:(UIApplication *)application