From 8b6981c6ebf8286eb690764aaa8165a7a398c8da Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Tue, 1 Aug 2017 12:28:59 +0200 Subject: fixed otr jingle file size reporting --- src/main/java/de/pixart/messenger/Config.java | 2 -- .../de/pixart/messenger/services/AbstractConnectionManager.java | 3 +-- src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java | 6 +----- 3 files changed, 2 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java index 3ecf584cb..87e494af2 100644 --- a/src/main/java/de/pixart/messenger/Config.java +++ b/src/main/java/de/pixart/messenger/Config.java @@ -105,8 +105,6 @@ public final class Config { public static final boolean ENCRYPT_ON_HTTP_UPLOADED = false; - public static final boolean REPORT_WRONG_FILESIZE_IN_OTR_JINGLE = true; - public static final boolean X509_VERIFICATION = false; //use x509 certificates to verify OMEMO keys public static final boolean IGNORE_ID_REWRITE_IN_MUC = true; diff --git a/src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java b/src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java index 9232b2d7e..8fd7dc814 100644 --- a/src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java +++ b/src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java @@ -99,8 +99,7 @@ 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"); - final int s = Config.REPORT_WRONG_FILESIZE_IN_OTR_JINGLE ? size : (size / 16 + 1) * 16; - return new Pair(new CipherInputStream(is, cipher), s); + return new Pair(new CipherInputStream(is, cipher), (size / 16 + 1) * 16); } } catch (InvalidKeyException e) { return null; 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 bf92a2c30..2f8d66306 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java @@ -463,11 +463,7 @@ public class JingleConnection implements Transferable { } } this.mFileOutputStream = AbstractConnectionManager.createOutputStream(this.file, message.getEncryption() == Message.ENCRYPTION_AXOLOTL); - if (message.getEncryption() == Message.ENCRYPTION_OTR && Config.REPORT_WRONG_FILESIZE_IN_OTR_JINGLE) { - this.file.setExpectedSize((size / 16 + 1) * 16); - } else { - this.file.setExpectedSize(size); - } + this.file.setExpectedSize(size); Log.d(Config.LOGTAG, "receiving file: expecting size of " + this.file.getExpectedSize()); } else { this.sendCancel(); -- cgit v1.2.3