felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-02 22:26:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into mention_only

Browse Source
This commit is contained in:
giomfo
2016-10-14 16:02:34 +02:00
parent 1de9860ca0 13a9c43c14
commit a1f3b37568
154 changed files with 4091 additions and 1409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/Model/Room/RoomDataSource.m
+7 -4
View File
@@ -145,11 +145,12 @@
bubbleCell.bubbleOverlayContainer.userInteractionEnabled = NO;
bubbleCell.bubbleOverlayContainer.hidden = NO;
NSInteger index = cellData.bubbleComponents.count;
NSArray *bubbleComponents = cellData.bubbleComponents;
NSInteger index = bubbleComponents.count;
CGFloat bottomPositionY = bubbleCell.frame.size.height;
while (index--)
{
MXKRoomBubbleComponent *component = cellData.bubbleComponents[index];
MXKRoomBubbleComponent *component = bubbleComponents[index];
if (component.event.mxkState != MXKEventStateSendingFailed)
{
@@ -260,10 +261,12 @@
// Manage initial event (case of permalink or search result)
if (self.timeline.initialEventId)
{
NSArray *bubbleComponents = cellData.bubbleComponents;
// Check if the cell contains this initial event
for (NSUInteger index = 0; index < cellData.bubbleComponents.count; index++)
for (NSUInteger index = 0; index < bubbleComponents.count; index++)
{
MXKRoomBubbleComponent *component = cellData.bubbleComponents[index];
MXKRoomBubbleComponent *component = bubbleComponents[index];
if ([component.event.eventId isEqualToString:self.timeline.initialEventId])
{