diff options
| author | Christian Schneppe <christian.schneppe@pix-art.de> | 2020-01-31 21:03:55 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian.schneppe@pix-art.de> | 2020-01-31 21:04:24 +0100 |
| commit | 1373c583e98dc7eb051bca615f708071e6338210 (patch) | |
| tree | 9ff7be86bd03b64e2c7d483b054c07e542b66fb7 /src/main/java | |
| parent | ec7cc243adfab9312f6d562dad8bd4044db59287 (diff) | |
small jingle fixes
possibly fixes #417, but I couldn't check this, because I can't reproduce the problems. Feel free to reopen it with updated logs.
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java index 478c8c992..7e78121ed 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java @@ -100,7 +100,7 @@ public class JingleConnection implements Transferable { if (mJingleStatus != JINGLE_STATUS_FAILED && mJingleStatus != JINGLE_STATUS_FINISHED) { fail(IqParser.extractErrorMessage(packet)); } else { - Log.d(Config.LOGTAG,"ignoring late delivery of jingle packet to jingle session with status="+mJingleStatus+": "+packet.toString()); + Log.d(Config.LOGTAG, "ignoring late delivery of jingle packet to jingle session with status=" + mJingleStatus + ": " + packet.toString()); } } }; @@ -1086,7 +1086,7 @@ public class JingleConnection implements Transferable { FileBackend.close(mFileOutputStream); if (this.message != null) { if (responding()) { - this.message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_FAILED)); + this.message.setTransferable(new TransferablePlaceholder(cancelled ? Transferable.STATUS_CANCELLED : Transferable.STATUS_FAILED)); if (this.file != null) { file.delete(); } |