mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-20 16:42:44 +02:00
Merge branch 'develop' into ismail/4384_room_summary_store
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user