projects / pub / Android / ownCloud.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Better failure handling in files renaming and removal
[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / fragment / FileDetailFragment.java
diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index db91641..a31541a 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -22,14 +22,11 @@ import java.io.IOException;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-import org.apache.commons.httpclient.HostConfiguration;\r
 import org.apache.commons.httpclient.HttpException;\r
 import org.apache.commons.httpclient.HttpException;\r
-import org.apache.commons.httpclient.cookie.CookiePolicy;\r
 import org.apache.commons.httpclient.methods.GetMethod;\r
 import org.apache.commons.httpclient.methods.PostMethod;\r
 import org.apache.commons.httpclient.methods.StringRequestEntity;\r
 import org.apache.commons.httpclient.params.HttpConnectionManagerParams;\r
 import org.apache.commons.httpclient.methods.GetMethod;\r
 import org.apache.commons.httpclient.methods.PostMethod;\r
 import org.apache.commons.httpclient.methods.StringRequestEntity;\r
 import org.apache.commons.httpclient.params.HttpConnectionManagerParams;\r
-import org.apache.commons.httpclient.params.HttpMethodParams;\r
 import org.apache.http.HttpStatus;\r
 import org.apache.http.NameValuePair;\r
 import org.apache.http.client.utils.URLEncodedUtils;\r
 import org.apache.http.HttpStatus;\r
 import org.apache.http.NameValuePair;\r
 import org.apache.http.client.utils.URLEncodedUtils;\r
@@ -37,20 +34,17 @@ import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HTTP;\r
 import org.apache.jackrabbit.webdav.client.methods.DavMethodBase;\r
 import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;\r
 import org.apache.http.protocol.HTTP;\r
 import org.apache.jackrabbit.webdav.client.methods.DavMethodBase;\r
 import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;\r
-import org.apache.jackrabbit.webdav.client.methods.MoveMethod;\r
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;\r
 import org.json.JSONException;\r
 import org.json.JSONObject;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;\r
 import org.json.JSONException;\r
 import org.json.JSONObject;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
-import android.app.AlertDialog;\r
-import android.app.Dialog;\r
+import android.annotation.SuppressLint;\r
+import android.app.Activity;\r
 import android.content.ActivityNotFoundException;\r
 import android.content.BroadcastReceiver;\r
 import android.content.Context;\r
 import android.content.ActivityNotFoundException;\r
 import android.content.BroadcastReceiver;\r
 import android.content.Context;\r
-import android.content.DialogInterface;\r
-import android.content.DialogInterface.OnDismissListener;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.content.res.Resources.NotFoundException;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.content.res.Resources.NotFoundException;\r
@@ -58,14 +52,10 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;\r
 import android.graphics.BitmapFactory.Options;\r
 import android.graphics.Point;\r
 import android.graphics.BitmapFactory;\r
 import android.graphics.BitmapFactory.Options;\r
 import android.graphics.Point;\r
-import android.graphics.drawable.BitmapDrawable;\r
-import android.graphics.drawable.Drawable;\r
 import android.net.Uri;\r
 import android.os.AsyncTask;\r
 import android.os.Bundle;\r
 import android.net.Uri;\r
 import android.os.AsyncTask;\r
 import android.os.Bundle;\r
-import android.os.Environment;\r
 import android.os.Handler;\r
 import android.os.Handler;\r
-import android.preference.PreferenceActivity.Header;\r
 import android.support.v4.app.FragmentTransaction;\r
 import android.util.Log;\r
 import android.view.Display;\r
 import android.support.v4.app.FragmentTransaction;\r
 import android.util.Log;\r
 import android.view.Display;\r
@@ -77,7 +67,6 @@ import android.view.WindowManager.LayoutParams;
 import android.webkit.MimeTypeMap;\r
 import android.widget.Button;\r
 import android.widget.CheckBox;\r
 import android.webkit.MimeTypeMap;\r
 import android.widget.Button;\r
 import android.widget.CheckBox;\r
-import android.widget.EditText;\r
 import android.widget.ImageView;\r
 import android.widget.TextView;\r
 import android.widget.Toast;\r
 import android.widget.ImageView;\r
 import android.widget.TextView;\r
 import android.widget.Toast;\r
@@ -92,9 +81,12 @@ import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.files.services.FileDownloader;\r
 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.files.services.FileDownloader;\r
+import eu.alefzero.owncloud.files.services.FileUploader;\r
+import eu.alefzero.owncloud.ui.activity.FileDetailActivity;\r
 import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;\r
 import eu.alefzero.owncloud.utils.OwnCloudVersion;\r
 import eu.alefzero.webdav.WebdavClient;\r
 import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;\r
 import eu.alefzero.owncloud.utils.OwnCloudVersion;\r
 import eu.alefzero.webdav.WebdavClient;\r
+import eu.alefzero.webdav.WebdavUtils;\r
 \r
 /**\r
  * This Fragment is used to display the details about a file.\r
 \r
 /**\r
  * This Fragment is used to display the details about a file.\r
@@ -108,6 +100,8 @@ public class FileDetailFragment extends SherlockFragment implements
     public static final String EXTRA_FILE = "FILE";\r
     public static final String EXTRA_ACCOUNT = "ACCOUNT";\r
 \r
     public static final String EXTRA_FILE = "FILE";\r
     public static final String EXTRA_ACCOUNT = "ACCOUNT";\r
 \r
+    private FileDetailFragment.ContainerActivity mContainerActivity;\r
+    \r
     private int mLayout;\r
     private View mView;\r
     private OCFile mFile;\r
     private int mLayout;\r
     private View mView;\r
     private OCFile mFile;\r
@@ -115,6 +109,7 @@ public class FileDetailFragment extends SherlockFragment implements
     private ImageView mPreview;\r
     \r
     private DownloadFinishReceiver mDownloadFinishReceiver;\r
     private ImageView mPreview;\r
     \r
     private DownloadFinishReceiver mDownloadFinishReceiver;\r
+    private UploadFinishReceiver mUploadFinishReceiver;\r
 \r
     private static final String TAG = "FileDetailFragment";\r
     public static final String FTAG = "FileDetails"; \r
 \r
     private static final String TAG = "FileDetailFragment";\r
     public static final String FTAG = "FileDetails"; \r
@@ -151,6 +146,20 @@ public class FileDetailFragment extends SherlockFragment implements
         }\r
     }\r
     \r
         }\r
     }\r
     \r
+\r
+    /**\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r
+    public void onAttach(Activity activity) {\r
+        super.onAttach(activity);\r
+        try {\r
+            mContainerActivity = (ContainerActivity) activity;\r
+        } catch (ClassCastException e) {\r
+            throw new ClassCastException(activity.toString() + " must implement FileListFragment.ContainerActivity");\r
+        }\r
+    }\r
+    \r
     \r
     @Override\r
     public View onCreateView(LayoutInflater inflater, ViewGroup container,\r
     \r
     @Override\r
     public View onCreateView(LayoutInflater inflater, ViewGroup container,\r
@@ -168,9 +177,11 @@ public class FileDetailFragment extends SherlockFragment implements
         \r
         if (mLayout == R.layout.file_details_fragment) {\r
             mView.findViewById(R.id.fdKeepInSync).setOnClickListener(this);\r
         \r
         if (mLayout == R.layout.file_details_fragment) {\r
             mView.findViewById(R.id.fdKeepInSync).setOnClickListener(this);\r
-            //mView.findViewById(R.id.fdShareBtn).setOnClickListener(this);\r
             mView.findViewById(R.id.fdRenameBtn).setOnClickListener(this);\r
             mView.findViewById(R.id.fdRenameBtn).setOnClickListener(this);\r
+            mView.findViewById(R.id.fdDownloadBtn).setOnClickListener(this);\r
+            mView.findViewById(R.id.fdOpenBtn).setOnClickListener(this);\r
             mView.findViewById(R.id.fdRemoveBtn).setOnClickListener(this);\r
             mView.findViewById(R.id.fdRemoveBtn).setOnClickListener(this);\r
+            //mView.findViewById(R.id.fdShareBtn).setOnClickListener(this);\r
             mPreview = (ImageView)mView.findViewById(R.id.fdPreview);\r
         }\r
         \r
             mPreview = (ImageView)mView.findViewById(R.id.fdPreview);\r
         }\r
         \r
@@ -192,20 +203,31 @@ public class FileDetailFragment extends SherlockFragment implements
     @Override\r
     public void onResume() {\r
         super.onResume();\r
     @Override\r
     public void onResume() {\r
         super.onResume();\r
+        \r
         mDownloadFinishReceiver = new DownloadFinishReceiver();\r
         IntentFilter filter = new IntentFilter(\r
                 FileDownloader.DOWNLOAD_FINISH_MESSAGE);\r
         getActivity().registerReceiver(mDownloadFinishReceiver, filter);\r
         mDownloadFinishReceiver = new DownloadFinishReceiver();\r
         IntentFilter filter = new IntentFilter(\r
                 FileDownloader.DOWNLOAD_FINISH_MESSAGE);\r
         getActivity().registerReceiver(mDownloadFinishReceiver, filter);\r
+        \r
+        mUploadFinishReceiver = new UploadFinishReceiver();\r
+        filter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE);\r
+        getActivity().registerReceiver(mUploadFinishReceiver, filter);\r
+        \r
+        mPreview = (ImageView)mView.findViewById(R.id.fdPreview);\r
     }\r
 \r
     @Override\r
     public void onPause() {\r
         super.onPause();\r
     }\r
 \r
     @Override\r
     public void onPause() {\r
         super.onPause();\r
+        \r
         getActivity().unregisterReceiver(mDownloadFinishReceiver);\r
         mDownloadFinishReceiver = null;\r
         getActivity().unregisterReceiver(mDownloadFinishReceiver);\r
         mDownloadFinishReceiver = null;\r
+        \r
+        getActivity().unregisterReceiver(mUploadFinishReceiver);\r
+        mUploadFinishReceiver = null;\r
+        \r
         if (mPreview != null) {\r
             mPreview = null;\r
         if (mPreview != null) {\r
             mPreview = null;\r
-            System.gc();\r
         }\r
     }\r
 \r
         }\r
     }\r
 \r
@@ -220,14 +242,17 @@ public class FileDetailFragment extends SherlockFragment implements
     public void onClick(View v) {\r
         switch (v.getId()) {\r
             case R.id.fdDownloadBtn: {\r
     public void onClick(View v) {\r
         switch (v.getId()) {\r
             case R.id.fdDownloadBtn: {\r
-                //Toast.makeText(getActivity(), "Downloading", Toast.LENGTH_LONG).show();\r
                 Intent i = new Intent(getActivity(), FileDownloader.class);\r
                 i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);\r
                 i.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mFile.getRemotePath());\r
                 Intent i = new Intent(getActivity(), FileDownloader.class);\r
                 i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);\r
                 i.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mFile.getRemotePath());\r
-                i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getURLDecodedRemotePath());\r
+                i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getRemotePath());\r
                 i.putExtra(FileDownloader.EXTRA_FILE_SIZE, mFile.getFileLength());\r
                 i.putExtra(FileDownloader.EXTRA_FILE_SIZE, mFile.getFileLength());\r
-                v.setEnabled(false);\r
+                \r
+                // update ui \r
+                setButtonsForTransferring();\r
+                \r
                 getActivity().startService(i);\r
                 getActivity().startService(i);\r
+                mContainerActivity.onFileStateChanged();    // this is not working; it is performed before the fileDownloadService registers it as 'in progress'\r
                 break;\r
             }\r
             case R.id.fdKeepInSync: {\r
                 break;\r
             }\r
             case R.id.fdKeepInSync: {\r
@@ -235,8 +260,10 @@ public class FileDetailFragment extends SherlockFragment implements
                 mFile.setKeepInSync(cb.isChecked());\r
                 FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());\r
                 fdsm.saveFile(mFile);\r
                 mFile.setKeepInSync(cb.isChecked());\r
                 FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());\r
                 fdsm.saveFile(mFile);\r
-                if (mFile.keepInSync() && !mFile.isDownloaded()) {\r
+                if (mFile.keepInSync()) {\r
                     onClick(getView().findViewById(R.id.fdDownloadBtn));\r
                     onClick(getView().findViewById(R.id.fdDownloadBtn));\r
+                } else {    \r
+                    mContainerActivity.onFileStateChanged();    // put inside 'else' to not call it twice (here, and in the virtual click on fdDownloadBtn)\r
                 }\r
                 break;\r
             }\r
                 }\r
                 break;\r
             }\r
@@ -247,11 +274,57 @@ public class FileDetailFragment extends SherlockFragment implements
                 break;\r
             }   \r
             case R.id.fdRemoveBtn: {\r
                 break;\r
             }   \r
             case R.id.fdRemoveBtn: {\r
-                ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance("to remove " + mFile.getFileName());\r
+                ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance(\r
+                        R.string.confirmation_remove_alert,\r
+                        new String[]{mFile.getFileName()},\r
+                        mFile.isDown() ? R.string.confirmation_remove_remote_and_local : R.string.confirmation_remove_remote,\r
+                        mFile.isDown() ? R.string.confirmation_remove_local : -1,\r
+                        R.string.common_cancel);\r
                 confDialog.setOnConfirmationListener(this);\r
                 confDialog.show(getFragmentManager(), FTAG_CONFIRMATION);\r
                 break;\r
             }\r
                 confDialog.setOnConfirmationListener(this);\r
                 confDialog.show(getFragmentManager(), FTAG_CONFIRMATION);\r
                 break;\r
             }\r
+            case R.id.fdOpenBtn: {\r
+                String storagePath = mFile.getStoragePath();\r
+                String encodedStoragePath = WebdavUtils.encodePath(storagePath);\r
+                try {\r
+                    Intent i = new Intent(Intent.ACTION_VIEW);\r
+                    i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mFile.getMimetype());\r
+                    i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);\r
+                    startActivity(i);\r
+                    \r
+                } catch (Throwable t) {\r
+                    Log.e(TAG, "Fail when trying to open with the mimeType provided from the ownCloud server: " + mFile.getMimetype());\r
+                    boolean toastIt = true; \r
+                    String mimeType = "";\r
+                    try {\r
+                        Intent i = new Intent(Intent.ACTION_VIEW);\r
+                        mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));\r
+                        if (mimeType != null && !mimeType.equals(mFile.getMimetype())) {\r
+                            i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mimeType);\r
+                            i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);\r
+                            startActivity(i);\r
+                            toastIt = false;\r
+                        }\r
+                        \r
+                    } catch (IndexOutOfBoundsException e) {\r
+                        Log.e(TAG, "Trying to find out MIME type of a file without extension: " + storagePath);\r
+                        \r
+                    } catch (ActivityNotFoundException e) {\r
+                        Log.e(TAG, "No activity found to handle: " + storagePath + " with MIME type " + mimeType + " obtained from extension");\r
+                        \r
+                    } catch (Throwable th) {\r
+                        Log.e(TAG, "Unexpected problem when opening: " + storagePath, th);\r
+                        \r
+                    } finally {\r
+                        if (toastIt) {\r
+                            Toast.makeText(getActivity(), "There is no application to handle file " + mFile.getFileName(), Toast.LENGTH_SHORT).show();\r
+                        }\r
+                    }\r
+                    \r
+                }\r
+                break;\r
+            }\r
             default:\r
                 Log.e(TAG, "Incorrect view clicked!");\r
         }\r
             default:\r
                 Log.e(TAG, "Incorrect view clicked!");\r
         }\r
@@ -264,14 +337,32 @@ public class FileDetailFragment extends SherlockFragment implements
     \r
     \r
     @Override\r
     \r
     \r
     @Override\r
-    public void onConfirmation(boolean confirmation, String callerTag) {\r
-        if (confirmation && callerTag.equals(FTAG_CONFIRMATION)) {\r
-            Log.e("ASD","onConfirmation");\r
+    public void onConfirmation(String callerTag) {\r
+        if (callerTag.equals(FTAG_CONFIRMATION)) {\r
             FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
             if (fdsm.getFileById(mFile.getFileId()) != null) {\r
                 new Thread(new RemoveRunnable(mFile, mAccount, new Handler())).start();\r
             FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
             if (fdsm.getFileById(mFile.getFileId()) != null) {\r
                 new Thread(new RemoveRunnable(mFile, mAccount, new Handler())).start();\r
+                boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
+                getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
             }\r
             }\r
-        } else if (!confirmation) Log.d(TAG, "REMOVAL CANCELED");\r
+        }\r
+    }\r
+    \r
+    @Override\r
+    public void onNeutral(String callerTag) {\r
+        FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
+        File f = null;\r
+        if (mFile.isDown() && (f = new File(mFile.getStoragePath())).exists()) {\r
+            f.delete();\r
+            mFile.setStoragePath(null);\r
+            fdsm.saveFile(mFile);\r
+            updateFileDetails(mFile, mAccount);\r
+        }\r
+    }\r
+    \r
+    @Override\r
+    public void onCancel(String callerTag) {\r
+        Log.d(TAG, "REMOVAL CANCELED");\r
     }\r
     \r
     \r
     }\r
     \r
     \r
@@ -312,7 +403,6 @@ public class FileDetailFragment extends SherlockFragment implements
 \r
         if (mFile != null && mAccount != null && mLayout == R.layout.file_details_fragment) {\r
             \r
 \r
         if (mFile != null && mAccount != null && mLayout == R.layout.file_details_fragment) {\r
             \r
-            Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);\r
             // set file details\r
             setFilename(mFile.getFileName());\r
             setFiletype(DisplayUtils.convertMIMEtoPrettyPrint(mFile\r
             // set file details\r
             setFilename(mFile.getFileName());\r
             setFiletype(DisplayUtils.convertMIMEtoPrettyPrint(mFile\r
@@ -326,61 +416,22 @@ public class FileDetailFragment extends SherlockFragment implements
             \r
             CheckBox cb = (CheckBox)getView().findViewById(R.id.fdKeepInSync);\r
             cb.setChecked(mFile.keepInSync());\r
             \r
             CheckBox cb = (CheckBox)getView().findViewById(R.id.fdKeepInSync);\r
             cb.setChecked(mFile.keepInSync());\r
-            \r
-            if (mFile.getStoragePath() != null) {\r
+\r
+            // configure UI for depending upon local state of the file\r
+            if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath()) || FileUploader.isUploading(mAccount, mFile.getRemotePath())) {\r
+                setButtonsForTransferring();\r
+                \r
+            } else if (mFile.isDown()) {\r
                 // Update preview\r
                 if (mFile.getMimetype().startsWith("image/")) {\r
                     BitmapLoader bl = new BitmapLoader();\r
                     bl.execute(new String[]{mFile.getStoragePath()});\r
                 }\r
                 \r
                 // Update preview\r
                 if (mFile.getMimetype().startsWith("image/")) {\r
                     BitmapLoader bl = new BitmapLoader();\r
                     bl.execute(new String[]{mFile.getStoragePath()});\r
                 }\r
                 \r
-                // Change download button to open button\r
-                downloadButton.setText(R.string.filedetails_open);\r
-                downloadButton.setOnClickListener(new OnClickListener() {\r
-                    @Override\r
-                    public void onClick(View v) {\r
-                        String storagePath = mFile.getStoragePath();\r
-                        try {\r
-                            Intent i = new Intent(Intent.ACTION_VIEW);\r
-                            i.setDataAndType(Uri.parse("file://"+ storagePath), mFile.getMimetype());\r
-                            i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);\r
-                            startActivity(i);\r
-                            \r
-                        } catch (Throwable t) {\r
-                            Log.e(TAG, "Fail when trying to open with the mimeType provided from the ownCloud server: " + mFile.getMimetype());\r
-                            boolean toastIt = true; \r
-                            String mimeType = "";\r
-                            try {\r
-                                Intent i = new Intent(Intent.ACTION_VIEW);\r
-                                mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));\r
-                                if (mimeType != null && !mimeType.equals(mFile.getMimetype())) {\r
-                                    i.setDataAndType(Uri.parse("file://"+mFile.getStoragePath()), mimeType);\r
-                                    i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);\r
-                                    startActivity(i);\r
-                                    toastIt = false;\r
-                                }\r
-                                \r
-                            } catch (IndexOutOfBoundsException e) {\r
-                                Log.e(TAG, "Trying to find out MIME type of a file without extension: " + storagePath);\r
-                                \r
-                            } catch (ActivityNotFoundException e) {\r
-                                Log.e(TAG, "No activity found to handle: " + storagePath + " with MIME type " + mimeType + " obtained from extension");\r
-                                \r
-                            } catch (Throwable th) {\r
-                                Log.e(TAG, "Unexpected problem when opening: " + storagePath, th);\r
-                                \r
-                            } finally {\r
-                                if (toastIt) {\r
-                                    Toast.makeText(getActivity(), "There is no application to handle file " + mFile.getFileName(), Toast.LENGTH_SHORT).show();\r
-                                }\r
-                            }\r
-                            \r
-                        }\r
-                    }\r
-                });\r
+                setButtonsForDown();\r
+                \r
             } else {\r
             } else {\r
-                // Make download button effective\r
-                downloadButton.setOnClickListener(this);\r
+                setButtonsForRemote();\r
             }\r
         }\r
     }\r
             }\r
         }\r
     }\r
@@ -442,6 +493,53 @@ public class FileDetailFragment extends SherlockFragment implements
     }\r
     \r
     /**\r
     }\r
     \r
     /**\r
+     * Enables or disables buttons for a file being downloaded\r
+     */\r
+    private void setButtonsForTransferring() {\r
+        if (!isEmpty()) {\r
+            Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);\r
+            //downloadButton.setText(R.string.filedetails_download_in_progress);    // ugly\r
+            downloadButton.setEnabled(false);   // TODO replace it with a 'cancel download' button\r
+        \r
+            // let's protect the user from himself ;)\r
+            ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(false);\r
+            ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(false);\r
+            ((Button) getView().findViewById(R.id.fdRemoveBtn)).setEnabled(false);\r
+        }\r
+    }\r
+    \r
+    /**\r
+     * Enables or disables buttons for a file locally available \r
+     */\r
+    private void setButtonsForDown() {\r
+        if (!isEmpty()) {\r
+            Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);\r
+            //downloadButton.setText(R.string.filedetails_redownload);      // ugly\r
+            downloadButton.setEnabled(true);\r
+        \r
+            ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(true);\r
+            ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(true);\r
+            ((Button) getView().findViewById(R.id.fdRemoveBtn)).setEnabled(true);\r
+        }\r
+    }\r
+\r
+    /**\r
+     * Enables or disables buttons for a file not locally available \r
+     */\r
+    private void setButtonsForRemote() {\r
+        if (!isEmpty()) {\r
+            Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);\r
+            //downloadButton.setText(R.string.filedetails_download);    // unnecessary\r
+            downloadButton.setEnabled(true);\r
+            \r
+            ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(false);\r
+            ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(true);\r
+            ((Button) getView().findViewById(R.id.fdRemoveBtn)).setEnabled(true);\r
+        }\r
+    }\r
+    \r
+\r
+    /**\r
      * In ownCloud 3.X.X and 4.X.X there is a bug that SabreDAV does not return\r
      * the time that the file was created. There is a chance that this will\r
      * be fixed in future versions. Use this method to check if this version of\r
      * In ownCloud 3.X.X and 4.X.X there is a bug that SabreDAV does not return\r
      * the time that the file was created. There is a chance that this will\r
      * be fixed in future versions. Use this method to check if this version of\r
@@ -459,6 +557,31 @@ public class FileDetailFragment extends SherlockFragment implements
         }*/\r
         return false;\r
     }\r
         }*/\r
         return false;\r
     }\r
