vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'fixReason' into jingle2

This commit is contained in:
vanitasvitae 2017-07-06 16:57:36 +02:00
parent bbaa367dfb 58c32639b5
commit f3244f507e
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReason.java
View File

@ -156,5 +156,9 @@ public class JingleReason implements NamedElement {
xml.closeElement(this); xml.closeElement(this);
return xml; return xml;
} }
public String getAlternativeSessionId() {
return sessionId;
}
} }
} }

9
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java
View File

@ -69,7 +69,14 @@ public class JingleProvider extends IQProvider<Jingle> {
case JingleReason.ELEMENT: case JingleReason.ELEMENT:
parser.next(); parser.next();
String reasonString = parser.getName(); String reasonString = parser.getName();
Reason reason = Reason.fromString(reasonString); JingleReason reason;
if (reasonString.equals("alternative-session")) {
parser.next();
String sid = parser.nextText();
reason = new JingleReason.AlternativeSession(sid);
} else {
reason = new JingleReason(Reason.fromString(reasonString));
}
builder.setReason(reason); builder.setReason(reason);
break; break;
default: default: