From 1c14932e8449e40e4cb12427cae7e51791f68595 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 18 Feb 2019 21:28:07 +0100
Subject: fix some more NPEs

---
 src/main/java/de/pixart/messenger/persistance/FileBackend.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/persistance/FileBackend.java')

diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
index 0023eec37..e85eab5c9 100644
--- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
@@ -487,7 +487,15 @@ public class FileBackend {
             if (originalBitmap == null) {
                 throw new FileCopyException(R.string.error_not_an_image_file);
             }
-            Bitmap scaledBitmap = resize(originalBitmap, mXmppConnectionService.getCompressImageResolutionPreference());
+            int size;
+            if (mXmppConnectionService.getCompressImageResolutionPreference() == 0) {
+                int height = originalBitmap.getHeight();
+                int width = originalBitmap.getWidth();
+                size = height > width ? height : width;
+            } else {
+                size = mXmppConnectionService.getCompressImageResolutionPreference();
+            }
+            Bitmap scaledBitmap = resize(originalBitmap, size);
             int rotation = getRotation(image);
             scaledBitmap = rotate(scaledBitmap, rotation);
             boolean targetSizeReached = false;
-- 
cgit v1.2.3