Added cancelation for subtrees

[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 dc8d6b7..35b6924 100644 (file)
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@ -235,7 +235,6 @@ public class FileOperationsHelper {
             intent.setAction(OperationsService.ACTION_SYNC_FOLDER);
             intent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
             intent.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
             intent.setAction(OperationsService.ACTION_SYNC_FOLDER);
             intent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
             intent.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());

-            intent.putExtra(OperationsService.EXTRA_SYNC_FILE_CONTENTS, true);

             mFileActivity.startService(intent);   // reevaluating: with or without Binder?
             //mFileActivity.getOperationsServiceBinder().queueNewOperation(intent);
         }
             mFileActivity.startService(intent);   // reevaluating: with or without Binder?
             //mFileActivity.getOperationsServiceBinder().queueNewOperation(intent);
         }


@@ -279,21 +278,36 @@ public class FileOperationsHelper {
         mFileActivity.showLoadingDialog();
     }
 
         mFileActivity.showLoadingDialog();
     }
 

-    
+    /**
+     * Cancel the transference in downloads (files/folders) and file uploads
+     * @param file OCFile
+     */

     public void cancelTransference(OCFile file) {
         Account account = mFileActivity.getAccount();
     public void cancelTransference(OCFile file) {
         Account account = mFileActivity.getAccount();

+        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.putExtra(OperationsService.EXTRA_FILE, file);
+            mFileActivity.startService(intent);
+        }
+
+        // for both files and folders

         FileDownloaderBinder downloaderBinder = mFileActivity.getFileDownloaderBinder();
         FileDownloaderBinder downloaderBinder = mFileActivity.getFileDownloaderBinder();

-        FileUploaderBinder uploaderBinder =  mFileActivity.getFileUploaderBinder();
+        FileUploaderBinder uploaderBinder = mFileActivity.getFileUploaderBinder();
+        //if (downloaderBinder != null && file.isDownloading()) {

         if (downloaderBinder != null && downloaderBinder.isDownloading(account, file)) {
         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()) {
             // 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);
+                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 (uploaderBinder != null && uploaderBinder.isUploading(account, file)) {
             uploaderBinder.cancel(account, file);
         }