Merge branch 'master' of github.com:owncloud/android into setAsWallpaper

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / fragment / FileDetailFragment.java

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index b2e6464..6aafbf7 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -248,9 +248,8 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
                 dialog.show(getFragmentManager(), FTAG_RENAME_FILE);
                 return true;
             }
                 dialog.show(getFragmentManager(), FTAG_RENAME_FILE);
                 return true;
             }

-            case R.id.action_cancel_download:
-            case R.id.action_cancel_upload: {
-                ((FileDisplayActivity) mContainerActivity).cancelTransference(getFile());
+            case R.id.action_cancel_sync: {
+                ((FileDisplayActivity)mContainerActivity).cancelTransference(getFile());

                 return true;
             }
             case R.id.action_download_file:
                 return true;
             }
             case R.id.action_download_file:


@@ -300,7 +299,6 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
         }
     }
 
         }
     }
 

-

     /**
      * Check if the fragment was created with an empty layout. An empty fragment can't show file details, must be replaced.
      *
     /**
      * Check if the fragment was created with an empty layout. An empty fragment can't show file details, must be replaced.
      *