From 5a61d1c22762b94de978cc98c0c300e37f82331d Mon Sep 17 00:00:00 2001 From: manuroe Date: Thu, 12 Jul 2018 10:50:59 +0200 Subject: [PATCH] Use new MXRoomState.membersCount --- .../Integrations/IntegrationManagerViewController.m | 2 +- Riot/Modules/Room/RoomViewController.m | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Riot/Modules/Integrations/IntegrationManagerViewController.m b/Riot/Modules/Integrations/IntegrationManagerViewController.m index cb5b17e72..3e7a4b226 100644 --- a/Riot/Modules/Integrations/IntegrationManagerViewController.m +++ b/Riot/Modules/Integrations/IntegrationManagerViewController.m @@ -692,7 +692,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ"; MXRoom *room = [self roomCheckForRequest:requestId data:requestData]; if (room) { - NSUInteger membershipCount = room.state.members.joinedMembers.count; + NSUInteger membershipCount = room.state.membersCount.joined; [self sendIntegerResponse:membershipCount toRequest:requestId]; } } diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m index a64732094..b651f9540 100644 --- a/Riot/Modules/Room/RoomViewController.m +++ b/Riot/Modules/Room/RoomViewController.m @@ -1335,7 +1335,7 @@ RoomInputToolbarView *roomInputToolbarView = (RoomInputToolbarView*)self.inputToolbarView; // Check whether the call option is supported - roomInputToolbarView.supportCallOption = self.roomDataSource.mxSession.callManager && self.roomDataSource.room.state.members.joinedMembers.count >= 2; + roomInputToolbarView.supportCallOption = self.roomDataSource.mxSession.callManager && self.roomDataSource.room.state.membersCount.joined >= 2; // Get user picture view in input toolbar userPictureView = roomInputToolbarView.pictureView; @@ -3015,7 +3015,7 @@ // If enabled, create the conf using jitsi widget and open it directly else if (RiotSettings.shared.createConferenceCallsWithJitsi - && self.roomDataSource.room.state.members.joinedMembers.count > 2) + && self.roomDataSource.room.state.membersCount.joined > 2) { [self startActivityIndicator]; @@ -3043,7 +3043,7 @@ }]; } // Classic conference call is not supported in encrypted rooms - else if (self.roomDataSource.room.state.isEncrypted && self.roomDataSource.room.state.members.joinedMembers.count > 2) + else if (self.roomDataSource.room.state.isEncrypted && self.roomDataSource.room.state.membersCount.joined > 2) { [currentAlert dismissViewControllerAnimated:NO completion:nil]; @@ -3066,7 +3066,7 @@ } // In case of conference call, check that the user has enough power level - else if (self.roomDataSource.room.state.members.joinedMembers.count > 2 && + else if (self.roomDataSource.room.state.membersCount.joined > 2 && ![MXCallManager canPlaceConferenceCallInRoom:self.roomDataSource.room]) { [currentAlert dismissViewControllerAnimated:NO completion:nil];