зеркало из https://github.com/nextcloud/talk-ios.git
Cast room's name and display name when retrieving rooms.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
This commit is contained in:
Родитель
e3acf2118a
Коммит
caa4d0c600
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче