From d41f2c21e32b61c9c9371f7e6669a1c825c2f4df Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Thu, 4 May 2023 11:08:10 +0200 Subject: [PATCH] Add audio_video_conference_factory_address condition to display voip conference buttons in ChatRoomConverstaionSwift --- Classes/Swift/Chat/Views/ChatConversationViewSwift.swift | 4 ++-- Classes/Swift/Util/BackActionsNavigationView.swift | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift b/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift index 7df488306..873a99f31 100644 --- a/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift +++ b/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift @@ -439,9 +439,9 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll func initDataSource(groupeChat: Bool, secureLevel: Bool, cChatRoom: OpaquePointer) { menu.dataSource.removeAll() - + let defaultAccount = Core.getSwiftObject(cObject: LinphoneManager.getLc()).defaultAccount if(groupeChat){ - if !ChatConversationViewModel.sharedModel.chatRoom!.isReadOnly { + if !ChatConversationViewModel.sharedModel.chatRoom!.isReadOnly && (defaultAccount != nil) && (defaultAccount!.params!.audioVideoConferenceFactoryAddress != nil) { menu.dataSource.append(VoipTexts.conference_schedule_start) } menu.dataSource.append(VoipTexts.dropdown_menu_chat_conversation_group_infos) diff --git a/Classes/Swift/Util/BackActionsNavigationView.swift b/Classes/Swift/Util/BackActionsNavigationView.swift index fbeaadd3e..4c3ea8cca 100644 --- a/Classes/Swift/Util/BackActionsNavigationView.swift +++ b/Classes/Swift/Util/BackActionsNavigationView.swift @@ -349,9 +349,13 @@ class BackActionsNavigationView: UIViewController { func changeCallIcon(groupChat: Bool){ isGroupChat = groupChat - if(groupChat){ + let defaultAccount = Core.getSwiftObject(cObject: LinphoneManager.getLc()).defaultAccount + if(groupChat && (defaultAccount != nil) && (defaultAccount!.params!.audioVideoConferenceFactoryAddress != nil)){ action1Button.isHidden = true action1BisButton.isHidden = false + }else if(groupChat){ + action1Button.isHidden = true + action1BisButton.isHidden = true }else{ action1Button.isHidden = false action1BisButton.isHidden = true