Added workaround app project to environment setup files

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / preview / PreviewImageFragment.java

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index fe94f64..578c56e 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@ -2,9 +2,8 @@
  *   Copyright (C) 2012-2013 ownCloud Inc. 
  *
  *   This program is free software: you can redistribute it and/or modify
  *   Copyright (C) 2012-2013 ownCloud Inc. 
  *
  *   This program is free software: you can redistribute it and/or modify

- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 2 of the License, or
- *   (at your option) any later version.
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.

  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -37,7 +36,6 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.app.FragmentStatePagerAdapter;

-import android.util.Log;

 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;


@@ -45,16 +43,15 @@ import android.view.View.OnTouchListener;
 import android.view.ViewGroup;
 import android.webkit.MimeTypeMap;
 import android.widget.ImageView;
 import android.view.ViewGroup;
 import android.webkit.MimeTypeMap;
 import android.widget.ImageView;

+import android.widget.ProgressBar;

 import android.widget.TextView;
 import android.widget.Toast;
 
 import android.widget.TextView;
 import android.widget.Toast;
 

-import com.actionbarsherlock.app.SherlockFragment;

 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;

-import com.owncloud.android.network.OwnCloudClientUtils;

 import com.owncloud.android.operations.OnRemoteOperationListener;
 import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.OnRemoteOperationListener;
 import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;


@@ -62,8 +59,8 @@ import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
 
 import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
 

+import com.owncloud.android.Log_OC;

 import com.owncloud.android.R;
 import com.owncloud.android.R;

-import eu.alefzero.webdav.WebdavClient;

 import eu.alefzero.webdav.WebdavUtils;
 
 
 import eu.alefzero.webdav.WebdavUtils;
 
 


@@ -76,18 +73,17 @@ import eu.alefzero.webdav.WebdavUtils;
  * 
  * @author David A. Velasco
  */
  * 
  * @author David A. Velasco
  */

-public class PreviewImageFragment extends SherlockFragment implements   FileFragment, 
-                                                                        OnRemoteOperationListener, 
+public class PreviewImageFragment extends FileFragment implements   OnRemoteOperationListener, 

                                                                         ConfirmationDialogFragment.ConfirmationDialogFragmentListener {
     public static final String EXTRA_FILE = "FILE";
     public static final String EXTRA_ACCOUNT = "ACCOUNT";
 
     private View mView;
                                                                         ConfirmationDialogFragment.ConfirmationDialogFragmentListener {
     public static final String EXTRA_FILE = "FILE";
     public static final String EXTRA_ACCOUNT = "ACCOUNT";
 
     private View mView;

-    private OCFile mFile;

     private Account mAccount;
     private FileDataStorageManager mStorageManager;
     private ImageView mImageView;
     private TextView mMessageView;
     private Account mAccount;
     private FileDataStorageManager mStorageManager;
     private ImageView mImageView;
     private TextView mMessageView;

+    private ProgressBar mProgressWheel;

 
     public Bitmap mBitmap = null;
     
 
     public Bitmap mBitmap = null;
     


@@ -109,7 +105,7 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
      * @param ignoreFirstSavedState     Flag to work around an unexpected behaviour of {@link FragmentStatePagerAdapter}; TODO better solution 
      */
     public PreviewImageFragment(OCFile fileToDetail, Account ocAccount, boolean ignoreFirstSavedState) {
      * @param ignoreFirstSavedState     Flag to work around an unexpected behaviour of {@link FragmentStatePagerAdapter}; TODO better solution 
      */
     public PreviewImageFragment(OCFile fileToDetail, Account ocAccount, boolean ignoreFirstSavedState) {

-        mFile = fileToDetail;
+        super(fileToDetail);

         mAccount = ocAccount;
         mStorageManager = null; // we need a context to init this; the container activity is not available yet at this moment
         mIgnoreFirstSavedState = ignoreFirstSavedState;
         mAccount = ocAccount;
         mStorageManager = null; // we need a context to init this; the container activity is not available yet at this moment
         mIgnoreFirstSavedState = ignoreFirstSavedState;


@@ -124,7 +120,7 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
      *  DO NOT CALL IT: an {@link OCFile} and {@link Account} must be provided for a successful construction 
      */
     public PreviewImageFragment() {
      *  DO NOT CALL IT: an {@link OCFile} and {@link Account} must be provided for a successful construction 
      */
     public PreviewImageFragment() {

-        mFile = null;
+        super();

         mAccount = null;
         mStorageManager = null;
         mIgnoreFirstSavedState = false;
         mAccount = null;
         mStorageManager = null;
         mIgnoreFirstSavedState = false;


@@ -151,9 +147,12 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
         super.onCreateView(inflater, container, savedInstanceState);
         mView = inflater.inflate(R.layout.preview_image_fragment, container, false);
         mImageView = (ImageView)mView.findViewById(R.id.image);
         super.onCreateView(inflater, container, savedInstanceState);
         mView = inflater.inflate(R.layout.preview_image_fragment, container, false);
         mImageView = (ImageView)mView.findViewById(R.id.image);

+        mImageView.setVisibility(View.GONE);

         mView.setOnTouchListener((OnTouchListener)getActivity());   // WATCH OUT THAT CAST
         mMessageView = (TextView)mView.findViewById(R.id.message);
         mMessageView.setVisibility(View.GONE);
         mView.setOnTouchListener((OnTouchListener)getActivity());   // WATCH OUT THAT CAST
         mMessageView = (TextView)mView.findViewById(R.id.message);
         mMessageView.setVisibility(View.GONE);

+        mProgressWheel = (ProgressBar)mView.findViewById(R.id.progressWheel);
+        mProgressWheel.setVisibility(View.VISIBLE);

         return mView;
     }
     
         return mView;
     }
     


@@ -178,19 +177,19 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
         mStorageManager = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());
         if (savedInstanceState != null) {
             if (!mIgnoreFirstSavedState) {
         mStorageManager = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());
         if (savedInstanceState != null) {
             if (!mIgnoreFirstSavedState) {

-                mFile = savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_FILE);
+                setFile((OCFile)savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_FILE));

                 mAccount = savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_ACCOUNT);
             } else {
                 mIgnoreFirstSavedState = false;
             }
         }
                 mAccount = savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_ACCOUNT);
             } else {
                 mIgnoreFirstSavedState = false;
             }
         }

