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

Merge pull request #6274 from vector-im/ismail/5502_ungroup_threads

Browse Source 
Ungroup events containing thread roots
This commit is contained in:
ismailgulek
2022-06-14 11:18:23 +03:00
committed by GitHub
parent 18cf1c631a 8d9a820e15
commit a195f43b38
5 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/CellData/RoomBubbleCellData.m
+11
View File
@@ -989,11 +989,22 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
return NO;
}
if (self.hasThreadRoot || bubbleCellData.hasThreadRoot)
{
// We do not want to merge events containing thread roots
return NO;
}
return [super hasSameSenderAsBubbleCellData:bubbleCellData];
}
- (BOOL)addEvent:(MXEvent*)event andRoomState:(MXRoomState*)roomState
{
if (self.hasThreadRoot)
{
// We don't want to add any events into this bubble data if it's a thread root
return NO;
}
RoomTimelineConfiguration *timelineConfiguration = [RoomTimelineConfiguration shared];
if (NO == [timelineConfiguration.currentStyle canAddEvent:event and:roomState to:self]) {