+    \r
+    \r
+    /**\r
+     * Interface to implement by any Activity that includes some instance of FileDetailFragment\r
+     * \r
+     * @author David A. Velasco\r
+     */\r
+    public interface ContainerActivity {\r
+\r
+        /**\r
+         * Callback method invoked when the detail fragment wants to notice its container \r
+         * activity about a relevant state the file shown by the fragment.\r
+         * \r
+         * Added to notify to FileDisplayActivity about the need of refresh the files list. \r
+         * \r
+         * Currently called when:\r
+         *  - a download is started;\r
+         *  - a rename is completed;\r
+         *  - a deletion is completed;\r
+         *  - the 'inSync' flag is changed;\r
+         */\r
+        public void onFileStateChanged();\r
+        \r
+    }\r
+    \r
 \r
     /**\r
      * Once the file download has finished -> update view\r
 \r
     /**\r
      * Once the file download has finished -> update view\r
@@ -467,19 +590,52 @@ public class FileDetailFragment extends SherlockFragment implements
     private class DownloadFinishReceiver extends BroadcastReceiver {\r
         @Override\r
         public void onReceive(Context context, Intent intent) {\r
     private class DownloadFinishReceiver extends BroadcastReceiver {\r
         @Override\r
         public void onReceive(Context context, Intent intent) {\r
-            if (getView()!=null && getView().findViewById(R.id.fdDownloadBtn) != null) \r
-                getView().findViewById(R.id.fdDownloadBtn).setEnabled(true);\r
-            \r
-            if (intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false)) {\r
-                mFile.setStoragePath(intent.getStringExtra(FileDownloader.EXTRA_FILE_PATH));\r
-                updateFileDetails();\r
-            } else if (intent.getAction().equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) {\r
-                Toast.makeText(context, R.string.downloader_download_failed , Toast.LENGTH_SHORT).show();\r
+            String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);\r
+\r
+            if (!isEmpty() && accountName.equals(mAccount.name)) {\r
+                boolean downloadWasFine = intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false);\r
+                String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);\r
+                if (mFile.getRemotePath().equals(downloadedRemotePath)) {\r
+                    if (downloadWasFine) {\r
+                        mFile.setStoragePath(intent.getStringExtra(FileDownloader.EXTRA_FILE_PATH));    // updates the local object without accessing the database again\r
+                    }\r
+                    updateFileDetails();    // it updates the buttons; must be called although !downloadWasFine\r
+                }\r
+            }\r
+        }\r
+    }\r
+    \r
+    \r
+    /**\r
+     * Once the file upload has finished -> update view\r
+     * \r
+     * Being notified about the finish of an upload is necessary for the next sequence:\r
+     *   1. Upload a big file.\r
+     *   2. Force a synchronization; if it finished before the upload, the file in transfer will be included in the local database and in the file list\r
+     *      of its containing folder; the the server includes it in the PROPFIND requests although it's not fully upload. \r
+     *   3. Click the file in the list to see its details.\r
+     *   4. Wait for the upload finishes; at this moment, the details view must be refreshed to enable the action buttons.\r
+     */\r
+    private class UploadFinishReceiver extends BroadcastReceiver {\r
+        @Override\r
+        public void onReceive(Context context, Intent intent) {\r
+            String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME);\r
+\r
+            if (!isEmpty() && accountName.equals(mAccount.name)) {\r
+                boolean uploadWasFine = intent.getBooleanExtra(FileUploader.EXTRA_UPLOAD_RESULT, false);\r
+                String uploadRemotePath = intent.getStringExtra(FileUploader.EXTRA_REMOTE_PATH);\r
+                if (mFile.getRemotePath().equals(uploadRemotePath)) {\r
+                    if (uploadWasFine) {\r
+                        FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());\r
+                        mFile = fdsm.getFileByPath(mFile.getRemotePath());\r
+                    }\r
+                    updateFileDetails();    // it updates the buttons; must be called although !uploadWasFine; interrupted uploads still leave an incomplete file in the server\r
+                }\r
             }\r
         }\r
             }\r
         }\r
