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

Revert "change ephemeral api from SDK update"

Browse source 
This reverts commit 49bc5de54e.
This commit is contained in:
Ghislain MARY 2026-03-26 10:36:04 +01:00
parent 745419014a
commit 0bb4b5423e
6 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Linphone/core/chat/ChatCore.cpp
View file

@ -334,6 +334,9 @@ void ChatCore::setSelf(const QSharedPointer<ChatCore> &me) {
}); });
}); });
mChatModelConnection->makeConnectToCore(&ChatCore::lEnableEphemeral, [this](bool enable) {
mChatModelConnection->invokeToModel([this, enable]() { mChatModel->enableEphemeral(enable); });
});
mChatModelConnection->makeConnectToModel(&ChatModel::ephemeralEnableChanged, [this](bool enable) { mChatModelConnection->makeConnectToModel(&ChatModel::ephemeralEnableChanged, [this](bool enable) {
mChatModelConnection->invokeToCore([this, enable]() { mChatModelConnection->invokeToCore([this, enable]() {
if (mEphemeralEnabled != enable) { if (mEphemeralEnabled != enable) {

3
Linphone/core/chat/ChatCore.hpp
View file

@ -60,7 +60,7 @@ public:
Q_PROPERTY(bool isSecured READ isSecured WRITE setIsSecured NOTIFY isSecuredChanged) Q_PROPERTY(bool isSecured READ isSecured WRITE setIsSecured NOTIFY isSecuredChanged)
Q_PROPERTY(bool isBasic MEMBER mIsBasic CONSTANT) Q_PROPERTY(bool isBasic MEMBER mIsBasic CONSTANT)
Q_PROPERTY(QString sendingText READ getSendingText WRITE setSendingText NOTIFY sendingTextChanged) Q_PROPERTY(QString sendingText READ getSendingText WRITE setSendingText NOTIFY sendingTextChanged)
Q_PROPERTY(bool ephemeralEnabled READ isEphemeralEnabled NOTIFY ephemeralEnabledChanged) Q_PROPERTY(bool ephemeralEnabled READ isEphemeralEnabled WRITE lEnableEphemeral NOTIFY ephemeralEnabledChanged)
Q_PROPERTY( Q_PROPERTY(
int ephemeralLifetime READ getEphemeralLifetime WRITE lSetEphemeralLifetime NOTIFY ephemeralLifetimeChanged) int ephemeralLifetime READ getEphemeralLifetime WRITE lSetEphemeralLifetime NOTIFY ephemeralLifetimeChanged)
Q_PROPERTY(bool muted READ isMuted WRITE lSetMuted NOTIFY mutedChanged) Q_PROPERTY(bool muted READ isMuted WRITE lSetMuted NOTIFY mutedChanged)
@ -190,6 +190,7 @@ signals:
void lCompose(); void lCompose();
void lLeave(); void lLeave();
void lSetMuted(bool muted); void lSetMuted(bool muted);
void lEnableEphemeral(bool enable);
void lSetEphemeralLifetime(int time); void lSetEphemeralLifetime(int time);
void lSetSubject(QString subject); void lSetSubject(QString subject);
void lRemoveParticipant(QString sipAddress); void lRemoveParticipant(QString sipAddress);

13
Linphone/model/chat/ChatModel.cpp
View file

@ -147,14 +147,15 @@ void ChatModel::setMuted(bool muted) {
emit mutedChanged(muted); emit mutedChanged(muted);
} }
void ChatModel::enableEphemeral(bool enable) {
mMonitor->enableEphemeral(enable);
emit ephemeralEnableChanged(enable);
}
void ChatModel::setEphemeralLifetime(int time) { void ChatModel::setEphemeralLifetime(int time) {
if (time != 0) { mMonitor->setEphemeralLifetime(time);
mMonitor->activateEphemeral(time, mMonitor->getEphemeralNotReadLifetime());
} else {
mMonitor->deactivateEphemeral();
}
emit ephemeralLifetimeChanged(time); emit ephemeralLifetimeChanged(time);
emit ephemeralEnableChanged(time != 0); enableEphemeral(time != 0);
} }
void ChatModel::deleteHistory() { void ChatModel::deleteHistory() {

1
Linphone/model/chat/ChatModel.hpp
View file

@ -80,6 +80,7 @@ public:
void compose(); void compose();
linphone::ChatRoom::State getState() const; linphone::ChatRoom::State getState() const;
void setMuted(bool muted); void setMuted(bool muted);
void enableEphemeral(bool enable);
void setEphemeralLifetime(int time); void setEphemeralLifetime(int time);
void setSubject(QString subject) const; void setSubject(QString subject) const;
void removeParticipant(const QString &sipAddress) const; void removeParticipant(const QString &sipAddress) const;

2
Linphone/model/conference/ConferenceInfoModel.cpp
View file

@ -73,7 +73,7 @@ void ConferenceInfoModel::setConferenceScheduler(const std::shared_ptr<Conferenc
// secured chatroom // secured chatroom
auto chatParams = params->getChatParams(); auto chatParams = params->getChatParams();
if (!chatParams) return; if (!chatParams) return;
chatParams->deactivateEphemeral(); chatParams->setEphemeralLifetime(0);
chatParams->setBackend(linphone::ChatRoom::Backend::FlexisipChat); chatParams->setBackend(linphone::ChatRoom::Backend::FlexisipChat);
params->setSecurityLevel(linphone::Conference::SecurityLevel::EndToEnd); params->setSecurityLevel(linphone::Conference::SecurityLevel::EndToEnd);
mConferenceSchedulerModel->getMonitor()->sendInvitations(params); mConferenceSchedulerModel->getMonitor()->sendInvitations(params);

4
Linphone/model/tool/ToolModel.cpp
View file

@ -667,7 +667,7 @@ ToolModel::getChatRoomParams(std::shared_ptr<linphone::Call> call, std::shared_p
qWarning() << "failed to get chat params from conference params, return"; qWarning() << "failed to get chat params from conference params, return";
return nullptr; return nullptr;
} }
chatParams->deactivateEphemeral(); chatParams->setEphemeralLifetime(0);
auto accountParams = account->getParams(); auto accountParams = account->getParams();
auto sameDomain = remoteAddress && remoteAddress->getDomain() == SettingsModel::getInstance()->getDefaultDomain() && auto sameDomain = remoteAddress && remoteAddress->getDomain() == SettingsModel::getInstance()->getDefaultDomain() &&
remoteAddress->getDomain() == accountParams->getDomain(); remoteAddress->getDomain() == accountParams->getDomain();
@ -787,7 +787,7 @@ ToolModel::createGroupChatRoom(QString subject, std::list<std::shared_ptr<linpho
qWarning() << "failed to get chat params from conference params, return"; qWarning() << "failed to get chat params from conference params, return";
return nullptr; return nullptr;
} }
chatParams->deactivateEphemeral(); chatParams->setEphemeralLifetime(0);
chatParams->setBackend(linphone::ChatRoom::Backend::FlexisipChat); chatParams->setBackend(linphone::ChatRoom::Backend::FlexisipChat);
auto accountParams = account->getParams(); auto accountParams = account->getParams();