Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' into feature/4260_merge_foss_1_10_2

# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	fastlane/Fastfile

Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift

@@ -48,13 +48,15 @@ class RoomActionProvider: RoomActionProviderProtocol {
                     ])
                 }
             } else {
-                return UIMenu(children: [
+                var children = service.hasUnread ? [self.markAsReadAction] : [self.markAsUnreadAction]
+                children.append(contentsOf: [
                     self.directChatAction,
                     self.notificationsAction,
                     self.favouriteAction,
                     self.lowPriorityAction,
                     self.leaveAction
                 ])
+                return UIMenu(children: children)
             }
         } else {
             if service.roomMembership == .invite {
@@ -126,6 +128,14 @@ class RoomActionProvider: RoomActionProviderProtocol {
                 self.service.markAsRead()
         }
     }
+    private var markAsUnreadAction: UIAction {
+        return UIAction(
+            title: VectorL10n.homeContextMenuMarkAsUnread,
+            image: UIImage(systemName: "envelope.badge")) { [weak self] action in
+                guard let self = self else { return }
+                self.service.markAsUnread()
+        }
+    }
     
     private var leaveAction: UIAction {
         let image = UIImage(systemName: "rectangle.righthalf.inset.fill.arrow.right")

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
+        self.hasUnread = (room.summary?.hasAnyUnread ?? false) || room.isMarkedAsUnread
         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)
@@ -108,6 +108,11 @@ class RoomContextActionService: NSObject, RoomContextActionServiceProtocol {
     
     func markAsRead() {
         room.markAllAsRead()
+        self.delegate?.roomContextActionServiceDidMarkRoom(self)
+    }
+    func markAsUnread() {
+        room.setUnread()
+        self.delegate?.roomContextActionServiceDidMarkRoom(self)
     }
     
     // MARK: - Private

Riot/Modules/ContextMenu/Services/RoomContextActionServiceProtocol.swift

@@ -22,6 +22,7 @@ import Foundation
     func roomContextActionService(_ service: RoomContextActionServiceProtocol, showRoomNotificationSettingsForRoomWithId roomId: String)
     func roomContextActionServiceDidJoinRoom(_ service: RoomContextActionServiceProtocol)
     func roomContextActionServiceDidLeaveRoom(_ service: RoomContextActionServiceProtocol)
+    func roomContextActionServiceDidMarkRoom(_ service: RoomContextActionServiceProtocol)
 }
 
 /// `RoomContextActionServiceProtocol` classes are meant to be called by a `RoomActionProviderProtocol` instance so it provides the implementation of the menu actions.