From cc61e2c576f98eeaa8cd0536b794d2783e7e69d2 Mon Sep 17 00:00:00 2001
From: ababi <albert.babi@savoirfairelinux.com>
Date: Fri, 18 Sep 2020 14:39:09 +0200
Subject: [PATCH] misc: update view on contact banned
- use of specific MessagesAdapter::blockConversation function
- signal contactBanned subscription
- fix missing string
Gitlab: #82
Change-Id: I5e35d0939f8a5f23208f91f19bbb9cc2047b33b4
---
src/mainview/MainView.qml | 4 ++++
src/mainview/components/ConversationSmartListView.qml | 5 +----
src/settingsview/components/BannedItemDelegate.qml | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 195e38c01..819537a5e 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -577,6 +577,10 @@ Window {
function onNeedToUpdateSmartList() {
mainViewWindowSidePanel.forceUpdateConversationSmartListView()
}
+
+ function onContactBanned() {
+ showWelcomeView()
+ }
}
onNeedToGoBackToWelcomeView: {
diff --git a/src/mainview/components/ConversationSmartListView.qml b/src/mainview/components/ConversationSmartListView.qml
index c3df41f74..189ab3176 100644
--- a/src/mainview/components/ConversationSmartListView.qml
+++ b/src/mainview/components/ConversationSmartListView.qml
@@ -129,10 +129,7 @@ ListView {
context: Qt.ApplicationShortcut
enabled: root.visible
onActivated: {
- UtilsAdapter.removeConversation(UtilsAdapter.getCurrAccId(),
- UtilsAdapter.getCurrConvId(),
- true)
- root.needToBackToWelcomePage()
+ MessagesAdapter.blockConversation(UtilsAdapter.getCurrConvId())
}
}
diff --git a/src/settingsview/components/BannedItemDelegate.qml b/src/settingsview/components/BannedItemDelegate.qml
index ed113f3cb..e71f7199b 100644
--- a/src/settingsview/components/BannedItemDelegate.qml
+++ b/src/settingsview/components/BannedItemDelegate.qml
@@ -151,7 +151,7 @@ ItemDelegate {
backgroundColor: "transparent"
ToolTip.visible: hovered
- ToolTip.text: reinstateContact
+ ToolTip.text: JamiStrings.reinstateContact
onClicked: {
btnReAddContactClicked()
--
GitLab