Conference call: Tapping on the room details for Matrix HQ freezes the app for about 5s #499

This commit is contained in:
manuroe
2016-08-09 09:52:05 +02:00
parent 5e3014f95a
commit efe63f1aab
2 changed files with 11 additions and 20 deletions
+9 -14
View File
@@ -57,27 +57,22 @@
self.roomTopic.text = [MXTools stripNewlineCharacters:self.mxRoom.state.topic];
// Compute active members count
NSArray *members = self.mxRoom.state.members;
NSArray *members = [self.mxRoom.state membersWithMembership:MXMembershipJoin includeConferenceUser:NO];
NSUInteger activeCount = 0;
NSUInteger memberCount = 0;
for (MXRoomMember *mxMember in members)
{
// Filter out conference users from non conference user rooms
if (mxMember.membership == MXMembershipJoin
&& !(self.mxRoom.state.isConferenceUserRoom && [MXCallManager isConferenceUser:mxMember.userId]))
memberCount ++;
// Get the user that corresponds to this member
MXUser *user = [self.mxRoom.mxSession userWithUserId:mxMember.userId];
// existing user ?
if (user && user.presence == MXPresenceOnline)
{
memberCount ++;
// Get the user that corresponds to this member
MXUser *user = [self.mxRoom.mxSession userWithUserId:mxMember.userId];
// existing user ?
if (user && user.presence == MXPresenceOnline)
{
activeCount ++;
}
activeCount ++;
}
}
if (memberCount)
{
// Check whether the logged in user is alone in this room