Join cancelation of downloads and uploads in 'cancel sync', both for files and folders

[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 af1c5e9..36955a5 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-2013 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,


@@ -18,372 +21,534 @@
 package com.owncloud.android.operations;
 
 import java.io.File;
 package com.owncloud.android.operations;
 
 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.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 

-import org.apache.http.HttpStatus;
-import org.apache.jackrabbit.webdav.MultiStatus;
-import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
-

 import android.accounts.Account;
 import android.content.Context;
 import android.accounts.Account;
 import android.content.Context;

-import com.owncloud.android.Log_OC;
-import com.owncloud.android.datamodel.DataStorageManager;
+import android.content.Intent;
+import android.util.Log;
+
+
+import com.owncloud.android.datamodel.FileDataStorageManager;

 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.OCFile;

-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+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.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.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.services.OperationsService;

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

-import eu.alefzero.webdav.WebdavClient;
-import eu.alefzero.webdav.WebdavEntry;
-import eu.alefzero.webdav.WebdavUtils;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+//import android.support.v4.content.LocalBroadcastManager;

 
 
 /**
 
 
 /**

- * Remote operation performing the synchronization a the contents of a remote folder with the local database
- * 
- * @author David A. Velasco
+ *  Remote operation performing the synchronization of the list of files contained 
+ *  in a folder identified with its remote path.
+ *  
+ *  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, BUT requests for a new operation instance
+ *  doing so.

  */
  */

-public class SynchronizeFolderOperation extends RemoteOperation {
+public class SynchronizeFolderOperation extends SyncOperation {

 
     private static final String TAG = SynchronizeFolderOperation.class.getSimpleName();
 
 
     private static final String TAG = SynchronizeFolderOperation.class.getSimpleName();
 

-    /** Remote folder to synchronize */
-    private String mRemotePath;
-    
-    /** Timestamp for the synchronization in progress */
+    /** Time stamp for the synchronization process in progress */

     private long mCurrentSyncTime;
     private long mCurrentSyncTime;

-    
-    /** Id of the folder to synchronize in the local database */
-    private long mParentId;

 
 

-    /** Access to the local database */
-    private DataStorageManager mStorageManager;
+    /** Remote path of the folder to synchronize */
+    private String mRemotePath;

     
     /** Account where the file to synchronize belongs */
     private Account mAccount;
     
     /** Account where the file to synchronize belongs */
     private Account mAccount;

-    
-    /** Android context; necessary to send requests to the download service; maybe something to refactor */
+
+    /** Android context; necessary to send requests to the download service */

     private Context mContext;
     private Context mContext;

-    
-    /** Files and folders contained in the synchronized folder */
-    private List<OCFile> mChildren;

 
 

+    /** Locally cached information about folder to synchronize */
+    private OCFile mLocalFolder;
+
+    /** Files and folders contained in the synchronized folder after a successful operation */
+    //private List<OCFile> mChildren;
+
+    /** Counter of conflicts found between local and remote files */

     private int mConflictsFound;
 
     private int mConflictsFound;
 

-    private int mFailsInFavouritesFound;
+    /** Counter of failed operations in synchronization of kept-in-sync files */
+    private int mFailsInFileSyncsFound;

 
 

-    private Map<String, String> mForgottenLocalFiles;
-    
+    /** 'True' means that the remote folder changed and should be fetched */
+    private boolean mRemoteFolderChanged;
+
+    private List<OCFile> mFilesForDirectDownload;
+        // to avoid extra PROPFINDs when there was no change in the folder

     
     

-    public SynchronizeFolderOperation(  String remotePath, 
-                                        long currentSyncTime, 
-                                        long parentId, 
-                                        DataStorageManager dataStorageManager, 
-                                        Account account, 
-                                        Context context ) {
+    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}.
+     *
+     * @param   context                 Application context.
+     * @param   remotePath              Path to synchronize.
+     * @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){

         mRemotePath = remotePath;
         mCurrentSyncTime = currentSyncTime;
         mRemotePath = remotePath;
         mCurrentSyncTime = currentSyncTime;

-        mParentId = parentId;
-        mStorageManager = dataStorageManager;

         mAccount = account;
         mContext = context;
         mAccount = account;
         mContext = context;

-        mForgottenLocalFiles = new HashMap<String, String>();
+        mRemoteFolderChanged = false;
+        mFilesForDirectDownload = new Vector<OCFile>();
+        mFilesToSyncContents = new Vector<SyncOperation>();
+        mCancellationRequested = new AtomicBoolean(false);

     }
     }

-    
-    
+
+

     public int getConflictsFound() {
         return mConflictsFound;
     }
     public int getConflictsFound() {
         return mConflictsFound;
     }

-    
-    public int getFailsInFavouritesFound() {
-        return mFailsInFavouritesFound;
-    }
-    
-    public Map<String, String> getForgottenLocalFiles() {
-        return mForgottenLocalFiles;
+
+    public int getFailsInFileSyncsFound() {
+        return mFailsInFileSyncsFound;

     }
     }

-    
+

     /**
     /**

-     * 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.
+     * Performs the synchronization.
+     *
+     * {@inheritDoc}

      */
      */

-    public List<OCFile> getChildren() {
-        return mChildren;
-    }
+    @Override
+    protected RemoteOperationResult run(OwnCloudClient client) {
+        RemoteOperationResult result = null;
+        mFailsInFileSyncsFound = 0;
+        mConflictsFound = 0;
+        
+        try {
+            // get locally cached information about folder 
+            mLocalFolder = getStorageManager().getFileByPath(mRemotePath);   
+            
+            result = checkForChanges(client);

     
     

-    public String getRemotePath() {
-        return mRemotePath;
-    }
+            if (result.isSuccess()) {
+                if (mRemoteFolderChanged) {
+                    result = fetchAndSyncRemoteFolder(client);
+                    
+                } else {
+                    prepareOpsFromLocalKnowledge();
+                }
+                
+                if (result.isSuccess()) {
+                    syncContents(client);
+                }
+
+            }
+            
+            if (mCancellationRequested.get()) {
+                throw new OperationCancelledException();
+            }
+            
+        } catch (OperationCancelledException e) {
+            result = new RemoteOperationResult(e);
+        }
+
+        return result;

 
 

-    public long getParentId() {
-        return mParentId;

     }
 
     }
 

-    @Override
-    protected RemoteOperationResult run(WebdavClient client) {
+    private RemoteOperationResult checkForChanges(OwnCloudClient client)
+            throws OperationCancelledException {
+        Log_OC.d(TAG, "Checking changes in " + mAccount.name + mRemotePath);
+
+        mRemoteFolderChanged = true;

         RemoteOperationResult result = null;
         RemoteOperationResult result = null;

-        mFailsInFavouritesFound = 0;
-        mConflictsFound = 0;
-        mForgottenLocalFiles.clear();
-        boolean fileChanged = false;
+        
+        if (mCancellationRequested.get()) {
+            throw new OperationCancelledException();
+        }
+        
+        // remote request
+        ReadRemoteFileOperation operation = new ReadRemoteFileOperation(mRemotePath);
+        result = operation.execute(client);
+        if (result.isSuccess()){
+            OCFile remoteFolder = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0));
+
+            // check if remote and local folder are different
+            mRemoteFolderChanged =
+                        !(remoteFolder.getEtag().equalsIgnoreCase(mLocalFolder.getEtag()));
+
+            result = new RemoteOperationResult(ResultCode.OK);
+
+            Log_OC.i(TAG, "Checked " + mAccount.name + mRemotePath + " : " +
+                    (mRemoteFolderChanged ? "changed" : "not changed"));
+
+        } else {
+            // check failed
+            if (result.getCode() == ResultCode.FILE_NOT_FOUND) {
+                removeLocalFolder();
+            }
+            if (result.isException()) {
+                Log_OC.e(TAG, "Checked " + mAccount.name + mRemotePath  + " : " +
+                        result.getLogMessage(), result.getException());
+            } else {
+                Log_OC.e(TAG, "Checked " + mAccount.name + mRemotePath + " : " +
+                        result.getLogMessage());
+            }

 
 

-        // code before in FileSyncAdapter.fetchData
-        PropFindMethod query = null;
-        try {
-            Log_OC.d(TAG, "Synchronizing " + mAccount.name + ", fetching files in " + mRemotePath);
-
-            // remote request 
-            query = new PropFindMethod(client.getBaseUri() + WebdavUtils.encodePath(mRemotePath));
-            int status = client.executeMethod(query);
-
-            // check and process response   - /// TODO take into account all the possible status per child-resource
-            if (isMultiStatus(status)) { 
-                MultiStatus resp = query.getResponseBodyAsMultiStatus();
-
-                // synchronize properties of the parent folder, if necessary
-                if (mParentId == DataStorageManager.ROOT_PARENT_ID) {
-                    WebdavEntry we = new WebdavEntry(resp.getResponses()[0], client.getBaseUri().getPath());
-
-                    // Properties of server folder
-                    OCFile parent = fillOCFile(we);
-                    // Properties of local folder
-                    OCFile localParent = mStorageManager.getFileById(1);
-                    if (parent.getEtag() != localParent.getEtag()) {
-                        mStorageManager.saveFile(parent);
-                        mParentId = parent.getFileId();
-                    }
-                }
+        }

 
 

+        return result;
+    }

 
 

-                // read contents in folder
-                List<String> filesOnServer = new ArrayList<String> (); // Contains the lists of files on server
-                List<OCFile> updatedFiles = new Vector<OCFile>(resp.getResponses().length - 1);
-                List<SynchronizeFileOperation> filesToSyncContents = new Vector<SynchronizeFileOperation>();
-                for (int i = 1; i < resp.getResponses().length; ++i) {
-                    /// new OCFile instance with the data from the server
-                    WebdavEntry we = new WebdavEntry(resp.getResponses()[i], client.getBaseUri().getPath());
-                    OCFile file = fillOCFile(we);
-
-                    filesOnServer.add(file.getRemotePath()); // Registry the file in the list
-
-                    /// set data about local state, keeping unchanged former data if existing
-                    file.setLastSyncDateForProperties(mCurrentSyncTime);
-                    OCFile oldFile = mStorageManager.getFileByPath(file.getRemotePath());
-
-                    // Check if it is needed to synchronize the folder
-                    fileChanged = false;
-                    if (oldFile != null) {
-                        if (!file.getEtag().equalsIgnoreCase(oldFile.getEtag())) {
-                            fileChanged = true; 
-                        }                        
-                    } else
-                        fileChanged= true;
-
-                    if (fileChanged){               
-                        if (oldFile != null) { 
-                            file.setKeepInSync(oldFile.keepInSync());
-                            file.setLastSyncDateForData(oldFile.getLastSyncDateForData());
-                            file.setModificationTimestampAtLastSyncForData(oldFile.getModificationTimestampAtLastSyncForData());    // must be kept unchanged when the file contents are not updated
-                            checkAndFixForeignStoragePath(oldFile);
-                            file.setStoragePath(oldFile.getStoragePath());
-                        }
-                        /// scan default location if local copy of file is not linked in OCFile instance
-                        if (file.getStoragePath() == null && !file.isDirectory()) {
-                            File f = new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, file));
-                            if (f.exists()) {
-                                file.setStoragePath(f.getAbsolutePath());
-                                file.setLastSyncDateForData(f.lastModified());
-                            }
-                        }
-
-                        /// prepare content synchronization for kept-in-sync files
-                        if (file.keepInSync()) {
-                            SynchronizeFileOperation operation = new SynchronizeFileOperation(  oldFile,        
-                                    file, 
-                                    mStorageManager,
-                                    mAccount,       
-                                    true, 
-                                    false,          
-                                    mContext
-                                    );
-                            filesToSyncContents.add(operation);
-                        }
-
-                        updatedFiles.add(file);
-                    }
-                }

 
 

