X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/6596d650679170c4da2b7f92ff79318aa106beff..ab8bf56a15193f69169d284876ac6bbd80ff2150:/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 bbef1f83..cf9f4749 100644
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@ -1,5 +1,5 @@
 /* ownCloud Android client application
- *   Copyright (C) 2012-2014 ownCloud Inc.
+ *   Copyright (C) 2012-2015 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -208,35 +208,11 @@ public class FileOperationsHelper {
             mFileActivity.showLoadingDialog();
             
         } else {
-            /*
-            // Add files recursivly
-            FileDataStorageManager storageManager = mFileActivity.getStorageManager();
-            filesList.addAll(storageManager.getFolderContent(file));
-            boolean newfiles;
-            do {
-                Vector<OCFile> tmpFolders = new Vector<OCFile>();
-                for (OCFile tmpfile : filesList) {
-                    if (tmpfile.isFolder()) {
-                        tmpFolders.add(tmpfile);
-                    }
-                }
-                if (tmpFolders.isEmpty()){
-                    newfiles = false;
-                }else {
-                    for(OCFile tmpFolder : tmpFolders){
-                        filesList.remove(tmpFolder);
-                        filesList.addAll(storageManager.getFolderContent(tmpFolder));
-                    }
-                    newfiles = true;
-                }
-            } while(newfiles);
-            */
             Intent intent = new Intent(mFileActivity, OperationsService.class);
             intent.setAction(OperationsService.ACTION_SYNC_FOLDER);
             intent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
             intent.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
-            mFileActivity.startService(intent);   // reevaluating: with or without Binder?
-            //mFileActivity.getOperationsServiceBinder().queueNewOperation(intent);
+            mFileActivity.startService(intent);
         }
     }
     
@@ -278,21 +254,33 @@ public class FileOperationsHelper {
         mFileActivity.showLoadingDialog();
     }
 
-    
+    /**
+     * Cancel the transference in downloads (files/folders) and file uploads
+     * @param file OCFile
+     */
     public void cancelTransference(OCFile file) {
         Account account = mFileActivity.getAccount();
+        if (file.isFolder()) {
+            OperationsService.OperationsServiceBinder opsBinder = mFileActivity.getOperationsServiceBinder();
+            if (opsBinder != null) {
+                opsBinder.cancel(account, file);
+            }
+        }
+
+        // for both files and folders
         FileDownloaderBinder downloaderBinder = mFileActivity.getFileDownloaderBinder();
-        FileUploaderBinder uploaderBinder =  mFileActivity.getFileUploaderBinder();
+        FileUploaderBinder uploaderBinder = mFileActivity.getFileUploaderBinder();
         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);
+                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);
         }