-        if (mFile == null) {
+        if (getFile() == null) {

             throw new IllegalStateException("Instanced with a NULL OCFile");
         }
         if (mAccount == null) {
             throw new IllegalStateException("Instanced with a NULL ownCloud Account");
         }
             throw new IllegalStateException("Instanced with a NULL OCFile");
         }
         if (mAccount == null) {
             throw new IllegalStateException("Instanced with a NULL ownCloud Account");
         }

-        if (!mFile.isDown()) {
+        if (!getFile().isDown()) {

             throw new IllegalStateException("There is no local file to preview");
         }
     }
             throw new IllegalStateException("There is no local file to preview");
         }
     }


@@ -202,7 +201,7 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);

-        outState.putParcelable(PreviewImageFragment.EXTRA_FILE, mFile);
+        outState.putParcelable(PreviewImageFragment.EXTRA_FILE, getFile());

         outState.putParcelable(PreviewImageFragment.EXTRA_ACCOUNT, mAccount);
     }
     
         outState.putParcelable(PreviewImageFragment.EXTRA_ACCOUNT, mAccount);
     }
     


@@ -210,9 +209,9 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
     @Override
     public void onStart() {
         super.onStart();
     @Override
     public void onStart() {
         super.onStart();

-        if (mFile != null) {
-           BitmapLoader bl = new BitmapLoader(mImageView, mMessageView);
-           bl.execute(new String[]{mFile.getStoragePath()});
+        if (getFile() != null) {
+           BitmapLoader bl = new BitmapLoader(mImageView, mMessageView, mProgressWheel);
+           bl.execute(new String[]{getFile().getStoragePath()});

         }
     }
     
         }
     }
     


