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

fix: fixed status messages not showing (MESSENGER-6173)

Browse Source
This commit is contained in:
JanNiklas Grabowski
2024-07-03 13:17:31 +02:00
parent 6a22f7ab36
commit 93fb072522
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Riot/Utils/EventFormatter.m
View File

@@ -451,11 +451,12 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
// TODO: Build a complete summary like Riot-web // TODO: Build a complete summary like Riot-web
// bwi #5575 correct texts for collapsed acl events // bwi #5575 correct texts for collapsed acl events
else if (aclEvent || roomMemberEvent) else if (aclEvent || roomMemberEvent || joinRuleEvent)
{ {
CollapsedACLEvents eventsType = [[FederationEventHelper shared] isCollapsedACLEventsWithEvents:events]; CollapsedACLEvents eventsType = [[FederationEventHelper shared] isCollapsedACLEventsWithEvents:events];
switch (eventsType) { switch (eventsType) {
case CollapsedACLEventsNone: case CollapsedACLEventsNone:
displayText = [VectorL10n eventFormatterMemberUpdates:events.count];
break; break;
case CollapsedACLEventsMixed: case CollapsedACLEventsMixed:
displayText = [BWIL10n eventFormatterAclAndOtherCollapsed:events.count]; displayText = [BWIL10n eventFormatterAclAndOtherCollapsed:events.count];
@@ -463,10 +464,8 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
case CollapsedACLEventsAll: case CollapsedACLEventsAll:
displayText = [BWIL10n eventFormatterAclCollapsed:events.count]; displayText = [BWIL10n eventFormatterAclCollapsed:events.count];
break; break;
case CollapsedACLEventsOnlyMember:
displayText = [VectorL10n eventFormatterMemberUpdates:events.count];
break;
default: default:
displayText = [VectorL10n eventFormatterMemberUpdates:events.count];
break; break;
} }
} }

17
bwi/Federation/FederationEventHelper.swift
View File

@@ -21,7 +21,6 @@ import Foundation
case none = 0 case none = 0
case mixed = 1 case mixed = 1
case all = 2 case all = 2
case onlyMember = 3
} }
@objc class FederationEventHelper: NSObject { @objc class FederationEventHelper: NSObject {
@@ -59,23 +58,19 @@ import Foundation
} }
@objc func isCollapsedACLEvents( events: [MXEvent]) -> CollapsedACLEvents { @objc func isCollapsedACLEvents( events: [MXEvent]) -> CollapsedACLEvents {
var aclEventCount = 0, otherEventCount = 0, memberEventCount = 0 var aclEventCount = 0, otherEventCount = 0
for event in events { for event in events {
if event.eventType == .roomServerACL { if event.eventType != .roomServerACL {
aclEventCount += 1
} else if event.eventType == .roomMember {
memberEventCount += 1
} else {
otherEventCount += 1 otherEventCount += 1
} else {
aclEventCount += 1
} }
} }
if aclEventCount > 0 && otherEventCount == 0 && memberEventCount == 0 { if aclEventCount > 0 && otherEventCount == 0 {
return .all return .all
} else if otherEventCount > 0 && aclEventCount == 0 && memberEventCount == 0 { } else if otherEventCount > 0 && aclEventCount == 0 {
return .none return .none
} else if memberEventCount > 0 && otherEventCount == 0 && aclEventCount == 0 {
return .onlyMember
} else { } else {
return .mixed return .mixed
} }