From 7341421ca975f5396d42c99ded1212833084e0f9 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Tue, 11 Mar 2014 19:18:08 +0100 Subject: [PATCH] Announce support for vcard-temp/XEP-54 Add VCardManager to setup the vcard-temp feature. Fixes SMACK-414. --- .../smackx/vcardtemp/VCardManager.java | 48 +++++++++++++++++++ .../smackx/vcardtemp/packet/VCard.java | 3 +- .../org.jivesoftware.smackx/extensions.xml | 1 + 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java b/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java new file mode 100644 index 000000000..001acee57 --- /dev/null +++ b/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java @@ -0,0 +1,48 @@ +/** + * + * Copyright 2014 Florian Schmaus + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jivesoftware.smackx.vcardtemp; + +import org.jivesoftware.smack.ConnectionCreationListener; +import org.jivesoftware.smack.XMPPConnection; +import org.jivesoftware.smack.XMPPException; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; + +public class VCardManager { + public static final String NAMESPACE = "vcard-temp"; + public static final String ELEMENT = "vCard"; + + static { + XMPPConnection.addConnectionCreationListener(new ConnectionCreationListener() { + @Override + public void connectionCreated(XMPPConnection connection) { + ServiceDiscoveryManager.getInstanceFor(connection).addFeature(NAMESPACE); + } + }); + } + + /** + * Returns true if the given entity understands the vCard-XML format and allows the exchange of such. + * + * @param jid + * @param connection + * @return true if the given entity understands the vCard-XML format and exchange. + * @throws XMPPException If there was an exception while determining the support. + */ + public static boolean isSupported(String jid, XMPPConnection connection) throws XMPPException { + return ServiceDiscoveryManager.getInstanceFor(connection).supportsFeature(jid, NAMESPACE); + } +} diff --git a/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java b/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java index a45737a86..32add6568 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java @@ -37,6 +37,7 @@ import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.StringUtils; +import org.jivesoftware.smackx.vcardtemp.VCardManager; /** * A VCard class for use with the @@ -692,7 +693,7 @@ public class VCard extends IQ { } public void write() { - appendTag("vCard", "xmlns", "vcard-temp", hasContent(), new ContentBuilder() { + appendTag(VCardManager.ELEMENT, "xmlns", VCardManager.NAMESPACE, hasContent(), new ContentBuilder() { public void addTagContent() { buildActualContent(); } diff --git a/extensions/src/main/resources/org.jivesoftware.smackx/extensions.xml b/extensions/src/main/resources/org.jivesoftware.smackx/extensions.xml index f8f43954d..5db58f683 100644 --- a/extensions/src/main/resources/org.jivesoftware.smackx/extensions.xml +++ b/extensions/src/main/resources/org.jivesoftware.smackx/extensions.xml @@ -11,5 +11,6 @@ org.jivesoftware.smackx.ping.PingManager org.jivesoftware.smackx.privacy.PrivacyListManager org.jivesoftware.smackx.time.EntityTimeManager + org.jivesoftware.smackx.vcardtemp.VCardManager \ No newline at end of file