mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-05-16 04:40:01 +02:00
Merge pull request #5867 from vector-im/any/5866_ignore_invitee
Allow ignoring invited users that have not joined a room yet
This commit is contained in:
@@ -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])
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
Room: Allow ignoring invited users that have not joined a room yet
|
||||
Reference in New Issue
Block a user