From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 31 Oct 2015 07:09:49 +0000 (+0100)
Subject: fixed rotating resized image
X-Git-Tag: beta-20151122~1^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/61338bbb0c62d5cb9293a655d9db5f8af2758240?ds=inline;hp=--cc

fixed rotating resized image
---

61338bbb0c62d5cb9293a655d9db5f8af2758240
diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index bb33a9c6..f05391ad 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@ -70,6 +70,7 @@ public class PreviewImageFragment extends FileFragment {
 
     private static final String ARG_FILE = "FILE";
     private static final String ARG_IGNORE_FIRST = "IGNORE_FIRST";
+    private static final String ARG_SHOW_RESIZED_IMAGE = "SHOW_RESIZED_IMAGE";
 
     private TouchImageViewCustom mImageView;
     private TextView mMessageView;
@@ -107,6 +108,7 @@ public class PreviewImageFragment extends FileFragment {
         Bundle args = new Bundle();
         args.putParcelable(ARG_FILE, imageFile);
         args.putBoolean(ARG_IGNORE_FIRST, ignoreFirstSavedState);
+        args.putBoolean(ARG_SHOW_RESIZED_IMAGE, showResizedImage);
         frag.setArguments(args);
         return frag;
     }
@@ -139,6 +141,7 @@ public class PreviewImageFragment extends FileFragment {
             // not right now
 
         mIgnoreFirstSavedState = args.getBoolean(ARG_IGNORE_FIRST);
+        mShowResizedImage = args.getBoolean(ARG_SHOW_RESIZED_IMAGE);
         setHasOptionsMenu(true);
     }
     
@@ -214,8 +217,9 @@ public class PreviewImageFragment extends FileFragment {
                     mImageView.setVisibility(View.VISIBLE);
                     mBitmap  = thumbnail;
                 } else {
-                // generate new Thumbnail
-                    if (ThumbnailsCacheManager.cancelPotentialWork(getFile(), mImageView)) {
+                    // generate new Thumbnail
+                    if (ThumbnailsCacheManager.cancelPotentialWork(getFile(), mImageView) &&
+                        mContainerActivity.getStorageManager() != null) {
                         final ThumbnailsCacheManager.ThumbnailGenerationTask task =
                                 new ThumbnailsCacheManager.ThumbnailGenerationTask(
                                         mImageView, mContainerActivity.getStorageManager(),