From e4f7995e4d4d0b0829c8889b445247f6c380907c Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Fri, 1 Jun 2018 11:50:18 -0400
Subject: [PATCH 1/2] Ensure conversation view is first responder before
 presenting another view.

---
 .../ConversationView/ConversationViewController.m  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 6d2398a9bc..a49abc6f82 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -5114,6 +5114,20 @@ interactionControllerForAnimationController:(id<UIViewControllerAnimatedTransiti
     [self dismissViewControllerAnimated:YES completion:nil];
 }
 
+#pragma mark -
+
+- (void)presentViewController:(UIViewController *)viewController
+                     animated:(BOOL)animated
+                   completion:(void (^__nullable)(void))completion
+{
+    // Ensure that we are first responder before presenting other views.
+    // This ensures that the input toolbar will be restored after the
+    // presented view is dismissed.
+    [self becomeFirstResponder];
+
+    [super presentViewController:viewController animated:animated completion:completion];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END

From 5ed22ada7b4e47ebb70d640d4afb35748a76c5f1 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Fri, 1 Jun 2018 12:01:20 -0400
Subject: [PATCH 2/2] Respond to CR.

---
 .../ConversationView/ConversationViewController.m             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index a49abc6f82..789a54f391 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -5123,7 +5123,9 @@ interactionControllerForAnimationController:(id<UIViewControllerAnimatedTransiti
     // Ensure that we are first responder before presenting other views.
     // This ensures that the input toolbar will be restored after the
     // presented view is dismissed.
-    [self becomeFirstResponder];
+    if (![self isFirstResponder]) {
+        [self becomeFirstResponder];
+    }
 
     [super presentViewController:viewController animated:animated completion:completion];
 }