felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 15:09:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed other potential crashes with NSNull values. FTR, homeserver can send null values for displayname, avatar_url,status_msg and presence keys.

Browse Source
This commit is contained in:
manuroe
2014-11-05 18:04:27 +01:00
parent 732ecce448
commit dba6589075
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
syMessaging/syMessaging/MatrixHandler.m
View File

@@ -128,8 +128,10 @@ static MatrixHandler *sharedHandler = nil;
if ([event.userId isEqualToString:self.userId]) {
// Check whether this is a displayname change
if (event.prevContent) {
NSString *prevDisplayname = event.prevContent[@"displayname"];
NSString *displayname = event.content[@"displayname"];
MXRoomMemberEventContent *content = [MXRoomMemberEventContent modelFromJSON:event.content];
MXRoomMemberEventContent *prevContent = [MXRoomMemberEventContent modelFromJSON:event.prevContent];
NSString *prevDisplayname = prevContent.displayname;
NSString *displayname = content.displayname;
if (prevDisplayname && displayname && [displayname isEqualToString:prevDisplayname] == NO) {
// Update local storage
self.userDisplayName = displayname;
@@ -444,7 +446,8 @@ static MatrixHandler *sharedHandler = nil;
displayText = [NSString stringWithFormat:@"%@ left", memberDisplayName];
} else {
if (message.prevContent) {
NSString *prev = message.prevContent[@"membership"];
MXRoomMemberEventContent *prevContent = [MXRoomMemberEventContent modelFromJSON:message.prevContent];
NSString *prev = prevContent.membership;
if ([prev isEqualToString:@"join"] || [prev isEqualToString:@"invite"]) {
displayText = [NSString stringWithFormat:@"%@ kicked %@", memberDisplayName, targetDisplayName];