When accepting an invite, expecting to see the room

Riot/Modules/Application/ScreenNavigation/RoomNavigationParameters.swift

@@ -61,24 +61,39 @@ class RoomNavigationParameters: NSObject {
     /// ID of the sender of the notification. Default `nil`
     let senderId: String?
 
+    /// If `true`, the invited room is automatically joined.
+    let autoJoinInvitedRoom: Bool
+
     // MARK: - Setup
 
     init(roomId: String,
          eventId: String?,
          mxSession: MXSession,
          threadParameters: ThreadParameters?,
-         presentationParameters: ScreenPresentationParameters) {
+         presentationParameters: ScreenPresentationParameters,
+         autoJoinInvitedRoom: Bool
+    ) {
         self.roomId = roomId
         self.eventId = eventId
         self.mxSession = mxSession
         self.threadParameters = threadParameters
         self.presentationParameters = presentationParameters
         self.showSettingsInitially = false
         self.senderId = nil
+        self.autoJoinInvitedRoom = autoJoinInvitedRoom
 
         super.init()
     }
 
+    convenience init(roomId: String,
+                     eventId: String?,
+                     mxSession: MXSession,
+                     threadParameters: ThreadParameters?,
+                     presentationParameters: ScreenPresentationParameters
+    ) {
+        self.init(roomId: roomId, eventId: eventId, mxSession: mxSession, threadParameters: threadParameters, presentationParameters: presentationParameters, autoJoinInvitedRoom: false)
+    }
+
     init(roomId: String,
          eventId: String?,
          mxSession: MXSession,
@@ -92,6 +107,7 @@ class RoomNavigationParameters: NSObject {
         self.presentationParameters = presentationParameters
         self.showSettingsInitially = false
         self.senderId = senderId
+        self.autoJoinInvitedRoom = false
 
         super.init()
     }
@@ -108,6 +124,7 @@ class RoomNavigationParameters: NSObject {
         self.showSettingsInitially = showSettingsInitially
         self.threadParameters = nil
         self.senderId = nil
+        self.autoJoinInvitedRoom = false
 
         super.init()
     }

Riot/Modules/Common/Recents/RecentsViewController.m

@@ -895,6 +895,11 @@ - (void)showPublicRoomsDirectory
 }
 
 - (void)showRoomWithRoomId:(NSString*)roomId inMatrixSession:(MXSession*)matrixSession
+{
+    [self showRoomWithRoomId:roomId andAutoJoinInvitedRoom:false inMatrixSession:matrixSession];
+}
+
+- (void)showRoomWithRoomId:(NSString*)roomId andAutoJoinInvitedRoom:(BOOL)autoJoinInvitedRoom inMatrixSession:(MXSession*)matrixSession
 {
     MXRoom *room = [matrixSession roomWithRoomId:roomId];
     if (room.summary.membership == MXMembershipInvite)
@@ -912,7 +917,8 @@ - (void)showRoomWithRoomId:(NSString*)roomId inMatrixSession:(MXSession*)matrixS
                                                                                     eventId:nil
                                                                                   mxSession:matrixSession
                                                                            threadParameters:nil
-                                                                     presentationParameters:presentationParameters];
+                                                                     presentationParameters:presentationParameters
+                                                                        autoJoinInvitedRoom:autoJoinInvitedRoom];
 
     [[AppDelegate theDelegate] showRoomWithParameters:parameters completion:^{
         self.userInteractionEnabled = YES;
@@ -1018,9 +1024,9 @@ - (void)dataSource:(MXKDataSource *)dataSource didRecognizeAction:(NSString *)ac
             return;
         }
 
-        // Accept invitation
+        // Accept invitation and display the room
         Analytics.shared.joinedRoomTrigger = AnalyticsJoinedRoomTriggerInvite;
-        [self joinRoom:invitedRoom completion:nil];
+        [self showRoomWithRoomId:invitedRoom.roomId andAutoJoinInvitedRoom:true inMatrixSession:invitedRoom.mxSession];
     }
     else if ([actionIdentifier isEqualToString:kInviteRecentTableViewCellDeclineButtonPressed])
     {

Riot/Modules/Room/RoomCoordinator.swift

@@ -170,6 +170,7 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
             self.stopLoading()
 
             if let roomDataSource = roomDataSource {
+                self.roomViewController.autoJoinInvitedRoom = self.parameters.autoJoinInvitedRoom
                 self.roomViewController.displayRoom(roomDataSource)
             }
 

Riot/Modules/Room/RoomCoordinatorParameters.swift

@@ -55,6 +55,9 @@ struct RoomCoordinatorParameters {
     /// If `true`, the room settings screen will be initially displayed. Default `false`
     let showSettingsInitially: Bool
 
+    /// If `true`, the invited room is automatically joined.
+    let autoJoinInvitedRoom: Bool
+
     // MARK: - Setup
 
     private init(navigationRouter: NavigationRouterType?,
@@ -67,7 +70,8 @@ struct RoomCoordinatorParameters {
                  threadId: String?,
                  displayConfiguration: RoomDisplayConfiguration,
                  previewData: RoomPreviewData?,
-                 showSettingsInitially: Bool) {
+                 showSettingsInitially: Bool,
+                 autoJoinInvitedRoom: Bool) {
         self.navigationRouter = navigationRouter
         self.navigationRouterStore = navigationRouterStore
         self.userIndicatorPresenter = userIndicatorPresenter
@@ -79,6 +83,7 @@ struct RoomCoordinatorParameters {
         self.displayConfiguration = displayConfiguration
         self.previewData = previewData
         self.showSettingsInitially = showSettingsInitially
+        self.autoJoinInvitedRoom = autoJoinInvitedRoom
     }
 
     /// Init to present a joined room
@@ -91,7 +96,8 @@ struct RoomCoordinatorParameters {
          eventId: String? = nil,
          threadId: String? = nil,
          showSettingsInitially: Bool,
-         displayConfiguration: RoomDisplayConfiguration = .default) {
+         displayConfiguration: RoomDisplayConfiguration = .default,
+         autoJoinInvitedRoom: Bool = false) {
 
         self.init(navigationRouter: navigationRouter,
                   navigationRouterStore: navigationRouterStore,
@@ -103,7 +109,8 @@ struct RoomCoordinatorParameters {
                   threadId: threadId,
                   displayConfiguration: displayConfiguration,
                   previewData: nil,
-                  showSettingsInitially: showSettingsInitially)
+                  showSettingsInitially: showSettingsInitially,
+                  autoJoinInvitedRoom: autoJoinInvitedRoom)
     }
 
     /// Init to present a room preview
@@ -123,6 +130,7 @@ struct RoomCoordinatorParameters {
                   threadId: nil,
                   displayConfiguration: .default,
                   previewData: previewData,
-                  showSettingsInitially: false)
+                  showSettingsInitially: false,
+                  autoJoinInvitedRoom: false)
     }
 }

Riot/Modules/Room/RoomViewController.m

@@ -1066,10 +1066,8 @@ - (void)onRoomDataSourceReady
         // Show preview header
         [self showPreviewHeader:YES];
     }
-    else
-    {
-        [super onRoomDataSourceReady];
-    }
+
+    [super onRoomDataSourceReady];
 }
 
 - (void)updateViewControllerAppearanceOnRoomDataSourceState

Riot/Modules/TabBar/TabBarCoordinator.swift

@@ -428,7 +428,9 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
                                                                       roomId: roomNavigationParameters.roomId,
                                                                       eventId: roomNavigationParameters.eventId,
                                                                       threadId: threadId,
-                                                                      showSettingsInitially: roomNavigationParameters.showSettingsInitially, displayConfiguration: displayConfig)
+                                                                      showSettingsInitially: roomNavigationParameters.showSettingsInitially,
+                                                                      displayConfiguration: displayConfig,
+                                                                      autoJoinInvitedRoom: roomNavigationParameters.autoJoinInvitedRoom)
 
             self.showRoom(with: roomCoordinatorParameters,
                           stackOnSplitViewDetail: roomNavigationParameters.presentationParameters.stackAboveVisibleViews,

changelog.d/4986.change

@@ -0,0 +1 @@
+Open the room when user accepts an invite from the room list