From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 17 Dec 2014 08:32:13 +0000 (+0100)
Subject: Allow cancelling download of folders as soon as the SynchronizeFolderOperation is... 
X-Git-Tag: oc-android-1.7.0_signed~23^2~23^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1d0f70550960a7a3e2f3a8cabeab2dc311659e02?ds=inline

Allow cancelling download of folders as soon as the SynchronizeFolderOperation is in the OperationsService
---

diff --git a/src/com/owncloud/android/files/FileMenuFilter.java b/src/com/owncloud/android/files/FileMenuFilter.java
index 6d235f23..7d1dbb0f 100644
--- a/src/com/owncloud/android/files/FileMenuFilter.java
+++ b/src/com/owncloud/android/files/FileMenuFilter.java
@@ -31,6 +31,7 @@ import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
+import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 
 /**
@@ -141,6 +142,8 @@ public class FileMenuFilter {
         if (mComponentsGetter != null && mFile != null && mAccount != null) {
             FileDownloaderBinder downloaderBinder = mComponentsGetter.getFileDownloaderBinder();
             downloading = downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile);
+            OperationsServiceBinder opsBinder = mComponentsGetter.getOperationsServiceBinder();
+            downloading |= (opsBinder != null && opsBinder.isSynchronizing(mAccount, mFile.getRemotePath()));
             FileUploaderBinder uploaderBinder = mComponentsGetter.getFileUploaderBinder();
             uploading = uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile);
         }