mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix thumbnails, add secure chat redirection in chat rooms if friend have capability

Browse source
This commit is contained in:
Julien Wadel 2021-08-09 16:12:01 +02:00
parent a5fa14461b
commit 89e976f649
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -199,7 +199,7 @@ void ContentModel::createThumbnail () {
if( path != ""){
setWasDownloaded( !path.isEmpty() && QFileInfo(path).isFile());
if(appdata.mData.contains(path))
if(appdata.mData.contains(path) && !appdata.mData[path].isEmpty())
setThumbnail(QStringLiteral("image://%1/%2").arg(ThumbnailProvider::ProviderId).arg(appdata.mData[path]));
}
}

16
linphone-app/ui/views/App/Main/Conversation.qml
View file

@ -4,11 +4,14 @@ import QtQuick.Layouts 1.3
import Common 1.0
import Linphone 1.0
import Utils 1.0
import UtilsCpp 1.0
import LinphoneEnums 1.0
import App.Styles 1.0
import Common.Styles 1.0
import Units 1.0
import 'Conversation.js' as Logic
// =============================================================================
@ -224,6 +227,19 @@ ColumnLayout {
onClicked: CallsListModel.launchChat(conversation.peerAddress, 0)
}
ActionButton {
icon: 'chat'
visible: SettingsModel.chatEnabled && SettingsModel.getShowStartChatButton() && !conversation.chatRoomModel.groupEnabled && conversation.securityLevel == 1 && UtilsCpp.hasCapability(conversation.peerAddress, LinphoneEnums.FriendCapabilityLimeX3Dh)
onClicked: CallsListModel.launchChat(conversation.peerAddress, 1)
Icon{
icon:'secure_level_1'
iconSize:15
anchors.right:parent.right
anchors.top:parent.top
anchors.topMargin: -3
}
}
ActionButton {
icon: 'group_chat'