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

Merge remote-tracking branch 'origin/develop' into vector_301

Browse Source
This commit is contained in:
manuroe
2016-08-09 14:17:18 +02:00
parent 28b477a00e
commit 80c632dd28
18 changed files with 300 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/ViewController/RoomParticipantsViewController.m
+3 -1
View File
@@ -28,6 +28,8 @@
#import "Contact.h"
#import "MXCallManager.h"
@interface RoomParticipantsViewController ()
{
// Search session
@@ -429,7 +431,7 @@
if (self.mxRoom)
{
// Retrieve the current members from the room state
NSArray *members = self.mxRoom.state.members;
NSArray *members = [self.mxRoom.state membersWithoutConferenceUser];
NSString *userId = self.mxRoom.mxSession.myUser.userId;
NSArray *roomThirdPartyInvites = self.mxRoom.state.thirdPartyInvites;