Merge branch 'develop' into refactor_remote_operation_to_read_file

Conflicts:
	src/com/owncloud/android/utils/FileStorageUtils.java

diff --cc src/com/owncloud/android/utils/FileStorageUtils.java
index d13d051,16812c6..d4042f5
--- 1/src/com/owncloud/android/utils/FileStorageUtils.java
--- 2/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@@ -84,19 -84,20 +84,36 @@@ public class FileStorageUtils 
          return parentPath;
      }
      
 +    /**
 +     * Creates and populates a new {@link 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.
 +     */
 +    public static 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());
++        
++        return file;
++    }
+     
+     /**
+      * Creates and populates a new {@link RemoteFile} object with the data read from an {@link OCFile}.
+      * 
+      * @param oCFile    OCFile 
+      * @return          New RemoteFile instance representing the resource described by ocFile.
+      */
+     public static RemoteFile fillRemoteFile(OCFile ocFile){
+         RemoteFile file = new RemoteFile(ocFile.getRemotePath());
+         file.setCreationTimestamp(ocFile.getCreationTimestamp());
+         file.setLength(ocFile.getFileLength());
+         file.setMimeType(ocFile.getMimetype());
+         file.setModifiedTimestamp(ocFile.getModificationTimestamp());
+         file.setEtag(ocFile.getEtag());
          return file;
      }