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

vector-im/element-ios/issues/5114 - Prevent poll events from ever getting merged into other bubble data.

Browse Source
This commit is contained in:
Stefan Ceriu
2021-12-09 17:44:47 +02:00
committed by Stefan Ceriu
parent 321e759a39
commit 1ae9b708a1
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithAppendingMode.m
View File

@@ -36,11 +36,6 @@ static NSAttributedString *messageSeparator = nil;
- (BOOL)addEvent:(MXEvent*)event andRoomState:(MXRoomState*)roomState
{
// Never merge polls
if (self.events.firstObject.eventType == MXEventTypePollStart) {
return NO;
}
// We group together text messages from the same user (attachments are not merged).
if ([event.sender isEqualToString:self.senderId] && (self.attachment == nil) && (self.bubbleComponents.count < self.maxComponentCount))
{
@@ -90,11 +85,6 @@ static NSAttributedString *messageSeparator = nil;
- (BOOL)mergeWithBubbleCellData:(id<MXKRoomBubbleCellDataStoring>)bubbleCellData
{
// Never merge polls
if (self.events.firstObject.eventType == MXEventTypePollStart) {
return NO;
}
if ([self hasSameSenderAsBubbleCellData:bubbleCellData])
{
MXKRoomBubbleCellData *cellData = (MXKRoomBubbleCellData*)bubbleCellData;