Merge branch 'develop' into ux_rework

This commit is contained in:
Giom Foret
2017-03-31 17:37:50 +02:00
15 changed files with 103 additions and 87 deletions
+2 -2
View File
@@ -316,7 +316,7 @@
{
id<MXKRecentCellDataStoring> cellDataStoring = (id<MXKRecentCellDataStoring> )cellData;
if (NSNotFound == [cellDataStoring.recentsDataSource.mxSession.invitedRooms indexOfObject:cellDataStoring.roomDataSource.room])
if (NSNotFound == [cellDataStoring.recentsDataSource.mxSession.invitedRooms indexOfObject:cellDataStoring.roomSummary.room])
{
return RecentTableViewCell.class;
}
@@ -330,7 +330,7 @@
{
id<MXKRecentCellDataStoring> cellDataStoring = (id<MXKRecentCellDataStoring> )cellData;
if (NSNotFound == [cellDataStoring.recentsDataSource.mxSession.invitedRooms indexOfObject:cellDataStoring.roomDataSource.room])
if (NSNotFound == [cellDataStoring.recentsDataSource.mxSession.invitedRooms indexOfObject:cellDataStoring.roomSummary.room])
{
return RecentTableViewCell.defaultReuseIdentifier;
}