From 5ad93ec6f4b749943441aae16f3ff7a5f34c7066 Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Fri, 11 Jan 2019 11:52:29 +0100 Subject: [PATCH] fix create group chatroom --- Classes/ChatConversationCreateView.m | 5 ----- Classes/PhoneMainView.m | 9 +++++++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Classes/ChatConversationCreateView.m b/Classes/ChatConversationCreateView.m index 30d538160..9d88f4bb8 100644 --- a/Classes/ChatConversationCreateView.m +++ b/Classes/ChatConversationCreateView.m @@ -133,11 +133,6 @@ static UICompositeViewDescription *compositeDescription = nil; } - (IBAction)onNextClick:(id)sender { - if (_tableController.contactsGroup.count == 1 && !_isForEditing) { - [self createChatRoom]; - return; - } - ChatConversationInfoView *view = VIEW(ChatConversationInfoView); view.contacts = _tableController.contactsGroup; view.create = !_isForEditing; diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index c751a4dbf..08d0b923c 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -912,8 +912,13 @@ static RootViewManager *rootViewManagerInstance = nil; LinphoneChatRoomCbs *cbs = linphone_factory_create_chat_room_cbs(linphone_factory_get()); linphone_chat_room_cbs_set_state_changed(cbs, main_view_chat_room_state_changed); linphone_chat_room_add_callbacks(room, cbs); - - linphone_chat_room_add_participants(room, addresses); + + if (bctbx_list_size(addresses) == 1) { + //avoid creating ont-to-one chatroom + linphone_chat_room_add_participant(room, addresses->data); + } else { + linphone_chat_room_add_participants(room, addresses); + } } - (void)goToChatRoom:(LinphoneChatRoom *)cr {