diff --git a/Classes/Swift/Conference/ViewModels/ConferenceSchedulingViewModel.swift b/Classes/Swift/Conference/ViewModels/ConferenceSchedulingViewModel.swift index 035757c0f..43eb2ce39 100644 --- a/Classes/Swift/Conference/ViewModels/ConferenceSchedulingViewModel.swift +++ b/Classes/Swift/Conference/ViewModels/ConferenceSchedulingViewModel.swift @@ -83,9 +83,9 @@ class ConferenceSchedulingViewModel { // Send conference info even when conf is not scheduled for later // as the conference server doesn't invite participants automatically if let chatRoomParams = try?self.core.createDefaultChatRoomParams() { - chatRoomParams.backend = ChatRoomBackend.FlexisipChat + chatRoomParams.encryptionEnabled = self.isEndToEndEncryptedChatAvailable() chatRoomParams.groupEnabled = false - chatRoomParams.encryptionEnabled = true + chatRoomParams.backend = chatRoomParams.encryptionEnabled ? .FlexisipChat : .Basic chatRoomParams.subject = self.subject.value! scheduler.sendInvitations(chatRoomParams: chatRoomParams) } @@ -140,6 +140,13 @@ class ConferenceSchedulingViewModel { } + func isEndToEndEncryptedChatAvailable() -> Bool { + let core = Core.get() + return core.limeX3DhEnabled && + ((core.limeX3DhServerUrl != nil && core.limeX3DhServerUrl.count > 0) || core.defaultAccount?.params?.limeServerUrl != nil) && + core.defaultAccount?.params?.conferenceFactoryUri != nil + } + func reset() { subject.value = ""