fix jingle file transfer

fixes #360

3 files changed, 4 insertions, 4 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;
     }
 
@@ -648,7 +648,7 @@ public class JingleConnection implements Transferable {
 
     private boolean receiveAccept(JinglePacket packet) {
         if (this.mJingleStatus != JINGLE_STATUS_INITIATED) {
-            Log.d(Config.LOGTAG,account.getJid().asBareJid()+": received out of order session-accept");
+            Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": received out of order session-accept");
             return false;
         }
         this.mJingleStatus = JINGLE_STATUS_ACCEPTED;
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;