@@ -270,42 +269,19 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
 
     
     private void seeDetails() {
 
     
     private void seeDetails() {

-        ((FileFragment.ContainerActivity)getActivity()).showFragmentWithDetails(mFile);        
+        ((FileFragment.ContainerActivity)getActivity()).showDetails(getFile());        

     }
 
 
     @Override
     public void onResume() {
         super.onResume();
     }
 
 
     @Override
     public void onResume() {
         super.onResume();

-        Log.e(TAG, "FRAGMENT, ONRESUME");
-        /*
-        mDownloadFinishReceiver = new DownloadFinishReceiver();
-        IntentFilter filter = new IntentFilter(
-                FileDownloader.DOWNLOAD_FINISH_MESSAGE);
-        getActivity().registerReceiver(mDownloadFinishReceiver, filter);
-        
-        mUploadFinishReceiver = new UploadFinishReceiver();
-        filter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE);
-        getActivity().registerReceiver(mUploadFinishReceiver, filter);
-        */
-

     }
 
 
     @Override
     public void onPause() {
         super.onPause();
     }
 
 
     @Override
     public void onPause() {
         super.onPause();

-        /*
-        if (mVideoPreview.getVisibility() == View.VISIBLE) {
-            mSavedPlaybackPosition = mVideoPreview.getCurrentPosition();
-        }*/
-        /*
-        getActivity().unregisterReceiver(mDownloadFinishReceiver);
-        mDownloadFinishReceiver = null;
-        
-        getActivity().unregisterReceiver(mUploadFinishReceiver);
-        mUploadFinishReceiver = null;
-        */

     }
 
 
     }
 
 


@@ -326,22 +302,23 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
      * available apps for the MIME type known from the file extension, to let the user choose
      */
     private void openFile() {
      * available apps for the MIME type known from the file extension, to let the user choose
      */
     private void openFile() {

-        String storagePath = mFile.getStoragePath();
+        OCFile file = getFile();
+        String storagePath = file.getStoragePath();

         String encodedStoragePath = WebdavUtils.encodePath(storagePath);
         try {
             Intent i = new Intent(Intent.ACTION_VIEW);
         String encodedStoragePath = WebdavUtils.encodePath(storagePath);
         try {
             Intent i = new Intent(Intent.ACTION_VIEW);

-            i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mFile.getMimetype());
+            i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), file.getMimetype());

             i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
             startActivity(i);
             
         } catch (Throwable t) {
             i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
             startActivity(i);
             
         } catch (Throwable t) {

-            Log.e(TAG, "Fail when trying to open with the mimeType provided from the ownCloud server: " + mFile.getMimetype());
+            Log_OC.e(TAG, "Fail when trying to open with the mimeType provided from the ownCloud server: " + file.getMimetype());

             boolean toastIt = true; 
             String mimeType = "";
             try {
                 Intent i = new Intent(Intent.ACTION_VIEW);
                 mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));
             boolean toastIt = true; 
             String mimeType = "";
             try {
                 Intent i = new Intent(Intent.ACTION_VIEW);
                 mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));

-                if (mimeType == null || !mimeType.equals(mFile.getMimetype())) {
+                if (mimeType == null || !mimeType.equals(file.getMimetype())) {

                     if (mimeType != null) {
                         i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mimeType);
                     } else {
                     if (mimeType != null) {
                         i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mimeType);
                     } else {


@@ -354,17 +331,17 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
                 }
                 
             } catch (IndexOutOfBoundsException e) {
                 }
                 
             } catch (IndexOutOfBoundsException e) {

-                Log.e(TAG, "Trying to find out MIME type of a file without extension: " + storagePath);
+                Log_OC.e(TAG, "Trying to find out MIME type of a file without extension: " + storagePath);

                 
             } catch (ActivityNotFoundException e) {
                 
             } catch (ActivityNotFoundException e) {

-                Log.e(TAG, "No activity found to handle: " + storagePath + " with MIME type " + mimeType + " obtained from extension");
+                Log_OC.e(TAG, "No activity found to handle: " + storagePath + " with MIME type " + mimeType + " obtained from extension");

                 
             } catch (Throwable th) {
                 
             } catch (Throwable th) {

-                Log.e(TAG, "Unexpected problem when opening: " + storagePath, th);
+                Log_OC.e(TAG, "Unexpected problem when opening: " + storagePath, th);

                 
             } finally {
                 if (toastIt) {
                 
             } finally {
                 if (toastIt) {

-                    Toast.makeText(getActivity(), "There is no application to handle file " + mFile.getFileName(), Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getActivity(), "There is no application to handle file " + file.getFileName(), Toast.LENGTH_SHORT).show();

                 }
             }
             
                 }
             }
             


