From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 18 Jul 2012 22:04:37 +0000 (+0200)
Subject: use star instead of heart, download while if its marked as favorite,ignoring last... 
X-Git-Tag: oc-android-1.4.3~263
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f8e0f7a582c236763b145f34d61281a5f5176e83

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

diff --git a/res/drawable/ic_favorite.png b/res/drawable/ic_favorite.png
index 27edbd4a..4843dc1f 100644
Binary files a/res/drawable/ic_favorite.png and b/res/drawable/ic_favorite.png differ
diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index 7aa5ffbc..34a82cba 100644
--- 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());
                 FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());
                 fdsm.saveFile(mFile);
-                if (mFile.keepInSync() && !mFile.isDownloaded()) {
+                if (mFile.keepInSync()) {
                     onClick(getView().findViewById(R.id.fdDownloadBtn));
                 }
                 break;
@@ -597,7 +597,6 @@ public class FileDetailFragment extends SherlockFragment implements
     }
     
     public void onDismiss(EditNameFragment dialog) {
-        Log.e("ASD","ondismiss");
         if (dialog instanceof EditNameFragment) {
             if (((EditNameFragment)dialog).getResult()) {
                 String newFilename = ((EditNameFragment)dialog).getNewFilename();
@@ -614,7 +613,13 @@ public class FileDetailFragment extends SherlockFragment implements
                         newFile.setMimetype(mFile.getMimetype());
                         newFile.setModificationTimestamp(mFile.getModificationTimestamp());
                         newFile.setParentId(mFile.getParentId());
-                        newFile.setStoragePath(mFile.getStoragePath());
+                        if (mFile.isDownloaded()) {
+                            File f = new File(mFile.getStoragePath());
+                            Log.e(TAG, f.getAbsolutePath()+"");
+                            f.renameTo(new File(f.getParent()+"/"+newFilename));
+                            Log.e(TAG, f.getAbsolutePath()+"");
+                            newFile.setStoragePath(f.getAbsolutePath());
+                        }
                         
                         new Thread(new RenameRunnable(mFile, newFile, mAccount, new Handler())).start();
 
@@ -755,7 +760,6 @@ public class FileDetailFragment extends SherlockFragment implements
         
     }
     
-    
     private class RemoveRunnable implements Runnable {
         
         /** Arbitrary timeout for deletion */
@@ -906,7 +910,7 @@ public class FileDetailFragment extends SherlockFragment implements
         }
         @Override
         protected void onPostExecute(Bitmap result) {
-            if (result != null) {
+            if (result != null && mPreview != null) {
                 mPreview.setImageBitmap(result);
             }
         }