error response to sending the jingle ft hash should not file the transfer
This commit is contained in:
parent
98e1044bdd
commit
c8f23aef4e
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -630,10 +630,14 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
|
|||
|
||||
final JinglePacket packet = this.bootstrapPacket(JinglePacket.Action.SESSION_INFO);
|
||||
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());
|
||||
}
|
||||
|
||||
|
@ -1019,7 +1023,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
|
|||
abort(Reason.CANCEL);
|
||||
}
|
||||
|
||||
void abort(final Reason reason) {
|
||||
private void abort(final Reason reason) {
|
||||
this.disconnectSocks5Connections();
|
||||
if (this.transport instanceof JingleInBandTransport) {
|
||||
this.transport.disconnect();
|
||||
|
@ -1163,7 +1167,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
|
|||
}
|
||||
}
|
||||
|
||||
public int getJingleStatus() {
|
||||
private int getJingleStatus() {
|
||||
return this.mJingleStatus;
|
||||
}
|
||||
|
||||
|
@ -1206,11 +1210,11 @@ public class JingleFileTransferConnection extends AbstractJingleConnection imple
|
|||
jingleConnectionManager.updateConversationUi(false);
|
||||
}
|
||||
|
||||
public String getTransportId() {
|
||||
String getTransportId() {
|
||||
return this.transportId;
|
||||
}
|
||||
|
||||
public FileTransferDescription.Version getFtVersion() {
|
||||
FileTransferDescription.Version getFtVersion() {
|
||||
return this.description.getVersion();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue