use star instead of heart, download while if its marked as favorite,ignoring last...

[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 7aa5ffb..34a82cb 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -236,7 +236,7 @@ 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
                 }\r
                 break;\r
                     onClick(getView().findViewById(R.id.fdDownloadBtn));\r
                 }\r
                 break;\r


@@ -597,7 +597,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


@@ -614,7 +613,13 @@ 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
+                        if (mFile.isDownloaded()) {\r
+                            File f = new File(mFile.getStoragePath());\r
+                            Log.e(TAG, f.getAbsolutePath()+"");\r
+                            f.renameTo(new File(f.getParent()+"/"+newFilename));\r
+                            Log.e(TAG, f.getAbsolutePath()+"");\r
+                            newFile.setStoragePath(f.getAbsolutePath());\r
+                        }\r

                         \r
                         new Thread(new RenameRunnable(mFile, newFile, mAccount, new Handler())).start();\r
 \r
                         \r
                         new Thread(new RenameRunnable(mFile, newFile, mAccount, new Handler())).start();\r
 \r


@@ -755,7 +760,6 @@ public class FileDetailFragment extends SherlockFragment implements
         \r
     }\r
     \r
         \r
     }\r
     \r

-    \r

     private class RemoveRunnable implements Runnable {\r
         \r
         /** Arbitrary timeout for deletion */\r
     private class RemoveRunnable implements Runnable {\r
         \r
         /** Arbitrary timeout for deletion */\r


@@ -906,7 +910,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