Improved DecodeException handling

4 years ago · 4049621bc0
parent 9ae68499cb
commit 4049621bc0
1 changed files with 4 additions and 1 deletions
--- a/app/src/main/java/eu/faircode/email/ImageHelper.java
+++ b/app/src/main/java/eu/faircode/email/ImageHelper.java
@ -692,7 +692,10 @@ class ImageHelper {
                        at android.graphics.ImageDecoder.decodeDrawableImpl(ImageDecoder.java:1758)
                        at android.graphics.ImageDecoder.decodeDrawable(ImageDecoder.java:1751)
             */
-            d = new BitmapDrawable(context.getResources(), file.getAbsolutePath());
+            Bitmap bm = _decodeImage(file, scaleToPixels);
+            if (bm == null)
+                throw new FileNotFoundException(file.getAbsolutePath());
+            d = new BitmapDrawable(context.getResources(), bm);
        }

        d.setBounds(0, 0, d.getIntrinsicWidth(), d.getIntrinsicHeight());