From: jabarros <jabarros@solidgear.es>
Date: Tue, 20 Jan 2015 11:42:27 +0000 (+0100)
Subject: Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into... 
X-Git-Tag: oc-android-1.7.0_signed~23^2~8^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d8ac7b2241bc99df58b5f4be4c3c4d83fc9efaf6?ds=sidebyside

Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into download_folder_update_database
---

d8ac7b2241bc99df58b5f4be4c3c4d83fc9efaf6
diff --cc src/com/owncloud/android/datamodel/OCFile.java
index bda6166d,2ba0415a..e6fd4141
--- a/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;
+     }
 -
  }