aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-02-15 19:19:53 +0100
committerChristian Schneppe <christian@pix-art.de>2018-02-15 19:19:53 +0100
commitfdf7ea3c3e77e8cfbf433cffc99f430834aabf82 (patch)
treefe24aea96379e1c750281899798cea9c5675ca5a /src/main
parenta5176a16f2b593addffec613ae975f04cfbf1c1b (diff)
null check on invite object
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/ui/StartConversationActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 30c6b8d97..b66999eac 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -442,7 +442,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
}
final Contact contact = account.getRoster().getContact(contactJid);
- if (invite.getName() != null) {
+ if (invite != null && invite.getName() != null) {
contact.setServerName(invite.getName());
}
if (contact.isSelf()) {