diff options
author | Ingo Bauersachs <ingo@jitsi.org> | 2016-05-15 16:37:22 +0200 |
---|---|---|
committer | Ingo Bauersachs <ingo@jitsi.org> | 2016-05-17 21:41:16 +0200 |
commit | b8b79607237a78cc7406e2ecf73744e0fe18afed (patch) | |
tree | e4b75b2553a82af95c443aafd3aa50cd09753449 /src/net/java/sip/communicator | |
parent | 46cf28ef04df709fa5b5a3688f1d8bb3e3283b08 (diff) | |
download | jitsi-b8b79607237a78cc7406e2ecf73744e0fe18afed.zip jitsi-b8b79607237a78cc7406e2ecf73744e0fe18afed.tar.gz jitsi-b8b79607237a78cc7406e2ecf73744e0fe18afed.tar.bz2 |
Better search for contact results
The filter pattern is only null when no filter has been set, thus
the matching for phone numbers was never executed.
Diffstat (limited to 'src/net/java/sip/communicator')
-rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFilter.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFilter.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFilter.java index 837d369..4735892 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFilter.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFilter.java @@ -270,14 +270,13 @@ public class SearchFilter */ private boolean isMatching(String text) { - if (filterPattern != null) - return filterPattern.matcher(text).find(); + if (filterPattern != null && filterPattern.matcher(text).find()) + return true; if(isSearchingPhoneNumber && this.filterString != null) return GuiActivator.getPhoneNumberI18nService() .phoneNumbersMatch(this.filterString, text); return true; - } } |