Email invitation: Room participants: Show 3pid invite

This commit is contained in:
manuroe
2016-02-03 17:30:20 +01:00
parent 3b1dadcb5a
commit 0d306d0ec8
2 changed files with 21 additions and 3 deletions
@@ -294,6 +294,7 @@
{
NSArray *members = self.mxRoom.state.members;
NSString *userId = self.mxRoom.mxSession.myUser.userId;
NSArray *roomThirdPartyInvites = self.mxRoom.state.thirdPartyInvites;
for (MXRoomMember *mxMember in members)
{
@@ -311,6 +312,11 @@
[self addRoomMemberToParticipants:mxMember];
}
}
for (MXRoomThirdPartyInvite *roomThirdPartyInvite in roomThirdPartyInvites)
{
[self addRoomRoomThirdPartyInviteToParticipants:roomThirdPartyInvite];
}
}
}
@@ -426,6 +432,14 @@
}
}
- (void)addRoomRoomThirdPartyInviteToParticipants:(MXRoomThirdPartyInvite*)roomThirdPartyInvite
{
Contact *contact = [[Contact alloc] initMatrixContactWithDisplayName:roomThirdPartyInvite.displayname andMatrixID:nil];
mxkContactsById[roomThirdPartyInvite.token] = contact;
[mutableParticipants addObject:roomThirdPartyInvite.token];
}
- (void)addPendingActionMask
{
// Add a spinner above the tableview to avoid that the user tap on any other button