Fixes #1482 - Popping the user back to the home screen after leaving …

…a room.

Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift

@@ -188,6 +188,10 @@ extension RoomInfoCoordinator: RoomInfoListCoordinatorDelegate {
     func roomInfoListCoordinatorDidCancel(_ coordinator: RoomInfoListCoordinatorType) {
         self.delegate?.roomInfoCoordinatorDidComplete(self)
     }
+
+    func roomInfoListCoordinatorDidLeaveRoom(_ coordinator: RoomInfoListCoordinatorType) {
+        self.delegate?.roomInfoCoordinatorDidLeaveRoom(self)
+    }
 
 }
 

Riot/Modules/Room/RoomInfo/RoomInfoCoordinatorBridgePresenter.swift

@@ -21,6 +21,7 @@ import Foundation
 @objc protocol RoomInfoCoordinatorBridgePresenterDelegate {
     func roomInfoCoordinatorBridgePresenterDelegateDidComplete(_ coordinatorBridgePresenter: RoomInfoCoordinatorBridgePresenter)
     func roomInfoCoordinatorBridgePresenter(_ coordinatorBridgePresenter: RoomInfoCoordinatorBridgePresenter, didRequestMentionForMember member: MXRoomMember)
+    func roomInfoCoordinatorBridgePresenterDelegateDidLeaveRoom(_ coordinatorBridgePresenter: RoomInfoCoordinatorBridgePresenter)
 }
 
 /// RoomInfoCoordinatorBridgePresenter enables to start RoomInfoCoordinator from a view controller.
@@ -120,6 +121,9 @@ extension RoomInfoCoordinatorBridgePresenter: RoomInfoCoordinatorDelegate {
         self.delegate?.roomInfoCoordinatorBridgePresenter(self, didRequestMentionForMember: member)
     }
 
+    func roomInfoCoordinatorDidLeaveRoom(_ coordinator: RoomInfoCoordinatorType) {
+        self.delegate?.roomInfoCoordinatorBridgePresenterDelegateDidLeaveRoom(self)
+    }
 }
 
 // MARK: - UIAdaptivePresentationControllerDelegate

Riot/Modules/Room/RoomInfo/RoomInfoCoordinatorType.swift

@@ -21,6 +21,7 @@ import Foundation
 protocol RoomInfoCoordinatorDelegate: AnyObject {
     func roomInfoCoordinatorDidComplete(_ coordinator: RoomInfoCoordinatorType)
     func roomInfoCoordinator(_ coordinator: RoomInfoCoordinatorType, didRequestMentionForMember member: MXRoomMember)
+    func roomInfoCoordinatorDidLeaveRoom(_ coordinator: RoomInfoCoordinatorType)
 }
 
 /// `RoomInfoCoordinatorType` is a protocol describing a Coordinator that handle keybackup setup navigation flow.

Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListCoordinator.swift

@@ -70,5 +70,9 @@ extension RoomInfoListCoordinator: RoomInfoListViewModelCoordinatorDelegate {
     func roomInfoListViewModelDidCancel(_ viewModel: RoomInfoListViewModelType) {
         self.delegate?.roomInfoListCoordinatorDidCancel(self)
     }
+
+    func roomInfoListViewModelDidLeaveRoom(_ viewModel: RoomInfoListViewModelType) {
+        self.delegate?.roomInfoListCoordinatorDidLeaveRoom(self)
+    }
 
 }

Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListCoordinatorType.swift

@@ -21,6 +21,7 @@ import Foundation
 protocol RoomInfoListCoordinatorDelegate: AnyObject {
     func roomInfoListCoordinator(_ coordinator: RoomInfoListCoordinatorType, wantsToNavigateTo target: RoomInfoListTarget)
     func roomInfoListCoordinatorDidCancel(_ coordinator: RoomInfoListCoordinatorType)
+    func roomInfoListCoordinatorDidLeaveRoom(_ coordinator: RoomInfoListCoordinatorType)
 }
 
 /// `RoomInfoListCoordinatorType` is a protocol describing a Coordinator that handle key backup setup passphrase navigation flow.

Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewModel.swift

@@ -106,7 +106,7 @@ final class RoomInfoListViewModel: NSObject, RoomInfoListViewModelType {
         self.room.leave { (response) in
             switch response {
             case .success:
-                self.coordinatorDelegate?.roomInfoListViewModelDidCancel(self)
+                self.coordinatorDelegate?.roomInfoListViewModelDidLeaveRoom(self)
             case .failure(let error):
                 self.startObservingSummaryChanges()
                 self.update(viewState: .error(error))

Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewModelType.swift

@@ -24,6 +24,7 @@ protocol RoomInfoListViewModelViewDelegate: AnyObject {
 
 protocol RoomInfoListViewModelCoordinatorDelegate: AnyObject {
     func roomInfoListViewModelDidCancel(_ viewModel: RoomInfoListViewModelType)
+    func roomInfoListViewModelDidLeaveRoom(_ viewModel: RoomInfoListViewModelType)
     func roomInfoListViewModel(_ viewModel: RoomInfoListViewModelType, wantsToNavigateTo target: RoomInfoListTarget)
 }
 

Riot/Modules/Room/RoomViewController.m

@@ -1080,6 +1080,8 @@ - (void)leaveRoomOnEvent:(MXEvent*)event
     self.jumpToLastUnreadBannerContainer.hidden = YES;
 
     [super leaveRoomOnEvent:event];
+
+    [[LegacyAppDelegate theDelegate] restoreInitialDisplay:nil];
 }
 
 // Set the input toolbar according to the current display
@@ -6146,6 +6148,11 @@ - (void)roomInfoCoordinatorBridgePresenter:(RoomInfoCoordinatorBridgePresenter *
     [self mention:member];
 }
 
+- (void)roomInfoCoordinatorBridgePresenterDelegateDidLeaveRoom:(RoomInfoCoordinatorBridgePresenter *)coordinatorBridgePresenter
+{
+    [[LegacyAppDelegate theDelegate] restoreInitialDisplay:nil];
+}
+
 #pragma mark - RemoveJitsiWidgetViewDelegate
 
 - (void)removeJitsiWidgetViewDidCompleteSliding:(RemoveJitsiWidgetView *)view

Riot/Modules/Room/Settings/RoomSettingsViewController.m

@@ -3494,7 +3494,7 @@ - (void)onLeave:(id)sender
                                                            [self startActivityIndicator];
                                                            [self->mxRoom leave:^{
 
-                                                               [self withdrawViewControllerAnimated:YES completion:nil];
+                                                               [[LegacyAppDelegate theDelegate] restoreInitialDisplay:nil];
 
                                                            } failure:^(NSError *error) {
 

changelog.d/1482.change

@@ -0,0 +1 @@
+Popping the user back to the home screen after leaving a room.