From 7167a55f81d6f51db04ee739799813b1a280d835 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Fri, 6 Jan 2017 14:49:58 +0100 Subject: [PATCH] AccountManager: Don't fallback to disco#info if not authenticated --- .../jivesoftware/smackx/iqregister/AccountManager.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java index dd291013d..40d3c4572 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java @@ -340,7 +340,13 @@ public final class AccountManager extends Manager { return true; } - return ServiceDiscoveryManager.getInstanceFor(connection).serverSupportsFeature(Registration.NAMESPACE); + // Fallback to disco#info only if this connection is authenticated, as otherwise we won't have an full JID and + // won't be able to do IQs. + if (connection.isAuthenticated()) { + return ServiceDiscoveryManager.getInstanceFor(connection).serverSupportsFeature(Registration.NAMESPACE); + } + + return false; } /**