aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-06-01 20:35:52 +0200
committerChristian Schneppe <christian@pix-art.de>2017-06-01 20:35:52 +0200
commit814f34ba49093534ce88b8824fc74a699cd81938 (patch)
tree97035e2dd24fa5674a02b18708038f871c613496 /src/main/java/de/pixart/messenger
parent8ef4e7eed08393eafe6b2fe8fc794d1041d7ec57 (diff)
fix NPE when bookmark jid is null on creating suggestions
Diffstat (limited to 'src/main/java/de/pixart/messenger')
-rw-r--r--src/main/java/de/pixart/messenger/services/XmppConnectionService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 27412e1ea..94ab83b8a 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -3678,7 +3678,8 @@ public class XmppConnectionService extends Service {
mucServers.add(server);
}
for (Bookmark bookmark : account.getBookmarks()) {
- final String s = bookmark.getJid().getDomainpart();
+ final Jid jid = bookmark.getJid();
+ final String s = jid == null ? null : jid.getDomainpart();
if (s != null && !mucServers.contains(s)) {
mucServers.add(s);
}