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

error response to sending the jingle ft hash should not file the transfer

This commit is contained in:
Daniel Gultsch 2020-06-15 21:33:32 +02:00
parent 98e1044bdd
commit c8f23aef4e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
View File

@ -200,7 +200,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
} }
}; };
public JingleFileTransferConnection(JingleConnectionManager jingleConnectionManager, Id id, Jid initiator) { JingleFileTransferConnection(JingleConnectionManager jingleConnectionManager, Id id, Jid initiator) {
super(jingleConnectionManager, id, initiator); super(jingleConnectionManager, id, initiator);
} }
@ -630,10 +630,14 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
final JinglePacket packet = this.bootstrapPacket(JinglePacket.Action.SESSION_INFO); final JinglePacket packet = this.bootstrapPacket(JinglePacket.Action.SESSION_INFO);
packet.addJingleChild(checksum); packet.addJingleChild(checksum);
this.sendJinglePacket(packet); xmppConnectionService.sendIqPacket(id.account, packet, (account, response) -> {
if (response.getType() == IqPacket.TYPE.ERROR) {
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": ignoring error response to our session-info (hash transmission)");
}
});
} }
public Collection<JingleCandidate> getOurCandidates() { private Collection<JingleCandidate> getOurCandidates() {
return Collections2.filter(this.candidates, c -> c != null && c.isOurs()); return Collections2.filter(this.candidates, c -> c != null && c.isOurs());
} }
@ -1019,7 +1023,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
abort(Reason.CANCEL); abort(Reason.CANCEL);
} }
void abort(final Reason reason) { private void abort(final Reason reason) {
this.disconnectSocks5Connections(); this.disconnectSocks5Connections();
if (this.transport instanceof JingleInBandTransport) { if (this.transport instanceof JingleInBandTransport) {
this.transport.disconnect(); this.transport.disconnect();
@ -1163,7 +1167,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
} }
} }
public int getJingleStatus() { private int getJingleStatus() {
return this.mJingleStatus; return this.mJingleStatus;
} }
@ -1206,11 +1210,11 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
jingleConnectionManager.updateConversationUi(false); jingleConnectionManager.updateConversationUi(false);
} }
public String getTransportId() { String getTransportId() {
return this.transportId; return this.transportId;
} }
public FileTransferDescription.Version getFtVersion() { FileTransferDescription.Version getFtVersion() {
return this.description.getVersion(); return this.description.getVersion();
} }