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

cleans code

Browse source
This commit is contained in:
Benjamin Reis 2017-11-23 14:37:17 +01:00
parent 22c8cf64cb
commit 73913ba4d8
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Classes/ChatConversationView.m
View file

@ -713,10 +713,13 @@ void on_chat_room_state_changed(LinphoneChatRoom *cr, LinphoneChatRoomState newS
void on_chat_room_subject_changed(LinphoneChatRoom *cr, const LinphoneEventLog *event_log) {
ChatConversationView *view = (__bridge ChatConversationView *)linphone_chat_room_cbs_get_user_data(linphone_chat_room_get_callbacks(cr));
view.addressLabel.text = [NSString stringWithUTF8String:linphone_chat_room_get_subject(cr)];
[view.tableController addEventEntry:(LinphoneEventLog *)event_log];
[view.tableController.tableView reloadData];
[view.tableController scrollToBottom:true];
const char *subject = linphone_chat_room_get_subject(cr) ?: linphone_event_log_get_subject(event_log);
if (subject) {
view.addressLabel.text = [NSString stringWithUTF8String:subject];
[view.tableController addEventEntry:(LinphoneEventLog *)event_log];
[view.tableController.tableView reloadData];
[view.tableController scrollToBottom:true];
}
}
void on_chat_room_participant_added(LinphoneChatRoom *cr, const LinphoneEventLog *event_log) {
@ -748,13 +751,12 @@ void on_chat_room_chat_message_received(LinphoneChatRoom *cr, const LinphoneEven
LinphoneChatMessage *chat = linphone_event_log_get_chat_message(event_log);
const LinphoneAddress *from = linphone_chat_message_get_from_address(chat);
if (from == NULL || chat == NULL) {
if (from == NULL || chat == NULL)
return;
}
if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive) {
if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive)
linphone_chat_room_mark_as_read(view.chatRoom);
}
[NSNotificationCenter.defaultCenter postNotificationName:kLinphoneMessageReceived object:view];
[view.tableController addEventEntry:(LinphoneEventLog *)event_log];
[view setComposingVisible:FALSE withDelay:0];

2
submodules/linphone

@ -1 +1 @@
Subproject commit 5c7fe8a92b57883b89f5dd4940090a4b12ac36b0
Subproject commit 97cd45702cc7c7774807d4b0e97e332c2373286f