From 9b275c4c831035aeb8b65c2159832cb7522bf4e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 17 Dec 2021 13:50:05 -0500
Subject: [PATCH] smartlist's context menu: show Contact details only on
contacts
GitLab: #340
Change-Id: I4a0ce6c51351daa7eb81bd09785535bfcfc84981
---
src/constant/JamiStrings.qml | 1 +
src/mainview/components/ConversationSmartListContextMenu.qml | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml
index aa32169b2..4a88a1ed8 100644
--- a/src/constant/JamiStrings.qml
+++ b/src/constant/JamiStrings.qml
@@ -248,6 +248,7 @@ Item {
property string removeConversation: qsTr("Remove conversation")
property string removeContact: qsTr("Remove contact")
property string blockContact: qsTr("Block contact")
+ property string blockSwarm: qsTr("Block swarm")
property string contactDetails: qsTr("Contact details")
// CallViewContextMenu
diff --git a/src/mainview/components/ConversationSmartListContextMenu.qml b/src/mainview/components/ConversationSmartListContextMenu.qml
index f5b534fbc..042871dff 100644
--- a/src/mainview/components/ConversationSmartListContextMenu.qml
+++ b/src/mainview/components/ConversationSmartListContextMenu.qml
@@ -127,7 +127,7 @@ ContextMenuAutoLoader {
id: blockContact
canTrigger: !hasCall && contactType !== Profile.Type.SIP
- itemName: JamiStrings.blockContact
+ itemName: !(mode && mode !== Conversation.Mode.ONE_TO_ONE && mode !== Conversation.Mode.NON_SWARM) ? JamiStrings.blockContact : JamiStrings.blockSwarm
iconSource: JamiResources.block_black_24dp_svg
addMenuSeparatorAfter: contactType !== Profile.Type.SIP
onClicked: MessagesAdapter.blockConversation(responsibleConvUid)
@@ -136,6 +136,7 @@ ContextMenuAutoLoader {
id: contactDetails
canTrigger: contactType !== Profile.Type.SIP
+ && !(mode && mode !== Conversation.Mode.ONE_TO_ONE && mode !== Conversation.Mode.NON_SWARM)
itemName: JamiStrings.contactDetails
iconSource: JamiResources.person_24dp_svg
onClicked: userProfile.open()
--
GitLab