narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

split search keywords by whitespaces and imply AND operatior

Browse source
This commit is contained in:
iNPUTmice 2014-11-17 17:24:33 +01:00
parent e30e84c819
commit 252c7e68d6
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/eu/siacs/conversations/entities/Contact.java
View file

@ -149,7 +149,17 @@ public class Contact implements ListItem {
return true; return true;
} }
needle = needle.toLowerCase(); 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) { private boolean matchInTag(String needle) {