-                // save updated contents in local database; all at once, trying to get a best performance in database update (not a big deal, indeed)
-                mStorageManager.saveFiles(updatedFiles);
-
-                // request for the synchronization of files AFTER saving last properties
-                //SynchronizeFileOperation op = null;
-                RemoteOperationResult contentsResult = null;
-                for (SynchronizeFileOperation op: filesToSyncContents) {//int i=0; i < filesToSyncContents.size(); i++) {
-                    //op = filesToSyncContents.get(i);
-                    contentsResult = op.execute(client);   // returns without waiting for upload or download finishes
-                    if (!contentsResult.isSuccess()) {
-                        if (contentsResult.getCode() == ResultCode.SYNC_CONFLICT) {
-                            mConflictsFound++;
-                        } else {
-                            mFailsInFavouritesFound++;
-                            if (contentsResult.getException() != null) {
-                                Log_OC.d(TAG, "Error while synchronizing favourites : " +  contentsResult.getLogMessage(), contentsResult.getException());
-                            } else {
-                                Log_OC.d(TAG, "Error while synchronizing favourites : " + contentsResult.getLogMessage());
-                            }
-                        }
-                    }   // won't let these fails break the synchronization process
-                }
+    private RemoteOperationResult fetchAndSyncRemoteFolder(OwnCloudClient client)
+            throws OperationCancelledException {
+        if (mCancellationRequested.get()) {
+            throw new OperationCancelledException();
+        }
+        
+        ReadRemoteFolderOperation operation = new ReadRemoteFolderOperation(mRemotePath);
+        RemoteOperationResult result = operation.execute(client);
+        Log_OC.d(TAG, "Synchronizing " + mAccount.name + mRemotePath);
+
+        if (result.isSuccess()) {
+            synchronizeData(result.getData(), client);
+            if (mConflictsFound > 0  || mFailsInFileSyncsFound > 0) {
+                result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT);
+                    // should be a different result code, but will do the job
+            }
+        } else {
+            if (result.getCode() == ResultCode.FILE_NOT_FOUND)
+                removeLocalFolder();
+        }
+        

 
 

