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

Add missing jingle action, some comments

This commit is contained in:
vanitasvitae 2017-06-02 21:47:20 +02:00
parent 9d34cbc6f3
commit 1bf8cf9a12
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java
View File

@ -50,6 +50,7 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.WeakHashMap;
import java.util.logging.Level;
@ -68,6 +69,7 @@ public final class JingleFileTransferManager extends Manager implements JingleHa
private static final WeakHashMap<XMPPConnection, JingleFileTransferManager> INSTANCES = new WeakHashMap<>();
private final HashSet<IncomingJingleFileTransferListener> incomingJingleFileTransferListeners = new HashSet<>();
private final HashMap<String, JingleFileTransferSession> sessions = new HashMap<>();
/**
* Private constructor. This registers a JingleContentDescriptionFileTransferProvider with the
@ -188,32 +190,47 @@ public final class JingleFileTransferManager extends Manager implements JingleHa
JingleContent content = jingle.getContents().get(i);
switch (jingle.getAction()) {
case content_accept:
// Remote accepts our content-add request.
case content_add:
// Remote wants to add content to the session.
case content_modify:
// Remote wants to change the directionality of the session
case content_reject:
// Remote rejects our content-add request
case content_remove:
// Remote wants to remove a content from the session/abort a single transfer
case description_info:
// Additional parameters of exchanged media
case security_info:
// Remote wants to exchange security information
case session_accept:
// Remote accepts our session-initiate
case session_info:
// Remote sends session-info (eg. hash)
case session_initiate:
// File Offer
// Remote offers file
if (content.getSenders() == JingleContent.Senders.initiator) {
handleFileOffer(jingle);
}
//File Request
// Remote requests file
else if (content.getSenders() == JingleContent.Senders.responder) {
return handleFileRequest(jingle);
}
//Both or none
//Both or none - illegal
else {
throw new AssertionError("Undefined (see XEP-0234 §4.1)");
}
//break;
case session_terminate:
// Remote wants to terminate our current session
case transport_accept:
// Remote accepts our transport-replace
case transport_info:
// Remote exchanges transport methods
case transport_reject:
// Remote rejects our transport-replace
case transport_replace:
// Remote wants to replace the transport
}
}
return null;
@ -248,6 +265,7 @@ public final class JingleFileTransferManager extends Manager implements JingleHa
contentBuilder.addTransport(preferredTransport);
acceptBuilder.addJingleContent(contentBuilder.build());
connection().sendStanza(acceptBuilder.build());
}
}

1
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleAction.java
View File

@ -33,6 +33,7 @@ public enum JingleAction {
content_reject,
content_remove,
description_info,
security_info,
session_accept,
session_info,
session_initiate,