From 92a6e956fd90c71091c9d8348804e5f285382f32 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 14 Feb 2016 15:36:37 +0100 Subject: [PATCH] be more carefull when checking push availability --- .../siacs/conversations/services/PushManagementService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java b/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java index f613fe5b7..fbd768cf2 100644 --- a/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java +++ b/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java @@ -15,6 +15,7 @@ import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.xml.Element; import eu.siacs.conversations.xmpp.OnIqPacketReceived; +import eu.siacs.conversations.xmpp.XmppConnection; import eu.siacs.conversations.xmpp.forms.Data; import eu.siacs.conversations.xmpp.jid.InvalidJidException; import eu.siacs.conversations.xmpp.jid.Jid; @@ -100,7 +101,8 @@ public class PushManagementService { public boolean available(Account account) { - return account.getXmppConnection().getFeatures().push() && playServicesAvailable(); + final XmppConnection connection = account.getXmppConnection(); + return connection != null && connection.getFeatures().push() && playServicesAvailable(); } private boolean playServicesAvailable() {