From 89e976f6497126260e5ffcd6951516241551c318 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Mon, 9 Aug 2021 16:12:01 +0200
Subject: [PATCH] Fix thumbnails, add secure chat redirection in chat rooms if
 friend have capability

---
 .../components/chat-events/ChatMessageModel.cpp  |  2 +-
 linphone-app/ui/views/App/Main/Conversation.qml  | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/linphone-app/src/components/chat-events/ChatMessageModel.cpp b/linphone-app/src/components/chat-events/ChatMessageModel.cpp
index 73015f915..6d77764ef 100644
--- a/linphone-app/src/components/chat-events/ChatMessageModel.cpp
+++ b/linphone-app/src/components/chat-events/ChatMessageModel.cpp
@@ -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]));
 		}
 	}
diff --git a/linphone-app/ui/views/App/Main/Conversation.qml b/linphone-app/ui/views/App/Main/Conversation.qml
index f3d6c0285..02a4b33a6 100644
--- a/linphone-app/ui/views/App/Main/Conversation.qml
+++ b/linphone-app/ui/views/App/Main/Conversation.qml
@@ -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'