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

MESSENGER-5575 ACL status event handling in the timeline

Browse Source
This commit is contained in:
Frank Rotermund
2024-03-01 07:25:42 +01:00
parent d07f992659
commit 2867bae23e
16 changed files with 162 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/CellData/RoomBubbleCellData.m
+14 -6
View File
@@ -125,11 +125,8 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
case MXEventTypeRoomAvatar:
case MXEventTypeRoomJoinRules:
{
if (event.prevContent == nil) {
self.tag = RoomBubbleCellDataTagRoomCreateConfiguration;
} else {
self.tag = RoomBubbleCellDataTagRoomConfiguration;
}
self.tag = RoomBubbleCellDataTagRoomCreateConfiguration;
// Membership events can be collapsed together
self.collapsable = YES;
@@ -138,11 +135,12 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
self.collapsed = YES;
}
break;
// bwi #5575 ACL events can be collapsed together
case MXEventTypeRoomServerACL:
{
self.tag = RoomBubbleCellDataTagACL;
// ACL events can be collapsed together
self.collapsable = YES;
self.collapsed = YES;
}
@@ -396,6 +394,16 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
break;
case RoomBubbleCellDataTagVoiceBroadcastNoDisplay:
break;
// bwi #5575 ACL events and membership events should be displayed (and could be filtered later)
// this does not work at the moment but i'll leave it commented out for later reevaluation
// case RoomBubbleCellDataTagACL:
// case RoomBubbleCellDataTagRoomCreateConfiguration:
// if (!self.collapsedAttributedTextMessage) {
// hasNoDisplay = NO;
// } else {
// hasNoDisplay = [super hasNoDisplay];
// }
// break;
default:
hasNoDisplay = [super hasNoDisplay];
break;