felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-25 11:02:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

MELS: For now, do not merge VoIP conference events

Browse Source
This commit is contained in:
manuroe
2017-07-17 15:59:43 +02:00
parent 33d3817a80
commit 3a7610a714
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Model/Room/RoomBubbleCellData.m
+11 -9
View File
@@ -117,17 +117,19 @@ static NSAttributedString *readReceiptVerticalWhitespace = nil;
if (self.tag == RoomBubbleCellDataTagMembership
&& cellData.tag == RoomBubbleCellDataTagMembership)
{
// Keep a pagination between events of different days
NSString *bubbleDateString = [roomDataSource.eventFormatter dateStringFromDate:self.date withTime:NO];
NSString *eventDateString = [roomDataSource.eventFormatter dateStringFromDate:((RoomBubbleCellData*)cellData).date withTime:NO];
if (bubbleDateString && eventDateString && [bubbleDateString isEqualToString:eventDateString])
// For now, do not merge VoIP conference events
if (![MXCallManager isConferenceUser:cellData.events.firstObject.stateKey])
{
return YES;
}
else
{
return NO;
// Keep a pagination between events of different days
NSString *bubbleDateString = [roomDataSource.eventFormatter dateStringFromDate:self.date withTime:NO];
NSString *eventDateString = [roomDataSource.eventFormatter dateStringFromDate:((RoomBubbleCellData*)cellData).date withTime:NO];
if (bubbleDateString && eventDateString && [bubbleDateString isEqualToString:eventDateString])
{
return YES;
}
}
return NO;
}
return [super collapseWith:cellData];