diff --git a/Vector/ViewController/RoomParticipantsViewController.m b/Vector/ViewController/RoomParticipantsViewController.m index cdc025f7c5..024ea39c12 100644 --- a/Vector/ViewController/RoomParticipantsViewController.m +++ b/Vector/ViewController/RoomParticipantsViewController.m @@ -431,7 +431,7 @@ - (void)refreshParticipantsFromRoomMembers 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; @@ -451,11 +451,7 @@ - (void)refreshParticipantsFromRoomMembers } else { - // Filter out conference users from non conference user rooms - if (!(self.mxRoom.state.isConferenceUserRoom && [MXCallManager isConferenceUser:mxMember.userId])) - { - [self handleRoomMember:mxMember]; - } + [self handleRoomMember:mxMember]; } } diff --git a/Vector/Views/RoomTitle/ExpandedRoomTitleView.m b/Vector/Views/RoomTitle/ExpandedRoomTitleView.m index 25afdeee28..fb6a16a37c 100644 --- a/Vector/Views/RoomTitle/ExpandedRoomTitleView.m +++ b/Vector/Views/RoomTitle/ExpandedRoomTitleView.m @@ -57,27 +57,22 @@ - (void)refreshDisplay 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