From 499aa5fb53144f94da364c2c573dd7535474abd0 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 2 Oct 2024 13:50:16 +0200 Subject: [PATCH] Force ZRTP to Call conferences. More shadow on stickers. --- Linphone/model/tool/ToolModel.cpp | 3 +++ Linphone/view/Control/Display/Sticker.qml | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Linphone/model/tool/ToolModel.cpp b/Linphone/model/tool/ToolModel.cpp index 475cca03c..aa8cd53a5 100644 --- a/Linphone/model/tool/ToolModel.cpp +++ b/Linphone/model/tool/ToolModel.cpp @@ -120,6 +120,7 @@ bool ToolModel::createCall(const QString &sipAddress, bool localVideoEnabled = options.contains("localVideoEnabled") ? options["localVideoEnabled"].toBool() : false; std::shared_ptr address = interpretUrl(sipAddress); + if (!address) { lCritical() << "[" + QString(gClassName) + "] The calling address is not an interpretable SIP address: " << sipAddress; @@ -128,6 +129,8 @@ bool ToolModel::createCall(const QString &sipAddress, } return false; } + bool isConference = !!core->findConferenceInformationFromUri(address); + if (isConference) mediaEncryption = linphone::MediaEncryption::ZRTP; if (SettingsModel::dndEnabled( core->getConfig())) { // Force tones for outgoing calls when in DND mode (ringback, dtmf, etc ... ) disabled diff --git a/Linphone/view/Control/Display/Sticker.qml b/Linphone/view/Control/Display/Sticker.qml index 86799c873..be9431633 100644 --- a/Linphone/view/Control/Display/Sticker.qml +++ b/Linphone/view/Control/Display/Sticker.qml @@ -45,6 +45,7 @@ Item { property string qmlName property bool displayAll : !!mainItem.call property bool mutedStatus: participantDevice ? participantDevice.core.isMuted : false + clip: false onCallChanged: { waitingTime.seconds = 0 waitingTimer.restart() @@ -276,8 +277,9 @@ Item { anchors.fill: background shadowEnabled: true shadowColor: DefaultStyle.grey_1000 - shadowBlur: 0.1 - shadowOpacity: 0.4 + shadowBlur: 1 + shadowOpacity: 0.3 + shadowScale: 1.05 } RowLayout{ anchors.right: parent.right