@@ -382,7 +359,7 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
     private void removeFile() {
         ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance(
                 R.string.confirmation_remove_alert,
     private void removeFile() {
         ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance(
                 R.string.confirmation_remove_alert,

-                new String[]{mFile.getFileName()},
+                new String[]{getFile().getFileName()},

                 R.string.confirmation_remove_remote_and_local,
                 R.string.confirmation_remove_local,
                 R.string.common_cancel);
                 R.string.confirmation_remove_remote_and_local,
                 R.string.confirmation_remove_local,
                 R.string.common_cancel);


@@ -396,14 +373,13 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
      */
     @Override
     public void onConfirmation(String callerTag) {
      */
     @Override
     public void onConfirmation(String callerTag) {

-        if (mStorageManager.getFileById(mFile.getFileId()) != null) {   // check that the file is still there;
-            mLastRemoteOperation = new RemoveFileOperation( mFile,      // TODO we need to review the interface with RemoteOperations, and use OCFile IDs instead of OCFile objects as parameters
+        if (mStorageManager.getFileById(getFile().getFileId()) != null) {   // check that the file is still there;
+            mLastRemoteOperation = new RemoveFileOperation( getFile(),      // TODO we need to review the interface with RemoteOperations, and use OCFile IDs instead of OCFile objects as parameters

                                                             true, 
                                                             mStorageManager);
                                                             true, 
                                                             mStorageManager);

-            WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getSherlockActivity().getApplicationContext());
-            mLastRemoteOperation.execute(wc, this, mHandler);
+            mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity());

             
             

-            getActivity().showDialog(PreviewImageActivity.DIALOG_SHORT_WAIT);
+            ((PreviewImageActivity) getActivity()).showLoadingDialog();

         }
     }
     
         }
     }
     


@@ -414,11 +390,12 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
     @Override
     public void onNeutral(String callerTag) {
         // TODO this code should be made in a secondary thread,
     @Override
     public void onNeutral(String callerTag) {
         // TODO this code should be made in a secondary thread,

-        if (mFile.isDown()) {   // checks it is still there
-            File f = new File(mFile.getStoragePath());
+        OCFile file = getFile();
+        if (file.isDown()) {   // checks it is still there
+            File f = new File(file.getStoragePath());

             f.delete();
             f.delete();

-            mFile.setStoragePath(null);
-            mStorageManager.saveFile(mFile);
+            file.setStoragePath(null);
+            mStorageManager.saveFile(file);

             finish();
         }
     }
             finish();
         }
     }


@@ -432,33 +409,6 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
     }
     
 
     }
     
 

