vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-22 12:02:05 +01:00
Code Issues Releases Wiki Activity

Merge pull request #136 from vanitasvitae/jingleManagerFixes

Browse source 
Fix typos and xml issues in jingle package
This commit is contained in:
Florian Schmaus 2017-06-05 11:04:52 +02:00 committed by GitHub
commit 349d1ba2ae
11 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleHandler.java
View file

@ -21,6 +21,6 @@ import org.jivesoftware.smackx.jingle.element.Jingle;
public interface JingleHandler {
IQ handleRequest(Jingle jingle);
IQ handleJingleRequest(Jingle jingle);
}

8
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
View file

@ -23,8 +23,8 @@ import java.util.logging.Logger;
import org.jivesoftware.smack.Manager;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode;
import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler;
import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.IQ.Type;
import org.jivesoftware.smackx.jingle.element.Jingle;
@ -72,7 +72,7 @@ public final class JingleManager extends Manager {
// TODO handle non existing jingle session handler.
return null;
}
return jingleSessionHandler.handleRequest(jingle, sid);
return jingleSessionHandler.handleJingleSessionRequest(jingle, sid);
}
if (jingle.getContents().size() > 1) {
@ -88,7 +88,7 @@ public final class JingleManager extends Manager {
// TODO handle non existing content description handler.
return null;
}
return jingleDescriptionHandler.handleRequest(jingle);
return jingleDescriptionHandler.handleJingleRequest(jingle);
}
});
}
@ -102,7 +102,7 @@ public final class JingleManager extends Manager {
return jingleSessionHandlers.put(fullJidAndSessionId, sessionHandler);
}
public JingleSessionHandler unregisterJingleSessionhandler(FullJid otherJid, String sessionId, JingleSessionHandler sessionHandler) {
public JingleSessionHandler unregisterJingleSessionHandler(FullJid otherJid, String sessionId, JingleSessionHandler sessionHandler) {
FullJidAndSessionId fullJidAndSessionId = new FullJidAndSessionId(otherJid, sessionId);
return jingleSessionHandlers.remove(fullJidAndSessionId);
}

2
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionHandler.java
View file

@ -21,6 +21,6 @@ import org.jivesoftware.smackx.jingle.element.Jingle;
public interface JingleSessionHandler {
IQ handleRequest(Jingle jingle, String sessionId);
IQ handleJingleSessionRequest(Jingle jingle, String sessionId);
}

1
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/Jingle.java
View file

@ -78,6 +78,7 @@ public final class Jingle extends IQ {
else {
this.contents = Collections.emptyList();
}
setType(Type.set);
}
/**

2
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContent.java
View file

@ -140,7 +140,7 @@ public final class JingleContent implements NamedElement {
@Override
public XmlStringBuilder toXML() {
XmlStringBuilder xml = new XmlStringBuilder();
XmlStringBuilder xml = new XmlStringBuilder(this);
xml.attribute(CREATOR_ATTRIBUTE_NAME, creator);
xml.optAttribute(DISPOSITION_ATTRIBUTE_NAME, disposition);
xml.attribute(NAME_ATTRIBUTE_NAME, name);

7
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescription.java
View file

@ -30,9 +30,9 @@ public abstract class JingleContentDescription implements ExtensionElement {
public static final String ELEMENT = "description";
private final List<JingleContentDescriptionPayloadType> payloads;
private final List<JingleContentDescriptionChildElement> payloads;
protected JingleContentDescription(List<JingleContentDescriptionPayloadType> payloads) {
protected JingleContentDescription(List<JingleContentDescriptionChildElement> payloads) {
if (payloads != null) {
this.payloads = Collections.unmodifiableList(payloads);
}
@ -46,7 +46,7 @@ public abstract class JingleContentDescription implements ExtensionElement {
return ELEMENT;
}
public List<JingleContentDescriptionPayloadType> getJinglePayloadTypes() {
public List<JingleContentDescriptionChildElement> getJingleContentDescriptionChildren() {
return payloads;
}
@ -62,6 +62,7 @@ public abstract class JingleContentDescription implements ExtensionElement {
xml.append(payloads);
xml.closeElement(this);
return xml;
}

2
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescriptionPayloadType.java → smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescriptionChildElement.java
View file

@ -22,7 +22,7 @@ import org.jivesoftware.smack.packet.NamedElement;
* An element found usually in 'description' elements.
*
*/
public abstract class JingleContentDescriptionPayloadType implements NamedElement {
public abstract class JingleContentDescriptionChildElement implements NamedElement {
public static final String ELEMENT = "payload-type";

10
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentTransport.java
View file

@ -58,11 +58,17 @@ public abstract class JingleContentTransport implements ExtensionElement {
public final XmlStringBuilder toXML() {
XmlStringBuilder xml = new XmlStringBuilder(this);
addExtraAttributes(xml);
if (candidates.isEmpty()) {
xml.closeEmptyElement();
} else {
xml.rightAngleBracket();
xml.append(candidates);
xml.closeElement(this);
}
return xml;
}

2
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java
View file

@ -39,7 +39,7 @@ public final class JingleError implements ExtensionElement {
/**
* Creates a new error with the specified code and errorName.
*
* @param message a message describing the error.
* @param errorName a name describing the error.
*/
private JingleError(final String errorName) {
this.errorName = errorName;

2
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReason.java
View file

@ -96,7 +96,7 @@ public class JingleReason implements NamedElement {
XmlStringBuilder xml = new XmlStringBuilder(this);
xml.rightAngleBracket();
xml.emptyElement(reason);
xml.emptyElement(reason.asString);
xml.closeElement(this);
return xml;

4
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProviderManager.java
View file

@ -25,7 +25,7 @@ public class JingleContentProviderManager {
private static final Map<String, JingleContentTransportProvider<?>> jingleContentTransportProviders = new ConcurrentHashMap<>();
public static JingleContentDescriptionProvider<?> addJingleContentDescrptionProvider(String namespace,
public static JingleContentDescriptionProvider<?> addJingleContentDescriptionProvider(String namespace,
JingleContentDescriptionProvider<?> provider) {
return jingleContentDescriptionProviders.put(namespace, provider);
}
@ -34,7 +34,7 @@ public class JingleContentProviderManager {
return jingleContentDescriptionProviders.get(namespace);
}
public static JingleContentTransportProvider<?> addJingleContentDescrptionProvider(String namespace,
public static JingleContentTransportProvider<?> addJingleContentTransportProvider(String namespace,
JingleContentTransportProvider<?> provider) {
return jingleContentTransportProviders.put(namespace, provider);
}