fixed otr jingle file size reporting

Daniel Gultsch created 8 years ago

Change summary

src/main/java/eu/siacs/conversations/Config.java                             | 2 
src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java | 3 
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java       | 6 
3 files changed, 2 insertions(+), 9 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/Config.java

@@ -96,8 +96,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 ONLY_INTERNAL_STORAGE = false; //use internal storage instead of sdcard to save attachments

src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java

@@ -81,8 +81,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<InputStream,Integer>(new CipherInputStream(is, cipher),s);
+				return new Pair<InputStream,Integer>(new CipherInputStream(is, cipher),(size / 16 + 1) * 16);
 			}
 		} catch (InvalidKeyException e) {
 			return null;

src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java

@@ -459,11 +459,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();