From 69be930692ecafe59c8495bd27c1bbae730bd1ee Mon Sep 17 00:00:00 2001 From: Andy Uhnak Date: Fri, 18 Mar 2022 12:14:40 +0000 Subject: [PATCH 1/3] Allow ignoring invited users that have not joined a room yet --- Riot/Modules/Contacts/Details/ContactDetailsViewController.m | 2 +- .../Room/Members/Detail/RoomMemberDetailsViewController.m | 4 ++-- changelog.d/5866.change | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 changelog.d/5866.change diff --git a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m index bc1815a41..ac0661eda 100644 --- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m +++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m @@ -671,7 +671,7 @@ switch (action) { case ContactDetailsActionIgnore: - title = [VectorL10n roomParticipantsActionIgnore]; + title = [VectorL10n ignoreUser]; break; case ContactDetailsActionUnignore: title = [VectorL10n roomParticipantsActionUnignore]; diff --git a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m index 5fd62ecad..68011b5c1 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]) @@ -778,7 +778,7 @@ title = [VectorL10n roomParticipantsActionUnban]; break; case MXKRoomMemberDetailsActionIgnore: - title = [VectorL10n roomParticipantsActionIgnore]; + title = [VectorL10n ignoreUser]; break; case MXKRoomMemberDetailsActionUnignore: title = [VectorL10n roomParticipantsActionUnignore]; 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 From 7d3ecfb1205cae611c3b405e88b4616596aa735a Mon Sep 17 00:00:00 2001 From: Andy Uhnak Date: Fri, 18 Mar 2022 14:02:50 +0000 Subject: [PATCH 2/3] Revert copy change --- Riot/Modules/Contacts/Details/ContactDetailsViewController.m | 2 +- .../Room/Members/Detail/RoomMemberDetailsViewController.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m index ac0661eda..bc1815a41 100644 --- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m +++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m @@ -671,7 +671,7 @@ switch (action) { case ContactDetailsActionIgnore: - title = [VectorL10n ignoreUser]; + title = [VectorL10n roomParticipantsActionIgnore]; break; case ContactDetailsActionUnignore: title = [VectorL10n roomParticipantsActionUnignore]; diff --git a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m index 68011b5c1..2648fc89c 100644 --- a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m +++ b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m @@ -778,7 +778,7 @@ title = [VectorL10n roomParticipantsActionUnban]; break; case MXKRoomMemberDetailsActionIgnore: - title = [VectorL10n ignoreUser]; + title = [VectorL10n roomParticipantsActionIgnore]; break; case MXKRoomMemberDetailsActionUnignore: title = [VectorL10n roomParticipantsActionUnignore]; From bd0bad7b699e16134681aa092864f7fd25f498ec Mon Sep 17 00:00:00 2001 From: Andy Uhnak Date: Fri, 18 Mar 2022 15:26:30 +0000 Subject: [PATCH 3/3] Fix broken indicators on iPad --- Riot/Modules/SplitView/SplitViewCoordinator.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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()