From 803568ab277b7b7791ec792300e85e2fc880c3eb Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Mon, 22 Apr 2013 14:34:42 +0200
Subject: [PATCH] Moved buttons in details view to options/action menu

---
 res/drawable-hdpi-v9/ic_action_download.png        | Bin 0 -> 686 bytes
 res/drawable-hdpi/ic_action_download.png           | Bin 0 -> 687 bytes
 res/drawable-ldpi-v9/ic_action_download.png        | Bin 0 -> 457 bytes
 res/drawable-ldpi/ic_action_download.png           | Bin 0 -> 457 bytes
 res/drawable-mdpi-v9/ic_action_download.png        | Bin 0 -> 568 bytes
 res/drawable-mdpi/ic_action_download.png           | Bin 0 -> 556 bytes
 res/layout/file_details_fragment.xml               |  53 +--
 res/menu/file_actions_menu.xml                     |   5 +-
 .../android/ui/fragment/FileDetailFragment.java    | 357 ++++++++++++---------
 .../android/ui/preview/PreviewMediaFragment.java   |   1 +
 10 files changed, 230 insertions(+), 186 deletions(-)
 create mode 100644 res/drawable-hdpi-v9/ic_action_download.png
 create mode 100644 res/drawable-hdpi/ic_action_download.png
 create mode 100644 res/drawable-ldpi-v9/ic_action_download.png
 create mode 100644 res/drawable-ldpi/ic_action_download.png
 create mode 100644 res/drawable-mdpi-v9/ic_action_download.png
 create mode 100644 res/drawable-mdpi/ic_action_download.png

