sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

content name and creator are properly set

This commit is contained in:
Daniel Gultsch 2014-05-03 18:47:53 +02:00
parent 2df57f38a0
commit f7033cb7e0
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -399,7 +399,6 @@ public class XmppConnectionService extends Service {
query.addChild("feature").setAttribute("var", "urn:xmpp:jingle:apps:file-transfer:3"); query.addChild("feature").setAttribute("var", "urn:xmpp:jingle:apps:file-transfer:3");
query.addChild("feature").setAttribute("var", "urn:xmpp:jingle:transports:s5b:1"); query.addChild("feature").setAttribute("var", "urn:xmpp:jingle:transports:s5b:1");
query.addChild("feature").setAttribute("var", "urn:xmpp:jingle:transports:ibb:1"); query.addChild("feature").setAttribute("var", "urn:xmpp:jingle:transports:ibb:1");
Log.d(LOGTAG,"replying to disco from "+packet.getFrom()+"with: "+iqResponse);
account.getXmppConnection().sendIqPacket(iqResponse, null); account.getXmppConnection().sendIqPacket(iqResponse, null);
} else { } else {
if ((packet.getType() == IqPacket.TYPE_GET)||(packet.getType() == IqPacket.TYPE_SET)) { if ((packet.getType() == IqPacket.TYPE_GET)||(packet.getType() == IqPacket.TYPE_SET)) {

21
src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
View File

@ -52,6 +52,9 @@ public class JingleConnection {
private Element fileOffer; private Element fileOffer;
private JingleFile file = null; private JingleFile file = null;
private String contentName;
private String contentCreator;
private boolean receivedCandidate = false; private boolean receivedCandidate = false;
private boolean sentCandidate = false; private boolean sentCandidate = false;
@ -160,6 +163,8 @@ public class JingleConnection {
} }
public void init(Message message) { public void init(Message message) {
this.contentCreator = "initiator";
this.contentName = this.mJingleConnectionManager.nextRandomId();
this.message = message; this.message = message;
this.account = message.getConversation().getAccount(); this.account = message.getConversation().getAccount();
this.initiator = this.account.getFullJid(); this.initiator = this.account.getFullJid();
@ -215,6 +220,8 @@ public class JingleConnection {
this.responder = this.account.getFullJid(); this.responder = this.account.getFullJid();
this.sessionId = packet.getSessionId(); this.sessionId = packet.getSessionId();
Content content = packet.getJingleContent(); Content content = packet.getJingleContent();
this.contentCreator = content.getAttribute("creator");
this.contentName = content.getAttribute("name");
this.transportId = content.getTransportId(); this.transportId = content.getTransportId();
this.mergeCandidates(JingleCandidate.parse(content.socks5transport().getChildren())); this.mergeCandidates(JingleCandidate.parse(content.socks5transport().getChildren()));
this.fileOffer = packet.getJingleContent().getFileOffer(); this.fileOffer = packet.getJingleContent().getFileOffer();
@ -263,10 +270,8 @@ public class JingleConnection {
private void sendInitRequest() { private void sendInitRequest() {
JinglePacket packet = this.bootstrapPacket("session-initiate"); JinglePacket packet = this.bootstrapPacket("session-initiate");
Content content = new Content(); Content content = new Content(this.contentCreator,this.contentName);
if (message.getType() == Message.TYPE_IMAGE) { if (message.getType() == Message.TYPE_IMAGE) {
content.setAttribute("creator", "initiator");
content.setAttribute("name", "a-file-offer");
content.setTransportId(this.transportId); content.setTransportId(this.transportId);
this.file = this.mXmppConnectionService.getFileBackend().getJingleFile(message); this.file = this.mXmppConnectionService.getFileBackend().getJingleFile(message);
content.setFileOffer(this.file); content.setFileOffer(this.file);
@ -295,7 +300,7 @@ public class JingleConnection {
@Override @Override
public void onPrimaryCandidateFound(boolean success,final JingleCandidate candidate) { public void onPrimaryCandidateFound(boolean success,final JingleCandidate candidate) {
final JinglePacket packet = bootstrapPacket("session-accept"); final JinglePacket packet = bootstrapPacket("session-accept");
final Content content = new Content(); final Content content = new Content(contentCreator,contentName);
content.setFileOffer(fileOffer); content.setFileOffer(fileOffer);
content.setTransportId(transportId); content.setTransportId(transportId);
if ((success)&&(!equalCandidateExists(candidate))) { if ((success)&&(!equalCandidateExists(candidate))) {
@ -499,7 +504,7 @@ public class JingleConnection {
private void sendFallbackToIbb() { private void sendFallbackToIbb() {
JinglePacket packet = this.bootstrapPacket("transport-replace"); JinglePacket packet = this.bootstrapPacket("transport-replace");
Content content = new Content("initiator","a-file-offer"); Content content = new Content(this.contentCreator,this.contentName);
this.transportId = this.mJingleConnectionManager.nextRandomId(); this.transportId = this.mJingleConnectionManager.nextRandomId();
content.setTransportId(this.transportId); content.setTransportId(this.transportId);
content.ibbTransport().setAttribute("block-size",""+this.ibbBlockSize); content.ibbTransport().setAttribute("block-size",""+this.ibbBlockSize);
@ -613,7 +618,7 @@ public class JingleConnection {
private void sendProxyActivated(String cid) { private void sendProxyActivated(String cid) {
JinglePacket packet = bootstrapPacket("transport-info"); JinglePacket packet = bootstrapPacket("transport-info");
Content content = new Content("inititaor","a-file-offer"); Content content = new Content(this.contentCreator,this.contentName);
content.setTransportId(this.transportId); content.setTransportId(this.transportId);
content.socks5transport().addChild("activated").setAttribute("cid", cid); content.socks5transport().addChild("activated").setAttribute("cid", cid);
packet.setContent(content); packet.setContent(content);
@ -622,7 +627,7 @@ public class JingleConnection {
private void sendCandidateUsed(final String cid) { private void sendCandidateUsed(final String cid) {
JinglePacket packet = bootstrapPacket("transport-info"); JinglePacket packet = bootstrapPacket("transport-info");
Content content = new Content("initiator","a-file-offer"); Content content = new Content(this.contentCreator,this.contentName);
content.setTransportId(this.transportId); content.setTransportId(this.transportId);
content.socks5transport().addChild("candidate-used").setAttribute("cid", cid); content.socks5transport().addChild("candidate-used").setAttribute("cid", cid);
packet.setContent(content); packet.setContent(content);
@ -635,7 +640,7 @@ public class JingleConnection {
private void sendCandidateError() { private void sendCandidateError() {
JinglePacket packet = bootstrapPacket("transport-info"); JinglePacket packet = bootstrapPacket("transport-info");
Content content = new Content("initiator","a-file-offer"); Content content = new Content(this.contentCreator,this.contentName);
content.setTransportId(this.transportId); content.setTransportId(this.transportId);
content.socks5transport().addChild("candidate-error"); content.socks5transport().addChild("candidate-error");
packet.setContent(content); packet.setContent(content);