oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Fix occasional crash when sending after deleting messages

Browse source 
// FREEBIE
This commit is contained in:
Michael Kirk 2016-10-05 15:34:24 -04:00
parent ee0cce75e8
commit 43a2eb9da1
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Signal/src/view controllers/MessagesViewController.m
View file

@ -109,7 +109,6 @@ typedef enum : NSUInteger {
@property (nonatomic, retain) NSTimer *readTimer;
@property (nonatomic, strong) UILabel *navbarTitleLabel;
@property (nonatomic, retain) UIButton *attachButton;
@property (nonatomic, retain) NSIndexPath *lastDeliveredMessageIndexPath;
@property NSUInteger page;
@property (nonatomic) BOOL composeOnOpen;
@ -172,7 +171,6 @@ typedef enum : NSUInteger {
_thread = thread;
isGroupConversation = [self.thread isKindOfClass:[TSGroupThread class]];
_composeOnOpen = keyboardAppearing;
_lastDeliveredMessageIndexPath = nil;
[self.uiDatabaseConnection beginLongLivedReadTransaction];
self.messageMappings =
@ -632,7 +630,10 @@ typedef enum : NSUInteger {
[[TSMessagesManager sharedManager] sendMessage:message
inThread:self.thread
success:^{
TSMessage *penultimateMessage = self.lastDeliveredMessage;
self.lastDeliveredMessage = message;
// Touch the old one to remove "delivered" label
[penultimateMessage touch];
}
failure:^{
DDLogWarn(@"%@ Failed to deliver message.", self.tag);
@ -954,7 +955,6 @@ typedef enum : NSUInteger {
return failedString;
} else if ([outgoingMessage isEqual:self.lastDeliveredMessage]) {
_lastDeliveredMessageIndexPath = indexPath; // So we can remove it later.
NSAttributedString *deliveredString =
[[NSAttributedString alloc] initWithString:NSLocalizedString(@"DELIVERED_MESSAGE_TEXT", @"")];
@ -1758,13 +1758,7 @@ typedef enum : NSUInteger {
if (collectionKey.key) {
[self.messageAdapterCache removeObjectForKey:collectionKey.key];
}
// remove "delivered" from all but final message.
NSMutableArray *rowsToUpdate = [@[ rowChange.indexPath ] mutableCopy];
if (_lastDeliveredMessageIndexPath) {
[rowsToUpdate addObject:_lastDeliveredMessageIndexPath];
}
[self.collectionView reloadItemsAtIndexPaths:rowsToUpdate];
[self.collectionView reloadItemsAtIndexPaths:@[ rowChange.indexPath ]];
scrollToBottom = YES;
break;
}