Merge branch 'charlesmchen/gifVsDraft'

8 years ago · c6738c477a
parent 569e6808a4 89dbcb0fe8
commit c6738c477a
2 changed files with 1 additions and 2 deletions
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
@ -173,7 +173,6 @@ NS_ASSUME_NONNULL_BEGIN
    return [self.text ows_stripped];
 }

-
 #pragma mark - UITextViewDelegate

 - (void)textViewDidBeginEditing:(UITextView *)textView
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@ -459,7 +459,6 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
        [self.inputToolbar endEditing:TRUE];
    } else {
        self.inputToolbar.hidden = NO;
-        [self loadDraftInCompose];
    }
 }

@ -477,6 +476,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
    [self createHeaderViews];
    [self createBackButton];
    [self addNotificationListeners];
+    [self loadDraftInCompose];
 }

 - (void)createContents