witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

update submodules and API accordingly

Browse source
This commit is contained in:
Benjamin Reis 2017-11-07 14:51:22 +01:00
parent d9b726edca
commit 11512b1abc
5 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Classes/ChatConversationTableView.m
View file

@ -164,30 +164,32 @@
LinphoneEventLog *event = bctbx_list_nth_data(eventList, (int)[indexPath row]);
if (linphone_event_log_get_type(event) == LinphoneEventLogTypeConferenceChatMessage) {
LinphoneChatMessage *chat = linphone_event_log_get_chat_message(event);
if (linphone_chat_message_get_file_transfer_information(chat) ||
linphone_chat_message_get_external_body_url(chat)) {
if (linphone_chat_message_get_file_transfer_information(chat) || linphone_chat_message_get_external_body_url(chat))
kCellId = NSStringFromClass(UIChatBubblePhotoCell.class);
} else {
else
kCellId = NSStringFromClass(UIChatBubbleTextCell.class);
}
UIChatBubbleTextCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellId];
if (cell == nil) {
if (cell == nil)
cell = [[NSClassFromString(kCellId) alloc] initWithIdentifier:kCellId];
}
[cell setChatMessage:chat];
if (chat) {
if (chat)
[cell update];
}
[cell setChatRoomDelegate:_chatRoomDelegate];
[super accessoryForCell:cell atPath:indexPath];
cell.selectionStyle = UITableViewCellSelectionStyleNone;
return cell;
} else {
if (linphone_event_log_is_full_state(event))
return NULL;
kCellId = NSStringFromClass(UIChatNotifiedEventCell.class);
UIChatNotifiedEventCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellId];
if (cell == nil) {
if (cell == nil)
cell = [[NSClassFromString(kCellId) alloc] initWithIdentifier:kCellId];
}
[cell setEvent:event];
[super accessoryForCell:cell atPath:indexPath];
cell.selectionStyle = UITableViewCellSelectionStyleNone;

2
Classes/LinphoneUI/UIChatBubbleTextCell.m
View file

@ -90,7 +90,7 @@
if (url || last_content) {
return @"🗻";
} else {
const char *text = linphone_chat_message_get_text(message) ?: "";
const char *text = linphone_chat_message_get_text_content(message) ?: "";
return [NSString stringWithUTF8String:text] ?: [NSString stringWithCString:text encoding:NSASCIIStringEncoding]
?: NSLocalizedString(@"(invalid string)", nil);
}

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit e3b9709cc5c01250aa944a7cb6f8abbee885113f
Subproject commit 51906fb43d56a698f86f5d72b3fe0ead4ad22910

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit ddddd2b3bc66604225c26b6cdecaf3c91680deda
Subproject commit 96d053faca4a35bfd27eef64a081c0a193c97735

2
submodules/linphone

@ -1 +1 @@
Subproject commit 8e05e6a21f0770e4e00fbf316568645bebaf41c0
Subproject commit 95ab4ff5855b0472b1d187dafe4e35fe4beefb82