From: jabarros <jabarros@solidgear.es>
Date: Wed, 10 Dec 2014 15:23:46 +0000 (+0100)
Subject: Resolve recursion on new SyncFolderOperation creating new instances of SynFolderOpera... 
X-Git-Tag: oc-android-1.7.0_signed~23^2~30^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d564ef443c2cb2975c5febcc64cf44723cc2356b?ds=inline;hp=-c

Resolve recursion on new SyncFolderOperation creating new instances of SynFolderOperation and running them
---

d564ef443c2cb2975c5febcc64cf44723cc2356b
diff --git a/src/com/owncloud/android/operations/SyncFolderOperation.java b/src/com/owncloud/android/operations/SyncFolderOperation.java
index 32a71059..850c0b30 100644
--- a/src/com/owncloud/android/operations/SyncFolderOperation.java
+++ b/src/com/owncloud/android/operations/SyncFolderOperation.java
@@ -30,14 +30,10 @@ 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;
-import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation;
 import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
 import com.owncloud.android.lib.resources.files.RemoteFile;
-import com.owncloud.android.lib.resources.shares.GetRemoteSharesForFileOperation;
-import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.operations.common.SyncOperation;
-import com.owncloud.android.syncadapter.FileSyncAdapter;
 import com.owncloud.android.utils.FileStorageUtils;
 
 import org.apache.http.HttpStatus;
@@ -341,9 +337,17 @@ public class SyncFolderOperation extends SyncOperation {
                 filesToSyncContents.add(operation);
             }
 
-            // Start the download of all the files in the folder (non recursively)
             if (!remoteFile.isFolder()) {
+                // Start file download
                 requestForDownloadFile(remoteFile);
+            } else {
+                // Run new SyncFolderOperation for download children files recursively from a folder
+                RemoteOperation synchFolderOp =  new SyncFolderOperation( mContext,
+                        remoteFile.getRemotePath(),
+                        mAccount,
+                        mCurrentSyncTime);
+
+                synchFolderOp.execute(mAccount, mContext, null, null);
             }
 
             updatedFiles.add(remoteFile);