Merge branch 'release/1.8.7/master'

element-hq · Mar 18, 2022 · 95ff74d · 95ff74d
2 parents 31ff803 + d9160fd
commit 95ff74d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,10 @@
+## Changes in 1.8.7 (2022-03-18)
+
+🙌 Improvements
+
+- Room: Allow ignoring invited users that have not joined a room yet ([#5866](https://github.com/vector-im/element-ios/issues/5866))
+
+
 ## Changes in 1.8.6 (2022-03-14)
 
 🙌 Improvements

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.8.6
-CURRENT_PROJECT_VERSION = 1.8.6
+MARKETING_VERSION = 1.8.7
+CURRENT_PROJECT_VERSION = 1.8.7
diff --git a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
@@ -629,7 +629,7 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
         }
 
         // 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
@@ -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()