diff --git a/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp b/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp index 699ebb091..3ccc59fb8 100644 --- a/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp +++ b/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp @@ -374,6 +374,7 @@ void ConferenceInfoModel::createConference() { CoreManager::getInstance()->getTimelineListModel()->mAutoSelectAfterCreation = false; shared_ptr core = CoreManager::getInstance()->getCore(); static std::shared_ptr conference; + mConferenceInfo->setSecurityLevel(linphone::Conference::SecurityLevel::None); // TODO: remove when conferences can be encrypted qInfo() << "Conference creation of " << getSubject() << " at " << (int)mConferenceInfo->getSecurityLevel() << " security, organized by " << getOrganizer() << " for " << getDateTimeSystem().toString(); qInfo() << "Participants:"; for(auto p : mConferenceInfo->getParticipants()) diff --git a/linphone-app/ui/views/App/Dialog/NewConference.qml b/linphone-app/ui/views/App/Dialog/NewConference.qml index f24707184..b8b6d1967 100644 --- a/linphone-app/ui/views/App/Dialog/NewConference.qml +++ b/linphone-app/ui/views/App/Dialog/NewConference.qml @@ -51,6 +51,7 @@ DialogPlus { Layout.alignment: Qt.AlignLeft Layout.leftMargin: 15 spacing:4 + visible: false // TODO: remove when conferences can be encrypted Text { Layout.fillWidth: true //: 'Would you like to encrypt your meeting ?' : Ask about setting the meeting as secured. diff --git a/linphone-sdk b/linphone-sdk index 94eb2e8dd..2f9c2d231 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit 94eb2e8dd4c03168cb180095412a6f7120730f42 +Subproject commit 2f9c2d231386233c1d93a6120a109e5fdd5eb50a