Email invitation: Room participants: Show 3pid invite

Vector/ViewController/RoomParticipantsViewController.m

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

Vector/Views/Contact/ContactTableViewCell.m

@@ -196,12 +196,12 @@
     NSString* matrixId = [self getFirstMatrixId];
     MXRoomMember* member = nil;
     
-    if (self.mxRoom)
+    if (self.mxRoom && matrixId)
     {
         member = [self.mxRoom.state memberWithUserId:matrixId];
     }
 
-    if (!member || (member.membership != MXMembershipJoin))
+    if (member && (member.membership != MXMembershipJoin))
     {
         if (member.membership == MXMembershipInvite)
         {
@@ -216,7 +216,7 @@
             presenceText =  NSLocalizedStringFromTable(@"room_participants_ban", @"Vector", nil);
         }
     }
-    else
+    else if (matrixId)
     {
         MXUser *user = nil;
         
@@ -262,6 +262,10 @@
             }
         }
     }
+    else
+    {
+        presenceText =  NSLocalizedStringFromTable(@"room_participants_invite", @"Vector", nil);
+    }
 
     self.lastPresenceLabel.text = presenceText;
 }