From: masensio <masensio@solidgear.es>
Date: Mon, 19 May 2014 11:31:37 +0000 (+0200)
Subject: Merge pull request #495 from owncloud/fixed_loading_dialog_dismissed_on_rotation
X-Git-Tag: oc-android-1.7.0_signed~309^2~10
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/81fd95ad6f9de92b8c2a65234758c605559d933e?ds=inline;hp=-c

Merge pull request #495 from owncloud/fixed_loading_dialog_dismissed_on_rotation

Fixed loading dialog dismissed on rotation
---

81fd95ad6f9de92b8c2a65234758c605559d933e
diff --combined src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index 0a66966e,b8219a5f..54f73333
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@@ -213,9 -213,6 +213,9 @@@ public class PreviewImageFragment exten
          super.onPrepareOptionsMenu(menu);
          
          if (mContainerActivity.getStorageManager() != null) {
 +            // Update the file
 +            setFile(mContainerActivity.getStorageManager().getFileById(getFile().getFileId()));
 +            
              FileMenuFilter mf = new FileMenuFilter(
                  getFile(),
                  mContainerActivity.getStorageManager().getAccount(),
@@@ -297,10 -294,10 +297,10 @@@
  
      @Override
      public void onDestroy() {
-         super.onDestroy();
          if (mBitmap != null) {
              mBitmap.recycle();
          }
+         super.onDestroy();
      }