diff options
| author | Christian Schneppe <christian@pix-art.de> | 2019-06-25 11:05:25 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2019-06-25 11:05:25 +0200 |
| commit | 6891ca336b64dc00a9f4a964c28b85c492401cb8 (patch) | |
| tree | f061ba386091b3640f37d90158ffa254a7c50ae7 /src/main/java/de/pixart/messenger/xmpp/jingle | |
| parent | a8f97149d9516298f6756789f66907974b564945 (diff) | |
fix jingle file transfer
fixes #360
Diffstat (limited to 'src/main/java/de/pixart/messenger/xmpp/jingle')
3 files changed, 3 insertions, 3 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 e97b7f478..8e005cc60 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java @@ -204,7 +204,7 @@ public class JingleConnection implements Transferable { } this.file.getParentFile().mkdirs(); this.file.createNewFile(); - this.mFileOutputStream = AbstractConnectionManager.createOutputStream(this.file, message.getEncryption() == Message.ENCRYPTION_AXOLOTL); + this.mFileOutputStream = AbstractConnectionManager.createOutputStream(this.file); return this.mFileOutputStream; } diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java index aadfe0370..f3e7cc814 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java @@ -129,7 +129,7 @@ public class JingleInbandTransport extends JingleTransport { callback.onFileTransferAborted(); return; } - innerInputStream = AbstractConnectionManager.upgrade(file, fileInputStream, false); + innerInputStream = AbstractConnectionManager.upgrade(file, fileInputStream); if (this.connected) { this.sendNextBlock(); } diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java index 35498664f..15b811bf7 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java @@ -95,7 +95,7 @@ public class JingleSocks5Transport extends JingleTransport { callback.onFileTransferAborted(); return; } - final InputStream innerInputStream = AbstractConnectionManager.upgrade(file, fileInputStream, false); + final InputStream innerInputStream = AbstractConnectionManager.upgrade(file, fileInputStream); long size = file.getExpectedSize(); long transmitted = 0; int count; |