Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-25 15:52:06 +01:00
Code Issues Releases Wiki Activity

[xhtmlim] Use stanza builder API, deprecate old

Browse source
This commit is contained in:
Florian Schmaus 2020-05-21 22:45:28 +02:00
parent ca85b8326a
commit b3c57ef918
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java
View file

@ -26,6 +26,8 @@ import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPConnectionRegistry; import org.jivesoftware.smack.XMPPConnectionRegistry;
import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.XMPPException.XMPPErrorException;
import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.MessageBuilder;
import org.jivesoftware.smack.packet.MessageView;
import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
import org.jivesoftware.smackx.xhtmlim.packet.XHTMLExtension; import org.jivesoftware.smackx.xhtmlim.packet.XHTMLExtension;
@ -57,7 +59,7 @@ public class XHTMLManager {
* @param message an XHTML message * @param message an XHTML message
* @return an Iterator for the bodies in the message or null if none. * @return an Iterator for the bodies in the message or null if none.
*/ */
public static List<CharSequence> getBodies(Message message) { public static List<CharSequence> getBodies(MessageView message) {
XHTMLExtension xhtmlExtension = XHTMLExtension.from(message); XHTMLExtension xhtmlExtension = XHTMLExtension.from(message);
if (xhtmlExtension != null) if (xhtmlExtension != null)
return xhtmlExtension.getBodies(); return xhtmlExtension.getBodies();
@ -68,9 +70,29 @@ public class XHTMLManager {
/** /**
* Adds an XHTML body to the message. * Adds an XHTML body to the message.
* *
* @param message the message that will receive the XHTML body * @param messageBuilder the message that will receive the XHTML body
* @param xhtmlText the string to add as an XHTML body to the message * @param xhtmlText the string to add as an XHTML body to the message
*/ */
public static void addBody(MessageBuilder messageBuilder, XHTMLText xhtmlText) {
XHTMLExtension xhtmlExtension = XHTMLExtension.from(messageBuilder);
if (xhtmlExtension == null) {
// Create an XHTMLExtension and add it to the message
xhtmlExtension = new XHTMLExtension();
messageBuilder.addExtension(xhtmlExtension);
}
// Add the required bodies to the message
xhtmlExtension.addBody(xhtmlText.toXML());
}
/**
* Adds an XHTML body to the message.
*
* @param message the message that will receive the XHTML body
* @param xhtmlText the string to add as an XHTML body to the message
* @deprecated use {@link #addBody(MessageBuilder, XHTMLText)} instead.
*/
// TODO: Remove in Smack 4.6
@Deprecated
public static void addBody(Message message, XHTMLText xhtmlText) { public static void addBody(Message message, XHTMLText xhtmlText) {
XHTMLExtension xhtmlExtension = XHTMLExtension.from(message); XHTMLExtension xhtmlExtension = XHTMLExtension.from(message);
if (xhtmlExtension == null) { if (xhtmlExtension == null) {