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
@@ -18,6 +18,7 @@
#import "RecentCellData.h"
#import "MXRoom+Riot.h"
#import "MatrixSDK-Swift.h"
@implementation RecentCellData
// trick to hide the mother class property as it is readonly one.
@@ -58,7 +59,7 @@
- (void)update
{
[super update];
roomDisplayname = self.roomSummary.displayname;
roomDisplayname = self.spaceChildInfo ? self.spaceChildInfo.name: self.roomSummary.displayname;
if (!roomDisplayname.length)
{
roomDisplayname = [NSBundle mxk_localizedStringForKey:@"room_displayname_empty_room"];