Skip to content

Commit

Permalink
element-hq/element-meta/issues/2201 - Disable mark as unread
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanceriu committed Feb 21, 2024
1 parent 1dc609b commit c8c6f55
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 9 deletions.
8 changes: 1 addition & 7 deletions Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,7 @@ - (void)render:(MXKCellData *)cellData
self.lastEventDecriptionLabelTrailingConstraint.constant = self.unsentImageView.hidden ? 10 : 30;

// Notify unreads and bing
if (roomCellData.isRoomMarkedAsUnread)
{
self.missedNotifAndUnreadBadgeBgView.hidden = NO;
self.missedNotifAndUnreadBadgeBgView.backgroundColor = ThemeService.shared.theme.tintColor;
self.missedNotifAndUnreadBadgeBgViewWidthConstraint.constant = 20;
}
else if (roomCellData.hasUnread)
if (roomCellData.hasUnread)
{
self.missedNotifAndUnreadIndicator.hidden = NO;
if (0 < roomCellData.notificationCount)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class RoomActionProvider: RoomActionProviderProtocol {

var menu: UIMenu {
if service.isRoomJoined {
var children = service.hasUnread ? [self.markAsReadAction] : [self.markAsUnreadAction]
var children = service.hasUnread ? [self.markAsReadAction] : []
children.append(contentsOf: [
self.directChatAction,
self.notificationsAction,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class RoomContextActionService: NSObject, RoomContextActionServiceProtocol {
self.room = room
self.delegate = delegate
self.isRoomJoined = room.summary?.isJoined ?? false
self.hasUnread = (room.summary?.hasAnyUnread ?? false) || room.isMarkedAsUnread
self.hasUnread = room.summary?.hasAnyUnread ?? false
self.roomMembership = room.summary?.membership ?? .unknown
self.session = room.mxSession
self.unownedRoomService = UnownedRoomContextActionService(roomId: room.roomId, canonicalAlias: room.summary?.aliases?.first, session: self.session, delegate: delegate)
Expand Down
1 change: 1 addition & 0 deletions changelog.d/pr-7758.change
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Disable the mark as unread feature to avoid it clashing with the new MSC2876 based one

0 comments on commit c8c6f55

Please sign in to comment.