mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
Fixes #4583 - Mention user does not work (settings -> members -> select a member -> mention)
This commit is contained in:
parent
14ccfe4440
commit
34f9fb433f
5 changed files with 14 additions and 9 deletions
|
@ -8,7 +8,7 @@ Changes to be released in next version
|
|||
*
|
||||
|
||||
🐛 Bugfix
|
||||
*
|
||||
* Room: Fixed mentioning users from room info member details (#4583)
|
||||
|
||||
⚠️ API Changes
|
||||
*
|
||||
|
|
|
@ -194,7 +194,8 @@ extension RoomInfoCoordinator: RoomInfoListCoordinatorDelegate {
|
|||
extension RoomInfoCoordinator: RoomParticipantsViewControllerDelegate {
|
||||
|
||||
func roomParticipantsViewController(_ roomParticipantsViewController: RoomParticipantsViewController!, mention member: MXRoomMember!) {
|
||||
|
||||
self.navigationRouter.popToRootModule(animated: true)
|
||||
self.delegate?.roomInfoCoordinator(self, didRequestMentionForMember: member)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -20,6 +20,7 @@ import Foundation
|
|||
|
||||
@objc protocol RoomInfoCoordinatorBridgePresenterDelegate {
|
||||
func roomInfoCoordinatorBridgePresenterDelegateDidComplete(_ coordinatorBridgePresenter: RoomInfoCoordinatorBridgePresenter)
|
||||
func roomInfoCoordinatorBridgePresenter(_ coordinatorBridgePresenter: RoomInfoCoordinatorBridgePresenter, didRequestMentionForMember member: MXRoomMember)
|
||||
}
|
||||
|
||||
/// RoomInfoCoordinatorBridgePresenter enables to start RoomInfoCoordinator from a view controller.
|
||||
|
@ -115,6 +116,10 @@ extension RoomInfoCoordinatorBridgePresenter: RoomInfoCoordinatorDelegate {
|
|||
self.delegate?.roomInfoCoordinatorBridgePresenterDelegateDidComplete(self)
|
||||
}
|
||||
|
||||
func roomInfoCoordinator(_ coordinator: RoomInfoCoordinatorType, didRequestMentionForMember member: MXRoomMember) {
|
||||
self.delegate?.roomInfoCoordinatorBridgePresenter(self, didRequestMentionForMember: member)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// MARK: - UIAdaptivePresentationControllerDelegate
|
||||
|
|
|
@ -20,6 +20,7 @@ import Foundation
|
|||
|
||||
protocol RoomInfoCoordinatorDelegate: AnyObject {
|
||||
func roomInfoCoordinatorDidComplete(_ coordinator: RoomInfoCoordinatorType)
|
||||
func roomInfoCoordinator(_ coordinator: RoomInfoCoordinatorType, didRequestMentionForMember member: MXRoomMember)
|
||||
}
|
||||
|
||||
/// `RoomInfoCoordinatorType` is a protocol describing a Coordinator that handle keybackup setup navigation flow.
|
||||
|
|
|
@ -3936,13 +3936,6 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
|
|||
[self cancelEventSelection];
|
||||
}
|
||||
|
||||
#pragma mark - RoomParticipantsViewControllerDelegate
|
||||
|
||||
- (void)roomParticipantsViewController:(RoomParticipantsViewController *)roomParticipantsViewController mention:(MXRoomMember*)member
|
||||
{
|
||||
[self mention:member];
|
||||
}
|
||||
|
||||
#pragma mark - MXKRoomMemberDetailsViewControllerDelegate
|
||||
|
||||
- (void)roomMemberDetailsViewController:(MXKRoomMemberDetailsViewController *)roomMemberDetailsViewController startChatWithMemberId:(NSString *)matrixId completion:(void (^)(void))completion
|
||||
|
@ -6121,6 +6114,11 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
|
|||
self.roomInfoCoordinatorBridgePresenter = nil;
|
||||
}
|
||||
|
||||
- (void)roomInfoCoordinatorBridgePresenter:(RoomInfoCoordinatorBridgePresenter *)coordinatorBridgePresenter didRequestMentionForMember:(MXRoomMember *)member
|
||||
{
|
||||
[self mention:member];
|
||||
}
|
||||
|
||||
#pragma mark - RemoveJitsiWidgetViewDelegate
|
||||
|
||||
- (void)removeJitsiWidgetViewDidCompleteSliding:(RemoveJitsiWidgetView *)view
|
||||
|
|
Loading…
Reference in a new issue