diff --git a/res/drawable-hdpi-v9/ic_action_download.png b/res/drawable-hdpi-v9/ic_action_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..25476cd7f09085a39e5b29bffcbdeb102ab57f06
GIT binary patch
literal 686
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ea{HEjtmSN`?>!lvI6;RN#5=*
z4F5rJ!QSPQfg+p*9+AZi4BWyX%*Zfnjs#GUy~NYkmHjS@7!SXp?X7pt3=B-#o-U3d
z6}R5bw9XC*6lvXG`h4OMH)+MWv0BpJ8?Rj2pEz~?f~ou_9y&hCF0KLG+-p_lMs##6
z+Gr5VC3?lnKx<aUF`e1UJc)AG&zzBcH}`Mp_k(+%uPHuvuX--CqW}v833qh;nfcc8
z!IAx^WBZLCm=}0oDhteAC9d;B#$dkHea{B@1F{P?G5zse{6@}rLBOlzh_ZJ|4$G^R
z)n|WEkYH+IP;}rBfKUM<v;VGg@to~ymhmF*LK&|G^PBexS!s=jW4+=Sbsu<s;(7aq
zInHBOESr7-!w<GOUhme;%}rR{?!JOqy`0yF`3IBE^fdbeWwJXa?fHM6ae4;ZoT*<H
zm>4<)aYr!RW4z2<lO?soe$}~t6ArIm95H^ct!^hjzuvI)QW~RYf1|X+XZz{V!Z#Ss
zdEU~fmWpAUx7=f%x!%==>`C{g?BkoTg>??Q-O`SG{gMf+JECVgd0dK4Fg$Lb-cXw0
zI7wUCK`4=R$8}}xD?z9BsJtu=^?s=Opp;#Z#fR~_s_p7E;uF5e?%=5Low#rBm0FfN
zYxYP_*}@i+>)q}9z;;8#lg<k_Hr5{ew(ITmZT<dp__x<y_~v|jd2YAok#B*wH?thP
z5pZthtiXML56gO5|BXAfTiJwPX7PdI-;9|I{+}aW?qQN)>SNe1aai!1T-sNW4~pkc
zSF&a-y_i4Mr9o$FX$F(Yq*YTg*i70q53IiOG0Zc`K{ldSMjRT2ju%?@Z<O!eInTv&
RCom;3c)I$ztaD0e0sxE>7IFXp

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_action_download.png b/res/drawable-hdpi/ic_action_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..05e75b4b8d672dc1a31322fd93563cd4a7f7fc4c
GIT binary patch
literal 687
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ea{HEjtmSN`?>!lvI6;RN#5=*
z4F5rJ!QSPQfg+p*9+AZi4BWyX%*Zfnjs#GUy~NYkmHjS@7!RM;x+P-o7#NszJY5_^
zDsH{KeK1QnP~_Oh`%5yFZcNo?jeU7->dhZ~P5T=7A7rl#S)1UvMz2Lr#6|H+>k5qs
zb0^W=ftgotndt3loN&ylck$(ub2f9$Jbh>9|LS);@0Y8e{PlOAmAms<Wd@c81_1^p
z2L=uXMg<0zhFNaL{)_#V2Zz)jH{5Y^1^4L<z11&7FGg;^t;^=nSjZ%P>G|A=*~T}H
z{9VK#GL4b-7~i(K$&9vtI;4<I0UEhX_`vt3TQV8?7Y?|dQ7t!@aX(hU;CwGZZ2B>Y
zrDkzzi%T9bo=IeW{vr3tt#1<~rPvoVZayi+zc2d{_q0`$80T;7NVYI`^s1LVxlA|a
z=xnX44RY%qGDp=H&KHw=kSN;yz-pbkL@y`%f3wu!)bhsVJFE`|WiPWTvRwP$E5Et?
z15<m^w)20i<aYO7&Ah<ath8;OvGA>mKl<DD7`0xI5-a+0^O*IS_Y1|fR<q1csO*nj
zII-k#%`LCxL0tNezDjUJ1~qzD*qx0_Fn-zGJF)7*F|S*O%kJ^6dvtBWom{npTOQc&
z6VSZPr~g=xPrbf?`TgmN3Clh`QuAA8x<BZe^Ayep!t0jIe1BcAVTpiu?~mF8b`Ghc
z($V+dO<vl`IOllg?*1KopN`m_PG0(%$)YRRtD@dM@yw&-iQWsQr|s90obXgM^la^t
zkkwAF_fIX)sbt*a<+?Onkiqz5$zRLRNBYL5{V1^p<YY<NGs^MiwJ<o{Sit}Up00i_
I>zopr0I=5>b^rhX

literal 0
HcmV?d00001

diff --git a/res/drawable-ldpi-v9/ic_action_download.png b/res/drawable-ldpi-v9/ic_action_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..41fe95a4097b59150dd699b6709d78a2c09c8b31
GIT binary patch
literal 457
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}EByV>Y
zhW{YAVDIwDKoQOYkH}&M25w;xW@MN(M*=9wUgGKN%6^wcjE76>)QQWl7#JAcJY5_^
zA`ZX3w%dz2P~h0d`^OUYggRMi8!r36TEi&K8t=#*e<bSQp<~CKHijO&CN3c2VjZ}_
zZ{Y%kdr8-xi72+r$T5>{k+pb}n3(?0T6|yUBMUPhZHY}!87v(PAC@OaIEb7x&l5;z
zHR!JGY0<GuW?di2cw|L;y5b$<_l-NAJ_(+nd7yfB(H`C^p63Ba+0&waC5W76T+^a`
zWmlop*9C2%GKp3WCh3ZYEYu3SOKq0&GI-xOC@z(|>8D)Necn~<=L#kMg?O`h-FT;3
zaY^kCuj#yuD)UxhneVT3ymknN76>SGRUD9t+az_kI)}BvKSz!8UccA@O|g$1ub22O
zvYUR%E8sxXEQX_cMwdAj-^f{Nz&m%%y;XDGGUX<0mG68T@Xq+nU)F$QHIwfxPYmn`
xeYcEL|AX+QIcg4!(=*Kz_f31w@L&Fc_|4OyA(wQXTLA-^!PC{xWt~$(69A*zv6KJ+

literal 0
HcmV?d00001

diff --git a/res/drawable-ldpi/ic_action_download.png b/res/drawable-ldpi/ic_action_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..7293d6da57ef5b1e17754b30b53bcdf0f3b07dc4
GIT binary patch
literal 457
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}EByV>Y
zhW{YAVDIwDKoQOYkH}&M25w;xW@MN(M*=9wUgGKN%6^wcjE6^3*-5mDfq~J@)5S3)
z;_%z+yS<nL1&)1;7ka!@P+D3)A$P9R2f-Rn>-!EhEcXu_JLIR6!y@h79Gew*!Hreg
zQ9!hJ)>cWyHHw|PW{bRIKipVsai;$Hrp?h_la3gKnx%*`upaQJS{%0eYjM5^w?^yU
z$3nKzt1f1gu)hd4j_Bu@_OXH2=D#IVt=2*JHJnk0S2U`mx{C9NJlN`N6=#%rSZ~%*
zn|lUxi|m?~GOT_i^F5Mz%Em5FlfyT|8T*oTuX*P@o7j|{)BZTEU1ZNgzUYr}Czi5F
zSsZd{->mhG$>h4yoqn1At#5r7^gVVgaTK<$a8Z4BNVJUoW}CU-yNxIQ^3D5{cX-RI
zh$FgsM$*UauRP3GOVDrdiZI{$Ncw@=Ro10)-|Y_VVp@~1Gxtu~!XTR~oP1S`K8bqj
w4J+${3ZxYCQh5T7-Q3>%===(XAKw|~_vHl|uA0fe5*Ww~p00i_>zopr0PexA%K!iX

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi-v9/ic_action_download.png b/res/drawable-mdpi-v9/ic_action_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..2684c83ff1915368a2ff452e337096a4c8b9baae
GIT binary patch
literal 568
zcmV-80>}M{P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004XF*Lt006O%
z3;baP00006VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru
z-2@g46)l<eNY?-W0kug)K~!ko?U=z!R8bhke`it$MiI9Xxo8&#Ld#a-A0Pz&5kk_Y
zrS1wUuzkB+mk_j-T)2srEu>Yth}^WX5Jio5+T4L*8gcC1@y(0xx4Z-2z2|%L-E-c9
zAP9mW2&zN53)-FoR#WXFEsp@dfQOQfbM7}XfTm0UcX|jo1RA+F8-#!YIO`J7Udv9S
z?lTYqLO=)z0e^9kQCZT_Q2BuE8DJ4O2b`8~wSVsNhNkV64nMd7oB(gixN}(}`w83!
z=7Dy1fA@F_1<(W@bwrpJ@Dez!Gz;0j3A_fTuW*=gU<-IG>Acbzkn|mRk^VCM)N2CY
zfahfopKXXGeMnEC)yIAX@Kn;lu-!thfKQi*XaO6Nc82nO!1irm1DNWOKF5KNz_O%l
z$uz4ENZJF|Q)4=7j{!e`Cpiy45F?ZH9@tDBZ|@=CnWX(%*t_jX+iz{}+WumDt#%p3
z_FdbbZExD1sAbTyy=41d-M&gRE{G`3VO;+mx}=*6=}s>yjQfX@w*OVYJ79KDpG5j#
z4A_<QpiG>0SGK>_d!X$5z}Hlys^J?2_F~e5AP9nBSos59`-Kv9)waO^0000<MNUMn
GLSTZYEcQzP

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_action_download.png b/res/drawable-mdpi/ic_action_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..afb2cb2e3c90b8600da385e6a63bfb2316cc6666
GIT binary patch
literal 556
zcmV+{0@MA8P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004XF*Lt006O%
z3;baP00006VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru
z-2@g46Ckl2lk5Nh0jWtuK~!ko?b$tx6Hye#@!z;+HzJnST5M^dkk4SRwtguqTVFug
zMFcCwMieZBpa_DMtW_4&Vqr1+zSrgmLohL!B+d-pr<q}9xcB~N&UwzcOp#L3W}VS;
zWq=Hj0Wv@a_`d<pPP*Ca^{R}yj@xmbN-t`NJJ_Ffz<$494WOdBxHJN=f?X8<^b1r}
z!qEu8DUNdvWPl8i0W!ce+Mi&rdrhkY=W#teK1HFrIA-yyxKVm`1qXN;b)q(aE4W&E
zyC;A63a9AcW~mx?u@Tn~>I$K6xQi_u;^$vNXc*6&;5DAkv-m~jzz;l%1x_<w2jB5H
zKpK(6@9_d_Q_Pp}Fu)t-LeKCyVtbs{@EjkTXrqU?hn+Fz(8Z?!ZEPLb#%4H8G2(VR
z5jsarFJy1=2Ioq16p`rLZD}Po@g-t@6|eBFO})?%_roT?;z=!=`Z=|Q2N*1)2U;dT
z5q-|@d??Rz+y;QOtPOk>fNQugPq(;$9Noo-ssOiedC}fIgF0aXl>ySou@0qqLTIq8
u<eMSH2NNA5|E0_T86X2>fDDiUYSb?c5@XQO6@V!K0000<MNUMnLSTaLOy~gs

literal 0
HcmV?d00001

diff --git a/res/layout/file_details_fragment.xml b/res/layout/file_details_fragment.xml
index aa77c657..ec756463 100644
--- a/res/layout/file_details_fragment.xml
+++ b/res/layout/file_details_fragment.xml
@@ -178,57 +178,32 @@
       				android:text="@string/downloader_download_in_progress_ticker"
       				/>
     			
-    			<ProgressBar android:id="@+id/fdProgressBar"
-					android:layout_width="match_parent" 
-					android:layout_height="wrap_content"
-					android:progressDrawable="@android:drawable/progress_horizontal"
-					android:indeterminate="false" 
-					android:indeterminateOnly="false" 
-					/>
-				    								
 			    <LinearLayout
+			        android:id="@+id/fdProgressBlock"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:gravity="center_horizontal"
 					android:layout_marginTop="12dp"
+					android:layout_marginBottom="12dp"
+					android:orientation="horizontal"
 					>
 				    				
-					<Button
-						android:id="@+id/fdDownloadBtn"
+    				<ProgressBar 
+    				    android:id="@+id/fdProgressBar"
 						android:layout_width="0dp"
 						android:layout_height="wrap_content"
 						android:layout_weight="1"
-						android:text="@string/filedetails_download" />
-						
-					<Button
-						android:id="@+id/fdOpenBtn"
-						android:layout_width="0dp"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						android:text="@string/filedetails_open" />
-						
-				</LinearLayout>
-		
-				<LinearLayout
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:gravity="center_horizontal"
-					android:layout_marginTop="12dp"
-					>
-					
+						android:progressDrawable="@android:drawable/progress_horizontal"
+						android:indeterminate="false" 
+						android:indeterminateOnly="false" 
+					/>
+				    								
 					<Button
-						android:id="@+id/fdRenameBtn"
-						android:layout_width="0dp"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						android:text="@string/common_rename" />
-						
-				    <Button
-						android:id="@+id/fdRemoveBtn"
-						android:layout_width="0dp"
+						android:id="@+id/fdCancelBtn"
+						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						android:text="@string/common_remove" />
+						android:layout_marginLeft="12dp"
+						android:text="@string/common_cancel" />
 						
 				</LinearLayout>
 	
diff --git a/res/menu/file_actions_menu.xml b/res/menu/file_actions_menu.xml
index e9c86885..5c25fed0 100644
--- a/res/menu/file_actions_menu.xml
+++ b/res/menu/file_actions_menu.xml
@@ -20,11 +20,12 @@
 <menu 	xmlns:android="http://schemas.android.com/apk/res/android">
     
 	<item 	android:id="@+id/action_open_file_with"			android:title="@string/filedetails_open"			android:icon="@android:drawable/ic_menu_edit"					android:orderInCategory="1" />
-	<item 	android:id="@+id/action_download_file" 			android:title="@string/filedetails_download"																		android:orderInCategory="1" />
+	<item 	android:id="@+id/action_download_file" 			android:title="@string/filedetails_download"		android:icon="@drawable/ic_action_download"						android:orderInCategory="1" />
+    <item 	android:id="@+id/action_sync_file"				android:title="@string/filedetails_sync_file"		android:icon="@drawable/ic_action_refresh"						android:orderInCategory="1" />
 	<item 	android:id="@+id/action_cancel_download"		android:title="@string/common_cancel_download"	 	android:icon="@android:drawable/ic_menu_close_clear_cancel"		android:orderInCategory="1" />
 	<item 	android:id="@+id/action_cancel_upload" 			android:title="@string/common_cancel_upload"		android:icon="@android:drawable/ic_menu_close_clear_cancel"		android:orderInCategory="1" />
 	<item 	android:id="@+id/action_rename_file"			android:title="@string/common_rename"				android:icon="@android:drawable/ic_menu_set_as"					android:orderInCategory="1" />
     <item 	android:id="@+id/action_remove_file"			android:title="@string/common_remove"				android:icon="@android:drawable/ic_menu_delete"					android:orderInCategory="1" />
-    <item 	android:id="@+id/action_see_details"			android:title="@string/actionbar_see_details"		android:icon="@android:drawable/ic_menu_view"					android:orderInCategory="1" />
+    <item 	android:id="@+id/action_see_details"			android:title="@string/actionbar_see_details"		android:icon="@android:drawable/ic_menu_info_details"			android:orderInCategory="1" />
     
 </menu>
diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 32d8f9ad..eadba154 100644
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -36,7 +36,6 @@ import org.json.JSONObject;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
-//import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
@@ -53,38 +52,16 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.webkit.MimeTypeMap;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.BitmapFactory.Options;
-import android.graphics.Point;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentTransaction;
-import android.util.Log;
-import android.view.Display;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.webkit.MimeTypeMap;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-
 import com.actionbarsherlock.app.SherlockFragment;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.AccountUtils;
 import com.owncloud.android.DisplayUtils;
 import com.owncloud.android.Log_OC;
@@ -185,6 +162,7 @@ public class FileDetailFragment extends SherlockFragment implements
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mHandler = new Handler();
+        setHasOptionsMenu(true);
     }
     
 
