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

room_members_search

Browse source 
remove the session property
This commit is contained in:
yannick 2015-12-21 14:28:18 +01:00
parent a41fc1b5f2
commit 4c5ff18b75
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Vector/Views/Contact/ContactTableViewCell.h
View file

@ -42,9 +42,5 @@
// This property is OPTIONAL.
@property (nonatomic) MXRoom* mxRoom;
// The session where this contact is displayed.
// It is MANDATORY.
@property (nonatomic) MXSession* mxSession;
@end

33
Vector/Views/Contact/ContactTableViewCell.m
View file

@ -22,11 +22,11 @@
#import "AvatarGenerator.h"
#import "MXKContactManager.h"
@interface ContactTableViewCell()
{
/**
The current displayed contact.
*/
// The current displayed contact.
MXKContact *contact;
/**
@ -37,7 +37,7 @@
@end
@implementation ContactTableViewCell
@synthesize mxRoom, mxSession;
@synthesize mxRoom;
- (void)awakeFromNib
{
@ -194,14 +194,14 @@
{
NSString* presenceText = nil;
NSString* matrixId = [self getFirstMatrixId];
MXRoomMember* member = [self.mxRoom.state memberWithUserId:matrixId];
// the oneself user is always active
if ([matrixId isEqualToString:self.mxSession.myUser.userId])
MXRoomMember* member = nil;
if (self.mxRoom)
{
presenceText = NSLocalizedStringFromTable(@"room_participants_active", @"Vector", nil);
member = [self.mxRoom.state memberWithUserId:matrixId];
}
else if (!member || (member.membership != MXMembershipJoin))
if (!member || (member.membership != MXMembershipJoin))
{
if (member.membership == MXMembershipInvite)
{
@ -218,8 +218,19 @@
}
else
{
MXUser *user = [self.mxSession userWithUserId:matrixId];
MXUser *user = nil;
// Consider here all sessions reported into contact manager
NSArray* mxSessions = [MXKContactManager sharedManager].mxSessions;
for (MXSession *mxSession in mxSessions)
{
user = [mxSession userWithUserId:matrixId];
if (user)
{
break;
}
}
if (user)
{
if (user.presence == MXPresenceOnline)