-    /**
-     * {@inheritDoc}
-     */
-    public OCFile getFile(){
-        return mFile;
-    }
-    
-    /*
-    /**
-     * Use this method to signal this Activity that it shall update its view.
-     * 
-     * @param file : An {@link OCFile}
-     *-/
-    public void updateFileDetails(OCFile file, Account ocAccount) {
-        mFile = file;
-        if (ocAccount != null && ( 
-                mStorageManager == null || 
-                (mAccount != null && !mAccount.equals(ocAccount))
-           )) {
-            mStorageManager = new FileDataStorageManager(ocAccount, getActivity().getApplicationContext().getContentResolver());
-        }
-        mAccount = ocAccount;
-        updateFileDetails(false);
-    }
-    */
-    
-

     private class BitmapLoader extends AsyncTask<String, Void, Bitmap> {
 
         /**
     private class BitmapLoader extends AsyncTask<String, Void, Bitmap> {
 
         /**


@@ -476,7 +426,18 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
         private final WeakReference<TextView> mMessageViewRef;
 
         
         private final WeakReference<TextView> mMessageViewRef;
 
         

-        private Throwable mThrowable;
+        /**
+         * Weak reference to the target {@link Progressbar} shown while the load is in progress.
+         * 
+         * Using a weak reference will avoid memory leaks if the target ImageView is retired from memory before the load finishes.
+         */
+        private final WeakReference<ProgressBar> mProgressWheelRef;
+
+        
+        /**
+         * Error message to show when a load fails 
+         */
+        private int mErrorMessageId;

         
         
         /**
         
         
         /**


@@ -484,10 +445,10 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
          * 
          * @param imageView     Target {@link ImageView} where the bitmap will be loaded into.
          */
          * 
          * @param imageView     Target {@link ImageView} where the bitmap will be loaded into.
          */

-        public BitmapLoader(ImageView imageView, TextView messageView) {
+        public BitmapLoader(ImageView imageView, TextView messageView, ProgressBar progressWheel) {

             mImageViewRef = new WeakReference<ImageView>(imageView);
             mMessageViewRef = new WeakReference<TextView>(messageView);
             mImageViewRef = new WeakReference<ImageView>(imageView);
             mMessageViewRef = new WeakReference<TextView>(messageView);

-            mThrowable = null;
+            mProgressWheelRef = new WeakReference<ProgressBar>(progressWheel);

         }
         
         
         }
         
         


@@ -517,14 +478,6 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
                 int height = options.outHeight;
                 int scale = 1;
                 
                 int height = options.outHeight;
                 int scale = 1;
                 

-                /*
-                if (width >= 2048 || height >= 2048) {  
-                    // try to scale down the image to save memory  
-                    scale = (int) Math.ceil((Math.ceil(Math.max(height, width) / 2048.)));
-                    options.inSampleSize = scale;
-                }
-                */
-                

                 Display display = getActivity().getWindowManager().getDefaultDisplay();
                 Point size = new Point();
                 int screenWidth;
                 Display display = getActivity().getWindowManager().getDefaultDisplay();
                 Point size = new Point();
                 int screenWidth;


@@ -539,70 +492,91 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
                 }
 
                 if (width > screenWidth) {
                 }
 
                 if (width > screenWidth) {

-                    // second try to scale down the image , this time depending upon the screen size; WTF... 
-                    scale = (int) Math.ceil((float)width / screenWidth);
-                    options.inSampleSize = scale;
+                    // second try to scale down the image , this time depending upon the screen size 
+                    scale = (int) Math.floor((float)width / screenWidth);

                 }
                 if (height > screenHeight) {
                 }
                 if (height > screenHeight) {

-                    scale = Math.max(scale, (int) Math.ceil((float)height / screenHeight));
+                    scale = Math.max(scale, (int) Math.floor((float)height / screenHeight));

                 }
                 }

-                
+                options.inSampleSize = scale;

 
                 // really load the bitmap
                 options.inJustDecodeBounds = false; // the next decodeFile call will be real
                 result = BitmapFactory.decodeFile(storagePath, options);
 
                 // really load the bitmap
                 options.inJustDecodeBounds = false; // the next decodeFile call will be real
                 result = BitmapFactory.decodeFile(storagePath, options);

-                //Log.d(TAG, "Image loaded - width: " + options.outWidth + ", loaded height: " + options.outHeight);
+                //Log_OC.d(TAG, "Image loaded - width: " + options.outWidth + ", loaded height: " + options.outHeight);

 
 