@@ -208,20 +186,15 @@ public class FileDetailFragment extends SherlockFragment implements
         
         if (mLayout == R.layout.file_details_fragment) {
             mView.findViewById(R.id.fdKeepInSync).setOnClickListener(this);
-            mView.findViewById(R.id.fdRenameBtn).setOnClickListener(this);
-            mView.findViewById(R.id.fdDownloadBtn).setOnClickListener(this);
-            mView.findViewById(R.id.fdOpenBtn).setOnClickListener(this);
-            mView.findViewById(R.id.fdRemoveBtn).setOnClickListener(this);
-            //mView.findViewById(R.id.fdShareBtn).setOnClickListener(this);
             ProgressBar progressBar = (ProgressBar)mView.findViewById(R.id.fdProgressBar);
             mProgressListener = new ProgressListener(progressBar);
+            mView.findViewById(R.id.fdCancelBtn).setOnClickListener(this);
         }
         
         updateFileDetails(false, false);
         return view;
     }
     
-
     /**
      * {@inheritDoc}
      */
@@ -294,108 +267,224 @@ public class FileDetailFragment extends SherlockFragment implements
         return super.getView() == null ? mView : super.getView();
     }
 
+    
+    /**
+     * {@inheritDoc}
+     */
     @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.fdDownloadBtn: {
-                FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
-                FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
-                if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile)) {
-                    downloaderBinder.cancel(mAccount, mFile);
-                    if (mFile.isDown()) {
-                        setButtonsForDown();
-                    } else {
-                        setButtonsForRemote();
-                    }
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.file_actions_menu, menu);
+        MenuItem item = menu.findItem(R.id.action_see_details);
+        if (item != null) {
+            item.setVisible(false);
+            item.setEnabled(false);
+        }
+    }
 
