add last latest.apk ;)

[pub/Android/ownCloud.git] / src / com / owncloud / android / operations / SynchronizeFolderOperation.java

diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index 72ccd13..227e2b2 100644 (file)
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@ -1,5 +1,8 @@
-/* ownCloud Android client application
- *   Copyright (C) 2012-2014 ownCloud Inc.
+/**
+ *   ownCloud Android client application
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 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,
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,


@@ -17,11 +20,19 @@
 
 package com.owncloud.android.operations;
 
 
 package com.owncloud.android.operations;
 

+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+

 import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
 import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 

+

 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;


@@ -34,21 +45,9 @@ 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.operations.common.SyncOperation;
 import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
 import com.owncloud.android.lib.resources.files.RemoteFile;
 import com.owncloud.android.operations.common.SyncOperation;

+import com.owncloud.android.services.OperationsService;

 import com.owncloud.android.utils.FileStorageUtils;
 
 import com.owncloud.android.utils.FileStorageUtils;
 

-import org.apache.http.HttpStatus;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;

 import java.util.concurrent.atomic.AtomicBoolean;
 
 //import android.support.v4.content.LocalBroadcastManager;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 //import android.support.v4.content.LocalBroadcastManager;


@@ -61,9 +60,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
  *  Fetches the list and properties of the files contained in the given folder, including their 
  *  properties, and updates the local database with them.
  *  
  *  Fetches the list and properties of the files contained in the given folder, including their 
  *  properties, and updates the local database with them.
  *  

- *  Does NOT enter in the child folders to synchronize their contents also.
- * 
- *  @author David A. Velasco
+ *  Does NOT enter in the child folders to synchronize their contents also, BUT requests for a new operation instance
+ *  doing so.

  */
 public class SynchronizeFolderOperation extends SyncOperation {
 
  */
 public class SynchronizeFolderOperation extends SyncOperation {
 


@@ -72,34 +70,37 @@ public class SynchronizeFolderOperation extends SyncOperation {
     /** Time stamp for the synchronization process in progress */
     private long mCurrentSyncTime;
 
     /** Time stamp for the synchronization process in progress */
     private long mCurrentSyncTime;
 

-    /** Remote folder to synchronize */
-    private OCFile mLocalFolder;
-
+    /** Remote path of the folder to synchronize */
+    private String mRemotePath;
+    

     /** Account where the file to synchronize belongs */
     private Account mAccount;
 
     /** Android context; necessary to send requests to the download service */
     private Context mContext;
 
     /** Account where the file to synchronize belongs */
     private Account mAccount;
 
     /** Android context; necessary to send requests to the download service */
     private Context mContext;
 

+    /** Locally cached information about folder to synchronize */
+    private OCFile mLocalFolder;
+

     /** Files and folders contained in the synchronized folder after a successful operation */
     /** Files and folders contained in the synchronized folder after a successful operation */

-    private List<OCFile> mChildren;
+    //private List<OCFile> mChildren;

 
     /** Counter of conflicts found between local and remote files */
     private int mConflictsFound;
 
     /** Counter of failed operations in synchronization of kept-in-sync files */
 
     /** Counter of conflicts found between local and remote files */
     private int mConflictsFound;
 
     /** Counter of failed operations in synchronization of kept-in-sync files */

-    private int mFailsInFavouritesFound;
-
-    /**
-     * Map of remote and local paths to files that where locally stored in a location
-     * out of the ownCloud folder and couldn't be copied automatically into it
-     **/
-    private Map<String, String> mForgottenLocalFiles;
+    private int mFailsInFileSyncsFound;

 
     /** 'True' means that the remote folder changed and should be fetched */
     private boolean mRemoteFolderChanged;
 
     /** 'True' means that the remote folder changed and should be fetched */
     private boolean mRemoteFolderChanged;

-    private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);

 
 

+    private List<OCFile> mFilesForDirectDownload;
+        // to avoid extra PROPFINDs when there was no change in the folder
+    
+    private List<SyncOperation> mFilesToSyncContents;
+        // this will be used for every file when 'folder synchronization' replaces 'folder download' 
+
+    private final AtomicBoolean mCancellationRequested;

 
     /**
      * Creates a new instance of {@link SynchronizeFolderOperation}.
 
     /**
      * Creates a new instance of {@link SynchronizeFolderOperation}.


@@ -109,13 +110,16 @@ public class SynchronizeFolderOperation extends SyncOperation {
      * @param   account                 ownCloud account where the folder is located.
      * @param   currentSyncTime         Time stamp for the synchronization process in progress.
      */
      * @param   account                 ownCloud account where the folder is located.
      * @param   currentSyncTime         Time stamp for the synchronization process in progress.
      */

-    public SynchronizeFolderOperation(Context context, String remotePath, Account account, long currentSyncTime){
-        mLocalFolder = new OCFile(remotePath);
+    public SynchronizeFolderOperation(Context context, String remotePath, Account account,
+                                      long currentSyncTime){
+        mRemotePath = remotePath;

         mCurrentSyncTime = currentSyncTime;
         mAccount = account;
         mContext = context;
         mCurrentSyncTime = currentSyncTime;
         mAccount = account;
         mContext = context;

-        mForgottenLocalFiles = new HashMap<String, String>();

         mRemoteFolderChanged = false;
         mRemoteFolderChanged = false;

+        mFilesForDirectDownload = new Vector<OCFile>();
+        mFilesToSyncContents = new Vector<SyncOperation>();
+        mCancellationRequested = new AtomicBoolean(false);

     }
 
 
     }
 
 


@@ -123,22 +127,8 @@ public class SynchronizeFolderOperation extends SyncOperation {
         return mConflictsFound;
     }
 
         return mConflictsFound;
     }
 

-    public int getFailsInFavouritesFound() {
-        return mFailsInFavouritesFound;
-    }
-
-    public Map<String, String> getForgottenLocalFiles() {
-        return mForgottenLocalFiles;
-    }
-
-    /**
-     * Returns the list of files and folders contained in the synchronized folder,
-     * if called after synchronization is complete.
-     *
-     * @return  List of files and folders contained in the synchronized folder.
-     */
-    public List<OCFile> getChildren() {
-        return mChildren;
+    public int getFailsInFileSyncsFound() {
+        return mFailsInFileSyncsFound;

     }
 
     /**
     }
 
     /**


@@ -149,41 +139,54 @@ public class SynchronizeFolderOperation extends SyncOperation {
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result = null;

-        mFailsInFavouritesFound = 0;
+        mFailsInFileSyncsFound = 0;

         mConflictsFound = 0;
         mConflictsFound = 0;

-        mForgottenLocalFiles.clear();
+        
+        try {
+            // get locally cached information about folder 
+            mLocalFolder = getStorageManager().getFileByPath(mRemotePath);   
+            
+            result = checkForChanges(client);
+    
+            if (result.isSuccess()) {
+                if (mRemoteFolderChanged) {
+                    result = fetchAndSyncRemoteFolder(client);
+                    
+                } else {
+                    prepareOpsFromLocalKnowledge();
+                }
+                
+                if (result.isSuccess()) {
+                    syncContents(client);
+                }

 
 

-        /// perform the download
-        synchronized(mCancellationRequested) {
-            if (mCancellationRequested.get()) {
-                return new RemoteOperationResult(new OperationCancelledException());

             }
             }

-        }
-
-        result = checkForChanges(client);
-
-        if (result.isSuccess()) {
-            if (mRemoteFolderChanged) {
-                result = fetchAndSyncRemoteFolder(client);
-            } else {
-                mChildren = getStorageManager().getFolderContent(mLocalFolder);
+            
+            if (mCancellationRequested.get()) {
+                throw new OperationCancelledException();

             }
             }

+            
+        } catch (OperationCancelledException e) {
+            result = new RemoteOperationResult(e);

         }
 
         return result;
 
     }
 
         }
 
         return result;
 
     }
 

-    private RemoteOperationResult checkForChanges(OwnCloudClient client) {
+    private RemoteOperationResult checkForChanges(OwnCloudClient client)
+            throws OperationCancelledException {
+        Log_OC.d(TAG, "Checking changes in " + mAccount.name + mRemotePath);
+

         mRemoteFolderChanged = true;
         RemoteOperationResult result = null;
         mRemoteFolderChanged = true;
         RemoteOperationResult result = null;

-        String remotePath = null;
-
-        remotePath = mLocalFolder.getRemotePath();
-        Log_OC.d(TAG, "Checking changes in " + mAccount.name + remotePath);
-
+        
+        if (mCancellationRequested.get()) {
+            throw new OperationCancelledException();
+        }
+        

         // remote request
         // remote request

-        ReadRemoteFileOperation operation = new ReadRemoteFileOperation(remotePath);
+        ReadRemoteFileOperation operation = new ReadRemoteFileOperation(mRemotePath);

         result = operation.execute(client);
         if (result.isSuccess()){
             OCFile remoteFolder = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0));
         result = operation.execute(client);
         if (result.isSuccess()){
             OCFile remoteFolder = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0));


@@ -194,7 +197,7 @@ public class SynchronizeFolderOperation extends SyncOperation {
 
             result = new RemoteOperationResult(ResultCode.OK);
 
 
             result = new RemoteOperationResult(ResultCode.OK);
 

-            Log_OC.i(TAG, "Checked " + mAccount.name + remotePath + " : " +
+            Log_OC.i(TAG, "Checked " + mAccount.name + mRemotePath + " : " +

                     (mRemoteFolderChanged ? "changed" : "not changed"));
 
         } else {
                     (mRemoteFolderChanged ? "changed" : "not changed"));
 
         } else {


@@ -203,27 +206,32 @@ public class SynchronizeFolderOperation extends SyncOperation {
                 removeLocalFolder();
             }
             if (result.isException()) {
                 removeLocalFolder();
             }
             if (result.isException()) {

-                Log_OC.e(TAG, "Checked " + mAccount.name + remotePath  + " : " +
+                Log_OC.e(TAG, "Checked " + mAccount.name + mRemotePath  + " : " +

                         result.getLogMessage(), result.getException());
             } else {
                         result.getLogMessage(), result.getException());
             } else {

-                Log_OC.e(TAG, "Checked " + mAccount.name + remotePath + " : " +
+                Log_OC.e(TAG, "Checked " + mAccount.name + mRemotePath + " : " +

                         result.getLogMessage());
             }
                         result.getLogMessage());
             }

+

         }
 
         return result;
     }
 
 
         }
 
         return result;
     }
 
 

-    private RemoteOperationResult fetchAndSyncRemoteFolder(OwnCloudClient client) {
-        String remotePath = mLocalFolder.getRemotePath();
-        ReadRemoteFolderOperation operation = new ReadRemoteFolderOperation(remotePath);
+    private RemoteOperationResult fetchAndSyncRemoteFolder(OwnCloudClient client)
+            throws OperationCancelledException {
+        if (mCancellationRequested.get()) {
+            throw new OperationCancelledException();
+        }
+        
+        ReadRemoteFolderOperation operation = new ReadRemoteFolderOperation(mRemotePath);

         RemoteOperationResult result = operation.execute(client);
         RemoteOperationResult result = operation.execute(client);

-        Log_OC.d(TAG, "Synchronizing " + mAccount.name + remotePath);
+        Log_OC.d(TAG, "Synchronizing " + mAccount.name + mRemotePath);

 
         if (result.isSuccess()) {
             synchronizeData(result.getData(), client);
 
         if (result.isSuccess()) {
             synchronizeData(result.getData(), client);

-            if (mConflictsFound > 0  || mFailsInFavouritesFound > 0) {
+            if (mConflictsFound > 0  || mFailsInFileSyncsFound > 0) {

                 result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT);
                     // should be a different result code, but will do the job
             }
                 result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT);
                     // should be a different result code, but will do the job
             }


@@ -231,6 +239,7 @@ public class SynchronizeFolderOperation extends SyncOperation {
             if (result.getCode() == ResultCode.FILE_NOT_FOUND)
                 removeLocalFolder();
         }
             if (result.getCode() == ResultCode.FILE_NOT_FOUND)
                 removeLocalFolder();
         }

+        

 
         return result;
     }
 
         return result;
     }


@@ -243,7 +252,8 @@ public class SynchronizeFolderOperation extends SyncOperation {
             storageManager.removeFolder(
                     mLocalFolder,
                     true,
             storageManager.removeFolder(
                     mLocalFolder,
                     true,

-                    (   mLocalFolder.isDown() &&
+                    (   mLocalFolder.isDown() &&        // TODO: debug, I think this is
+                                                        // always false for folders

                             mLocalFolder.getStoragePath().startsWith(currentSavePath)
                     )
             );
                             mLocalFolder.getStoragePath().startsWith(currentSavePath)
                     )
             );


@@ -263,14 +273,12 @@ public class SynchronizeFolderOperation extends SyncOperation {
      *                          retrieved.
      *  @return                 'True' when any change was made in the local data, 'false' otherwise
      */
      *                          retrieved.
      *  @return                 'True' when any change was made in the local data, 'false' otherwise
      */

-    private void synchronizeData(ArrayList<Object> folderAndFiles, OwnCloudClient client) {
+    private void synchronizeData(ArrayList<Object> folderAndFiles, OwnCloudClient client)
+            throws OperationCancelledException {

         FileDataStorageManager storageManager = getStorageManager();
         
         FileDataStorageManager storageManager = getStorageManager();
         

-        // get 'fresh data' from the database
-        mLocalFolder = storageManager.getFileByPath(mLocalFolder.getRemotePath());
-

         // parse data from remote folder
         // parse data from remote folder

-        OCFile remoteFolder = fillOCFile((RemoteFile)folderAndFiles.get(0));
+        OCFile remoteFolder = FileStorageUtils.fillOCFile((RemoteFile) folderAndFiles.get(0));

         remoteFolder.setParentId(mLocalFolder.getParentId());
         remoteFolder.setFileId(mLocalFolder.getFileId());
 
         remoteFolder.setParentId(mLocalFolder.getParentId());
         remoteFolder.setFileId(mLocalFolder.getFileId());
 


@@ -278,96 +286,155 @@ public class SynchronizeFolderOperation extends SyncOperation {
                 + " changed - starting update of local data ");
 
         List<OCFile> updatedFiles = new Vector<OCFile>(folderAndFiles.size() - 1);
                 + " changed - starting update of local data ");
 
         List<OCFile> updatedFiles = new Vector<OCFile>(folderAndFiles.size() - 1);

-        List<SynchronizeFileOperation> filesToSyncContents = new Vector<SynchronizeFileOperation>();
+        mFilesForDirectDownload.clear();
+        mFilesToSyncContents.clear();
+
+        if (mCancellationRequested.get()) {
+            throw new OperationCancelledException();
+        }

 
         // get current data about local contents of the folder to synchronize
 
         // get current data about local contents of the folder to synchronize

-        List<OCFile> localFiles = storageManager.getFolderContent(mLocalFolder);
+        List<OCFile> localFiles = storageManager.getFolderContent(mLocalFolder, false);

         Map<String, OCFile> localFilesMap = new HashMap<String, OCFile>(localFiles.size());
         for (OCFile file : localFiles) {
             localFilesMap.put(file.getRemotePath(), file);
         }
 
         Map<String, OCFile> localFilesMap = new HashMap<String, OCFile>(localFiles.size());
         for (OCFile file : localFiles) {
             localFilesMap.put(file.getRemotePath(), file);
         }
 

-        // loop to update every child
-        OCFile remoteFile = null, localFile = null;
+        // loop to synchronize every child
+        OCFile remoteFile = null, localFile = null, updatedFile = null;
+        RemoteFile r;

         for (int i=1; i<folderAndFiles.size(); i++) {
             /// new OCFile instance with the data from the server
         for (int i=1; i<folderAndFiles.size(); i++) {
             /// new OCFile instance with the data from the server

-            remoteFile = fillOCFile((RemoteFile)folderAndFiles.get(i));
-            remoteFile.setParentId(mLocalFolder.getFileId());
+            r = (RemoteFile) folderAndFiles.get(i);
+            remoteFile = FileStorageUtils.fillOCFile(r);
+
+            /// new OCFile instance to merge fresh data from server with local state
+            updatedFile = FileStorageUtils.fillOCFile(r);
+            updatedFile.setParentId(mLocalFolder.getFileId());

 
             /// retrieve local data for the read file
             //  localFile = mStorageManager.getFileByPath(remoteFile.getRemotePath());
             localFile = localFilesMap.remove(remoteFile.getRemotePath());
 
 
             /// retrieve local data for the read file
             //  localFile = mStorageManager.getFileByPath(remoteFile.getRemotePath());
             localFile = localFilesMap.remove(remoteFile.getRemotePath());
 

-            /// add to the remoteFile (the new one) data about LOCAL STATE (not existing in server)
-            remoteFile.setLastSyncDateForProperties(mCurrentSyncTime);
+            /// add to updatedFile data about LOCAL STATE (not existing in server)
+            updatedFile.setLastSyncDateForProperties(mCurrentSyncTime);

             if (localFile != null) {
             if (localFile != null) {

-                // some properties of local state are kept unmodified
-                remoteFile.setFileId(localFile.getFileId());
-                remoteFile.setKeepInSync(localFile.keepInSync());
-                remoteFile.setLastSyncDateForData(localFile.getLastSyncDateForData());
-                remoteFile.setModificationTimestampAtLastSyncForData(
+                updatedFile.setFileId(localFile.getFileId());
+                updatedFile.setFavorite(localFile.isFavorite());
+                updatedFile.setLastSyncDateForData(localFile.getLastSyncDateForData());
+                updatedFile.setModificationTimestampAtLastSyncForData(

                         localFile.getModificationTimestampAtLastSyncForData()
                 );
                         localFile.getModificationTimestampAtLastSyncForData()
                 );

-                remoteFile.setStoragePath(localFile.getStoragePath());
-                // eTag will not be updated unless contents are synchronized
-                //  (Synchronize[File|Folder]Operation with remoteFile as parameter)
-                remoteFile.setEtag(localFile.getEtag());
-                if (remoteFile.isFolder()) {
-                    remoteFile.setFileLength(localFile.getFileLength());
+                updatedFile.setStoragePath(localFile.getStoragePath());
+                // eTag will not be updated unless file CONTENTS are synchronized
+                updatedFile.setEtag(localFile.getEtag());
+                if (updatedFile.isFolder()) {
+                    updatedFile.setFileLength(localFile.getFileLength());

                         // TODO move operations about size of folders to FileContentProvider
                 } else if (mRemoteFolderChanged && remoteFile.isImage() &&
                         // TODO move operations about size of folders to FileContentProvider
                 } else if (mRemoteFolderChanged && remoteFile.isImage() &&

-                        remoteFile.getModificationTimestamp() != localFile.getModificationTimestamp()) {
-                    remoteFile.setNeedsUpdateThumbnail(true);
+                        remoteFile.getModificationTimestamp() !=
+                                localFile.getModificationTimestamp()) {
+                    updatedFile.setNeedsUpdateThumbnail(true);

                     Log.d(TAG, "Image " + remoteFile.getFileName() + " updated on the server");
                 }
                     Log.d(TAG, "Image " + remoteFile.getFileName() + " updated on the server");
                 }

-                remoteFile.setPublicLink(localFile.getPublicLink());
-                remoteFile.setShareByLink(localFile.isShareByLink());
+                updatedFile.setPublicLink(localFile.getPublicLink());
+                updatedFile.setShareViaLink(localFile.isSharedViaLink());
+                updatedFile.setShareWithSharee(localFile.isSharedWithSharee());
+                updatedFile.setEtagInConflict(localFile.getEtagInConflict());

             } else {
             } else {

-                // remote eTag will not be updated unless contents are synchronized
-                //  (Synchronize[File|Folder]Operation with remoteFile as parameter)
-                remoteFile.setEtag("");
+                // remote eTag will not be updated unless file CONTENTS are synchronized
+                updatedFile.setEtag("");

             }
 
             /// check and fix, if needed, local storage path
             }
 
             /// check and fix, if needed, local storage path

-            checkAndFixForeignStoragePath(remoteFile);      // policy - local files are COPIED
-                                                            // into the ownCloud local folder;
-            searchForLocalFileInDefaultPath(remoteFile);    // legacy
-
-            /// prepare content synchronization for kept-in-sync files
-            if (remoteFile.keepInSync()) {
-                SynchronizeFileOperation operation = new SynchronizeFileOperation(  localFile,
-                                                                                    remoteFile,
-                                                                                    mAccount,
-                                                                                    true,
-                                                                                    mContext
-                                                                                    );
-
-                filesToSyncContents.add(operation);
-            }
+            searchForLocalFileInDefaultPath(updatedFile);
+            
+            /// classify file to sync/download contents later
+            if (remoteFile.isFolder()) {
+                /// to download children files recursively
+                synchronized (mCancellationRequested) {
+                    if (mCancellationRequested.get()) {
+                        throw new OperationCancelledException();
+                    }
+                    startSyncFolderOperation(remoteFile.getRemotePath());
+                }

 
 

-            if (!remoteFile.isFolder()) {
-                // Start file download
-                requestForDownloadFile(remoteFile);

             } else {
             } else {

-                // Run new SyncFolderOperation for download children files recursively from a folder
-                SynchronizeFolderOperation synchFolderOp =  new SynchronizeFolderOperation( mContext,
-                        remoteFile.getRemotePath(),
+                /// prepare content synchronization for files (any file, not just favorites)
+                SynchronizeFileOperation operation = new SynchronizeFileOperation(
+                        localFile,
+                        remoteFile,

                         mAccount,
                         mAccount,

-                        mCurrentSyncTime);
-
-                synchFolderOp.execute(mAccount, mContext, null, null);
+                        true,
+                        mContext
+                    );
+                mFilesToSyncContents.add(operation);
+                

             }
 
             }
 

-            updatedFiles.add(remoteFile);
+            updatedFiles.add(updatedFile);

         }
 
         // save updated contents in local database
         storageManager.saveFolder(remoteFolder, updatedFiles, localFilesMap.values());
 
         }
 
         // save updated contents in local database
         storageManager.saveFolder(remoteFolder, updatedFiles, localFilesMap.values());
 

-        // request for the synchronization of file contents AFTER saving current remote properties
-        startContentSynchronizations(filesToSyncContents, client);
+    }
+    
+    
+    private void prepareOpsFromLocalKnowledge() throws OperationCancelledException {
+        List<OCFile> children = getStorageManager().getFolderContent(mLocalFolder, false);
+        for (OCFile child : children) {
+            /// classify file to sync/download contents later
+            if (child.isFolder()) {
+                /// to download children files recursively
+                synchronized(mCancellationRequested) {
+                    if (mCancellationRequested.get()) {
+                        throw new OperationCancelledException();
+                    }
+                    startSyncFolderOperation(child.getRemotePath());
+                }
+
+            } else {
+                /// synchronization for regular files
+                if (!child.isDown()) {
+                    mFilesForDirectDownload.add(child);

 
 

-        mChildren = updatedFiles;
+                } else {
+                    /// this should result in direct upload of files that were locally modified
+                    SynchronizeFileOperation operation = new SynchronizeFileOperation(
+                            child,
+                            (child.getEtagInConflict() != null ? child : null),
+                            mAccount,
+                            true,
+                            mContext
+                    );
+                    mFilesToSyncContents.add(operation);
+
+                }
+
+            }
+        }
+    }
+
+
+    private void syncContents(OwnCloudClient client) throws OperationCancelledException {
+        startDirectDownloads();
+        startContentSynchronizations(mFilesToSyncContents, client);
+    }
+
+    
+    private void startDirectDownloads() throws OperationCancelledException {
+        for (OCFile file : mFilesForDirectDownload) {
+            synchronized(mCancellationRequested) {
+                if (mCancellationRequested.get()) {
+                    throw new OperationCancelledException();
+                }
+                Intent i = new Intent(mContext, FileDownloader.class);
+                i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);
+                i.putExtra(FileDownloader.EXTRA_FILE, file);
+                mContext.startService(i);
+            }
+        }

     }
 
     /**
     }
 
     /**


@@ -380,125 +447,40 @@ public class SynchronizeFolderOperation extends SyncOperation {
      * @param filesToSyncContents       Synchronization operations to execute.
      * @param client                    Interface to the remote ownCloud server.
      */
      * @param filesToSyncContents       Synchronization operations to execute.
      * @param client                    Interface to the remote ownCloud server.
      */

-    private void startContentSynchronizations(
-            List<SynchronizeFileOperation> filesToSyncContents, OwnCloudClient client
-        ) {
+    private void startContentSynchronizations(List<SyncOperation> filesToSyncContents,
+                                              OwnCloudClient client)
+            throws OperationCancelledException {
+
+        Log_OC.v(TAG, "Starting content synchronization... ");

         RemoteOperationResult contentsResult = null;
         RemoteOperationResult contentsResult = null;

-        for (SynchronizeFileOperation op: filesToSyncContents) {
-            contentsResult = op.execute(getStorageManager(), mContext);   // async
+        for (SyncOperation op: filesToSyncContents) {
+            if (mCancellationRequested.get()) {
+                throw new OperationCancelledException();
+            }
+            contentsResult = op.execute(getStorageManager(), mContext);

             if (!contentsResult.isSuccess()) {
                 if (contentsResult.getCode() == ResultCode.SYNC_CONFLICT) {
                     mConflictsFound++;
                 } else {
             if (!contentsResult.isSuccess()) {
                 if (contentsResult.getCode() == ResultCode.SYNC_CONFLICT) {
                     mConflictsFound++;
                 } else {

-                    mFailsInFavouritesFound++;
+                    mFailsInFileSyncsFound++;

                     if (contentsResult.getException() != null) {
                     if (contentsResult.getException() != null) {

-                        Log_OC.e(TAG, "Error while synchronizing favourites : "
+                        Log_OC.e(TAG, "Error while synchronizing file : "

                                 +  contentsResult.getLogMessage(), contentsResult.getException());
                     } else {
                                 +  contentsResult.getLogMessage(), contentsResult.getException());
                     } else {

-                        Log_OC.e(TAG, "Error while synchronizing favourites : "
+                        Log_OC.e(TAG, "Error while synchronizing file : "

                                 + contentsResult.getLogMessage());
                     }
                 }
                                 + contentsResult.getLogMessage());
                     }
                 }

+                // TODO - use the errors count in notifications

             }   // won't let these fails break the synchronization process
         }
     }
 
             }   // won't let these fails break the synchronization process
         }
     }
 

-
-    public boolean isMultiStatus(int status) {
-        return (status == HttpStatus.SC_MULTI_STATUS);
-    }
-
-    /**
-     * Creates and populates a new {@link com.owncloud.android.datamodel.OCFile} object with the data read from the server.
-     *
-     * @param remote    remote file read from the server (remote file or folder).
-     * @return          New OCFile instance representing the remote resource described by we.
-     */
-    private OCFile fillOCFile(RemoteFile remote) {
-        OCFile file = new OCFile(remote.getRemotePath());
-        file.setCreationTimestamp(remote.getCreationTimestamp());
-        file.setFileLength(remote.getLength());
-        file.setMimetype(remote.getMimeType());
-        file.setModificationTimestamp(remote.getModifiedTimestamp());
-        file.setEtag(remote.getEtag());
-        file.setPermissions(remote.getPermissions());
-        file.setRemoteId(remote.getRemoteId());
-        return file;
-    }
-
-
-    /**
-     * Checks the storage path of the OCFile received as parameter.
-     * If it's out of the local ownCloud folder, tries to copy the file inside it.
-     *
-     * If the copy fails, the link to the local file is nullified. The account of forgotten
-     * files is kept in {@link #mForgottenLocalFiles}
-     *)
-     * @param file      File to check and fix.
-     */
-    private void checkAndFixForeignStoragePath(OCFile file) {
-        String storagePath = file.getStoragePath();
-        String expectedPath = FileStorageUtils.getDefaultSavePathFor(mAccount.name, file);
-        if (storagePath != null && !storagePath.equals(expectedPath)) {
-            /// fix storagePaths out of the local ownCloud folder
-            File originalFile = new File(storagePath);
-            if (FileStorageUtils.getUsableSpace(mAccount.name) < originalFile.length()) {
-                mForgottenLocalFiles.put(file.getRemotePath(), storagePath);
-                file.setStoragePath(null);
-
-            } else {
-                InputStream in = null;
-                OutputStream out = null;
-                try {
-                    File expectedFile = new File(expectedPath);
-                    File expectedParent = expectedFile.getParentFile();
-                    expectedParent.mkdirs();
-                    if (!expectedParent.isDirectory()) {
-                        throw new IOException(
-                                "Unexpected error: parent directory could not be created"
-                        );
-                    }
-                    expectedFile.createNewFile();
-                    if (!expectedFile.isFile()) {
-                        throw new IOException("Unexpected error: target file could not be created");
-                    }
-                    in = new FileInputStream(originalFile);
-                    out = new FileOutputStream(expectedFile);
-                    byte[] buf = new byte[1024];
-                    int len;
-                    while ((len = in.read(buf)) > 0){
-                        out.write(buf, 0, len);
-                    }
-                    file.setStoragePath(expectedPath);
-
-                } catch (Exception e) {
-                    Log_OC.e(TAG, "Exception while copying foreign file " + expectedPath, e);
-                    mForgottenLocalFiles.put(file.getRemotePath(), storagePath);
-                    file.setStoragePath(null);
-
-                } finally {
-                    try {
-                        if (in != null) in.close();
-                    } catch (Exception e) {
-                        Log_OC.d(TAG, "Weird exception while closing input stream for "
-                                + storagePath + " (ignoring)", e);
-                    }
-                    try {
-                        if (out != null) out.close();
-                    } catch (Exception e) {
-                        Log_OC.d(TAG, "Weird exception while closing output stream for "
-                                + expectedPath + " (ignoring)", e);
-                    }
-                }
-            }
-        }
-    }
-
-
+    

     /**
      * Scans the default location for saving local copies of files searching for
     /**
      * Scans the default location for saving local copies of files searching for

-     * a 'lost' file with the same full name as the {@link com.owncloud.android.datamodel.OCFile} received as
-     * parameter.
+     * a 'lost' file with the same full name as the {@link com.owncloud.android.datamodel.OCFile}
+     * received as parameter.

      *  
      * @param file      File to associate a possible 'lost' local file.
      */
      *  
      * @param file      File to associate a possible 'lost' local file.
      */


@@ -512,28 +494,31 @@ public class SynchronizeFolderOperation extends SyncOperation {
         }
     }
 
         }
     }
 

