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 layout glitch in messages view.

Browse source 
// FREEBIE
This commit is contained in:
Matthew Chen 2017-08-15 16:12:00 -04:00
parent 34cf56fb3a
commit b2360ace6e
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Signal/src/ViewControllers/ConversationView/MessagesViewController.m
View file

@ -1645,7 +1645,7 @@ typedef enum : NSUInteger {
break; break;
} }
default: { default: {
DDLogWarn(@"using default cell constructor for message: %@", message); OWSFail(@"using default cell constructor for message: %@", message);
cell = (JSQMessagesCollectionViewCell *)[super collectionView:collectionView cell = (JSQMessagesCollectionViewCell *)[super collectionView:collectionView
cellForItemAtIndexPath:indexPath]; cellForItemAtIndexPath:indexPath];
break; break;
@ -1751,7 +1751,6 @@ typedef enum : NSUInteger {
#pragma mark - Adjusting cell label heights #pragma mark - Adjusting cell label heights
/** /**
Due to the usage of JSQMessagesViewController, and it non-conformity to Dynamyc Type Due to the usage of JSQMessagesViewController, and it non-conformity to Dynamyc Type
we're left to our own devices to make this as usable as possible. we're left to our own devices to make this as usable as possible.
@ -3260,6 +3259,18 @@ typedef enum : NSUInteger {
return; return;
} }
// HACK to work around radar #28167779
// "UICollectionView performBatchUpdates can trigger a crash if the collection view is flagged for layout"
// more: https://github.com/PSPDFKit-labs/radar.apple.com/tree/master/28167779%20-%20CollectionViewBatchingIssue
// This was our #2 crash, and much exacerbated by the refactoring somewhere between 2.6.2.0-2.6.3.8
//
// NOTE: It's critical we do this before beginLongLivedReadTransaction.
// layoutIfNeeded triggers layout (obviously) which will update our cells using the current mappings
// but loading cells using interactionAtIndexPath: and messageAtIndexPath:, which will return the
// wrong results if the db connection has been updated but the mappings haven't.
[self.collectionView layoutIfNeeded];
// ENDHACK to work around radar #28167779
// We need to `beginLongLivedReadTransaction` before we update our // We need to `beginLongLivedReadTransaction` before we update our
// models in order to jump to the most recent commit. // models in order to jump to the most recent commit.
NSArray *notifications = [self.uiDatabaseConnection beginLongLivedReadTransaction]; NSArray *notifications = [self.uiDatabaseConnection beginLongLivedReadTransaction];
@ -3286,13 +3297,6 @@ typedef enum : NSUInteger {
return; return;
} }
// HACK to work around radar #28167779
// "UICollectionView performBatchUpdates can trigger a crash if the collection view is flagged for layout"
// more: https://github.com/PSPDFKit-labs/radar.apple.com/tree/master/28167779%20-%20CollectionViewBatchingIssue
// This was our #2 crash, and much exacerbated by the refactoring somewhere between 2.6.2.0-2.6.3.8
[self.collectionView layoutIfNeeded];
// ENDHACK to work around radar #28167779
NSArray *messageRowChanges = nil; NSArray *messageRowChanges = nil;
NSArray *sectionChanges = nil; NSArray *sectionChanges = nil;
[[self.uiDatabaseConnection ext:TSMessageDatabaseViewExtensionName] [[self.uiDatabaseConnection ext:TSMessageDatabaseViewExtensionName]