oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up ahead of PR. 

// FREEBIE
This commit is contained in:
Matthew Chen 2017-10-12 16:46:20 -04:00
parent e91599d986
commit 132d5b3408
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h
View File

@ -6,8 +6,6 @@
NS_ASSUME_NONNULL_BEGIN
@class OWSExpirationTimerView;
@interface OWSMessageCell : ConversationViewCell
@end

2
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
View File

@ -851,8 +851,6 @@ NS_ASSUME_NONNULL_BEGIN
return;
case OWSMessageCellType_GenericAttachment:
[AttachmentSharing showShareUIForAttachment:self.attachmentStream];
// [self.delegate didTapGenericAttachment:self.viewItem
// attachmentStream:self.attachmentStream];
break;
case OWSMessageCellType_DownloadingAttachment: {
OWSAssert(self.attachmentPointer);

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

@ -2762,6 +2762,24 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
return;
}
// We need to reload any modified interactions _before_ we call
// reloadViewItems.
for (YapDatabaseViewRowChange *rowChange in messageRowChanges) {
switch (rowChange.type) {
case YapDatabaseViewChangeUpdate: {
YapCollectionKey *collectionKey = rowChange.collectionKey;
OWSAssert(collectionKey.key.length > 0);
if (collectionKey.key) {
ConversationViewItem *viewItem = self.viewItemMap[collectionKey.key];
[self reloadInteractionForViewItem:viewItem];
}
break;
}
default:
break;
}
}
NSMutableSet<NSNumber *> *rowsThatChangedSize = [[self reloadViewItems] mutableCopy];
BOOL wasAtBottom = [self isScrolledToBottom];
@ -2816,12 +2834,6 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
case YapDatabaseViewChangeUpdate: {
DDLogError(
@".... YapDatabaseViewChangeUpdate: %@, %@", rowChange.collectionKey, rowChange.indexPath);
YapCollectionKey *collectionKey = rowChange.collectionKey;
OWSAssert(collectionKey.key.length > 0);
if (collectionKey.key) {
ConversationViewItem *viewItem = self.viewItemMap[collectionKey.key];
[self reloadViewItem:viewItem];
}
[self.collectionView reloadItemsAtIndexPaths:@[ rowChange.indexPath ]];
[rowsThatChangedSize removeObject:@(rowChange.indexPath.row)];
break;
@ -3931,7 +3943,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
// Whenever an interaction is modified, we need to reload it from the DB
// and update the corresponding view item.
- (void)reloadViewItem:(ConversationViewItem *)viewItem
- (void)reloadInteractionForViewItem:(ConversationViewItem *)viewItem
{
OWSAssert([NSThread isMainThread]);
OWSAssert(viewItem);