-                } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile)) {
-                    uploaderBinder.cancel(mAccount, mFile);
-                    if (!mFile.fileExists()) {
-                        // TODO make something better
-                        if (getActivity() instanceof FileDisplayActivity) {
-                            // double pane
-                            FragmentTransaction transaction = getActivity().getSupportFragmentManager().beginTransaction();
-                            transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FTAG); // empty FileDetailFragment
-                            transaction.commit();
-                            mContainerActivity.onFileStateChanged();
-                        } else {
-                            getActivity().finish();
-                        }
-                        
-                    } else if (mFile.isDown()) {
-                        setButtonsForDown();
-                    } else {
-                        setButtonsForRemote();
-                    }
-                    
-                } else {
-                    mLastRemoteOperation = new SynchronizeFileOperation(mFile, null, mStorageManager, mAccount, true, false, getActivity());
-                    WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getSherlockActivity().getApplicationContext());
-                    mLastRemoteOperation.execute(wc, this, mHandler);
-                
-                    // update ui 
-                    boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;
-                    getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);
-                    
-                }
-                break;
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onPrepareOptionsMenu (Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        
+        List<Integer> toHide = new ArrayList<Integer>();
+        List<Integer> toShow = new ArrayList<Integer>();
+        
+        FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
+        boolean downloading = downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile);
+        FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
+        boolean uploading = uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile);
+        
+        if (downloading || uploading) {
+            toHide.add(R.id.action_download_file);
+            toHide.add(R.id.action_rename_file);
+            toHide.add(R.id.action_remove_file);
+            toHide.add(R.id.action_open_file_with);
+            if (!downloading) {
+                toHide.add(R.id.action_cancel_download);
+                toShow.add(R.id.action_cancel_upload);
+            } else {
+                toHide.add(R.id.action_cancel_upload);
+                toShow.add(R.id.action_cancel_download);
             }
-            case R.id.fdKeepInSync: {
-                CheckBox cb = (CheckBox) getView().findViewById(R.id.fdKeepInSync);
-                mFile.setKeepInSync(cb.isChecked());
-                mStorageManager.saveFile(mFile);
-                
-                /// register the OCFile instance in the observer service to monitor local updates;
-                /// if necessary, the file is download 
-                Intent intent = new Intent(getActivity().getApplicationContext(),
-                                           FileObserverService.class);
-                intent.putExtra(FileObserverService.KEY_FILE_CMD,
-                           (cb.isChecked()?
-                                   FileObserverService.CMD_ADD_OBSERVED_FILE:
-                                   FileObserverService.CMD_DEL_OBSERVED_FILE));
-                intent.putExtra(FileObserverService.KEY_CMD_ARG_FILE, mFile);
-                intent.putExtra(FileObserverService.KEY_CMD_ARG_ACCOUNT, mAccount);
-                getActivity().startService(intent);
-                
-                if (mFile.keepInSync()) {
-                    onClick(getView().findViewById(R.id.fdDownloadBtn));    // force an immediate synchronization
-                }
-                break;
+
+        } else if (mFile != null && mFile.isDown()) {
+            toHide.add(R.id.action_download_file);
+            toHide.add(R.id.action_cancel_download);
+            toHide.add(R.id.action_cancel_upload);
+            
+            toShow.add(R.id.action_rename_file);
+            toShow.add(R.id.action_remove_file);
+            toShow.add(R.id.action_open_file_with);
+            toShow.add(R.id.action_sync_file);
+            
+        } else {
+            toHide.add(R.id.action_open_file_with);
+            toHide.add(R.id.action_cancel_download);
+            toHide.add(R.id.action_cancel_upload);
+            toHide.add(R.id.action_sync_file);
+            
+            toShow.add(R.id.action_rename_file);
+            toShow.add(R.id.action_remove_file);
+            toShow.add(R.id.action_download_file);
+        }
+
+        MenuItem item = null;
+        for (int i : toHide) {
+            item = menu.findItem(i);
+            if (item != null) {
+                item.setVisible(false);
+                item.setEnabled(false);
             }
-            case R.id.fdRenameBtn: {
-                String fileName = mFile.getFileName();
-                int extensionStart = mFile.isDirectory() ? -1 : fileName.lastIndexOf(".");
-                int selectionEnd = (extensionStart >= 0) ? extensionStart : fileName.length();
-                EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.rename_dialog_title), fileName, 0, selectionEnd, this);
-                dialog.show(getFragmentManager(), "nameeditdialog");
-                break;
-            }   
-            case R.id.fdRemoveBtn: {
-                ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance(
-                        R.string.confirmation_remove_alert,
-                        new String[]{mFile.getFileName()},
-                        mFile.isDown() ? R.string.confirmation_remove_remote_and_local : R.string.confirmation_remove_remote,
-                        mFile.isDown() ? R.string.confirmation_remove_local : -1,
-                        R.string.common_cancel);
-                confDialog.setOnConfirmationListener(this);
-                confDialog.show(getFragmentManager(), FTAG_CONFIRMATION);
-                break;
+        }
+        for (int i : toShow) {
+            item = menu.findItem(i);
+            if (item != null) {
+                item.setVisible(true);
+                item.setEnabled(true);
             }
-            case R.id.fdOpenBtn: {
+        }
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_open_file_with: {
                 openFile();
+                return true;
+            }
+            case R.id.action_remove_file: {
+                removeFile();
+                return true;
+            }
+            case R.id.action_rename_file: {
+                renameFile();
+                return true;
+            }
+            case R.id.action_download_file: 
+            case R.id.action_cancel_download:
+            case R.id.action_cancel_upload:
+            case R.id.action_sync_file: {
+                synchronizeFile();
+                return true;
+            }
+            default:
+                return false;
+        }
+    }
+    
+    
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.fdKeepInSync: {
+                toggleKeepInSync();
+                break;
+            }
+            case R.id.fdCancelBtn: {
+                synchronizeFile();
                 break;
             }
             default:
                 Log_OC.e(TAG, "Incorrect view clicked!");
         }
