From fc07c7c04f8641e8a5e2cf87e150271b50498759 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 9 Nov 2017 03:14:58 -0500 Subject: [PATCH] Respond to CR. // FREEBIE --- Signal/src/call/CallService.swift | 4 ++-- Signal/src/util/UIViewController+Permissions.m | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift index dfb04b02c..8223d4549 100644 --- a/Signal/src/call/CallService.swift +++ b/Signal/src/call/CallService.swift @@ -1434,8 +1434,8 @@ protocol CallServiceObserver: class { public func handleFailedCall(failedCall: SignalCall?, error: CallError) { AssertIsOnMainThread() - if case CallError.assertionError(description: let description) = error { - Logger.error(description) + if case CallError.assertionError(description:let description) = error { + owsFail(description) } if let failedCall = failedCall { diff --git a/Signal/src/util/UIViewController+Permissions.m b/Signal/src/util/UIViewController+Permissions.m index c1e730aa4..0a14fe5e9 100644 --- a/Signal/src/util/UIViewController+Permissions.m +++ b/Signal/src/util/UIViewController+Permissions.m @@ -65,9 +65,7 @@ NS_ASSUME_NONNULL_BEGIN callback(YES); } else if (status == AVAuthorizationStatusNotDetermined) { [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo - completionHandler:^(BOOL granted) { - callback(granted); - }]; + completionHandler:callback]; } else { DDLogError(@"Unknown AVAuthorizationStatus: %ld", (long)status); callback(NO); @@ -91,9 +89,7 @@ NS_ASSUME_NONNULL_BEGIN return; } - [[AVAudioSession sharedInstance] requestRecordPermission:^(BOOL granted) { - callback(granted); - }]; + [[AVAudioSession sharedInstance] requestRecordPermission:callback]; } @end