From 6fe5c5e770dd10b55c2fc1b1651a5c8b91f5c081 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 3 May 2018 15:38:48 +0200 Subject: [PATCH] handle invalid image bounds --- .../eu/siacs/conversations/persistance/FileBackend.java | 8 +++++++- .../eu/siacs/conversations/ui/adapter/MessageAdapter.java | 4 +--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java index 7d01d61b0..fdaa637b5 100644 --- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java @@ -888,7 +888,9 @@ public class FileBackend { if (image || video) { try { Dimensions dimensions = image ? getImageDimensions(file) : getVideoDimensions(file); - body.append('|').append(dimensions.width).append('|').append(dimensions.height); + if (dimensions.valid()) { + body.append('|').append(dimensions.width).append('|').append(dimensions.height); + } } catch (NotAVideoFile notAVideoFile) { Log.d(Config.LOGTAG, "file with mime type " + file.getMimeType() + " was not a video file"); //fall threw @@ -1015,6 +1017,10 @@ public class FileBackend { public int getMin() { return Math.min(width, height); } + + public boolean valid() { + return width > 0 && height > 0; + } } private static class NotAVideoFile extends Exception { diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index f77427cdc..1da81dc0d 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -790,9 +790,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie } else { displayInfoMessage(viewHolder, UIHelper.getMessagePreview(activity, message).first, darkBackground); } - } else if (message.getType() == Message.TYPE_IMAGE && message.getEncryption() != Message.ENCRYPTION_PGP && message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED) { - displayImageMessage(viewHolder, message); - } else if (message.getType() == Message.TYPE_FILE && message.getEncryption() != Message.ENCRYPTION_PGP && message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED) { + } else if (message.isFileOrImage() && message.getEncryption() != Message.ENCRYPTION_PGP && message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED) { if (message.getFileParams().width > 0 && message.getFileParams().height > 0) { displayImageMessage(viewHolder, message); } else if (message.getFileParams().runtime > 0) {