-        
-        /* else if (v.getId() == R.id.fdShareBtn) {
-            Thread t = new Thread(new ShareRunnable(mFile.getRemotePath()));
-            t.start();
-        }*/
     }
     
     
+    private void toggleKeepInSync() {
+        CheckBox cb = (CheckBox) getView().findViewById(R.id.fdKeepInSync);
+        mFile.setKeepInSync(cb.isChecked());
+        mStorageManager.saveFile(mFile);
+        
+        /// register the OCFile instance in the observer service to monitor local updates;
+        /// if necessary, the file is download 
+        Intent intent = new Intent(getActivity().getApplicationContext(),
+                                   FileObserverService.class);
+        intent.putExtra(FileObserverService.KEY_FILE_CMD,
+                   (cb.isChecked()?
+                           FileObserverService.CMD_ADD_OBSERVED_FILE:
+                           FileObserverService.CMD_DEL_OBSERVED_FILE));
+        intent.putExtra(FileObserverService.KEY_CMD_ARG_FILE, mFile);
+        intent.putExtra(FileObserverService.KEY_CMD_ARG_ACCOUNT, mAccount);
+        getActivity().startService(intent);
+        
+        if (mFile.keepInSync()) {
+            synchronizeFile();   // force an immediate synchronization
+        }
+    }
+
+
+    private void removeFile() {
+        ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance(
+                R.string.confirmation_remove_alert,
+                new String[]{mFile.getFileName()},
+                mFile.isDown() ? R.string.confirmation_remove_remote_and_local : R.string.confirmation_remove_remote,
+                mFile.isDown() ? R.string.confirmation_remove_local : -1,
+                R.string.common_cancel);
+        confDialog.setOnConfirmationListener(this);
+        confDialog.show(getFragmentManager(), FTAG_CONFIRMATION);
+    }
+
+
+    private void renameFile() {
+        String fileName = mFile.getFileName();
+        int extensionStart = mFile.isDirectory() ? -1 : fileName.lastIndexOf(".");
+        int selectionEnd = (extensionStart >= 0) ? extensionStart : fileName.length();
+        EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.rename_dialog_title), fileName, 0, selectionEnd, this);
+        dialog.show(getFragmentManager(), "nameeditdialog");
+    }
+
+    private void synchronizeFile() {
+        FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
+        FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
+        if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile)) {
+            downloaderBinder.cancel(mAccount, mFile);
+            if (mFile.isDown()) {
+                setButtonsForDown();
+            } else {
+                setButtonsForRemote();
+            }
+
+        } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile)) {
+            uploaderBinder.cancel(mAccount, mFile);
+            if (!mFile.fileExists()) {
+                // TODO make something better
+                if (getActivity() instanceof FileDisplayActivity) {
+                    // double pane
+                    FragmentTransaction transaction = getActivity().getSupportFragmentManager().beginTransaction();
+                    transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FTAG); // empty FileDetailFragment
+                    transaction.commit();
+                    mContainerActivity.onFileStateChanged();
+                } else {
+                    getActivity().finish();
+                }
+                
+            } else if (mFile.isDown()) {
+                setButtonsForDown();
+            } else {
+                setButtonsForRemote();
+            }
+            
+        } else {
+            mLastRemoteOperation = new SynchronizeFileOperation(mFile, null, mStorageManager, mAccount, true, false, getActivity());
+            WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getSherlockActivity().getApplicationContext());
+            mLastRemoteOperation.execute(wc, this, mHandler);
+        
+            // update ui 
+            boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;
+            getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);
+            
+        }
+    }
+
+
     /**
      * Opens mFile.
      */
