From 79af8a65fd17efd091b0388fc5e14da6e0bb312c Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 31 Jul 2023 10:10:34 +0200 Subject: [PATCH] Fix ephemeral time set on chat room creation. Update SDK to 5.2.94 (WASAPI crash) --- CHANGELOG.md | 2 +- linphone-app/src/components/calls/CallsListModel.cpp | 8 ++++++-- linphone-sdk | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5857eed31..a90090f98 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.92 +- Update SDK to 5.2.94 ### Removed - Picture zoom on mouse over. diff --git a/linphone-app/src/components/calls/CallsListModel.cpp b/linphone-app/src/components/calls/CallsListModel.cpp index d7d1437be..478f6a470 100644 --- a/linphone-app/src/components/calls/CallsListModel.cpp +++ b/linphone-app/src/components/calls/CallsListModel.cpp @@ -271,8 +271,10 @@ bool CallsListModel::createSecureChat (const QString& subject, const QString &pa qInfo() << "Create secure ChatRoom: " << subject << ", from " << QString::fromStdString(localAddress->asString()) << " and with " < chatRoom = core->createChatRoom(params, localAddress, participants); - if(chatRoom) + if(chatRoom) { + chatRoom->setEphemeralLifetime(ephemeralTime); chatRoom->enableEphemeral(ephemeralTime>0); + } // Still needed? // if( chatRoom != nullptr){ // auto timelineList = CoreManager::getInstance()->getTimelineListModel(); @@ -373,8 +375,10 @@ QVariantMap CallsListModel::createChatRoom(const QString& subject, const int& se } if( !chatRoom) qWarning() << "Chat room cannot be created"; - else if(securityLevel > 0) + else if(securityLevel > 0) { + chatRoom->setEphemeralLifetime(ephemeralTime); chatRoom->enableEphemeral(ephemeralTime>0); + } result["created"] = (chatRoom != nullptr); return result; diff --git a/linphone-sdk b/linphone-sdk index ac2c5f4a9..d11ee80e4 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit ac2c5f4a9abbf295f3c6045d3d988a84cea752ed +Subproject commit d11ee80e4f7ee67e876656286d94ffda49ac1d4e