From d8df4b9e358c0cb0cad3dea1c35cb627151285cc Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 2 Feb 2017 10:55:14 -0500 Subject: [PATCH] Can receive calls while in settings The existing presented settings (or fingerprint verification) modals were preventing the display of the incoming call modal. // FREEBIE --- Signal/src/view controllers/SignalsViewController.m | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Signal/src/view controllers/SignalsViewController.m b/Signal/src/view controllers/SignalsViewController.m index 5c59e2b93..42e5ca39a 100644 --- a/Signal/src/view controllers/SignalsViewController.m +++ b/Signal/src/view controllers/SignalsViewController.m @@ -161,9 +161,16 @@ NSString *const SignalsViewControllerSegueShowIncomingCall = @"ShowIncomingCallS return; } - SignalCall *call = (SignalCall *)notification.object; - [self performSegueWithIdentifier:SignalsViewControllerSegueShowIncomingCall sender:call]; + + // Dismiss any other modals so we can present call modal. + if (self.presentedViewController) { + [self dismissViewControllerAnimated:YES completion:^{ + [self performSegueWithIdentifier:SignalsViewControllerSegueShowIncomingCall sender:call]; + }]; + } else { + [self performSegueWithIdentifier:SignalsViewControllerSegueShowIncomingCall sender:call]; + } } - (void)previewingContext:(id)previewingContext