@@ -644,19 +733,11 @@ public class FileDetailFragment extends SherlockFragment implements
      */
     private void setButtonsForTransferring() {
         if (!isEmpty()) {
-            Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);
-            downloadButton.setText(R.string.common_cancel);
-            //downloadButton.setEnabled(false);
-        
             // let's protect the user from himself ;)
-            ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(false);
-            ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(false);
-            ((Button) getView().findViewById(R.id.fdRemoveBtn)).setEnabled(false);
             getView().findViewById(R.id.fdKeepInSync).setEnabled(false);
             
             // show the progress bar for the transfer
-            ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);
-            progressBar.setVisibility(View.VISIBLE);
+            getView().findViewById(R.id.fdProgressBlock).setVisibility(View.VISIBLE);
             TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);
             progressText.setVisibility(View.VISIBLE);
             FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
@@ -674,17 +755,10 @@ public class FileDetailFragment extends SherlockFragment implements
      */
     private void setButtonsForDown() {
         if (!isEmpty()) {
-            Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);
-            downloadButton.setText(R.string.filedetails_sync_file);
-        
-            ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(true);
-            ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(true);
-            ((Button) getView().findViewById(R.id.fdRemoveBtn)).setEnabled(true);
             getView().findViewById(R.id.fdKeepInSync).setEnabled(true);
             
             // hides the progress bar
-            ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);
-            progressBar.setVisibility(View.GONE);
+            getView().findViewById(R.id.fdProgressBlock).setVisibility(View.GONE);
             TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);
             progressText.setVisibility(View.GONE);
         }