-        \r
     }\r
     \r
     }\r
     \r
+\r
     // this is a temporary class for sharing purposes, it need to be replaced in transfer service\r
     private class ShareRunnable implements Runnable {\r
         private String mPath;\r
     // this is a temporary class for sharing purposes, it need to be replaced in transfer service\r
     private class ShareRunnable implements Runnable {\r
         private String mPath;\r
@@ -595,7 +751,6 @@ public class FileDetailFragment extends SherlockFragment implements
     }\r
     \r
     public void onDismiss(EditNameFragment dialog) {\r
     }\r
     \r
     public void onDismiss(EditNameFragment dialog) {\r
-        Log.e("ASD","ondismiss");\r
         if (dialog instanceof EditNameFragment) {\r
             if (((EditNameFragment)dialog).getResult()) {\r
                 String newFilename = ((EditNameFragment)dialog).getNewFilename();\r
         if (dialog instanceof EditNameFragment) {\r
             if (((EditNameFragment)dialog).getResult()) {\r
                 String newFilename = ((EditNameFragment)dialog).getNewFilename();\r
@@ -603,7 +758,7 @@ public class FileDetailFragment extends SherlockFragment implements
                 if (!newFilename.equals(mFile.getFileName())) {\r
                     FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
                     if (fdsm.getFileById(mFile.getFileId()) != null) {\r
                 if (!newFilename.equals(mFile.getFileName())) {\r
                     FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
                     if (fdsm.getFileById(mFile.getFileId()) != null) {\r
-                        OCFile newFile = new OCFile(fdsm.getFileById(mFile.getParentId()).getRemotePath()+"/"+newFilename);\r
+                        OCFile newFile = new OCFile(fdsm.getFileById(mFile.getParentId()).getRemotePath() + newFilename);\r
                         newFile.setCreationTimestamp(mFile.getCreationTimestamp());\r
                         newFile.setFileId(mFile.getFileId());\r
                         newFile.setFileLength(mFile.getFileLength());\r
                         newFile.setCreationTimestamp(mFile.getCreationTimestamp());\r
                         newFile.setFileId(mFile.getFileId());\r
                         newFile.setFileLength(mFile.getFileLength());\r
@@ -612,15 +767,30 @@ public class FileDetailFragment extends SherlockFragment implements
                         newFile.setMimetype(mFile.getMimetype());\r
                         newFile.setModificationTimestamp(mFile.getModificationTimestamp());\r
                         newFile.setParentId(mFile.getParentId());\r
                         newFile.setMimetype(mFile.getMimetype());\r
                         newFile.setModificationTimestamp(mFile.getModificationTimestamp());\r
                         newFile.setParentId(mFile.getParentId());\r
-                        newFile.setStoragePath(mFile.getStoragePath());\r
+                        boolean localRenameFails = false;\r
+                        if (mFile.isDown()) {\r
+                            File f = new File(mFile.getStoragePath());\r
+                            Log.e(TAG, f.getAbsolutePath());\r
+                            localRenameFails = !(f.renameTo(new File(f.getParent() + File.separator + newFilename)));\r
+                            Log.e(TAG, f.getParent() + File.separator + newFilename);\r
+                            newFile.setStoragePath(f.getParent() + File.separator + newFilename);\r
+                        }\r
                         \r
                         \r
-                        new Thread(new RenameRunnable(mFile, newFile, mAccount, new Handler())).start();\r
+                        if (localRenameFails) {\r
+                            Toast msg = Toast.makeText(getActivity(), R.string.rename_local_fail_msg, Toast.LENGTH_LONG); \r
+                            msg.show();\r
+                            \r
+                        } else {\r
+                            new Thread(new RenameRunnable(mFile, newFile, mAccount, new Handler())).start();\r
+                            boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
+                            getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
+                        }\r
 \r
                     }\r
                 }\r
             }\r
         } else {\r
 \r
                     }\r
                 }\r
             }\r
         } else {\r
-            Log.e(TAG, "Unknown dialog intance passed to onDismissDalog: " + dialog.getClass().getCanonicalName());\r
+            Log.e(TAG, "Unknown dialog instance passed to onDismissDalog: " + dialog.getClass().getCanonicalName());\r
         }\r
         \r
     }\r
         }\r
         \r
     }\r
