From 08ca95be2251aa17317c300b6f75f753a7e9ab85 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Thu, 3 May 2018 15:25:33 +0200 Subject: [PATCH] fix UI on ipad --- Classes/ChatConversationView.m | 3 +++ Classes/PhoneMainView.m | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m index 6cac282fa..a549d5702 100644 --- a/Classes/ChatConversationView.m +++ b/Classes/ChatConversationView.m @@ -770,6 +770,9 @@ void on_chat_room_chat_message_sent(LinphoneChatRoom *cr, const LinphoneEventLog ChatConversationView *view = (__bridge ChatConversationView *)linphone_chat_room_cbs_get_user_data(linphone_chat_room_get_current_callbacks(cr)); [view.tableController addEventEntry:(LinphoneEventLog *)event_log]; [view.tableController scrollToBottom:true]; + + if (IPAD) + [NSNotificationCenter.defaultCenter postNotificationName:kLinphoneMessageReceived object:view]; } void on_chat_room_is_composing_received(LinphoneChatRoom *cr, const LinphoneAddress *remoteAddr, bool_t isComposing) { diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 761eeab14..e2579dc2a 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -920,13 +920,13 @@ static RootViewManager *rootViewManagerInstance = nil; if (view.chatRoom && view.chatRoomCbs) linphone_chat_room_remove_callbacks(view.chatRoom, view.chatRoomCbs); - if (PhoneMainView.instance.currentView == view.compositeViewDescription) - [PhoneMainView.instance popCurrentView]; - view.chatRoomCbs = NULL; view.chatRoom = cr; self.currentRoom = view.chatRoom; - [PhoneMainView.instance changeCurrentView:view.compositeViewDescription]; + if (PhoneMainView.instance.currentView == view.compositeViewDescription) + [view viewWillAppear:TRUE]; + else + [PhoneMainView.instance changeCurrentView:view.compositeViewDescription]; } void main_view_chat_room_state_changed(LinphoneChatRoom *cr, LinphoneChatRoomState newState) {