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

Merge branch 'jingleManagerFixes' into jingle

This commit is contained in:
vanitasvitae 2017-06-04 15:51:07 +02:00
parent 4b50e44135 37c6961bb0
commit e6d365fb92
3 changed files with 4 additions and 4 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);
}

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

@ -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);
}
});
}

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);
}