diff --git a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m index 5fd62ecad..2648fc89c 100644 --- a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m +++ b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m @@ -629,7 +629,7 @@ } // Check whether the option Ignore may be presented - if (RiotSettings.shared.roomMemberScreenShowIgnore && self.mxRoomMember.membership == MXMembershipJoin) + if (RiotSettings.shared.roomMemberScreenShowIgnore) { // is he already ignored ? if (![self.mainSession isUserIgnored:self.mxRoomMember.userId]) diff --git a/Riot/Modules/SplitView/SplitViewCoordinator.swift b/Riot/Modules/SplitView/SplitViewCoordinator.swift index 6b18a0ded..17bfd2dfc 100644 --- a/Riot/Modules/SplitView/SplitViewCoordinator.swift +++ b/Riot/Modules/SplitView/SplitViewCoordinator.swift @@ -103,8 +103,6 @@ final class SplitViewCoordinator: NSObject, SplitViewCoordinatorType { // Setup split view controller self.splitViewController.viewControllers = [tabBarCoordinator.toPresentable(), detailNavigationController] - - updateUserIndicatorPresenter() self.add(childCoordinator: tabBarCoordinator) @@ -113,6 +111,8 @@ final class SplitViewCoordinator: NSObject, SplitViewCoordinatorType { self.detailNavigationController = detailNavigationController self.detailNavigationRouter = NavigationRouter(navigationController: detailNavigationController) + updateUserIndicatorPresenter() + self.parameters.router.setRootModule(self.splitViewController) self.registerNavigationRouterNotifications() diff --git a/changelog.d/5866.change b/changelog.d/5866.change new file mode 100644 index 000000000..776ccc919 --- /dev/null +++ b/changelog.d/5866.change @@ -0,0 +1 @@ +Room: Allow ignoring invited users that have not joined a room yet