From fdc9db34871e613dc86f69f07965f3bebabdd8a2 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Tue, 2 Apr 2019 15:31:20 -0600
Subject: [PATCH 1/2] iOS9 workaround to restore input view after sending
 captioned attachment

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

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 6ff11de17..ec9e05bb6 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -2977,6 +2977,13 @@ typedef enum : NSUInteger {
     didPickImageAttachments:(NSArray<SignalAttachment *> *)attachments
                 messageText:(NSString *_Nullable)messageText
 {
+    OWSAssert(self.isFirstResponder);
+    if (@available(iOS 10, *)) {
+        // do nothing
+    } else {
+        [self reloadInputViews];
+    }
+
     [self tryToSendAttachments:attachments messageText:messageText];
 }
 

From 8ead2cc83d567add02c060b79387caeb4b4383fd Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Wed, 3 Apr 2019 10:53:08 -0600
Subject: [PATCH 2/2] fix overzealous assert

---
 .../ConversationView/ConversationViewController.m               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index ec9e05bb6..bb49b1ba5 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -2977,7 +2977,7 @@ typedef enum : NSUInteger {
     didPickImageAttachments:(NSArray<SignalAttachment *> *)attachments
                 messageText:(NSString *_Nullable)messageText
 {
-    OWSAssert(self.isFirstResponder);
+    OWSAssertDebug(self.isFirstResponder);
     if (@available(iOS 10, *)) {
         // do nothing
     } else {