RecentsDataSource: Improve data handling

This commit is contained in:
Giom Foret
2017-04-05 14:03:59 +02:00
parent a25f92dfb2
commit d59903d750
2 changed files with 30 additions and 26 deletions
+3 -5
View File
@@ -338,7 +338,7 @@
{
id<MXKRecentCellDataStoring> cellDataStoring = (id<MXKRecentCellDataStoring> )cellData;
if (NSNotFound == [cellDataStoring.recentsDataSource.mxSession.invitedRooms indexOfObject:cellDataStoring.roomSummary.room])
if (cellDataStoring.roomSummary.room.state.membership != MXMembershipInvite)
{
return RecentTableViewCell.class;
}
@@ -352,7 +352,7 @@
{
id<MXKRecentCellDataStoring> cellDataStoring = (id<MXKRecentCellDataStoring> )cellData;
if (NSNotFound == [cellDataStoring.recentsDataSource.mxSession.invitedRooms indexOfObject:cellDataStoring.roomSummary.room])
if (cellDataStoring.roomSummary.room.state.membership != MXMembershipInvite)
{
return RecentTableViewCell.defaultReuseIdentifier;
}
@@ -421,10 +421,8 @@
if (room)
{
NSArray* invitedRooms = room.mxSession.invitedRooms;
// Display no action for the invited room
if (invitedRooms && ([invitedRooms indexOfObject:room] != NSNotFound))
if (room.state.membership == MXMembershipInvite)
{
return actions;
}