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

Merge pull request #3340 from vector-im/riot_2520

Browse source 
Fix Inviter Display Name
This commit is contained in:
ismailgulek 2020-06-12 15:41:47 +03:00 committed by GitHub
commit 7b40cab661
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.rst
View file

@ -10,6 +10,7 @@ Improvements:
Bug fix: Bug fix:
* CallVC: Declined calls now properly reset call view controller, thanks to @Legi429 (#2877). * 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) Changes in 0.11.5 (2020-05-18)
=============================================== ===============================================

32
Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
View file

@ -183,27 +183,19 @@
{ {
MXStrongifyAndReturnIfNil(self); MXStrongifyAndReturnIfNil(self);
NSArray *members = roomMembers.members; MXSession *mxSession = self.mxRoom.mxSession;
NSUInteger activeCount = 0; MXRoomMember *myMember = [roomMembers memberWithUserId:mxSession.myUserId];
NSUInteger memberCount = self.mxRoom.summary.membersCount.joined; NSString *inviterUserId = myMember.originalEvent.sender;
NSString *inviter = nil; NSString *inviter = [roomMembers memberName:inviterUserId];
// if not found, check the user in session
for (MXRoomMember *mxMember in members) if (inviter.length == 0)
{ {
if (mxMember.membership == MXMembershipJoin) inviter = [mxSession userWithUserId:inviterUserId].displayname;
{ }
// Get the user that corresponds to this member // if still not found, use the user ID
MXUser *user = [self.mxRoom.mxSession userWithUserId:mxMember.userId]; if (inviter.length == 0)
// existing user ? {
if (user && user.presence == MXPresenceOnline) inviter = inviterUserId;
{
activeCount ++;
}
// Presently only one member is available from invited room data
// This is the inviter
inviter = mxMember.displayname.length ? mxMember.displayname : mxMember.userId;
}
} }
// FIXME: Display members status when it will be available // FIXME: Display members status when it will be available