@@ -640,36 +810,63 @@ public class FileDetailFragment extends SherlockFragment implements
         \r
         public void run() {\r
             WebdavClient wc = new WebdavClient(mAccount, getSherlockActivity().getApplicationContext());\r
         \r
         public void run() {\r
             WebdavClient wc = new WebdavClient(mAccount, getSherlockActivity().getApplicationContext());\r
+            wc.allowSelfsignedCertificates();\r
             AccountManager am = AccountManager.get(getSherlockActivity());\r
             String baseUrl = am.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL);\r
             OwnCloudVersion ocv = new OwnCloudVersion(am.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION));\r
             String webdav_path = AccountUtils.getWebdavPath(ocv);\r
             AccountManager am = AccountManager.get(getSherlockActivity());\r
             String baseUrl = am.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL);\r
             OwnCloudVersion ocv = new OwnCloudVersion(am.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION));\r
             String webdav_path = AccountUtils.getWebdavPath(ocv);\r
-            Log.d("ASD", ""+baseUrl + webdav_path + mOld.getRemotePath());\r
+            Log.d("ASD", ""+baseUrl + webdav_path + WebdavUtils.encodePath(mOld.getRemotePath()));\r
 \r
 \r
-            Log.e("ASD", Uri.parse(baseUrl).getPath() == null ? "" : Uri.parse(baseUrl).getPath() + webdav_path + mNew.getRemotePath());\r
-            LocalMoveMethod move = new LocalMoveMethod(baseUrl + webdav_path + mOld.getRemotePath(),\r
-                                             Uri.parse(baseUrl).getPath() == null ? "" : Uri.parse(baseUrl).getPath() + webdav_path + mNew.getRemotePath());\r
+            Log.e("ASD", Uri.parse(baseUrl).getPath() == null ? "" : Uri.parse(baseUrl).getPath() + webdav_path + WebdavUtils.encodePath(mNew.getRemotePath()));\r
+            LocalMoveMethod move = new LocalMoveMethod(baseUrl + webdav_path + WebdavUtils.encodePath(mOld.getRemotePath()),\r
+                                             Uri.parse(baseUrl).getPath() == null ? "" : Uri.parse(baseUrl).getPath() + webdav_path + WebdavUtils.encodePath(mNew.getRemotePath()));\r
             \r
             \r
