From f60dd98d3c55d7ae882d33a2ecca4fc007cc9271 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 8 Feb 2017 16:52:35 +0100
Subject: [PATCH] only count push as available when sm is to avoid race
 conditions

---
 .../siacs/conversations/services/PushManagementService.java  | 5 ++++-
 1 file changed, 4 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 83d20aed..cfcef1b3 100644
--- a/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java
+++ b/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java
@@ -103,7 +103,10 @@ public class PushManagementService {
 
 	public boolean available(Account account) {
 		final XmppConnection connection = account.getXmppConnection();
-		return connection != null && connection.getFeatures().push() && playServicesAvailable();
+		return connection != null
+				&& connection.getFeatures().sm()
+				&& connection.getFeatures().push()
+				&& playServicesAvailable();
 	}
 
 	public boolean availableAndUseful(Account account) {