refactored file encryption to give access to inner stream

Conscrypt on some plattforms doesn’t like when we close the CipherInputStream. Therefor we refactor the api to give us access to the inner stream so we can close that independently.

3 files changed, 33 insertions, 44 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 6c726c8b9..77540bc9c 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
@@ -2,8 +2,8 @@ package de.pixart.messenger.xmpp.jingle;
 
 import android.util.Base64;
 import android.util.Log;
-import android.util.Pair;
 
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -489,36 +489,32 @@ public class JingleConnection implements Transferable {
         if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE) {
             content.setTransportId(this.transportId);
             this.file = this.mXmppConnectionService.getFileBackend().getFile(message, false);
-            Pair<InputStream, Integer> pair;
-            try {
-                if (message.getEncryption() == Message.ENCRYPTION_OTR) {
-                    Conversational conversation = this.message.getConversation();
-                    if (!this.mXmppConnectionService.renewSymmetricKey((Conversation) conversation)) {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": could not set symmetric key");
-                        cancel();
-                    }
-                    Conversation c = (Conversation) this.message.getConversation();
-                    this.file.setKeyAndIv(c.getSymmetricKey());
-                    pair = AbstractConnectionManager.createInputStream(this.file, false);
-                    this.file.setExpectedSize(pair.second);
-                    content.setFileOffer(this.file, true, this.ftVersion);
-                } else if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
-                    this.file.setKey(mXmppAxolotlMessage.getInnerKey());
-                    this.file.setIv(mXmppAxolotlMessage.getIV());
-                    pair = AbstractConnectionManager.createInputStream(this.file, true);
-                    this.file.setExpectedSize(pair.second);
-                    content.setFileOffer(this.file, false, this.ftVersion).addChild(mXmppAxolotlMessage.toElement());
-                } else {
-                    pair = AbstractConnectionManager.createInputStream(this.file, false);
-                    this.file.setExpectedSize(pair.second);
-                    content.setFileOffer(this.file, false, this.ftVersion);
+            if (message.getEncryption() == Message.ENCRYPTION_OTR) {
+                Conversational conversation = this.message.getConversation();
+                if (!this.mXmppConnectionService.renewSymmetricKey((Conversation) conversation)) {
+                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": could not set symmetric key");
+                    cancel();
                 }
+                Conversation c = (Conversation) this.message.getConversation();
+                this.file.setKeyAndIv(c.getSymmetricKey());
+                this.file.setExpectedSize((file.getSize() / 16 + 1) * 16);
+                content.setFileOffer(this.file, true, this.ftVersion);
+            } else if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
+                this.file.setKey(mXmppAxolotlMessage.getInnerKey());
+                this.file.setIv(mXmppAxolotlMessage.getIV());
+                this.file.setExpectedSize(file.getSize() + 16);
+                content.setFileOffer(this.file, false, this.ftVersion).addChild(mXmppAxolotlMessage.toElement());
+            } else {
+                this.file.setExpectedSize(file.getSize());
+                content.setFileOffer(this.file, false, this.ftVersion);
+            }
+            message.resetFileParams();
+            try {
+                this.mFileInputStream = new FileInputStream(file);
             } catch (FileNotFoundException e) {
                 cancel();
                 return;
             }
-            message.resetFileParams();
-            this.mFileInputStream = pair.first;
             content.setTransportId(this.transportId);
             content.socks5transport().setChildren(getCandidatesAsElements());
             packet.setContent(content);
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 151e9409f..df8b962c4 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java
@@ -14,6 +14,7 @@ import de.pixart.messenger.Config;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.entities.DownloadableFile;
 import de.pixart.messenger.persistance.FileBackend;
+import de.pixart.messenger.services.AbstractConnectionManager;
 import de.pixart.messenger.xml.Element;
 import de.pixart.messenger.xmpp.OnIqPacketReceived;
 import de.pixart.messenger.xmpp.stanzas.IqPacket;
@@ -35,6 +36,7 @@ public class JingleInbandTransport extends JingleTransport {
     private JingleConnection connection;
 
     private InputStream fileInputStream = null;
+    private InputStream innerInputStream = null;
     private OutputStream fileOutputStream = null;
     private long remainingSize = 0;
     private long fileSize = 0;
@@ -129,10 +131,11 @@ public class JingleInbandTransport extends JingleTransport {
                 callback.onFileTransferAborted();
                 return;
             }
+            innerInputStream = AbstractConnectionManager.upgrade(file, fileInputStream, false);
             if (this.connected) {
                 this.sendNextBlock();
             }
-        } catch (NoSuchAlgorithmException e) {
+        } catch (Exception e) {
             callback.onFileTransferAborted();
             Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": " + e.getMessage());
         }
@@ -141,26 +144,14 @@ public class JingleInbandTransport extends JingleTransport {
     @Override
     public void disconnect() {
         this.connected = false;
-        if (this.fileOutputStream != null) {
-            try {
-                this.fileOutputStream.close();
-            } catch (IOException e) {
-
-            }
-        }
-        if (this.fileInputStream != null) {
-            try {
-                this.fileInputStream.close();
-            } catch (IOException e) {
-
-            }
-        }
+        FileBackend.close(fileOutputStream);
+        FileBackend.close(fileInputStream);
     }
 
     private void sendNextBlock() {
         byte[] buffer = new byte[this.blockSize];
         try {
-            int count = fileInputStream.read(buffer);
+            int count = innerInputStream.read(buffer);
             if (count == -1) {
                 sendClose();
                 file.setSha1Sum(digest.digest());
@@ -168,7 +159,7 @@ public class JingleInbandTransport extends JingleTransport {
                 fileInputStream.close();
                 return;
             } else if (count != buffer.length) {
-                int rem = fileInputStream.read(buffer, count, buffer.length - count);
+                int rem = innerInputStream.read(buffer, count, buffer.length - count);
                 if (rem > 0) {
                     count += rem;
                 }
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 374e02750..35498664f 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java
@@ -15,6 +15,7 @@ import java.security.NoSuchAlgorithmException;
 import de.pixart.messenger.Config;
 import de.pixart.messenger.entities.DownloadableFile;
 import de.pixart.messenger.persistance.FileBackend;
+import de.pixart.messenger.services.AbstractConnectionManager;
 import de.pixart.messenger.utils.CryptoHelper;
 import de.pixart.messenger.utils.SocksSocketFactory;
 import de.pixart.messenger.utils.WakeLockHelper;
@@ -94,11 +95,12 @@ public class JingleSocks5Transport extends JingleTransport {
                     callback.onFileTransferAborted();
                     return;
                 }
+                final InputStream innerInputStream = AbstractConnectionManager.upgrade(file, fileInputStream, false);
                 long size = file.getExpectedSize();
                 long transmitted = 0;
                 int count;
                 byte[] buffer = new byte[8192];
-                while ((count = fileInputStream.read(buffer)) > 0) {
+                while ((count = innerInputStream.read(buffer)) > 0) {
                     outputStream.write(buffer, 0, count);
                     digest.update(buffer, 0, count);
                     transmitted += count;