Allow cancelling download of folders as soon as the SynchronizeFolderOperation is...

diff --git a/src/com/owncloud/android/files/FileMenuFilter.java b/src/com/owncloud/android/files/FileMenuFilter.java
index 6d235f2..7d1dbb0 100644 (file)
--- 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.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;
 
 /**
 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);
         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);
         }
             FileUploaderBinder uploaderBinder = mComponentsGetter.getFileUploaderBinder();
             uploading = uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile);
         }