From f8e0f7a582c236763b145f34d61281a5f5176e83 Mon Sep 17 00:00:00 2001 From: Bartek Przybylski Date: Thu, 19 Jul 2012 00:04:37 +0200 Subject: [PATCH] use star instead of heart, download while if its marked as favorite,ignoring last update --- res/drawable/ic_favorite.png | Bin 1837 -> 1867 bytes .../owncloud/ui/fragment/FileDetailFragment.java | 14 +++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/res/drawable/ic_favorite.png b/res/drawable/ic_favorite.png index 27edbd4a8cd5d24286c01d3f3899838569ba44c9..4843dc1f6933bde2e569ea6d5c3c0553cd5a1f90 100644 GIT binary patch delta 418 zcmV;T0bTyB4$BU(v;}{HNklNnS|#K+tBl$uIZ; zevh57r61rgtc8UjEcW4%fQ^W)vIvpPJr+AJPQqpp_QGw>J?G4wduJ#Kj|qFINHUNN z4{-)3geJ+S)9H%>ed@9QG60}rblDs9*hvGDR!EfOP1BqMhyZ`kG|joBug4sqnt>$O zT{r-^`-P;Tq@mL}9pT>ubCwkBHwxGkEy4*HnQX3t5!mSp8rmJU>5@4BwL={5Tq zkhD^`D#j$KA|`(T0=VkB?xqa$&|nXk{jBaCBn6UQ*ADo{K+ZXV7)zP}*aFx}nt&MR zoYOJCen|Z=8VD0fA9uUmdjJ>=2CoQS0%!nysJQ%=kxg& zcYm2uI+L_TCEVv?u^7b|$7M6DQxal~Xkez01t9yd+%td#O&u~@v7q?FQg+fB~-4ESD~+!%iV*luEsFMze}FbqSo zjighcgb*ItehK6~0^0#7F~*goC$_&yvZND0wy(wV?tGb*lxE!fsep}q*5g+zya`S zv)TL_@&6jsj$M1#y|;Z19NNydGjJ&BbJukrYVDrEL;;jx7~V;`mb8%cP||hI`3;ck z>~jJE#dhfX{vw3%8W1p)QeO3ae=#M{Ea=vh)Bswq*H2@N$MxQP?zM6~>Tdg2i{EK5 h1y1*Kr{=!D^KUkk43D?M{}TWJ002ovPDHLkV1jn+#a#dZ 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); } } -- 2.11.0