Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into...

diff --cc src/com/owncloud/android/datamodel/OCFile.java
index bda6166,2ba0415..e6fd414
--- 1/src/com/owncloud/android/datamodel/OCFile.java
--- 2/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@@ -567,12 -562,14 +567,16 @@@ public class OCFile implements Parcelab
          this.mRemoteId = remoteId;
      }
  
 -    public boolean isSynchronizing() {
 -        // TODO real implementation
 -        return false;
 +    public boolean isDownloading() {
 +        return mIsDownloading;
      }
  
 -    public boolean isDownloading() {
 +    public void setDownloading(boolean isDownloading) {
 +        this.mIsDownloading = isDownloading;
 +    }
 +
++    public boolean isSynchronizing() {
+         // TODO real implementation
+         return false;
+     }
 -
  }

diff --cc src/com/owncloud/android/files/services/FileDownloader.java
Simple merge