+        return result;
+    }
+
+
+    private void removeLocalFolder() {
+        FileDataStorageManager storageManager = getStorageManager();
+        if (storageManager.fileExists(mLocalFolder.getFileId())) {
+            String currentSavePath = FileStorageUtils.getSavePath(mAccount.name);
+            storageManager.removeFolder(
+                    mLocalFolder,
+                    true,
+                    (   mLocalFolder.isDown() &&        // TODO: debug, I think this is
+                                                        // always false for folders
+                            mLocalFolder.getStoragePath().startsWith(currentSavePath)
+                    )
+            );
+        }
+    }
+
+
+    /**
+     *  Synchronizes the data retrieved from the server about the contents of the target folder
+     *  with the current data in the local database.
+     *
+     *  Grants that mChildren is updated with fresh data after execution.
+     *
+     *  @param folderAndFiles   Remote folder and children files in Folder
+     *
+     *  @param client           Client instance to the remote server where the data were
+     *                          retrieved.
+     *  @return                 'True' when any change was made in the local data, 'false' otherwise
+     */
+    private void synchronizeData(ArrayList<Object> folderAndFiles, OwnCloudClient client)
+            throws OperationCancelledException {
+        FileDataStorageManager storageManager = getStorageManager();
+        
+        // parse data from remote folder
+        OCFile remoteFolder = fillOCFile((RemoteFile)folderAndFiles.get(0));
+        remoteFolder.setParentId(mLocalFolder.getParentId());
+        remoteFolder.setFileId(mLocalFolder.getFileId());
+
+        Log_OC.d(TAG, "Remote folder " + mLocalFolder.getRemotePath()
+                + " changed - starting update of local data ");
+
+        List<OCFile> updatedFiles = new Vector<OCFile>(folderAndFiles.size() - 1);
+        mFilesForDirectDownload.clear();
+        mFilesToSyncContents.clear();
+
+        if (mCancellationRequested.get()) {
+            throw new OperationCancelledException();
+        }

 
 

-                // removal of obsolete files
-                mChildren = mStorageManager.getDirectoryContent(mStorageManager.getFileById(mParentId));
-                //OCFile file;
-                String currentSavePath = FileStorageUtils.getSavePath(mAccount.name);
-                for (OCFile fileChild: mChildren) {
-                    //file = mChildren.get(i);
-                    //if (file.getLastSyncDateForProperties() != mCurrentSyncTime) {
-                    if (!filesOnServer.contains(fileChild.getRemotePath())) {
-                        Log_OC.d(TAG, "removing file: " + fileChild.getFileName());
-                        mStorageManager.removeFile(fileChild, (fileChild.isDown() && fileChild.getStoragePath().startsWith(currentSavePath)));
-                        mChildren.remove(fileChild); //.remove(i);
+        // get current data about local contents of the folder to synchronize
+        // TODO Enable when "On Device" is recovered ?
+        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);
+        }
+
+        // loop to synchronize every child
+        OCFile remoteFile = null, localFile = null;
+        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());
+
+            /// 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);
+            if (localFile != null) {
+                // some properties of local state are kept unmodified
+                remoteFile.setFileId(localFile.getFileId());
+                remoteFile.setFavorite(localFile.isFavorite());
+                remoteFile.setLastSyncDateForData(localFile.getLastSyncDateForData());
+                remoteFile.setModificationTimestampAtLastSyncForData(
+                        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());
+                        // TODO move operations about size of folders to FileContentProvider
+                } else if (mRemoteFolderChanged && remoteFile.isImage() &&
+                        remoteFile.getModificationTimestamp() !=
+                                localFile.getModificationTimestamp()) {
+                    remoteFile.setNeedsUpdateThumbnail(true);
+                    Log.d(TAG, "Image " + remoteFile.getFileName() + " updated on the server");
+                }
+                remoteFile.setPublicLink(localFile.getPublicLink());
+                remoteFile.setShareByLink(localFile.isShareByLink());
+            } else {
+                // remote eTag will not be updated unless contents are synchronized
+                //  (Synchronize[File|Folder]Operation with remoteFile as parameter)
+                remoteFile.setEtag("");
+            }
+
+            /// check and fix, if needed, local storage path
+            searchForLocalFileInDefaultPath(remoteFile);
+            
+            /// classify file to sync/download contents later
+            if (remoteFile.isFolder()) {
+                /// to download children files recursively
+                synchronized (mCancellationRequested) {
+                    if (mCancellationRequested.get()) {
+                        throw new OperationCancelledException();

                     }
                     }

-                    //                    } else {
-                    //                        i++;
-                    //                    }
+                    startSyncFolderOperation(remoteFile.getRemotePath());

                 }
                 }

