Added construction of SynchronizeFolderOperation to OperationService

[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 97c7a08..37f5b46 100644 (file)
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@ -1,5 +1,5 @@
 /* ownCloud Android client application
 /* ownCloud Android client application

- *   Copyright (C) 2012-2013 ownCloud Inc.
+ *   Copyright (C) 2012-2014 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,6 +17,26 @@
 
 package com.owncloud.android.operations;
 
 
 package com.owncloud.android.operations;
 

+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.lib.common.OwnCloudClient;
+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.utils.FileStorageUtils;
+
+import org.apache.http.HttpStatus;
+

 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;


@@ -29,25 +49,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
 import java.util.Map;
 import java.util.Vector;
 

-import org.apache.http.HttpStatus;
-import android.accounts.Account;
-import android.content.Context;
-import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
-
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.lib.network.OwnCloudClient;
-import com.owncloud.android.lib.operations.common.RemoteOperation;
-import com.owncloud.android.lib.operations.common.RemoteOperationResult;
-import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
-import com.owncloud.android.lib.operations.remote.ReadRemoteFileOperation;
-import com.owncloud.android.lib.operations.remote.ReadRemoteFolderOperation;
-import com.owncloud.android.lib.operations.common.RemoteFile;
-import com.owncloud.android.syncadapter.FileSyncAdapter;
-import com.owncloud.android.utils.FileStorageUtils;
-import com.owncloud.android.utils.Log_OC;
-
+//import android.support.v4.content.LocalBroadcastManager;

 
 
 /**
 
 
 /**


@@ -61,27 +63,25 @@ import com.owncloud.android.utils.Log_OC;
  * 
  *  @author David A. Velasco
  */
  * 
  *  @author David A. Velasco
  */

-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();
 

-    public static final String EVENT_SINGLE_FOLDER_SYNCED = SynchronizeFolderOperation.class.getName() + ".EVENT_SINGLE_FOLDER_SYNCED";
-    

     /** 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 folder to synchronize */
     private OCFile mLocalFolder;

-    
+

     /** Access to the local database */
     private FileDataStorageManager mStorageManager;
     /** Access to the local database */
     private FileDataStorageManager mStorageManager;

-    
+

     /** 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 */
     private Context mContext;
     /** Android context; necessary to send requests to the download service */
     private Context mContext;

-    
+

     /** Files and folders contained in the synchronized folder after a successful operation */
     private List<OCFile> mChildren;
 
     /** Files and folders contained in the synchronized folder after a successful operation */
     private List<OCFile> mChildren;
 


@@ -91,69 +91,60 @@ public class SynchronizeFolderOperation extends RemoteOperation {
     /** Counter of failed operations in synchronization of kept-in-sync files */
     private int mFailsInFavouritesFound;
 
     /** 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 */
+    /**
+     * 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 Map<String, String> mForgottenLocalFiles;
 

-    /** 'True' means that this operation is part of a full account synchronization */ 
-    private boolean mSyncFullAccount;
-
-    /** 'True' means that the remote folder changed from last synchronization and should be fetched */
+    /** 'True' means that the remote folder changed and should be fetched */

     private boolean mRemoteFolderChanged;
     private boolean mRemoteFolderChanged;

-    
-    
+
+

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

-     * 
-     * @param   remoteFolderPath        Remote folder to synchronize.
-     * @param   currentSyncTime         Time stamp for the synchronization process in progress.
-     * @param   localFolderId           Identifier in the local database of the folder to synchronize.
-     * @param   updateFolderProperties  'True' means that the properties of the folder should be updated also, not just its content.
-     * @param   syncFullAccount         'True' means that this operation is part of a full account synchronization.
-     * @param   dataStorageManager      Interface with the local database.
-     * @param   account                 ownCloud account where the folder is located. 
+     *

      * @param   context                 Application context.
      * @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(  OCFile folder, 
-                                        long currentSyncTime, 
-                                        boolean syncFullAccount,
-                                        FileDataStorageManager dataStorageManager, 
-                                        Account account, 
-                                        Context context ) {
-        mLocalFolder = folder;
+    public SynchronizeFolderOperation(Context context, String remotePath, Account account, long currentSyncTime){
+        mLocalFolder = new OCFile(remotePath);

         mCurrentSyncTime = currentSyncTime;
         mCurrentSyncTime = currentSyncTime;

-        mSyncFullAccount = syncFullAccount;
-        mStorageManager = dataStorageManager;
+        mStorageManager = getStorageManager();

         mAccount = account;
         mContext = context;
         mForgottenLocalFiles = new HashMap<String, String>();
         mRemoteFolderChanged = false;
     }
         mAccount = account;
         mContext = context;
         mForgottenLocalFiles = new HashMap<String, String>();
         mRemoteFolderChanged = false;
     }

-    
-    
+
+

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

-    
+

     public int getFailsInFavouritesFound() {
         return mFailsInFavouritesFound;
     }
     public int getFailsInFavouritesFound() {
         return mFailsInFavouritesFound;
     }

-    
+

     public Map<String, String> getForgottenLocalFiles() {
         return mForgottenLocalFiles;
     }
     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.
-     * 
+     * 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;
     }
      * @return  List of files and folders contained in the synchronized folder.
      */
     public List<OCFile> getChildren() {
         return mChildren;
     }

-    
+

     /**
      * Performs the synchronization.
     /**
      * Performs the synchronization.

-     * 
+     *

      * {@inheritDoc}
      */
     @Override
      * {@inheritDoc}
      */
     @Override


@@ -162,9 +153,9 @@ public class SynchronizeFolderOperation extends RemoteOperation {
         mFailsInFavouritesFound = 0;
         mConflictsFound = 0;
         mForgottenLocalFiles.clear();
         mFailsInFavouritesFound = 0;
         mConflictsFound = 0;
         mForgottenLocalFiles.clear();

-        
+

         result = checkForChanges(client);
         result = checkForChanges(client);

-        
+

         if (result.isSuccess()) {
             if (mRemoteFolderChanged) {
                 result = fetchAndSyncRemoteFolder(client);
         if (result.isSuccess()) {
             if (mRemoteFolderChanged) {
                 result = fetchAndSyncRemoteFolder(client);


@@ -172,48 +163,48 @@ public class SynchronizeFolderOperation extends RemoteOperation {
                 mChildren = mStorageManager.getFolderContent(mLocalFolder);
             }
         }
                 mChildren = mStorageManager.getFolderContent(mLocalFolder);
             }
         }

-        
-        if (!mSyncFullAccount) {            
-            sendLocalBroadcast(mLocalFolder.getRemotePath(), result);
-        }

 
         return result;
 
         return result;

-        
-    }

 
 

+    }

 
     private RemoteOperationResult checkForChanges(OwnCloudClient client) {
 
     private RemoteOperationResult checkForChanges(OwnCloudClient client) {

-        mRemoteFolderChanged = false;
+        mRemoteFolderChanged = true;

         RemoteOperationResult result = null;
         String remotePath = null;
 
         RemoteOperationResult result = null;
         String remotePath = null;
 

-            remotePath = mLocalFolder.getRemotePath();
-            Log_OC.d(TAG, "Checking changes in " + mAccount.name + remotePath);
-
-            // remote request 
-            ReadRemoteFileOperation operation = new ReadRemoteFileOperation(remotePath);
-            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 + remotePath + " : " + (mRemoteFolderChanged ? "changed" : "not changed"));
+        remotePath = mLocalFolder.getRemotePath();
+        Log_OC.d(TAG, "Checking changes in " + mAccount.name + remotePath);
+
+        // remote request
+        ReadRemoteFileOperation operation = new ReadRemoteFileOperation(remotePath);
+        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 + remotePath + " : " +
+                    (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 + remotePath  + " : " +
+                        result.getLogMessage(), result.getException());

             } else {
             } else {

-                // check failed
-                if (result.getCode() == ResultCode.FILE_NOT_FOUND) {
-                    removeLocalFolder();
-                }
-                if (result.isException()) {
-                    Log_OC.e(TAG, "Checked " + mAccount.name + remotePath  + " : " + result.getLogMessage(), result.getException());
-                } else {
-                    Log_OC.e(TAG, "Checked " + mAccount.name + remotePath + " : " + result.getLogMessage());
-                }
+                Log_OC.e(TAG, "Checked " + mAccount.name + remotePath + " : " +
+                        result.getLogMessage());

             }
             }

