felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-01 05:36:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Room Participants: withdraw correctly the view controller when user left the room

Browse Source
This commit is contained in:
giomfo
2016-06-23 10:31:47 +02:00
parent 4744b44d34
commit 2bd6d65abc
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/ViewController/RoomParticipantsViewController.m
+17 -14
View File
@@ -228,6 +228,19 @@
}
}
- (void)withdrawViewControllerAnimated:(BOOL)animated completion:(void (^)(void))completion
{
// Check whether the current view controller is displayed inside a segmented view controller in order to withdraw the right item
if (_segmentedViewController)
{
[_segmentedViewController withdrawViewControllerAnimated:animated completion:completion];
}
else
{
[super withdrawViewControllerAnimated:animated completion:completion];
}
}
#pragma mark -
- (void)setMxRoom:(MXRoom *)mxRoom
@@ -778,7 +791,8 @@
// oneself dedicated cell
if ((indexPath.section == participantsSection && userContact && indexPath.row == 0) && !_isAddParticipantSearchBarEditing)
{
mxkContact = userContact;
contact = userContact;
mxkContact = contact;
participantCell.selectionStyle = UITableViewCellSelectionStyleNone;
}
@@ -1102,11 +1116,8 @@
{
id<RoomParticipantsViewControllerDelegate> delegate = _delegate;
// Check whether the current view controller is displayed inside a segmented view controller in order to withdraw the right item
MXKViewController *viewController = _segmentedViewController ? _segmentedViewController : self;
// Withdraw the current view controller, and let the delegate mention the member
[viewController withdrawViewControllerAnimated:YES completion:^{
[self withdrawViewControllerAnimated:YES completion:^{
[delegate roomParticipantsViewController:self mention:member];
@@ -1157,15 +1168,7 @@
[strongSelf addPendingActionMask];
[strongSelf.mxRoom leave:^{
// check if there is a parent view controller
if (strongSelf.parentViewController)
{
[strongSelf.navigationController popViewControllerAnimated:YES];
}
else
{
[strongSelf withdrawViewControllerAnimated:YES completion:nil];
}
[strongSelf withdrawViewControllerAnimated:YES completion:nil];
} failure:^(NSError *error) {