Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use new MXRoomState.membersCount

Browse source
This commit is contained in:
manuroe 2018-07-12 10:50:59 +02:00
parent 7af86d9f9d
commit 5a61d1c227
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Riot/Modules/Integrations/IntegrationManagerViewController.m
View file

@ -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];
}
}

8
Riot/Modules/Room/RoomViewController.m
View file

@ -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];