Minimize refresh of list of files on reception of events from FileDownloader

[pub/Android/ownCloud.git] / src / com / owncloud / android / files / FileOperationsHelper.java

diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java
index 61094d1..35b6924 100644 (file)
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@ -284,29 +284,33 @@ public class FileOperationsHelper {
      */
     public void cancelTransference(OCFile file) {
         Account account = mFileActivity.getAccount();
      */
     public void cancelTransference(OCFile file) {
         Account account = mFileActivity.getAccount();

-        if (!file.isFolder()) {
-            FileDownloaderBinder downloaderBinder = mFileActivity.getFileDownloaderBinder();
-            FileUploaderBinder uploaderBinder = mFileActivity.getFileUploaderBinder();
-            if (downloaderBinder != null && downloaderBinder.isDownloading(account, file)) {
-                // Remove etag for parent, if file is a keep_in_sync
-                if (file.keepInSync()) {
-                    OCFile parent = mFileActivity.getStorageManager().getFileById(file.getParentId());
-                    parent.setEtag("");
-                    mFileActivity.getStorageManager().saveFile(parent);
-                }
-
-                downloaderBinder.cancel(account, file);
-
-            } else if (uploaderBinder != null && uploaderBinder.isUploading(account, file)) {
-                uploaderBinder.cancel(account, file);
-            }
-        } else {
+        if (file.isFolder()) {
+            // this goes to the queue!! :S

             Intent intent = new Intent(mFileActivity, OperationsService.class);
             intent.setAction(OperationsService.ACTION_CANCEL_SYNC_FOLDER);
             intent.putExtra(OperationsService.EXTRA_ACCOUNT, account);
             Intent intent = new Intent(mFileActivity, OperationsService.class);
             intent.setAction(OperationsService.ACTION_CANCEL_SYNC_FOLDER);
             intent.putExtra(OperationsService.EXTRA_ACCOUNT, account);

-            intent.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
+            intent.putExtra(OperationsService.EXTRA_FILE, file);

             mFileActivity.startService(intent);
         }
             mFileActivity.startService(intent);
         }

+
+        // for both files and folders
+        FileDownloaderBinder downloaderBinder = mFileActivity.getFileDownloaderBinder();
+        FileUploaderBinder uploaderBinder = mFileActivity.getFileUploaderBinder();
+        //if (downloaderBinder != null && file.isDownloading()) {
+        if (downloaderBinder != null && downloaderBinder.isDownloading(account, file)) {
+            downloaderBinder.cancel(account, file);
+
+            // TODO - review why is this here, and solve in a better way
+            // Remove etag for parent, if file is a keep_in_sync
+            if (file.keepInSync()) {
+                OCFile parent = mFileActivity.getStorageManager().getFileById(file.getParentId());
+                parent.setEtag("");
+                mFileActivity.getStorageManager().saveFile(parent);
+            }
+
+        } else if (uploaderBinder != null && uploaderBinder.isUploading(account, file)) {
+            uploaderBinder.cancel(account, file);
+        }

     }
 
     /**
     }
 
     /**