-                // }
-                //}

 
 

+            //} else if (remoteFile.isFavorite()) {

             } else {
             } else {

-                client.exhaustResponse(query.getResponseBodyAsStream());
+                /// prepare content synchronization for kept-in-sync files
+                SynchronizeFileOperation operation = new SynchronizeFileOperation(
+                        localFile,
+                        remoteFile,
+                        mAccount,
+                        true,
+                        mContext
+                    );
+                mFilesToSyncContents.add(operation);
+                
+            /*} else {
+                /// prepare limited synchronization for regular files
+                SynchronizeFileOperation operation = new SynchronizeFileOperation(
+                        localFile,
+                        remoteFile,
+                        mAccount,
+                        true,
+                        false,
+                        mContext
+                    );
+                mFilesToSyncContentsWithoutUpload.add(operation);*/

             }
 
             }
 

-            // prepare result object
-            if (!fileChanged) {
-                result = new RemoteOperationResult(ResultCode.OK_NO_CHANGES_ON_DIR);
+            updatedFiles.add(remoteFile);
+        }

 
 

-            } else if (isMultiStatus(status)) {
-                if (mConflictsFound > 0  || mFailsInFavouritesFound > 0) { 
-                    result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT);   // should be different result, but will do the job
+        // save updated contents in local database
+        storageManager.saveFolder(remoteFolder, updatedFiles, localFilesMap.values());

 
 

-                } else {
-                    result = new RemoteOperationResult(true, status);
+    }
+    
+    
+    private void prepareOpsFromLocalKnowledge() throws OperationCancelledException {
+        // TODO Enable when "On Device" is recovered ?
+        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 {
             } else {

-                result = new RemoteOperationResult(false, status);
-            }
-            Log_OC.i(TAG, "Synchronizing " + mAccount.name + ", folder " + mRemotePath + ": " + result.getLogMessage());
+                /// prepare limited synchronization for regular files
+                if (!child.isDown()) {
+                    mFilesForDirectDownload.add(child);

 
 

+                } else {
+                    /// this should result in direct upload of files that were locally modified
+                    SynchronizeFileOperation operation = new SynchronizeFileOperation(
+                            child,
+                            child,  // cheating with the remote file to get an upadte to server; to refactor
+                            mAccount,
+                            true,
+                            mContext
+                    );
+                    mFilesToSyncContents.add(operation);

 
 

-        } catch (Exception e) {
-            result = new RemoteOperationResult(e);
-            Log_OC.e(TAG, "Synchronizing " + mAccount.name + ", folder " + mRemotePath + ": " + result.getLogMessage(), result.getException());
+                }

 
 

-        } finally {
-            if (query != null)
-                query.releaseConnection();  // let the connection available for other methods
+            }

         }
         }

