Merge pull request #837 from owncloud/download_folder_fix_cancel_subfolders

[pub/Android/ownCloud.git] / src / com / owncloud / android / services / OperationsService.java

diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java
index 6c6f24c..656d81d 100644 (file)
--- a/src/com/owncloud/android/services/OperationsService.java
+++ b/src/com/owncloud/android/services/OperationsService.java
@@ -18,6 +18,7 @@
 package com.owncloud.android.services;
 
 import java.io.IOException;
 package com.owncloud.android.services;
 
 import java.io.IOException;

+import java.util.ArrayList;

 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;


@@ -449,6 +450,7 @@ public class OperationsService extends Service {
             }
 
             if (mCurrentSyncOperation != null) {
             }
 
             if (mCurrentSyncOperation != null) {

+                RemoteOperationResult result = null;

 
                 try {
 
 
                 try {
 


@@ -460,7 +462,7 @@ public class OperationsService extends Service {
                             mService.getContentResolver()
                     );
 
                             mService.getContentResolver()
                     );
 

-                    mCurrentSyncOperation.execute(mOwnCloudClient, mStorageManager);
+                    result = mCurrentSyncOperation.execute(mOwnCloudClient, mStorageManager);

 
                 } catch (AccountsException e) {
                     Log_OC.e(TAG, "Error while trying to get autorization", e);
 
                 } catch (AccountsException e) {
                     Log_OC.e(TAG, "Error while trying to get autorization", e);


@@ -470,6 +472,8 @@ public class OperationsService extends Service {
                     synchronized(mPendingOperations) {
                         mPendingOperations.remove(syncKey);
                     }
                     synchronized(mPendingOperations) {
                         mPendingOperations.remove(syncKey);
                     }

+
+                    mService.dispatchResultToOperationListeners(null, mCurrentSyncOperation, result);

                 }
             }
         }
                 }
             }
         }


@@ -479,28 +483,49 @@ public class OperationsService extends Service {
             mPendingOperations.putIfAbsent(syncKey,syncFolderOperation);
         }
 
             mPendingOperations.putIfAbsent(syncKey,syncFolderOperation);
         }
 

-

         /**
         /**

-         * Cancels a pending or current sync operation.
-         *
+         * Cancels sync operations.

          * @param account       Owncloud account where the remote file is stored.
          * @param account       Owncloud account where the remote file is stored.

-         * @param file          File
+         * @param file          File OCFile

          */
          */

-        public void cancel(Account account, OCFile file) {
+        public void cancel(Account account, OCFile file){

             SynchronizeFolderOperation syncOperation = null;
             SynchronizeFolderOperation syncOperation = null;

+            String targetKey = buildRemoteName(account, file.getRemotePath());
+            ArrayList<String> keyItems = new ArrayList<String>();

             synchronized (mPendingOperations) {
             synchronized (mPendingOperations) {

-                syncOperation = mPendingOperations.remove(buildRemoteName(account, file.getRemotePath()));
+                if (file.isFolder()) {
+                    Log_OC.d(TAG, "Canceling pending sync operations");
+                    Iterator<String> it = mPendingOperations.keySet().iterator();
+                    boolean found = false;
+                    while (it.hasNext()) {
+                        String keySyncOperation = it.next();
+                        found = keySyncOperation.startsWith(targetKey);
+                        if (found) {
+                            keyItems.add(keySyncOperation);
+                        }
+                    }
+                } else {
+                    // this is not really expected...
+                    Log_OC.d(TAG, "Canceling sync operation");
+                    keyItems.add(buildRemoteName(account, file.getRemotePath()));
+                }

             }
             }

-            if (syncOperation != null) {
-                syncOperation.cancel();
+            for (String item: keyItems) {
+                syncOperation = mPendingOperations.remove(item);
+                Log_OC.d(TAG, "Key sync operations removed: " + item);
+
+                if (syncOperation != null) {
+                    syncOperation.cancel();
+                }

             }
 
             }
 

-            Intent intent = new Intent( MainApp.getAppContext(), FileDownloader.class);
+            /// cancellation of download needs to be done separately in any case; a SynchronizeFolderOperation
+            //  may finish much sooner than the real download of the files in the folder
+            Intent intent = new Intent(mService, FileDownloader.class);

             intent.setAction(FileDownloader.ACTION_CANCEL_FILE_DOWNLOAD);
             intent.putExtra(FileDownloader.EXTRA_ACCOUNT, account);
             intent.putExtra(FileDownloader.EXTRA_FILE, file);
             intent.setAction(FileDownloader.ACTION_CANCEL_FILE_DOWNLOAD);
             intent.putExtra(FileDownloader.EXTRA_ACCOUNT, account);
             intent.putExtra(FileDownloader.EXTRA_FILE, file);

-            MainApp.getAppContext().startService(intent);
-
+            mService.startService(intent);

         }
 
         /**
         }
 
         /**


@@ -687,7 +712,7 @@ public class OperationsService extends Service {
                     String remotePath = operationIntent.getStringExtra(EXTRA_REMOTE_PATH);
                     Intent sendIntent = operationIntent.getParcelableExtra(EXTRA_SEND_INTENT);
                     if (remotePath.length() > 0) {
                     String remotePath = operationIntent.getStringExtra(EXTRA_REMOTE_PATH);
                     Intent sendIntent = operationIntent.getParcelableExtra(EXTRA_SEND_INTENT);
                     if (remotePath.length() > 0) {

-                        operation = new CreateShareOperation(remotePath, ShareType.PUBLIC_LINK, 
+                        operation = new CreateShareOperation(OperationsService.this, remotePath, ShareType.PUBLIC_LINK,

                                 "", false, "", 1, sendIntent);
                     }
                     
                                 "", false, "", 1, sendIntent);
                     }
                     


@@ -829,7 +854,7 @@ public class OperationsService extends Service {
     
     /**
      * Notifies the currently subscribed listeners about the end of an operation.
     
     /**
      * Notifies the currently subscribed listeners about the end of an operation.

-     * 
+     *

      * @param target            Account or URL pointing to an OC server.
      * @param operation         Finished operation.
      * @param result            Result of the operation.
      * @param target            Account or URL pointing to an OC server.
      * @param operation         Finished operation.
      * @param result            Result of the operation.