Merge pull request #7758 from element-hq/stefan/disableMarkAsUnread

Disable mark as unread
element-hq · Feb 21, 2024 · b39923f · b39923f
2 parents 1dc609b + c8c6f55
commit b39923f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
@@ -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)

diff --git a/Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift b/Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
@@ -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,

diff --git a/Riot/Modules/ContextMenu/Services/RoomContextActionService.swift b/Riot/Modules/ContextMenu/Services/RoomContextActionService.swift
@@ -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)

diff --git a/changelog.d/pr-7758.change b/changelog.d/pr-7758.change
@@ -0,0 +1 @@
+Disable the mark as unread feature to avoid it clashing with the new MSC2876 based one