From f22693cd4ee36495865505590f0d8430b59c4e00 Mon Sep 17 00:00:00 2001 From: jabarros Date: Tue, 16 Dec 2014 14:28:36 +0100 Subject: [PATCH] Added cancelation for each synchronizeFolderOperation when canceling download folder --- .../owncloud/android/operations/SynchronizeFolderOperation.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java index 534e16ab..4e1e5bc9 100644 --- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java @@ -27,6 +27,7 @@ import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader; import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.operations.OperationCancelledException; +import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.lib.common.utils.Log_OC; @@ -145,6 +146,10 @@ public class SynchronizeFolderOperation extends SyncOperation { synchronized(mCancellationRequested) { if (mCancellationRequested.get()) { + // Cancel each operation in mFoldersToWalkDown + for (SyncOperation synchOp: mFoldersToWalkDown) { + ((SynchronizeFolderOperation) synchOp).cancel(); + } return new RemoteOperationResult(new OperationCancelledException()); } } @@ -502,8 +507,6 @@ public class SynchronizeFolderOperation extends SyncOperation { * Cancel operation */ public void cancel(){ - // WIP Cancel the sync operation mCancellationRequested.set(true); } - } -- 2.11.0