From 3df2a4a01e119f78ecacba95fb0bd67e518ccd56 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Fri, 16 Feb 2018 11:29:18 +0100 Subject: [PATCH] fix crash on NULL subject --- Classes/ChatConversationCreateTableView.m | 1 - Classes/LinphoneUI/UIChatCell.m | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Classes/ChatConversationCreateTableView.m b/Classes/ChatConversationCreateTableView.m index 28de08f2d..295a59481 100644 --- a/Classes/ChatConversationCreateTableView.m +++ b/Classes/ChatConversationCreateTableView.m @@ -127,7 +127,6 @@ if (!addr) return cell; - cell.linphoneImage.hidden = !linphoneContact; cell.displayNameLabel.text = [FastAddressBook displayNameForAddress:addr]; cell.addressLabel.text = [NSString stringWithUTF8String:linphone_address_as_string(addr)]; diff --git a/Classes/LinphoneUI/UIChatCell.m b/Classes/LinphoneUI/UIChatCell.m index 2f7bc371d..98c90bbdd 100644 --- a/Classes/LinphoneUI/UIChatCell.m +++ b/Classes/LinphoneUI/UIChatCell.m @@ -77,7 +77,7 @@ } } else { const char *subject = linphone_chat_room_get_subject(chatRoom); - _addressLabel.text = [NSString stringWithUTF8String:subject]; + _addressLabel.text = [NSString stringWithUTF8String:subject ?: LINPHONE_DUMMY_SUBJECT]; [_avatarImage setImage:[UIImage imageNamed:@"chat_group_avatar.png"] bordered:NO withRoundedRadius:YES]; }