From 811c2f10681c71585ad58ac8afe586d0b32f1c39 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Thu, 15 Feb 2018 15:58:41 +0100 Subject: [PATCH] do not update 4 time the same thing --- Classes/ChatConversationView.m | 7 ++----- Classes/ChatsListTableView.m | 2 +- Classes/PhoneMainView.m | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m index 70cc81a6c..35db8d26e 100644 --- a/Classes/ChatConversationView.m +++ b/Classes/ChatConversationView.m @@ -109,7 +109,7 @@ static UICompositeViewDescription *compositeDescription = nil; name:kLinphoneCallUpdate object:nil]; if (_chatRoom) - [self setChatRoom:_chatRoom]; + [self setRoom:_chatRoom]; } - (void)viewWillDisappear:(BOOL)animated { @@ -150,7 +150,7 @@ static UICompositeViewDescription *compositeDescription = nil; #pragma mark - -- (void)setChatRoom:(LinphoneChatRoom *)chatRoom { +- (void)setRoom:(LinphoneChatRoom *)chatRoom { _chatRoom = chatRoom; LinphoneChatRoomCbs *cbs = linphone_chat_room_get_callbacks(_chatRoom); linphone_chat_room_cbs_set_state_changed(cbs, on_chat_room_state_changed); @@ -197,9 +197,6 @@ static UICompositeViewDescription *compositeDescription = nil; [self update]; linphone_chat_room_mark_as_read(_chatRoom); [self setComposingVisible:linphone_chat_room_is_remote_composing(_chatRoom) withDelay:0]; - TabBarView *tab = (TabBarView *)[PhoneMainView.instance.mainViewController - getCachedController:NSStringFromClass(TabBarView.class)]; - [tab update:YES]; [PhoneMainView.instance updateApplicationBadgeNumber]; } else { _chatView.hidden = YES; diff --git a/Classes/ChatsListTableView.m b/Classes/ChatsListTableView.m index cdce49b52..b3fe7cc5c 100644 --- a/Classes/ChatsListTableView.m +++ b/Classes/ChatsListTableView.m @@ -164,7 +164,7 @@ static int sorted_history_comparison(LinphoneChatRoom *to_insert, LinphoneChatRo if (![self isEditing]) { LinphoneChatRoom *chatRoom = (LinphoneChatRoom *)bctbx_list_nth_data(data, (int)[indexPath row]); ChatConversationView *view = VIEW(ChatConversationView); - [view setChatRoom:chatRoom]; + view.chatRoom = chatRoom; // on iPad, force unread bubble to disappear by reloading the cell if (IPAD) { UIChatCell *cell = (UIChatCell *)[tableView cellForRowAtIndexPath:indexPath]; diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 25b4641d0..2275985c9 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -871,7 +871,7 @@ static RootViewManager *rootViewManagerInstance = nil; return; } ChatConversationView *view = VIEW(ChatConversationView); - [view setChatRoom:room]; + view.chatRoom = room; [self changeCurrentView:view.compositeViewDescription]; }