felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-01 05:36:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Email invitation: Room participants: Show 3pid invite

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Vector/Views/Contact/ContactTableViewCell.m
+7 -3
View File
@@ -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;
}