From 7d0723261a7bccdf2d5d8c10d18c2d7454e94ef7 Mon Sep 17 00:00:00 2001 From: jabarros Date: Fri, 5 Dec 2014 09:33:34 +0100 Subject: [PATCH] Fixed. App crashes when previewing an image --- .../owncloud/android/ui/preview/PreviewImageFragment.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 269e25ee..4af01286 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -395,17 +395,23 @@ public class PreviewImageFragment extends FileFragment { if (result == null) { mErrorMessageId = R.string.preview_image_error_unknown_format; Log_OC.e(TAG, "File could not be loaded as a bitmap: " + storagePath); + } else { + // Rotate image, obeying exif tag. + result = BitmapUtils.rotateImage(result, storagePath); } } catch (OutOfMemoryError e) { Log_OC.e(TAG, "Out of memory occured for file " + storagePath, e); - // If out of memory error when loading image, try to load it scaled + // If out of memory error when loading or rotating image, try to load it scaled result = loadScaledImage(storagePath); if (result == null) { mErrorMessageId = R.string.preview_image_error_unknown_format; Log_OC.e(TAG, "File could not be loaded as a bitmap: " + storagePath); + } else { + // Rotate scaled image, obeying exif tag + result = BitmapUtils.rotateImage(result, storagePath); } } catch (NoSuchFieldError e) { @@ -418,10 +424,6 @@ public class PreviewImageFragment extends FileFragment { } - // Rotate image, obeying exif tag - result = BitmapUtils.rotateImage(result, storagePath); - - return result; } -- 2.11.0