From e604437e240d8b7452ddf16601942525d6a57adf Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 2 May 2018 20:15:42 -0400 Subject: [PATCH] Don't become first responder while presenting // FREEBIE --- .../ConversationView/ConversationViewController.m | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 54d6c97bb..0d1c0801a 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -561,7 +561,15 @@ typedef enum : NSUInteger { - (BOOL)canBecomeFirstResponder { - return YES; + // Normally there'd be no mechanism for us to become first responder while presenting + // another view controller, however due to our screen lock window juggling, a side effect of + // calling `makeKeyAndVisible` is that "last known" first responder is sent "becomeFirstResponder", + // regardless of if it is no longer the top most VC. + if (self.presentedViewController) { + return NO; + } else { + return YES; + } } - (nullable UIView *)inputAccessoryView