@@ -695,17 +769,10 @@ public class FileDetailFragment extends SherlockFragment implements
      */
     private void setButtonsForRemote() {
         if (!isEmpty()) {
-            Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);
-            downloadButton.setText(R.string.filedetails_download);
-            
-            ((Button) getView().findViewById(R.id.fdOpenBtn)).setEnabled(false);
-            ((Button) getView().findViewById(R.id.fdRenameBtn)).setEnabled(true);
-            ((Button) getView().findViewById(R.id.fdRemoveBtn)).setEnabled(true);
             getView().findViewById(R.id.fdKeepInSync).setEnabled(true);
             
             // hides the progress bar
-            ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);
-            progressBar.setVisibility(View.GONE);
+            getView().findViewById(R.id.fdProgressBlock).setVisibility(View.GONE);
             TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);
             progressText.setVisibility(View.GONE);
         }
diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
index 6fbf7d66..1244b191 100644
--- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@ -282,6 +282,7 @@ public class PreviewMediaFragment extends SherlockFragment implements
         toHide.add(R.id.action_cancel_download);
         toHide.add(R.id.action_cancel_upload);
         toHide.add(R.id.action_download_file);
+        toHide.add(R.id.action_sync_file);
         toHide.add(R.id.action_rename_file);    // by now
 
         for (int i : toHide) {
-- 
2.11.0