Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into...

[pub/Android/ownCloud.git] / src / com / owncloud / android / datamodel / OCFile.java

diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java
index 222746b..e6fd414 100644 (file)
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@ -71,7 +71,6 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     private boolean mNeedsUpdateThumbnail;
 
     private boolean mIsDownloading;
     private boolean mNeedsUpdateThumbnail;
 
     private boolean mIsDownloading;

-    private boolean mIsUploading;

 
 
     /**
 
 
     /**


@@ -116,7 +115,6 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mRemoteId = source.readString();
         mNeedsUpdateThumbnail = source.readInt() == 0;
         mIsDownloading = source.readInt() == 0;
         mRemoteId = source.readString();
         mNeedsUpdateThumbnail = source.readInt() == 0;
         mIsDownloading = source.readInt() == 0;

-        mIsUploading = source.readInt() == 0;

 
     }
 
 
     }
 


@@ -142,7 +140,6 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         dest.writeString(mRemoteId);
         dest.writeInt(mNeedsUpdateThumbnail ? 1 : 0);
         dest.writeInt(mIsDownloading ? 1 : 0);
         dest.writeString(mRemoteId);
         dest.writeInt(mNeedsUpdateThumbnail ? 1 : 0);
         dest.writeInt(mIsDownloading ? 1 : 0);

-        dest.writeInt(mIsUploading ? 1 : 0);

     }
 
     /**
     }
 
     /**


@@ -356,7 +353,6 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mRemoteId = null;
         mNeedsUpdateThumbnail = false;
         mIsDownloading = false;
         mRemoteId = null;
         mNeedsUpdateThumbnail = false;
         mIsDownloading = false;

-        mIsUploading = false;

     }
 
     /**
     }
 
     /**


@@ -575,16 +571,12 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         return mIsDownloading;
     }
 
         return mIsDownloading;
     }
 

-    public boolean isUploading() {
-        return mIsUploading;
-    }
-
-    public void setUploading(boolean isUploading) {
-        this.mIsUploading = isUploading;
-    }
-

     public void setDownloading(boolean isDownloading) {
         this.mIsDownloading = isDownloading;
     }
 
     public void setDownloading(boolean isDownloading) {
         this.mIsDownloading = isDownloading;
     }
 

+    public boolean isSynchronizing() {
+        // TODO real implementation
+        return false;
+    }

 }
 }