mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-25 15:58:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ephemeral start

Browse source
This commit is contained in:
Julien Wadel 2021-08-17 18:20:54 +02:00
parent d2f4a43d92
commit 029fba05e0
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linphone-app/src/components/chat-events/ChatMessageModel.cpp
View file

@ -415,6 +415,10 @@ qint64 ChatMessageModel::getEphemeralExpireTime() const{
//return QDateTime::fromMSecsSinceEpoch(mChatMessage->getEphemeralExpireTime() * 1000)
}
long ChatMessageModel::getEphemeralLifetime() const{
return mChatMessage->getEphemeralLifetime();
}
LinphoneEnums::ChatMessageState ChatMessageModel::getState() const{
return LinphoneEnums::fromLinphone(mChatMessage->getState());
}

2
linphone-app/src/components/chat-events/ChatMessageModel.hpp
View file

@ -142,6 +142,7 @@ public:
Q_PROPERTY(bool isEphemeral READ isEphemeral NOTIFY isEphemeralChanged)
Q_PROPERTY(qint64 ephemeralExpireTime READ getEphemeralExpireTime NOTIFY ephemeralExpireTimeChanged)
Q_PROPERTY(long ephemeralLifetime READ getEphemeralLifetime CONSTANT)
Q_PROPERTY(LinphoneEnums::ChatMessageState state READ getState NOTIFY stateChanged)
Q_PROPERTY(bool isOutgoing READ isOutgoing NOTIFY isOutgoingChanged)
@ -167,6 +168,7 @@ public:
ContactModel * getContactModel() const;
bool isEphemeral() const;
Q_INVOKABLE qint64 getEphemeralExpireTime() const;
Q_INVOKABLE long getEphemeralLifetime() const;
LinphoneEnums::ChatMessageState getState() const;
bool isOutgoing() const;
ContentModel * getFileContentModel() const;

5
linphone-app/ui/modules/Linphone/Chat/Message.qml
View file

@ -56,15 +56,14 @@ Item {
visible:$chatEntry.isEphemeral
spacing:5
Text{
visible : $chatEntry.ephemeralExpireTime > 0
text: Utils.formatElapsedTime($chatEntry.ephemeralExpireTime)
text: $chatEntry.ephemeralExpireTime > 0 ? Utils.formatElapsedTime($chatEntry.ephemeralExpireTime) : Utils.formatElapsedTime($chatEntry.ephemeralLifetime)
color:"#FF5E00"
font.pointSize: Units.dp * 8
Timer{
running:parent.visible
interval: 1000
repeat:true
onTriggered: parent.text = Utils.formatElapsedTime($chatEntry.getEphemeralExpireTime())// Use the function
onTriggered: if($chatEntry.getEphemeralExpireTime() > 0 ) parent.text = Utils.formatElapsedTime($chatEntry.getEphemeralExpireTime())// Use the function
}
}
Icon{