felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-24 18:42:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use autojoin boolean

Browse Source
This commit is contained in:
yostyle
2022-04-13 18:27:17 +02:00
parent 50bd7aa464
commit ea453d130f
6 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Common/Recents/RecentsViewController.m
+9 -7
View File
@@ -895,6 +895,11 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
}
- (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 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
eventId:nil
mxSession:matrixSession
threadParameters:nil
presentationParameters:presentationParameters];
presentationParameters:presentationParameters
autoJoinInvitedRoom:autoJoinInvitedRoom];
[[AppDelegate theDelegate] showRoomWithParameters:parameters completion:^{
self.userInteractionEnabled = YES;
@@ -1018,13 +1024,9 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
return;
}
// Accept invitation and show room
// Accept invitation and display the room
Analytics.shared.joinedRoomTrigger = AnalyticsJoinedRoomTriggerInvite;
[self joinRoom:invitedRoom completion:^(BOOL succeed) {
if (succeed) {
[self showRoomWithRoomId:invitedRoom.roomId inMatrixSession:invitedRoom.mxSession];
}
}];
[self showRoomWithRoomId:invitedRoom.roomId andAutoJoinInvitedRoom:true inMatrixSession:invitedRoom.mxSession];
}
else if ([actionIdentifier isEqualToString:kInviteRecentTableViewCellDeclineButtonPressed])
{