-    /**
-     * Requests for a download to the FileDownloader service
-     *
-     * @param file     OCFile object representing the file to download
-     */
-    private void requestForDownloadFile(OCFile file) {
-        Intent i = new Intent(mContext, FileDownloader.class);
-        i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);
-        i.putExtra(FileDownloader.EXTRA_FILE, file);
-        mContext.startService(i);
-    }
-
+    

     /**
      * Cancel operation
      */
     /**
      * Cancel operation
      */

-    public void cancel(){
-        // WIP Cancel the sync operation
+    public void cancel() {

         mCancellationRequested.set(true);
     }
 
         mCancellationRequested.set(true);
     }
 

-    public boolean getRemoteFolderChanged() {
-        return mRemoteFolderChanged;
+    public String getFolderPath() {
+        String path = mLocalFolder.getStoragePath();
+        if (path != null && path.length() > 0) {
+            return path;
+        }
+        return FileStorageUtils.getDefaultSavePathFor(mAccount.name, mLocalFolder);

     }
 
     }
 

+    private void startSyncFolderOperation(String path){
+        Intent intent = new Intent(mContext, OperationsService.class);
+        intent.setAction(OperationsService.ACTION_SYNC_FOLDER);
+        intent.putExtra(OperationsService.EXTRA_ACCOUNT, mAccount);
+        intent.putExtra(OperationsService.EXTRA_REMOTE_PATH, path);
+        mContext.startService(intent);
+    }
+
+    public String getRemotePath() {
+        return mRemotePath;
+    }

 }
 }