Merge pull request #6035 from vector-im/yostyle/join_and_show_room

yostyle · web-flow · commit c3d7d1eb5ee1 · 2022-04-15T15:16:36.000+02:00
When accepting an invite, expecting to see the room
diff --git a/Riot/Modules/Application/ScreenNavigation/RoomNavigationParameters.swift b/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()
     }
diff --git a/Riot/Modules/Common/Recents/RecentsViewController.m b/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])
     {
diff --git a/Riot/Modules/Room/RoomCoordinator.swift b/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)
             }
             
diff --git a/Riot/Modules/Room/RoomCoordinatorParameters.swift b/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)
     }
 }
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
@@ -1066,10 +1066,8 @@ - (void)onRoomDataSourceReady
         // Show preview header
         [self showPreviewHeader:YES];
     }
-    else
-    {
-        [super onRoomDataSourceReady];
-    }
+    
+    [super onRoomDataSourceReady];
 }
 
 - (void)updateViewControllerAppearanceOnRoomDataSourceState
diff --git a/Riot/Modules/TabBar/TabBarCoordinator.swift b/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,
diff --git a/changelog.d/4986.change b/changelog.d/4986.change
@@ -0,0 +1 @@
+Open the room when user accepts an invite from the room list

Original file line number	Diff line number	Diff line change
`@@ -895,6 +895,11 @@ - (void)showPublicRoomsDirectory`
`895`	`895`	`}`
`896`	`896`
`897`	`897`	`- (void)showRoomWithRoomId:(NSString)roomId inMatrixSession:(MXSession)matrixSession`
	`898`	`+{`
	`899`	`+ [self showRoomWithRoomId:roomId andAutoJoinInvitedRoom:false inMatrixSession:matrixSession];`
	`900`	`+}`
	`901`	`+`
	`902`	`+- (void)showRoomWithRoomId:(NSString)roomId andAutoJoinInvitedRoom:(BOOL)autoJoinInvitedRoom inMatrixSession:(MXSession)matrixSession`
`898`	`903`	`{`
`899`	`904`	`MXRoom *room = [matrixSession roomWithRoomId:roomId];`
`900`	`905`	`if (room.summary.membership == MXMembershipInvite)`
`@@ -912,7 +917,8 @@ - (void)showRoomWithRoomId:(NSString)roomId inMatrixSession:(MXSession)matrixS`
`912`	`917`	`eventId:nil`
`913`	`918`	`mxSession:matrixSession`
`914`	`919`	`threadParameters:nil`
`915`		`- presentationParameters:presentationParameters];`
	`920`	`+ presentationParameters:presentationParameters`
	`921`	`+ autoJoinInvitedRoom:autoJoinInvitedRoom];`
`916`	`922`
`917`	`923`	`[[AppDelegate theDelegate] showRoomWithParameters:parameters completion:^{`
`918`	`924`	`self.userInteractionEnabled = YES;`
`@@ -1018,9 +1024,9 @@ - (void)dataSource:(MXKDataSource )dataSource didRecognizeAction:(NSString )ac`
`1018`	`1024`	`return;`
`1019`	`1025`	`}`
`1020`	`1026`
`1021`		`- // Accept invitation`
	`1027`	`+ // Accept invitation and display the room`
`1022`	`1028`	`Analytics.shared.joinedRoomTrigger = AnalyticsJoinedRoomTriggerInvite;`
`1023`		`- [self joinRoom:invitedRoom completion:nil];`
	`1029`	`+ [self showRoomWithRoomId:invitedRoom.roomId andAutoJoinInvitedRoom:true inMatrixSession:invitedRoom.mxSession];`
`1024`	`1030`	`}`
`1025`	`1031`	`else if ([actionIdentifier isEqualToString:kInviteRecentTableViewCellDeclineButtonPressed])`
`1026`	`1032`	`{`
Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,7 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {`
`170`	`170`	`self.stopLoading()`
`171`	`171`
`172`	`172`	`if let roomDataSource = roomDataSource {`
	`173`	`+ self.roomViewController.autoJoinInvitedRoom = self.parameters.autoJoinInvitedRoom`
`173`	`174`	`self.roomViewController.displayRoom(roomDataSource)`
`174`	`175`	`}`
`175`	`176`
Original file line number	Diff line number	Diff line change
`@@ -1066,10 +1066,8 @@ - (void)onRoomDataSourceReady`
`1066`	`1066`	`// Show preview header`
`1067`	`1067`	`[self showPreviewHeader:YES];`
`1068`	`1068`	`}`
`1069`		`- else`
`1070`		`- {`
`1071`		`- [super onRoomDataSourceReady];`
`1072`		`- }`
	`1069`	`+`
	`1070`	`+ [super onRoomDataSourceReady];`
`1073`	`1071`	`}`
`1074`	`1072`
`1075`	`1073`	`- (void)updateViewControllerAppearanceOnRoomDataSourceState`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Open the room when user accepts an invite from the room list`