+            boolean success = false;\r
             try {\r
                 int status = wc.executeMethod(move);\r
             try {\r
                 int status = wc.executeMethod(move);\r
-                if (move.succeeded()) {\r
-                    FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
-                    fdsm.removeFile(mOld);\r
-                    fdsm.saveFile(mNew);\r
-                    mFile = mNew;\r
-                    mHandler.post(new Runnable() {\r
-                        @Override\r
-                        public void run() { updateFileDetails(mFile, mAccount); }\r
-                    });\r
-                }\r
-                Log.e("ASD", ""+move.getQueryString());\r
-                Log.d("move", "returned status " + status);\r
+                success = move.succeeded();\r
+                Log.d(TAG, "Move returned status: " + status);\r
+                \r
             } catch (HttpException e) {\r
             } catch (HttpException e) {\r
-                // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
+                Log.e(TAG, "HTTP Exception renaming file " + mOld.getRemotePath() + " to " + mNew.getRemotePath(), e);\r
+                \r
             } catch (IOException e) {\r
             } catch (IOException e) {\r
-                // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
+                Log.e(TAG, "I/O Exception renaming file " + mOld.getRemotePath() + " to " + mNew.getRemotePath(), e);\r
+                \r
+            } catch (Exception e) {\r
+                Log.e(TAG, "Unexpected exception renaming file " + mOld.getRemotePath() + " to " + mNew.getRemotePath(), e);\r
+            }\r
+            \r
+            if (success) {\r
+                FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
+                fdsm.removeFile(mOld);\r
+                fdsm.saveFile(mNew);\r
+                mFile = mNew;\r
+                mHandler.post(new Runnable() {\r
+                    @Override\r
+                    public void run() { \r
+                        boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
+                        getActivity().dismissDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
+                        updateFileDetails(mFile, mAccount);\r
+                        mContainerActivity.onFileStateChanged();\r
+                    }\r
+                });\r
+                \r
+            } else {\r
+                mHandler.post(new Runnable() {\r
+                    @Override\r
+                    public void run() {\r
+                        boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
+                        getActivity().dismissDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
+                        try {\r
+                            Toast msg = Toast.makeText(getActivity(), R.string.rename_server_fail_msg, Toast.LENGTH_LONG); \r
+                            msg.show();\r
+                            \r
+                        } catch (NotFoundException e) {\r
+                            e.printStackTrace();\r
+                        }\r
+                    }\r
+                });\r
             }\r
         }\r
         private class LocalMoveMethod extends DavMethodBase {\r
             }\r
         }\r
         private class LocalMoveMethod extends DavMethodBase {\r
@@ -753,7 +950,6 @@ public class FileDetailFragment extends SherlockFragment implements
         \r
     }\r
     \r
         \r
     }\r
     \r
