From 5bb5ce0f09d7ebb723366672f0c95716e6ced91f Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Wed, 19 May 2021 13:21:38 -0400
Subject: [PATCH] smartlist: filter banned items when the filter string is
empty
Gitlab: #418
Change-Id: I1c1a8004b8d268cb3be158a7766c5ae82d451e63
---
src/conversationlistmodel.cpp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/conversationlistmodel.cpp b/src/conversationlistmodel.cpp
index a14f1818b..4f896bcaf 100644
--- a/src/conversationlistmodel.cpp
+++ b/src/conversationlistmodel.cpp
@@ -107,12 +107,15 @@ ConversationListProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex& s
auto registeredName = index.data(ConversationList::Role::RegisteredName).toString();
auto itemProfileType = index.data(ConversationList::Role::ContactType).toInt();
auto typeFilter = static_cast<profile::Type>(itemProfileType) == currentTypeFilter_;
+ bool match {false};
if (index.data(ConversationList::Role::IsBanned).toBool()) {
- return typeFilter
- && (rx.exactMatch(uri) || rx.exactMatch(alias) || rx.exactMatch(registeredName));
+ match = !rx.isEmpty()
+ && (rx.exactMatch(uri) || rx.exactMatch(alias) || rx.exactMatch(registeredName));
+ } else {
+ match = (rx.indexIn(uri) != -1 || rx.indexIn(alias) != -1
+ || rx.indexIn(registeredName) != -1);
}
- return typeFilter
- && (rx.indexIn(uri) != -1 || rx.indexIn(alias) != -1 || rx.indexIn(registeredName) != -1);
+ return typeFilter && match;
}
bool
--
GitLab