From ae1d82be841e506fc9ed1f019840a83e20b4f824 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 1 Jun 2018 11:09:16 -0400 Subject: [PATCH] Fix: input toolbar disappears when tapping media while edit menu is present // FREEBIE --- .../ConversationView/ConversationViewController.m | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 9eacfd0a7..3f68d8784 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2075,6 +2075,12 @@ typedef enum : NSUInteger { [self dismissKeyBoard]; + // In case we were presenting edit menu, we need to become first responder before presenting another VC + // else UIKit won't restore first responder status to us when the presented VC is dismissed. + if (!self.isFirstResponder) { + [self becomeFirstResponder]; + } + if (![viewItem.interaction isKindOfClass:[TSMessage class]]) { OWSFail(@"Unexpected viewItem.interaction"); return; @@ -2098,6 +2104,11 @@ typedef enum : NSUInteger { OWSAssert(attachmentStream); [self dismissKeyBoard]; + // In case we were presenting edit menu, we need to become first responder before presenting another VC + // else UIKit won't restore first responder status to us when the presented VC is dismissed. + if (!self.isFirstResponder) { + [self becomeFirstResponder]; + } if (![viewItem.interaction isKindOfClass:[TSMessage class]]) { OWSFail(@"Unexpected viewItem.interaction");