-    \r
     private class RemoveRunnable implements Runnable {\r
         \r
         Account mAccount;\r
     private class RemoveRunnable implements Runnable {\r
         \r
         Account mAccount;\r
@@ -768,77 +964,83 @@ public class FileDetailFragment extends SherlockFragment implements
         \r
         public void run() {\r
             WebdavClient wc = new WebdavClient(mAccount, getSherlockActivity().getApplicationContext());\r
         \r
         public void run() {\r
             WebdavClient wc = new WebdavClient(mAccount, getSherlockActivity().getApplicationContext());\r
+            wc.allowSelfsignedCertificates();\r
             AccountManager am = AccountManager.get(getSherlockActivity());\r
             String baseUrl = am.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL);\r
             OwnCloudVersion ocv = new OwnCloudVersion(am.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION));\r
             String webdav_path = AccountUtils.getWebdavPath(ocv);\r
             AccountManager am = AccountManager.get(getSherlockActivity());\r
             String baseUrl = am.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL);\r
             OwnCloudVersion ocv = new OwnCloudVersion(am.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION));\r
             String webdav_path = AccountUtils.getWebdavPath(ocv);\r
-            Log.d("ASD", ""+baseUrl + webdav_path + mFileToRemove.getRemotePath());\r
+            Log.d("ASD", ""+baseUrl + webdav_path + WebdavUtils.encodePath(mFileToRemove.getRemotePath()));\r
 \r
 \r
