mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

avoid crash in case chatroom have no subject

Browse source
This commit is contained in:
Jehan Monnier 2018-02-16 14:27:08 +01:00
parent 3df2a4a01e
commit 67c05f97ca
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Classes/ChatConversationView.m
View file

@ -181,8 +181,10 @@ static UICompositeViewDescription *compositeDescription = nil;
LinphoneParticipant *firstParticipant = participants ? (LinphoneParticipant *)participants->data : NULL;
const LinphoneAddress *addr = firstParticipant ? linphone_participant_get_address(firstParticipant) : linphone_chat_room_get_peer_address(_chatRoom);
[ContactDisplay setDisplayNameLabel:_addressLabel forAddress:addr];
} else
} else if (linphone_chat_room_get_subject(_chatRoom))
_addressLabel.text = [NSString stringWithUTF8String:linphone_chat_room_get_subject(_chatRoom)];
else
_addressLabel.text=@LINPHONE_DUMMY_SUBJECT;
[self updateParticipantLabel];
@ -541,7 +543,7 @@ static UICompositeViewDescription *compositeDescription = nil;
view.oldContacts = [contactsArray mutableCopy];
view.admins = [admins mutableCopy];
view.oldAdmins = [admins mutableCopy];
view.oldSubject = [NSString stringWithUTF8String:linphone_chat_room_get_subject(_chatRoom)];
view.oldSubject = [NSString stringWithUTF8String:linphone_chat_room_get_subject(_chatRoom)?linphone_chat_room_get_subject(_chatRoom):LINPHONE_DUMMY_SUBJECT];
view.room = _chatRoom;
[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
}