mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix meeting scheduler

Browse source
This commit is contained in:
Benoit Martins 2025-09-16 16:31:55 +02:00
parent 7b32b149f8
commit 4ab97cdb33
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Linphone/UI/Main/Meetings/ViewModel/MeetingViewModel.swift
View file

@ -189,7 +189,7 @@ class MeetingViewModel: ObservableObject {
private func resetConferenceSchedulerAndListeners(core: Core) {
self.mSchedulerDelegate = nil
self.conferenceScheduler = try? core.createConferenceScheduler()
self.conferenceScheduler = LinphoneUtils.createConferenceScheduler(core: core)
guard let scheduler = self.conferenceScheduler else {
Log.info("\(MeetingViewModel.TAG) ConferenceScheduler is nil after reset, nothing to cancel")
@ -317,7 +317,9 @@ class MeetingViewModel: ObservableObject {
confInfo.setCapability(streamType: .Text, enable: true)
if LinphoneUtils.isEndToEndEncryptedChatAvailable(core: core) {
// Enable end-to-end encryption if client supports it
//if isEndToEndEncryptedChatAvailable(core: core) {
if false {
Log.info("\(MeetingViewModel.TAG) Requesting EndToEnd security level for conference")
confInfo.securityLevel = .EndToEnd
} else {

26
Linphone/Utils/LinphoneUtils.swift
View file

@ -72,6 +72,32 @@ class LinphoneUtils: NSObject {
core.defaultAccount?.params?.conferenceFactoryUri != nil
}
public class func createConferenceScheduler(core: Core) -> ConferenceScheduler? {
let account = LinphoneUtils.getDefaultAccount()
if let url = account?.params?.ccmpServerUrl, !url.isEmpty {
Log.info(
"CCMP server URL has been set in Account's params, using CCMP conference scheduler"
)
let conferenceScheduler = try? core.createConferenceSchedulerWithType(
account: account,
schedulingType: .CCMP
)
return conferenceScheduler
}
Log.info(
"CCMP server URL hasn't been set in Account's params, using SIP conference scheduler"
)
let conferenceScheduler = try? core.createConferenceSchedulerWithType(
account: account,
schedulingType: .SIP
)
return conferenceScheduler
}
public class func createGroupCall(core: Core, account: Account?, subject: String) -> Conference? {
do {
let conferenceParams = try core.createConferenceParams(conference: nil)