From d30515a85acaedb57d0d4308aeb72d96074f729a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 10 Aug 2015 12:55:37 +0200
Subject: report wrong file size in otr encrypted jingle file transfers to be
 compatible with conversations > 1.6

---
 .../eu/siacs/conversations/services/AbstractConnectionManager.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java')

diff --git a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
index b7e7c8d3..dbd7f376 100644
--- a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
@@ -72,7 +72,8 @@ public class AbstractConnectionManager {
 				Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
 				cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(file.getKey(), "AES"), ips);
 				Log.d(Config.LOGTAG, "opening encrypted input stream");
-				return new Pair<InputStream,Integer>(new CipherInputStream(is, cipher),(size / 16 + 1) * 16);
+				final int s = Config.REPORT_WRONG_FILESIZE_IN_OTR_JINGLE ? size : (size / 16 + 1) * 16;
+				return new Pair<InputStream,Integer>(new CipherInputStream(is, cipher),s);
 			}
 		} catch (InvalidKeyException e) {
 			return null;
-- 
cgit v1.2.3