Merge remote-tracking branch 'remotes/upstream/master' into beta

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

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index c639525..804d507 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -578,8 +578,7 @@ public class OCFileListFragment extends ExtendedListFragment {
                     mContainerActivity.getFileOperationsHelper().syncFile(mTargetFile);
                     return true;
                 }
-                case R.id.action_cancel_download:
-                case R.id.action_cancel_upload: {
+                case R.id.action_cancel_sync: {
                     ((FileDisplayActivity) mContainerActivity).cancelTransference(mTargetFile);
                     return true;
                 }