From b0abfe1bbaa7227c00da09538d1af4b1c1f2d93d Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sun, 18 Apr 2021 17:16:38 +0200 Subject: [PATCH] [offline] Make OfflineMessageManager.NAMESPACE public --- .../smackx/offline/OfflineMessageManager.java | 10 +++++----- .../smackx/offline/packet/OfflineMessageRequest.java | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java index 8021054da..e4973baa2 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java @@ -65,7 +65,7 @@ public final class OfflineMessageManager extends Manager { private static final Logger LOGGER = Logger.getLogger(OfflineMessageManager.class.getName()); - private static final String namespace = "http://jabber.org/protocol/offline"; + public static final String NAMESPACE = "http://jabber.org/protocol/offline"; private static final Map INSTANCES = new WeakHashMap<>(); @@ -100,7 +100,7 @@ public final class OfflineMessageManager extends Manager { * @throws InterruptedException if the calling thread was interrupted. */ public boolean supportsFlexibleRetrieval() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { - return serviceDiscoveryManager.serverSupportsFeature(namespace); + return serviceDiscoveryManager.serverSupportsFeature(NAMESPACE); } /** @@ -114,8 +114,8 @@ public final class OfflineMessageManager extends Manager { * @throws InterruptedException if the calling thread was interrupted. */ public int getMessageCount() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { - DiscoverInfo info = serviceDiscoveryManager.discoverInfo(null, namespace); - DataForm dataForm = DataForm.from(info, namespace); + DiscoverInfo info = serviceDiscoveryManager.discoverInfo(null, NAMESPACE); + DataForm dataForm = DataForm.from(info, NAMESPACE); if (dataForm == null) { return 0; } @@ -138,7 +138,7 @@ public final class OfflineMessageManager extends Manager { */ public List getHeaders() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { List answer = new ArrayList<>(); - DiscoverItems items = serviceDiscoveryManager.discoverItems(null, namespace); + DiscoverItems items = serviceDiscoveryManager.discoverItems(null, NAMESPACE); for (DiscoverItems.Item item : items.getItems()) { answer.add(new OfflineMessageHeader(item)); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java index f534f7d62..d255b74f9 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java @@ -27,6 +27,7 @@ import org.jivesoftware.smack.packet.XmlEnvironment; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; +import org.jivesoftware.smackx.offline.OfflineMessageManager; /** * Represents a request to get some or all the offline messages of a user. This class can also @@ -37,7 +38,7 @@ import org.jivesoftware.smack.xml.XmlPullParserException; public class OfflineMessageRequest extends IQ { public static final String ELEMENT = "offline"; - public static final String NAMESPACE = "http://jabber.org/protocol/offline"; + public static final String NAMESPACE = OfflineMessageManager.NAMESPACE; private final List items = new ArrayList<>(); private boolean purge = false;