selection impossible when filtering in add room screen #5757 (#5758)

- Fixed
- Other minor code / UI tweaks

Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift

@@ -247,4 +247,8 @@ extension RoomInfoCoordinator: RoomSettingsViewControllerDelegate {
     func roomSettingsViewController(_ controller: RoomSettingsViewController!, didReplaceRoomWithReplacementId newRoomId: String!) {
         self.delegate?.roomInfoCoordinator(self, didReplaceRoomWithReplacementId: newRoomId)
     }
+    
+    func roomSettingsViewControllerDidLeaveRoom(_ controller: RoomSettingsViewController!) {
+        self.delegate?.roomInfoCoordinatorDidLeaveRoom(self)
+    }
 }

Riot/Modules/Room/RoomViewController.m

@@ -2260,12 +2260,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
 - (void)notifyDelegateOnLeaveRoomIfNecessary {
     if (self.delegate)
     {
-        // Leaving room often triggers multiple events, incl local delegate callbacks as well as global notifications,
-        // which may lead to multiple identical UI changes (navigating to home, displaying notification etc).
-        // To avoid this, as soon as we notify the delegate the first time, we nilify it, preventing future messages
-        // from being passed along, assuming that after leaving a room there is nothing else to communicate to the delegate.
         [self.delegate roomViewControllerDidLeaveRoom:self];
-        self.delegate = nil;
     }
     else
     {

Riot/Modules/Room/Settings/RoomSettingsViewController.h

@@ -69,6 +69,8 @@ typedef enum : NSUInteger {
 
 @protocol RoomSettingsViewControllerDelegate <NSObject>
 
+- (void)roomSettingsViewControllerDidLeaveRoom:(RoomSettingsViewController *)controller;
+
 - (void)roomSettingsViewController:(RoomSettingsViewController *)controller didReplaceRoomWithReplacementId:(NSString *)newRoomId;
 
 - (void)roomSettingsViewControllerDidCancel:(RoomSettingsViewController *)controller;

Riot/Modules/Room/Settings/RoomSettingsViewController.m

@@ -3667,7 +3667,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
                                                            [self startActivityIndicator];
                                                            [self->mxRoom leave:^{
                                                                
-                                                               [[LegacyAppDelegate theDelegate] restoreInitialDisplay:nil];
+                                                               if (self.delegate) {
+                                                                   [self.delegate roomSettingsViewControllerDidLeaveRoom:self];
+                                                               } else {
+                                                                   [[LegacyAppDelegate theDelegate] restoreInitialDisplay:nil];
+                                                               }
                                                                
                                                            } failure:^(NSError *error) {