From f95e599c55b42ed29615c262c43f4465b3538cb7 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 26 Oct 2017 15:17:01 -0400 Subject: [PATCH 1/2] Don't overwrite draft after GIF send. // FREEBIE --- .../ConversationView/ConversationInputTextView.m | 1 - .../ConversationView/ConversationViewController.m | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m index a1b12a7e8..c1f1d3b79 100644 --- 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 diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 3096fa051..43804960a 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -225,6 +225,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { @property (nonatomic) BOOL viewHasEverAppeared; @property (nonatomic) BOOL wasScrolledToBottomBeforeKeyboardShow; @property (nonatomic) BOOL wasScrolledToBottomBeforeLayoutChange; +@property (nonatomic) BOOL hasLoadedDraft; @end @@ -459,7 +460,11 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { [self.inputToolbar endEditing:TRUE]; } else { self.inputToolbar.hidden = NO; - [self loadDraftInCompose]; + + if (!self.hasLoadedDraft) { + self.hasLoadedDraft = YES; + [self loadDraftInCompose]; + } } } From 89dbcb0fe8411ccfd645dd0c98fe72859677e5b2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 1 Nov 2017 12:01:42 -0400 Subject: [PATCH 2/2] Respond to CR. // FREEBIE --- .../ConversationView/ConversationViewController.m | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 43804960a..aa29cc8bd 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -225,7 +225,6 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { @property (nonatomic) BOOL viewHasEverAppeared; @property (nonatomic) BOOL wasScrolledToBottomBeforeKeyboardShow; @property (nonatomic) BOOL wasScrolledToBottomBeforeLayoutChange; -@property (nonatomic) BOOL hasLoadedDraft; @end @@ -460,11 +459,6 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { [self.inputToolbar endEditing:TRUE]; } else { self.inputToolbar.hidden = NO; - - if (!self.hasLoadedDraft) { - self.hasLoadedDraft = YES; - [self loadDraftInCompose]; - } } } @@ -482,6 +476,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { [self createHeaderViews]; [self createBackButton]; [self addNotificationListeners]; + [self loadDraftInCompose]; } - (void)createContents