From 252c7e68d6e0d0a43a310ff0f466e123dcbc5a90 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 17 Nov 2014 17:24:33 +0100 Subject: [PATCH] split search keywords by whitespaces and imply AND operatior --- .../eu/siacs/conversations/entities/Contact.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java index 99a749072..0b6c900a1 100644 --- a/src/main/java/eu/siacs/conversations/entities/Contact.java +++ b/src/main/java/eu/siacs/conversations/entities/Contact.java @@ -149,7 +149,17 @@ public class Contact implements ListItem { return true; } needle = needle.toLowerCase(); - return jid.toString().contains(needle) || getDisplayName().toLowerCase().contains(needle) || matchInTag(needle); + String[] parts = needle.split("\\s+"); + if (parts.length > 1) { + for(int i = 0; i < parts.length; ++i) { + if (!match(parts[i])) { + return false; + } + } + return true; + } else { + return jid.toString().contains(needle) || getDisplayName().toLowerCase().contains(needle) || matchInTag(needle); + } } private boolean matchInTag(String needle) {