Fixed lost of track of a downloaded file when it's tried to be renamed but the operat...

[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 a31541a..f8f4206 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -856,6 +856,16 @@ public class FileDetailFragment extends SherlockFragment implements
                 mHandler.post(new Runnable() {\r
                     @Override\r
                     public void run() {\r
                 mHandler.post(new Runnable() {\r
                     @Override\r
                     public void run() {\r

+                        // undo the local rename\r
+                        if (mNew.isDown()) {\r
+                            File f = new File(mNew.getStoragePath());\r
+                            if (!f.renameTo(new File(mOld.getStoragePath()))) {\r
+                                // the local rename undoing failed; last chance: save the new local storage path in the old file\r
+                                mFile.setStoragePath(mNew.getStoragePath());\r
+                                FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
+                                fdsm.saveFile(mFile);\r
+                            }\r
+                        }\r

                         boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
                         getActivity().dismissDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
                         try {\r
                         boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
                         getActivity().dismissDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
                         try {\r