From 9ec17ff5f13a6b055641ea94ea4b1a6d49493578 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 24 Aug 2021 21:21:54 +0200 Subject: [PATCH] Ephemeral feature only if admin and secure --- linphone-app/src/components/file/FileExtractor.cpp | 1 + linphone-app/ui/views/App/Main/Conversation.qml | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/linphone-app/src/components/file/FileExtractor.cpp b/linphone-app/src/components/file/FileExtractor.cpp index 877a81f45..e87fc9d82 100644 --- a/linphone-app/src/components/file/FileExtractor.cpp +++ b/linphone-app/src/components/file/FileExtractor.cpp @@ -27,6 +27,7 @@ #include "FileDownloader.hpp" #include "app/paths/Paths.hpp" #include "utils/Utils.hpp" +#include "utils/Constants.hpp" // ============================================================================= diff --git a/linphone-app/ui/views/App/Main/Conversation.qml b/linphone-app/ui/views/App/Main/Conversation.qml index 258ae8f00..6eaa5f1bf 100644 --- a/linphone-app/ui/views/App/Main/Conversation.qml +++ b/linphone-app/ui/views/App/Main/Conversation.qml @@ -325,8 +325,10 @@ ColumnLayout { height:1 width:parent.width color:Colors.u.color + visible: devicesMenuItem.visible } MenuItem{ + id: devicesMenuItem //: "Conversation's devices" : Item menu to get all participant devices of the chat room text: qsTr('conversationMenuDevices') iconMenu: (hovered ? 'menu_devices_selected' : 'menu_devices' ) @@ -343,13 +345,16 @@ ColumnLayout { height:1 width:parent.width color:Colors.u.color + visible: ephemeralMenuItem.visible } MenuItem{ + id: ephemeralMenuItem //: 'Ephemeral messages' : Item menu to enable ephemeral mode text: qsTr('conversationMenuEphemeral') iconMenu: (hovered ? 'menu_ephemeral_selected' : 'menu_ephemeral') iconSizeMenu: 25 menuItemStyle : MenuItemStyle.aux2 + visible: conversation.securityLevel != 1 && chatRoomModel.isMeAdmin onTriggered: { window.detachVirtualWindow() window.attachVirtualWindow(Qt.resolvedUrl('Dialogs/EphemeralChatRoom.qml')