Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-09-09 10:19:41 +02:00
Code Issues Releases Wiki Activity

Introduce XmlEnvironment

Browse source
This commit is contained in:
Florian Schmaus 2019-02-04 13:27:41 +01:00
parent dc780ffd6c
commit fee3ed81ca
229 changed files with 715 additions and 526 deletions
Download patch file Download diff file Expand all files Collapse all files

12
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
View file

@ -288,7 +288,7 @@ public final class JingleSession extends JingleNegotiator implements MediaReceiv
String responseId;
LOGGER.fine("Packet: " + iq.toXML(null));
LOGGER.fine("Packet: " + iq.toXML());
try {
@ -718,21 +718,21 @@ public final class JingleSession extends JingleNegotiator implements MediaReceiv
String sid = jin.getSid();
if (sid == null || !sid.equals(getSid())) {
LOGGER.fine("Ignored Jingle(SID) " + sid + "|" + getSid() + " :" + iq.toXML(null));
LOGGER.fine("Ignored Jingle(SID) " + sid + "|" + getSid() + " :" + iq.toXML());
return false;
}
Jid ini = jin.getInitiator();
if (!ini.equals(getInitiator())) {
LOGGER.fine("Ignored Jingle(INI): " + iq.toXML(null));
LOGGER.fine("Ignored Jingle(INI): " + iq.toXML());
return false;
}
} else {
// We accept some non-Jingle IQ packets: ERRORs and ACKs
if (iq.getType().equals(IQ.Type.set)) {
LOGGER.fine("Ignored Jingle(TYPE): " + iq.toXML(null));
LOGGER.fine("Ignored Jingle(TYPE): " + iq.toXML());
return false;
} else if (iq.getType().equals(IQ.Type.get)) {
LOGGER.fine("Ignored Jingle(TYPE): " + iq.toXML(null));
LOGGER.fine("Ignored Jingle(TYPE): " + iq.toXML());
return false;
}
}
@ -1062,7 +1062,7 @@ public final class JingleSession extends JingleNegotiator implements MediaReceiv
// NO! Let the normal state machinery do all of the sending.
// getConnection().sendStanza(perror);
LOGGER.severe("Error sent: " + errorPacket.toXML(null));
LOGGER.severe("Error sent: " + errorPacket.toXML());
}
return errorPacket;
}

4
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java
View file

@ -363,13 +363,13 @@ public class Jingle extends IQ {
synchronized (contents) {
for (JingleContent content : contents) {
buf.append(content.toXML(null));
buf.append(content.toXML());
}
}
// and the same for audio jmf info
if (contentInfo != null) {
buf.append(contentInfo.toXML(null));
buf.append(contentInfo.toXML());
}
return buf;

6
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContent.java
View file

@ -160,7 +160,7 @@ public class JingleContent implements ExtensionElement {
* @return a string with the XML representation
*/
@Override
public String toXML(String enclosingNamespace) {
public String toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
StringBuilder buf = new StringBuilder();
synchronized (transports) {
@ -171,12 +171,12 @@ public class JingleContent implements ExtensionElement {
// Add the description.
if (description != null) {
buf.append(description.toXML(null));
buf.append(description.toXML());
}
// Add all of the transports.
for (JingleTransport transport : transports) {
buf.append(transport.toXML(null));
buf.append(transport.toXML());
}
buf.append("</").append(getElementName()).append('>');
}

2
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentDescription.java
View file

@ -148,7 +148,7 @@ public abstract class JingleContentDescription implements ExtensionElement {
* @return a string with the XML representation
*/
@Override
public String toXML(String enclosingNamespace) {
public String toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
StringBuilder buf = new StringBuilder();
synchronized (payloads) {

2
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentInfo.java
View file

@ -84,7 +84,7 @@ public class JingleContentInfo implements ExtensionElement {
}
@Override
public String toXML(String enclosingNamespace) {
public String toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
StringBuilder buf = new StringBuilder();
buf.append('<').append(getElementName()).append(" xmlns=\"");
buf.append(getNamespace()).append("\" ");

2
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleDescription.java
View file

@ -155,7 +155,7 @@ public abstract class JingleDescription implements ExtensionElement {
* @return a string with the XML representation
*/
@Override
public String toXML(String enclosingNamespace) {
public String toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
StringBuilder buf = new StringBuilder();
synchronized (payloads) {

2
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleError.java
View file

@ -76,7 +76,7 @@ public class JingleError implements ExtensionElement {
* @return the error as XML.
*/
@Override
public String toXML(String enclosingNamespace) {
public String toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
StringBuilder buf = new StringBuilder();
if (message != null) {
buf.append("<error type=\"cancel\">");

2
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleTransport.java
View file

@ -152,7 +152,7 @@ public class JingleTransport implements ExtensionElement {
* Return the XML representation for this element.
*/
@Override
public String toXML(String enclosingNamespace) {
public String toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
StringBuilder buf = new StringBuilder();
buf.append('<').append(getElementName()).append(" xmlns=\"");