Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Room details: bug fix join correctly private rooms on invitation

Browse source
This commit is contained in:
giomfo 2014-11-21 15:17:36 +01:00
parent e26fa328ce
commit 9532a47c67
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
syMessaging/syMessaging/ViewController/RoomViewController.m
View file

@ -170,7 +170,7 @@ NSString *const kFailedEventId = @"failedEventId";
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
if (isBackPaginationInProgress) {
if (isBackPaginationInProgress || isJoinRequestInProgress) {
// Busy - be sure that activity indicator is running
[_activityIndicator startAnimating];
}
@ -282,8 +282,8 @@ NSString *const kFailedEventId = @"failedEventId";
// Update room title
self.roomNavItem.title = mxRoom.state.displayname;
// Join the room if the user is not already listed in room's members
if ([mxRoom.state memberWithUserId:mxHandler.userId] == nil) {
// Check first whether we have to join the room
if (mxRoom.state.membership == MXMembershipInvite) {
isJoinRequestInProgress = YES;
[_activityIndicator startAnimating];
[mxRoom join:^{