signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'charlesmchen/scrollVsAttachmentApproval'

Browse Source
This commit is contained in:
Matthew Chen 2018-02-16 15:14:19 -05:00
commit 3a2ec950cc
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View File

@ -3787,6 +3787,11 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
{
[self sendMessageAttachment:attachment];
[self dismissViewControllerAnimated:YES completion:nil];
// We always want to scroll to the bottom of the conversation after the local user
// sends a message. Normally, this is taken care of in yapDatabaseModified:, but
// we don't listen to db modifications when this view isn't visible, i.e. when the
// attachment approval view is presented.
[self scrollToBottomAnimated:YES];
}
- (void)attachmentApproval:(AttachmentApprovalViewController *)attachmentApproval didCancelAttachment:(SignalAttachment * _Nonnull)attachment