+                if (result == null) {
+                    mErrorMessageId = R.string.preview_image_error_unknown_format;
+                    Log_OC.e(TAG, "File could not be loaded as a bitmap: " + storagePath);
+                }
+                
+            } catch (OutOfMemoryError e) {
+                mErrorMessageId = R.string.preview_image_error_unknown_format;
+                Log_OC.e(TAG, "Out of memory occured for file " + storagePath, e);
+                    
+            } catch (NoSuchFieldError e) {
+                mErrorMessageId = R.string.common_error_unknown;
+                Log_OC.e(TAG, "Error from access to unexisting field despite protection; file " + storagePath, e);
+                    

             } catch (Throwable t) {
             } catch (Throwable t) {

-                result = null;
-                mThrowable = t; // error processing is delayed to #onPostExecute(Bitmap)
-                Log.e(TAG, "Unexpected error while creating image preview " + storagePath, t);
+                mErrorMessageId = R.string.common_error_unknown;
+                Log_OC.e(TAG, "Unexpected error loading " + getFile().getStoragePath(), t);
+                

             }
             return result;
         }
         
         @Override
         protected void onPostExecute(Bitmap result) {
             }
             return result;
         }
         
         @Override
         protected void onPostExecute(Bitmap result) {

-            if (mImageViewRef != null && result != null) {
+            hideProgressWheel();
+            if (result != null) {
+                showLoadedImage(result);
+            } else {
+                showErrorMessage();
+            }
+        }
+        
+        private void showLoadedImage(Bitmap result) {
+            if (mImageViewRef != null) {

                 final ImageView imageView = mImageViewRef.get();
                 if (imageView != null) {
                     imageView.setImageBitmap(result);
                 final ImageView imageView = mImageViewRef.get();
                 if (imageView != null) {
                     imageView.setImageBitmap(result);

+                    imageView.setVisibility(View.VISIBLE);

                     mBitmap  = result;
                     mBitmap  = result;

-                    if (mMessageViewRef != null) {
-                        final TextView messageView = mMessageViewRef.get();
-                        if (messageView != null) {
-                            messageView.setVisibility(View.GONE);
-                        }
-                    }

                 } // else , silently finish, the fragment was destroyed
                 } // else , silently finish, the fragment was destroyed

-                
-            } else if (mMessageViewRef != null && result == null) {
-                // error
-                int messageId;
-                if (mThrowable == null) {
-                    messageId = R.string.preview_image_error_unknown_format;
-                    Log.e(TAG, "File could not be loaded as a bitmap: " + mFile.getStoragePath());
-                
-                } else if (mThrowable instanceof OutOfMemoryError) {
-                    messageId = R.string.preview_image_error_unknown_format;
-                    Log.e(TAG, "Out of memory occured for file " + mFile.getStoragePath(), mThrowable);
-                    
-                } else if (mThrowable instanceof NoSuchFieldError) {
-                    messageId = R.string.common_error_unknown;
-                    Log.e(TAG, "Error from access to unexisting field despite protection; file " + mFile.getStoragePath(), mThrowable);
-                    
-                } else {
-                    messageId = R.string.common_error_unknown;
-                    Log.e(TAG, "Unexpected error loading " + mFile.getStoragePath(), mThrowable);
-                }
+            }
+            if (mMessageViewRef != null) {

                 final TextView messageView = mMessageViewRef.get();
                 if (messageView != null) {
                 final TextView messageView = mMessageViewRef.get();
                 if (messageView != null) {

-                    messageView.setText(messageId);
+                    messageView.setVisibility(View.GONE);
+                } // else , silently finish, the fragment was destroyed
+            }
+        }
+        
+        private void showErrorMessage() {
+            if (mImageViewRef != null) {
+                final ImageView imageView = mImageViewRef.get();
+                if (imageView != null) {
+                    // shows the default error icon
+                    imageView.setVisibility(View.VISIBLE);
+                } // else , silently finish, the fragment was destroyed
+            }
+            if (mMessageViewRef != null) {
+                final TextView messageView = mMessageViewRef.get();
+                if (messageView != null) {
+                    messageView.setText(mErrorMessageId);

                     messageView.setVisibility(View.VISIBLE);
                 } // else , silently finish, the fragment was destroyed
                     messageView.setVisibility(View.VISIBLE);
                 } // else , silently finish, the fragment was destroyed

-                    

             }
             }

-            
+        }
+        
+        private void hideProgressWheel() {
+            if (mProgressWheelRef != null) {
+                final ProgressBar progressWheel = mProgressWheelRef.get();
+                if (progressWheel != null) {
+                    progressWheel.setVisibility(View.GONE);
+                }
+            }

         }
         
     }
         }
         
     }


@@ -629,7 +603,7 @@ public class PreviewImageFragment extends SherlockFragment implements   FileFrag
     }
     
     private void onRemoveFileOperationFinish(RemoveFileOperation operation, RemoteOperationResult result) {
     }
     
     private void onRemoveFileOperationFinish(RemoveFileOperation operation, RemoteOperationResult result) {

-        getActivity().dismissDialog(PreviewImageActivity.DIALOG_SHORT_WAIT);
+        ((PreviewImageActivity) getActivity()).dismissLoadingDialog();

         
         if (result.isSuccess()) {
             Toast msg = Toast.makeText(getActivity().getApplicationContext(), R.string.remove_success_msg, Toast.LENGTH_LONG);
         
         if (result.isSuccess()) {
             Toast msg = Toast.makeText(getActivity().getApplicationContext(), R.string.remove_success_msg, Toast.LENGTH_LONG);