Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 16:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1553 from vector-im/fix_ram_usage_peak

Browse source 
EventFormatter: Improve updateRoomSummary:withStateEvents: to avoid t…
This commit is contained in:
manuroe 2017-10-05 09:45:41 +02:00 committed by GitHub
commit 4cf2d2ad1f
2 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Riot/AppDelegate.m
View file

@ -534,6 +534,11 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN
[self stopGoogleAnalytics];
}
- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application
{
NSLog(@"[AppDelegate] applicationDidReceiveMemoryWarning");
}
- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler
{
BOOL continueUserActivity = NO;

53
Riot/Utils/EventFormatter.m
View file

@ -224,9 +224,9 @@
BOOL ret = [super session:session updateRoomSummary:summary withStateEvents:stateEvents];
// Check whether the room display name and/or the room avatar url should be updated at Riot level.
NSString *riotRoomDisplayName;
NSString *riotRoomAvatarURL;
BOOL refreshRiotRoomDisplayName = NO;
BOOL refreshRiotRoomAvatarURL = NO;
for (MXEvent *event in stateEvents)
{
switch (event.eventType)
@ -235,45 +235,50 @@
case MXEventTypeRoomAliases:
case MXEventTypeRoomCanonicalAlias:
{
if (!riotRoomDisplayName.length)
{
riotRoomDisplayName = [self riotRoomDisplayNameFromRoomState:summary.room.state];
}
refreshRiotRoomDisplayName = YES;
break;
}
case MXEventTypeRoomMember:
{
if (!riotRoomDisplayName.length)
{
riotRoomDisplayName = [self riotRoomDisplayNameFromRoomState:summary.room.state];
}
refreshRiotRoomDisplayName = YES;
// Do not break here to check avatar url too.
}
case MXEventTypeRoomAvatar:
{
if (!riotRoomAvatarURL.length)
{
riotRoomAvatarURL = [self riotRoomAvatarURLFromRoomState:summary.room.state];
}
refreshRiotRoomAvatarURL = YES;
break;
}
default:
break;
}
if (refreshRiotRoomDisplayName && refreshRiotRoomAvatarURL)
{
break;
}
}
if (riotRoomDisplayName.length && ![summary.displayname isEqualToString:riotRoomDisplayName])
if (refreshRiotRoomDisplayName)
{
summary.displayname = riotRoomDisplayName;
ret = YES;
NSString *riotRoomDisplayName = [self riotRoomDisplayNameFromRoomState:summary.room.state];
if (riotRoomDisplayName.length && ![summary.displayname isEqualToString:riotRoomDisplayName])
{
summary.displayname = riotRoomDisplayName;
ret = YES;
}
}
if (riotRoomAvatarURL.length && ![summary.avatar isEqualToString:riotRoomAvatarURL])
if (refreshRiotRoomAvatarURL)
{
summary.avatar = riotRoomAvatarURL;
ret = YES;
NSString *riotRoomAvatarURL = [self riotRoomAvatarURLFromRoomState:summary.room.state];
if (riotRoomAvatarURL.length && ![summary.avatar isEqualToString:riotRoomAvatarURL])
{
summary.avatar = riotRoomAvatarURL;
ret = YES;
}
}
return ret;
}