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

Fix video conference invitation that wasn't send to secure chat because of missing subject.

Browse source 
Fix hidden secure icon on participant lists (chat room and video conference creation)
This commit is contained in:
Julien Wadel 2022-09-22 12:13:56 +02:00
parent 6c481ccad5
commit 0a149b55a8
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linphone-app/src/components/calls/CallsListModel.cpp
View file

@ -315,9 +315,7 @@ QVariantMap CallsListModel::createChatRoom(const QString& subject, const int& se
}
params->enableEncryption(securityLevel>0);
if( securityLevel>0){
params->enableEncryption(true);
}else
if( securityLevel<=0)
params->setBackend(linphone::ChatRoomBackend::Basic);
params->enableGroup( subject!="" );

10
linphone-app/src/components/conferenceScheduler/ConferenceScheduler.cpp
View file

@ -59,13 +59,13 @@ void ConferenceScheduler::onStateChanged(linphone::ConferenceScheduler::State st
qDebug() << "ConferenceScheduler::onStateChanged : " << (int)state;
emit stateChanged(state);
if( state == linphone::ConferenceScheduler::State::Ready) {
emit CoreManager::getInstance()->getHandlers()->conferenceInfoReceived(mConferenceScheduler->getInfo());
auto conferenceInfo = mConferenceScheduler->getInfo();
emit CoreManager::getInstance()->getHandlers()->conferenceInfoReceived(conferenceInfo);
if( (mSendInvite & 1) == 1){
std::shared_ptr<linphone::ChatRoomParams> params = CoreManager::getInstance()->getCore()->createDefaultChatRoomParams();
if( CoreManager::getInstance()->getSettingsModel()->getSecureChatEnabled())
params->setBackend(linphone::ChatRoomBackend::FlexisipChat);
else
params->setBackend(linphone::ChatRoomBackend::Basic);
params->enableGroup(false);
params->setSubject(conferenceInfo->getSubject());
params->enableEncryption(CoreManager::getInstance()->getSettingsModel()->getSecureChatEnabled());
mConferenceScheduler->sendInvitations(params);
}
}

10
linphone-app/ui/views/App/Dialog/NewConference.qml
View file

@ -497,14 +497,16 @@ DialogPlus {
actions:[{
colorSet: NewConferenceStyle.addParticipant,
secure: secureSwitch.checked,
secure: SettingsModel.secureChatEnabled,
visible: true,
secureIconVisibleHandler : function(entry) {
return UtilsCpp.hasCapability(entry.sipAddress, LinphoneEnums.FriendCapabilityLimeX3Dh)
return entry && entry.sipAddress ? UtilsCpp.hasCapability(entry.sipAddress, LinphoneEnums.FriendCapabilityLimeX3Dh) : false
},
handler: function (entry) {
selectedParticipants.addAddress(entry.sipAddress)
smartSearchBar.addAddressToIgnore(entry.sipAddress);
if(entry){
selectedParticipants.addAddress(entry.sipAddress)
smartSearchBar.addAddressToIgnore(entry.sipAddress);
}
},
}]

6
linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml
View file

@ -223,7 +223,7 @@ DialogPlus {
property int securityLevel : 2
anchors.top:parent.top
anchors.horizontalCenter: parent.right
visible: UtilsCpp.hasCapability(modelData.sipAddress, LinphoneEnums.FriendCapabilityLimeX3Dh)
visible: SettingsModel.secureChatEnabled && UtilsCpp.hasCapability(modelData.sipAddress, LinphoneEnums.FriendCapabilityLimeX3Dh)
icon: 'secure_on'
iconSize: parent.height/2
}
@ -316,10 +316,10 @@ DialogPlus {
actions:[{
colorSet: NewChatRoomStyle.addParticipant,
secure: secureSwitch.checked,
secure: SettingsModel.secureChatEnabled,
visible: true,
secureIconVisibleHandler : function(entry) {
return UtilsCpp.hasCapability(entry.sipAddress, LinphoneEnums.FriendCapabilityLimeX3Dh)
return entry && entry.sipsipAddress ? UtilsCpp.hasCapability(entry.sipAddress, LinphoneEnums.FriendCapabilityLimeX3Dh) : false
},
handler: function (entry) {
selectedParticipants.addAddress(entry.sipAddress)