From caa4d0c60036e090439862c533a358e6e9920a86 Mon Sep 17 00:00:00 2001 From: Ivan Sein Date: Fri, 16 Feb 2018 10:48:08 +0100 Subject: [PATCH] Cast room's name and display name when retrieving rooms. Signed-off-by: Ivan Sein --- VideoCalls/NCRoom.m | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/VideoCalls/NCRoom.m b/VideoCalls/NCRoom.m index d1bece6c..52d3db21 100644 --- a/VideoCalls/NCRoom.m +++ b/VideoCalls/NCRoom.m @@ -19,8 +19,6 @@ NCRoom *room = [[NCRoom alloc] init]; room.roomId = [[roomDict objectForKey:@"id"] integerValue]; room.token = [roomDict objectForKey:@"token"]; - room.name = [roomDict objectForKey:@"name"]; - room.displayName = [roomDict objectForKey:@"displayName"]; room.type = (NCRoomType)[[roomDict objectForKey:@"type"] integerValue]; room.count = [[roomDict objectForKey:@"count"] integerValue]; room.hasPassword = [[roomDict objectForKey:@"hasPassword"] boolValue]; @@ -30,6 +28,20 @@ room.guestList = [roomDict objectForKey:@"guestList"]; room.participants = [roomDict objectForKey:@"participants"]; + id name = [roomDict objectForKey:@"name"]; + if ([name isKindOfClass:[NSString class]]) { + room.name = name; + } else { + room.name = [name stringValue]; + } + + id displayName = [roomDict objectForKey:@"displayName"]; + if ([displayName isKindOfClass:[NSString class]]) { + room.displayName = displayName; + } else { + room.displayName = [displayName stringValue]; + } + return room; }