Merge branch 'develop' into ismail/4384_room_summary_store

This commit is contained in:
ismailgulek
2021-09-28 17:30:39 +03:00
319 changed files with 12712 additions and 2440 deletions
@@ -130,8 +130,9 @@
}
MXRoomSummary *summary = [roomCellData.mxSession roomSummaryWithRoomId:roomCellData.roomSummary.roomId];
[summary setRoomAvatarImageIn:self.roomAvatar];
[self.roomAvatar vc_setRoomAvatarImageWith:roomCellData.avatarUrl
displayName:roomCellData.roomDisplayname
mediaManager:roomCellData.mxSession.mediaManager];
}
}
@@ -170,11 +171,7 @@
- (NSString*)roomId
{
if (roomCellData)
{
return roomCellData.roomSummary.roomId;
}
return nil;
return roomCellData.roomIdentifier;
}
@end