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.

1 files changed, 3 insertions, 1 deletions

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;