-            DeleteMethod delete = new DeleteMethod(baseUrl + webdav_path + mFileToRemove.getRemotePath());\r
-            HttpMethodParams params = delete.getParams();\r
-            params.setSoTimeout(1000);\r
-            delete.setParams(params);\r
+            DeleteMethod delete = new DeleteMethod(baseUrl + webdav_path + WebdavUtils.encodePath(mFileToRemove.getRemotePath()));\r
             \r
             boolean success = false;\r
             \r
             boolean success = false;\r
+            int status = -1;\r
             try {\r
             try {\r
-                int status = wc.executeMethod(delete);\r
-                if (delete.succeeded()) {\r
-                    FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
-                    fdsm.removeFile(mFileToRemove);\r
-                    mHandler.post(new Runnable() {\r
-                        @Override\r
-                        public void run() { \r
-                            try {\r
-                                Toast msg = Toast.makeText(getActivity().getApplicationContext(), R.string.remove_success_msg, Toast.LENGTH_LONG);\r
-                                msg.show();\r
-                                if (getActivity() instanceof FileDisplayActivity) {\r
-                                    // double pane\r
-                                    FragmentTransaction transaction = getActivity().getSupportFragmentManager().beginTransaction();\r
-                                    transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
-                                    transaction.commit();\r
-                                    \r
-                                } else {\r
-                                    getActivity().finish();\r
-                                }\r
-                                \r
-                            } catch (NotFoundException e) {\r
-                                e.printStackTrace();\r
-                            }\r
-                        }\r
-                    });\r
-                    success = true;\r
-                }\r
-                Log.e("ASD", ""+ delete.getQueryString());\r
-                Log.d("delete", "returned status " + status);\r
+                status = wc.executeMethod(delete);\r
+                success = (delete.succeeded());\r
+                Log.d(TAG, "Delete: returned status " + status);\r
                 \r
             } catch (HttpException e) {\r
                 \r
             } catch (HttpException e) {\r
-                e.printStackTrace();\r
+                Log.e(TAG, "HTTP Exception removing file " + mFileToRemove.getRemotePath(), e);\r
                 \r
             } catch (IOException e) {\r
                 \r
             } catch (IOException e) {\r
-                e.printStackTrace();\r
+                Log.e(TAG, "I/O Exception removing file " + mFileToRemove.getRemotePath(), e);\r
                 \r
                 \r
-            } finally {\r
-                if (!success) {\r
-                    mHandler.post(new Runnable() {\r
-                        @Override\r
-                        public void run() {\r
-                            try {\r
-                                Toast msg = Toast.makeText(getActivity(), R.string.remove_fail_msg, Toast.LENGTH_LONG); \r
-                                msg.show();\r
-                            \r
-                            } catch (NotFoundException e) {\r
-                                e.printStackTrace();\r
+            } catch (Exception e) {\r
+                Log.e(TAG, "Unexpected exception removing file " + mFileToRemove.getRemotePath(), e);\r
+            }\r
+            \r
+            if (success) {\r
+                FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
+                fdsm.removeFile(mFileToRemove);\r
+                mHandler.post(new Runnable() {\r
+                    @Override\r
+                    public void run() {\r
+                        boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
+                        getActivity().dismissDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
+                        try {\r
+                            Toast msg = Toast.makeText(getActivity().getApplicationContext(), R.string.remove_success_msg, Toast.LENGTH_LONG);\r
+                            msg.show();\r
+                            if (inDisplayActivity) {\r
+                                // double pane\r
+                                FragmentTransaction transaction = getActivity().getSupportFragmentManager().beginTransaction();\r
+                                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
+                                transaction.commit();\r
+                                mContainerActivity.onFileStateChanged();\r
+                                \r
+                            } else {\r
+                                getActivity().finish();\r
                             }\r
                             }\r
+                            \r
+                        } catch (NotFoundException e) {\r
+                            e.printStackTrace();\r
                         }\r
                         }\r
-                    });\r
-                }\r
+                    }\r
+                });\r
+                \r
+            } else {\r
+                mHandler.post(new Runnable() {\r
+                    @Override\r
+                    public void run() {\r
+                        boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
+                        getActivity().dismissDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
+                        try {\r
+                            Toast msg = Toast.makeText(getActivity(), R.string.remove_fail_msg, Toast.LENGTH_LONG); \r
+                            msg.show();\r
+                            \r
+                        } catch (NotFoundException e) {\r
+                            e.printStackTrace();\r
+                        }\r
+                    }\r
+                });\r
             }\r
         }\r
         \r
     }\r
     \r
     class BitmapLoader extends AsyncTask<String, Void, Bitmap> {\r
             }\r
         }\r
         \r
     }\r
     \r
     class BitmapLoader extends AsyncTask<String, Void, Bitmap> {\r
-        @Override\r
+        @SuppressLint({ "NewApi", "NewApi", "NewApi" }) // to avoid Lint errors since Android SDK r20\r
+               @Override\r
         protected Bitmap doInBackground(String... params) {\r
             Bitmap result = null;\r
             if (params.length != 1) return result;\r
         protected Bitmap doInBackground(String... params) {\r
             Bitmap result = null;\r
             if (params.length != 1) return result;\r
@@ -848,6 +1050,7 @@ public class FileDetailFragment extends SherlockFragment implements
                 BitmapFactory.Options options = new Options();\r
                 options.inScaled = true;\r
                 options.inPurgeable = true;\r
                 BitmapFactory.Options options = new Options();\r
                 options.inScaled = true;\r
                 options.inPurgeable = true;\r
+                options.inJustDecodeBounds = true;\r
                 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {\r
                     options.inPreferQualityOverSpeed = false;\r
                 }\r
                 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {\r
                     options.inPreferQualityOverSpeed = false;\r
                 }\r
@@ -856,40 +1059,36 @@ public class FileDetailFragment extends SherlockFragment implements
                 }\r
 \r
                 result = BitmapFactory.decodeFile(storagePath, options);\r
                 }\r
 \r
                 result = BitmapFactory.decodeFile(storagePath, options);\r
+                options.inJustDecodeBounds = false;\r
 \r
 \r
-                if (result != null) {\r
-                    int width = options.outWidth;\r
-                    int height = options.outHeight;\r
-                    int scale = 1;\r
-                    boolean recycle = false;\r
-                    if (width >= 2048 || height >= 2048) {\r
-                        scale = (int) (Math.ceil(Math.max(height, width) / 2048.));\r
-                        options.inSampleSize = scale;\r
-                        recycle = true;\r
-                    }\r
-                    Display display = getActivity().getWindowManager().getDefaultDisplay();\r
-                    Point size = new Point();\r
-                    int screenwidth;\r
-                    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB_MR2) {\r
-                        display.getSize(size);\r
-                        screenwidth = size.x;\r
-                    } else {\r
-                        screenwidth = display.getWidth();\r
-                    }\r
-\r
-                    Log.e("ASD", "W " + width + " SW " + screenwidth);\r
+                int width = options.outWidth;\r
+                int height = options.outHeight;\r
+                int scale = 1;\r
+                if (width >= 2048 || height >= 2048) {\r
+                    scale = (int) Math.ceil((Math.ceil(Math.max(height, width) / 2048.)));\r
+                    options.inSampleSize = scale;\r
+                }\r
+                Display display = getActivity().getWindowManager().getDefaultDisplay();\r
+                Point size = new Point();\r
+                int screenwidth;\r
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB_MR2) {\r
+                    display.getSize(size);\r
+                    screenwidth = size.x;\r
+                } else {\r
+                    screenwidth = display.getWidth();\r
+                }\r
 \r
 \r
