diff --git a/CHANGELOG.md b/CHANGELOG.md index a90090f98..1475d8c38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Display video thumbnails. - Crop thumbnail and pictures if distored. - Enable registration from accounts list. -- Update SDK to 5.2.94 +- Update SDK to 5.2.95 ### Removed - Picture zoom on mouse over. diff --git a/linphone-app/ui/views/App/Calls/Incall.qml b/linphone-app/ui/views/App/Calls/Incall.qml index 3c787c3fa..fbf5e8527 100644 --- a/linphone-app/ui/views/App/Calls/Incall.qml +++ b/linphone-app/ui/views/App/Calls/Incall.qml @@ -458,12 +458,11 @@ Rectangle { ? IncallStyle.buttons.postQuantumSecure : IncallStyle.buttons.secure2 : IncallStyle.buttons.secure - onColorSetChanged:console.log(colorSet.icon) onClicked: if(callModel.encryption === CallModel.CallEncryptionZrtp){ window.attachVirtualWindow(Utils.buildLinphoneDialogUri('ZrtpTokenAuthenticationDialog'), {call:callModel}) } - tooltipText: Logic.makeReadableSecuredString(callModel.isSecured, callModel.securedString) + tooltipText: Logic.makeReadableSecuredString(callModel.encryption !== CallModel.CallEncryptionNone, callModel.securedString) } RowLayout{ visible: callModel.remoteRecording diff --git a/linphone-app/ui/views/App/Calls/IncallFullscreen.qml b/linphone-app/ui/views/App/Calls/IncallFullscreen.qml index aefff5528..6b42391f3 100644 --- a/linphone-app/ui/views/App/Calls/IncallFullscreen.qml +++ b/linphone-app/ui/views/App/Calls/IncallFullscreen.qml @@ -401,17 +401,19 @@ Window { iconIsCustom: ! (conference.isSecured && SettingsModel.isPostQuantumAvailable && callModel.encryption === CallModel.CallEncryptionZrtp) backgroundRadius: width/2 - colorSet: conference.isSecured - ? SettingsModel.isPostQuantumAvailable && callModel.encryption === CallModel.CallEncryptionZrtp && callModel.isPQZrtp == CallModel.CallPQStateOn - ? IncallStyle.buttons.postQuantumSecure - : IncallStyle.buttons.secure - : IncallStyle.buttons.unsecure + colorSet: callModel.encryption === CallModel.CallEncryptionNone + ? IncallStyle.buttons.unsecure + : callModel.isSecured + ? SettingsModel.isPostQuantumAvailable && callModel.encryption === CallModel.CallEncryptionZrtp && callModel.isPQZrtp == CallModel.CallPQStateOn + ? IncallStyle.buttons.postQuantumSecure + : IncallStyle.buttons.secure2 + : IncallStyle.buttons.secure onClicked: if(callModel.encryption === CallModel.CallEncryptionZrtp){ window.attachVirtualWindow(Utils.buildLinphoneDialogUri('ZrtpTokenAuthenticationDialog'), {call:callModel}) } - tooltipText: Logic.makeReadableSecuredString(conference.isSecured, callModel ? callModel.securedString : '') + tooltipText: Logic.makeReadableSecuredString(callModel.encryption !== CallModel.CallEncryptionNone, callModel ? callModel.securedString : '') } RowLayout{ visible: callModel && callModel.remoteRecording diff --git a/linphone-sdk b/linphone-sdk index d11ee80e4..4862516d1 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit d11ee80e4f7ee67e876656286d94ffda49ac1d4e +Subproject commit 4862516d1f8ebea0a81ef49bbdc7627236ce426a