Merge branch 'mkirk/ios9-hack-restore-input-view' into release/2.38.1

6 years ago · 2e1d805dd5
parent d06280a270 8ead2cc83d
commit 2e1d805dd5
1 changed files with 7 additions and 0 deletions
--- 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
 {
+    OWSAssertDebug(self.isFirstResponder);
+    if (@available(iOS 10, *)) {
+        // do nothing
+    } else {
+        [self reloadInputViews];
+    }
+
    [self tryToSendAttachments:attachments messageText:messageText];
 }