-                    if (width > screenwidth) {\r
-                        scale = (int) (Math.ceil(Math.max(height, width) / screenwidth));\r
-                        options.inSampleSize = scale;\r
-                        recycle = true;\r
-                    }\r
+                Log.e("ASD", "W " + width + " SW " + screenwidth);\r
 \r
 \r
-                    if (recycle)\r
-                        result.recycle();\r
-                    result = BitmapFactory.decodeFile(storagePath, options);\r
+                if (width > screenwidth) {\r
+                    scale = (int) Math.ceil((float)width / screenwidth);\r
+                    options.inSampleSize = scale;\r
                 }\r
 \r
                 }\r
 \r
+                result = BitmapFactory.decodeFile(storagePath, options);\r
+\r
+                Log.e("ASD", "W " + options.outWidth + " SW " + options.outHeight);\r
+\r
             } catch (OutOfMemoryError e) {\r
                 result = null;\r
                 Log.e(TAG, "Out of memory occured for file with size " + storagePath);\r
             } catch (OutOfMemoryError e) {\r
                 result = null;\r
                 Log.e(TAG, "Out of memory occured for file with size " + storagePath);\r
@@ -906,7 +1105,7 @@ public class FileDetailFragment extends SherlockFragment implements
         }\r
         @Override\r
         protected void onPostExecute(Bitmap result) {\r
         }\r
         @Override\r
         protected void onPostExecute(Bitmap result) {\r
-            if (result != null) {\r
+            if (result != null && mPreview != null) {\r
                 mPreview.setImageBitmap(result);\r
             }\r
         }\r
                 mPreview.setImageBitmap(result);\r
             }\r
         }\r
ownCloud Android App