From 766f43742fb02428d0bf0416a97f384a85995f74 Mon Sep 17 00:00:00 2001 From: Andy Uhnak Date: Fri, 18 Mar 2022 12:14:40 +0000 Subject: [PATCH 1/5] 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 bc1815a41c..ac0661eda4 100644 --- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m +++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m @@ -671,7 +671,7 @@ - (NSString*)actionButtonTitle:(ContactDetailsAction)action 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 5fd62ecad2..68011b5c19 100644 --- 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]) @@ -778,7 +778,7 @@ - (NSString*)actionButtonTitle:(MXKRoomMemberDetailsAction)action 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 0000000000..776ccc919d --- /dev/null +++ b/changelog.d/5866.change @@ -0,0 +1 @@ +Room: Allow ignoring invited users that have not joined a room yet From 794bc11eebac0aea9df675bbd3ad9bcae6ae21fa Mon Sep 17 00:00:00 2001 From: Andy Uhnak Date: Fri, 18 Mar 2022 14:02:50 +0000 Subject: [PATCH 2/5] 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 ac0661eda4..bc1815a41c 100644 --- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m +++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m @@ -671,7 +671,7 @@ - (NSString*)actionButtonTitle:(ContactDetailsAction)action 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 68011b5c19..2648fc89cc 100644 --- a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m +++ b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m @@ -778,7 +778,7 @@ - (NSString*)actionButtonTitle:(MXKRoomMemberDetailsAction)action title = [VectorL10n roomParticipantsActionUnban]; break; case MXKRoomMemberDetailsActionIgnore: - title = [VectorL10n ignoreUser]; + title = [VectorL10n roomParticipantsActionIgnore]; break; case MXKRoomMemberDetailsActionUnignore: title = [VectorL10n roomParticipantsActionUnignore]; From 3b8b019f9baf514f6221a09771db1862013d51d6 Mon Sep 17 00:00:00 2001 From: Andy Uhnak Date: Fri, 18 Mar 2022 15:26:30 +0000 Subject: [PATCH 3/5] 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 6b18a0deda..17bfd2dfcc 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() From 20e680b19db4369bc73c14ae59c33ddd9a8fbb8f Mon Sep 17 00:00:00 2001 From: Andy Uhnak Date: Fri, 18 Mar 2022 15:58:55 +0000 Subject: [PATCH 4/5] version++ --- CHANGES.md | 7 +++++++ Config/AppVersion.xcconfig | 4 ++-- changelog.d/5866.change | 1 - 3 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 changelog.d/5866.change diff --git a/CHANGES.md b/CHANGES.md index 53b5279699..040d7e5b45 100644 --- 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 index 174e0bd5b4..164b076c57 100644 --- 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/changelog.d/5866.change b/changelog.d/5866.change deleted file mode 100644 index 776ccc919d..0000000000 --- a/changelog.d/5866.change +++ /dev/null @@ -1 +0,0 @@ -Room: Allow ignoring invited users that have not joined a room yet From d9160fde910e21d33209b25b7b431d65332eabb9 Mon Sep 17 00:00:00 2001 From: Andy Uhnak Date: Fri, 18 Mar 2022 16:56:05 +0000 Subject: [PATCH 5/5] finish version++