diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-12-03 10:45:47 +0100 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-12-03 10:45:47 +0100 |
commit | 8f62d95e1fb5980daab5294148106ce09237e386 (patch) | |
tree | b4c00a4645acc5ae76a72b8f6a44ddc818abd4fe /src/main/java/eu/siacs/conversations/entities | |
parent | aaeba697bd3fe5fa74ef726fd5a99de496fd92f2 (diff) |
further npe checks
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Bookmark.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java index 91dc25beb..559e2f2dd 100644 --- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java +++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java @@ -128,7 +128,8 @@ public class Bookmark extends Element implements ListItem { return true; } needle = needle.toLowerCase(Locale.US); - return getJid().toString().contains(needle) || + final Jid jid = getJid(); + return (jid != null && jid.toString().contains(needle)) || getDisplayName().toLowerCase(Locale.US).contains(needle) || matchInTag(needle); } |