-            
+        }
+

         return result;
     }
 
         return result;
     }
 


@@ -223,52 +214,60 @@ public class SynchronizeFolderOperation extends RemoteOperation {
         ReadRemoteFolderOperation operation = new ReadRemoteFolderOperation(remotePath);
         RemoteOperationResult result = operation.execute(client);
         Log_OC.d(TAG, "Synchronizing " + mAccount.name + remotePath);
         ReadRemoteFolderOperation operation = new ReadRemoteFolderOperation(remotePath);
         RemoteOperationResult result = operation.execute(client);
         Log_OC.d(TAG, "Synchronizing " + mAccount.name + remotePath);

-        
+

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

-            if (mConflictsFound > 0  || mFailsInFavouritesFound > 0) { 
-                result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT);   // should be different result, but will do the job
+            if (mConflictsFound > 0  || mFailsInFavouritesFound > 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();
         }
             }
         } else {
             if (result.getCode() == ResultCode.FILE_NOT_FOUND)
                 removeLocalFolder();
         }

-        
+

         return result;
     }
 
         return result;
     }
 

-    
+

     private void removeLocalFolder() {
         if (mStorageManager.fileExists(mLocalFolder.getFileId())) {
             String currentSavePath = FileStorageUtils.getSavePath(mAccount.name);
     private void removeLocalFolder() {
         if (mStorageManager.fileExists(mLocalFolder.getFileId())) {
             String currentSavePath = FileStorageUtils.getSavePath(mAccount.name);

-            mStorageManager.removeFolder(mLocalFolder, true, (mLocalFolder.isDown() && mLocalFolder.getStoragePath().startsWith(currentSavePath)));
+            mStorageManager.removeFolder(
+                    mLocalFolder,
+                    true,
+                    (   mLocalFolder.isDown() &&
+                            mLocalFolder.getStoragePath().startsWith(currentSavePath)
+                    )
+            );

         }
     }
 
 
     /**
         }
     }
 
 
     /**

-     *  Synchronizes the data retrieved from the server about the contents of the target folder 
+     *  Synchronizes the data retrieved from the server about the contents of the target folder

      *  with the current data in the local database.
      *  with the current data in the local database.

-     *  
+     *

      *  Grants that mChildren is updated with fresh data after execution.
      *  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.
+     *
+     *  @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) {
         // get 'fresh data' from the database
         mLocalFolder = mStorageManager.getFileByPath(mLocalFolder.getRemotePath());
      */
     private void synchronizeData(ArrayList<Object> folderAndFiles, OwnCloudClient client) {
         // get 'fresh data' from the database
         mLocalFolder = mStorageManager.getFileByPath(mLocalFolder.getRemotePath());

-        
-        // parse data from remote folder 
+
+        // parse data from remote folder

         OCFile remoteFolder = fillOCFile((RemoteFile)folderAndFiles.get(0));
         remoteFolder.setParentId(mLocalFolder.getParentId());
         remoteFolder.setFileId(mLocalFolder.getFileId());
         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 ");
-        
+
+        Log_OC.d(TAG, "Remote folder " + mLocalFolder.getRemotePath()
+                + " changed - starting update of local data ");
+

         List<OCFile> updatedFiles = new Vector<OCFile>(folderAndFiles.size() - 1);
         List<SynchronizeFileOperation> filesToSyncContents = new Vector<SynchronizeFileOperation>();
 
         List<OCFile> updatedFiles = new Vector<OCFile>(folderAndFiles.size() - 1);
         List<SynchronizeFileOperation> filesToSyncContents = new Vector<SynchronizeFileOperation>();
 


@@ -278,7 +277,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
         for (OCFile file : localFiles) {
             localFilesMap.put(file.getRemotePath(), file);
         }
         for (OCFile file : localFiles) {
             localFilesMap.put(file.getRemotePath(), file);
         }

-        
+

         // loop to update every child
         OCFile remoteFile = null, localFile = null;
         for (int i=1; i<folderAndFiles.size(); i++) {
         // loop to update every child
         OCFile remoteFile = null, localFile = null;
         for (int i=1; i<folderAndFiles.size(); i++) {


@@ -286,83 +285,109 @@ public class SynchronizeFolderOperation extends RemoteOperation {
             remoteFile = fillOCFile((RemoteFile)folderAndFiles.get(i));
             remoteFile.setParentId(mLocalFolder.getFileId());
 
             remoteFile = fillOCFile((RemoteFile)folderAndFiles.get(i));
             remoteFile.setParentId(mLocalFolder.getFileId());
 

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

             localFile = localFilesMap.remove(remoteFile.getRemotePath());
             localFile = localFilesMap.remove(remoteFile.getRemotePath());

-            
-            /// add to the remoteFile (the new one) data about LOCAL STATE (not existing in the server side)
+
+            /// 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.setKeepInSync(localFile.keepInSync());
                 remoteFile.setLastSyncDateForData(localFile.getLastSyncDateForData());
             remoteFile.setLastSyncDateForProperties(mCurrentSyncTime);
             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(localFile.getModificationTimestampAtLastSyncForData());
+                remoteFile.setModificationTimestampAtLastSyncForData(
+                        localFile.getModificationTimestampAtLastSyncForData()
+                );

                 remoteFile.setStoragePath(localFile.getStoragePath());
                 remoteFile.setStoragePath(localFile.getStoragePath());

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

                 if (remoteFile.isFolder()) {
                 if (remoteFile.isFolder()) {

-                    remoteFile.setFileLength(localFile.getFileLength()); // TODO move operations about size of folders to FileContentProvider
+                    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 {
             } else {

-                remoteFile.setEtag(""); // remote eTag will not be updated unless contents are synchronized (Synchronize[File|Folder]Operation with remoteFile as parameter)
+                // 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
             }
 
             /// check and fix, if needed, local storage path

-            checkAndFixForeignStoragePath(remoteFile);      // fixing old policy - now local files must be copied into the ownCloud local folder 
-            searchForLocalFileInDefaultPath(remoteFile);    // legacy   
+            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()) {
 
             /// prepare content synchronization for kept-in-sync files
             if (remoteFile.keepInSync()) {

-                SynchronizeFileOperation operation = new SynchronizeFileOperation(  localFile,        
-                                                                                    remoteFile, 
-                                                                                    mStorageManager,
-                                                                                    mAccount,       
-                                                                                    true, 
+                SynchronizeFileOperation operation = new SynchronizeFileOperation(  localFile,
+                                                                                    remoteFile,
+                                                                                    mAccount,
+                                                                                    true,

                                                                                     mContext
                                                                                     );
                                                                                     mContext
                                                                                     );

+

                 filesToSyncContents.add(operation);
             }
                 filesToSyncContents.add(operation);
             }

-            
+
+            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);
         }
 
             updatedFiles.add(remoteFile);
         }
 

-        // save updated contents in local database; all at once, trying to get a best performance in database update (not a big deal, indeed)
+        // save updated contents in local database

         mStorageManager.saveFolder(remoteFolder, updatedFiles, localFilesMap.values());
 
         // request for the synchronization of file contents AFTER saving current remote properties
         startContentSynchronizations(filesToSyncContents, client);
 
         mStorageManager.saveFolder(remoteFolder, updatedFiles, localFilesMap.values());
 
         // request for the synchronization of file contents AFTER saving current remote properties
         startContentSynchronizations(filesToSyncContents, client);
 

-        // removal of obsolete files
-        //removeObsoleteFiles();
-       
-        // must be done AFTER saving all the children information, so that eTag is not updated in the database in case of unexpected exceptions
-        //mStorageManager.saveFile(remoteFolder);

         mChildren = updatedFiles;
         mChildren = updatedFiles;

-        

     }
 
     /**
     }
 
     /**

-     * 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.
-     * 
+     * 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.
      */
      * @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<SynchronizeFileOperation> filesToSyncContents, OwnCloudClient client
+        ) {

         RemoteOperationResult contentsResult = null;
         for (SynchronizeFileOperation op: filesToSyncContents) {
         RemoteOperationResult contentsResult = null;
         for (SynchronizeFileOperation op: filesToSyncContents) {

-            contentsResult = op.execute(client);   // returns without waiting for upload or download finishes
+            contentsResult = op.execute(mStorageManager, mContext);   // async

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

-                        Log_OC.e(TAG, "Error while synchronizing favourites : " +  contentsResult.getLogMessage(), contentsResult.getException());
+                        Log_OC.e(TAG, "Error while synchronizing favourites : "
+                                +  contentsResult.getLogMessage(), contentsResult.getException());

                     } else {
                     } else {

-                        Log_OC.e(TAG, "Error while synchronizing favourites : " + contentsResult.getLogMessage());
+                        Log_OC.e(TAG, "Error while synchronizing favourites : "
+                                + contentsResult.getLogMessage());

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


@@ -371,12 +396,12 @@ public class SynchronizeFolderOperation extends RemoteOperation {
 
 
     public boolean isMultiStatus(int status) {
 
 
     public boolean isMultiStatus(int status) {

-        return (status == HttpStatus.SC_MULTI_STATUS); 
+        return (status == HttpStatus.SC_MULTI_STATUS);

     }
 
     /**
     }
 
     /**

-     * Creates and populates a new {@link OCFile} object with the data read from the server.
-     * 
+     * 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.
      */
      * @param remote    remote file read from the server (remote file or folder).
      * @return          New OCFile instance representing the remote resource described by we.
      */


@@ -387,17 +412,19 @@ public class SynchronizeFolderOperation extends RemoteOperation {
         file.setMimetype(remote.getMimeType());
         file.setModificationTimestamp(remote.getModifiedTimestamp());
         file.setEtag(remote.getEtag());
         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}
-     *) 
+     * 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) {
      * @param file      File to check and fix.
      */
     private void checkAndFixForeignStoragePath(OCFile file) {


@@ -409,7 +436,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
             if (FileStorageUtils.getUsableSpace(mAccount.name) < originalFile.length()) {
                 mForgottenLocalFiles.put(file.getRemotePath(), storagePath);
                 file.setStoragePath(null);
             if (FileStorageUtils.getUsableSpace(mAccount.name) < originalFile.length()) {
                 mForgottenLocalFiles.put(file.getRemotePath(), storagePath);
                 file.setStoragePath(null);

-                    
+

             } else {
                 InputStream in = null;
                 OutputStream out = null;
             } else {
                 InputStream in = null;
                 OutputStream out = null;


@@ -418,12 +445,14 @@ public class SynchronizeFolderOperation extends RemoteOperation {
                     File expectedParent = expectedFile.getParentFile();
                     expectedParent.mkdirs();
                     if (!expectedParent.isDirectory()) {
                     File expectedParent = expectedFile.getParentFile();
                     expectedParent.mkdirs();
                     if (!expectedParent.isDirectory()) {

-                        throw new IOException("Unexpected error: parent directory could not be created");
+                        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");
                     }
                     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];
                     in = new FileInputStream(originalFile);
                     out = new FileOutputStream(expectedFile);
                     byte[] buf = new byte[1024];


@@ -432,31 +461,34 @@ public class SynchronizeFolderOperation extends RemoteOperation {
                         out.write(buf, 0, len);
                     }
                     file.setStoragePath(expectedPath);
                         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);
                 } 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) {
                 } finally {
                     try {
                         if (in != null) in.close();
                     } catch (Exception e) {

-                        Log_OC.d(TAG, "Weird exception while closing input stream for " + storagePath + " (ignoring)", e);
+                        Log_OC.d(TAG, "Weird exception while closing input stream for "
+                                + storagePath + " (ignoring)", e);

                     }
                     try {
                         if (out != null) out.close();
                     } catch (Exception e) {
                     }
                     try {
                         if (out != null) out.close();
                     } catch (Exception e) {

-                        Log_OC.d(TAG, "Weird exception while closing output stream for " + expectedPath + " (ignoring)", 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 OCFile} received as 
+     * 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.
      * parameter.
      *  
      * @param file      File to associate a possible 'lost' local file.


@@ -471,25 +503,18 @@ public class SynchronizeFolderOperation extends RemoteOperation {
         }
     }
 
         }
     }
 

-    

     /**
     /**

-     * Sends a message to any application component interested in the progress of the synchronization.
-     * 
-     * @param inProgress        'True' when the synchronization progress is not finished.
-     * @param dirRemotePath     Remote path of a folder that was just synchronized (with or without success)
+     * Requests for a download to the FileDownloader service
+     *
+     * @param file     OCFile object representing the file to download

      */
      */

-    private void sendLocalBroadcast(String dirRemotePath, RemoteOperationResult result) {
-        Intent intent = new Intent(EVENT_SINGLE_FOLDER_SYNCED);
-        intent.putExtra(FileSyncAdapter.EXTRA_ACCOUNT_NAME, mAccount.name);
-        if (dirRemotePath != null) {
-            intent.putExtra(FileSyncAdapter.EXTRA_FOLDER_PATH, dirRemotePath);
-        }
-        intent.putExtra(FileSyncAdapter.EXTRA_RESULT, result);
-        //mContext.sendStickyBroadcast(intent);
-        LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent);
+    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);

     }
 
     }
 

-

     public boolean getRemoteFolderChanged() {
         return mRemoteFolderChanged;
     }
     public boolean getRemoteFolderChanged() {
         return mRemoteFolderChanged;
     }