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] 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 a49abc6f8..789a54f39 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];
 }