mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-30 00:02:47 +00:00
Merge pull request #3340 from vector-im/riot_2520
Fix Inviter Display Name
This commit is contained in:
commit
7b40cab661
2 changed files with 14 additions and 21 deletions
|
@ -10,6 +10,7 @@ Improvements:
|
|||
|
||||
Bug fix:
|
||||
* CallVC: Declined calls now properly reset call view controller, thanks to @Legi429 (#2877).
|
||||
* PreviewRoomTitleView: Fix inviter display name (#2520).
|
||||
|
||||
Changes in 0.11.5 (2020-05-18)
|
||||
===============================================
|
||||
|
|
|
@ -183,27 +183,19 @@
|
|||
{
|
||||
MXStrongifyAndReturnIfNil(self);
|
||||
|
||||
NSArray *members = roomMembers.members;
|
||||
NSUInteger activeCount = 0;
|
||||
NSUInteger memberCount = self.mxRoom.summary.membersCount.joined;
|
||||
NSString *inviter = nil;
|
||||
|
||||
for (MXRoomMember *mxMember in members)
|
||||
MXSession *mxSession = self.mxRoom.mxSession;
|
||||
MXRoomMember *myMember = [roomMembers memberWithUserId:mxSession.myUserId];
|
||||
NSString *inviterUserId = myMember.originalEvent.sender;
|
||||
NSString *inviter = [roomMembers memberName:inviterUserId];
|
||||
// if not found, check the user in session
|
||||
if (inviter.length == 0)
|
||||
{
|
||||
if (mxMember.membership == MXMembershipJoin)
|
||||
{
|
||||
// Get the user that corresponds to this member
|
||||
MXUser *user = [self.mxRoom.mxSession userWithUserId:mxMember.userId];
|
||||
// existing user ?
|
||||
if (user && user.presence == MXPresenceOnline)
|
||||
{
|
||||
activeCount ++;
|
||||
}
|
||||
|
||||
// Presently only one member is available from invited room data
|
||||
// This is the inviter
|
||||
inviter = mxMember.displayname.length ? mxMember.displayname : mxMember.userId;
|
||||
}
|
||||
inviter = [mxSession userWithUserId:inviterUserId].displayname;
|
||||
}
|
||||
// if still not found, use the user ID
|
||||
if (inviter.length == 0)
|
||||
{
|
||||
inviter = inviterUserId;
|
||||
}
|
||||
|
||||
// FIXME: Display members status when it will be available
|
||||
|
|
Loading…
Reference in a new issue