-
-        return result;

     }
 
 
     }
 
 

-    public boolean isMultiStatus(int status) {
-        return (status == HttpStatus.SC_MULTI_STATUS); 
+    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);
+            }
+        }
+    }

 
     /**
 
     /**

-     * Creates and populates a new {@link OCFile} object with the data read from the server.
-     * 
-     * @param we        WebDAV entry read from the server for a WebDAV resource (remote file or folder).
+     * Performs a list of synchronization operations, determining if a download or upload is needed
+     * or if exists conflict due to changes both in local and remote contents of the each file.
+     *
+     * If download or upload is needed, request the operation to the corresponding service and goes
+     * on.
+     *
+     * @param filesToSyncContents       Synchronization operations to execute.
+     * @param client                    Interface to the remote ownCloud server.
+     */
+    private void startContentSynchronizations(List<SyncOperation> filesToSyncContents,
+                                              OwnCloudClient client)
+            throws OperationCancelledException {
+
+        Log_OC.v(TAG, "Starting content synchronization... ");
+        RemoteOperationResult contentsResult = null;
+        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 {
+                    mFailsInFileSyncsFound++;
+                    if (contentsResult.getException() != null) {
+                        Log_OC.e(TAG, "Error while synchronizing file : "
+                                +  contentsResult.getLogMessage(), contentsResult.getException());
+                    } else {
+                        Log_OC.e(TAG, "Error while synchronizing file : "
+                                + contentsResult.getLogMessage());
+                    }
+                }
+                // TODO - use the errors count in notifications
+            }   // won't let these fails break the synchronization process
+        }
+    }
+
+    
+    /**
+     * 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.
      */
      * @return          New OCFile instance representing the remote resource described by we.
      */

-    private OCFile fillOCFile(WebdavEntry we) {
-        OCFile file = new OCFile(we.decodedPath());
-        file.setCreationTimestamp(we.createTimestamp());
-        file.setFileLength(we.contentLength());
-        file.setMimetype(we.contentType());
-        file.setModificationTimestamp(we.modifiedTimestamp());
-        file.setParentId(mParentId);
-        file.setEtag(we.etag());
+    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;
     }
         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.
+     * 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.
+     *  
+     * @param file      File to associate a possible 'lost' local file.

      */
      */

-    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);
-                    }
-                }
+    private void searchForLocalFileInDefaultPath(OCFile file) {
+        if (file.getStoragePath() == null && !file.isFolder()) {
+            File f = new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, file));
+            if (f.exists()) {
+                file.setStoragePath(f.getAbsolutePath());
+                file.setLastSyncDateForData(f.lastModified());

             }
         }
     }
 
             }
         }
     }
 

+    
+    /**
+     * Cancel operation
+     */
+    public void cancel() {
+        mCancellationRequested.set(true);
+    }

 
 

+    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;
+    }

 }
 }