X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/b9ef747a0be9e50d50b709474daf9dca47d60f5f..f28faf0c26d1c739d27b718690d31cd41a18046f:/src/com/owncloud/android/datamodel/OCFile.java?ds=sidebyside

diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java
index 84c7846d..8c7101bb 100644
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@ -74,7 +74,9 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
 
     private boolean mIsDownloading;
 
-    private boolean mInConflict;
+    private String mEtagInConflict;    // Save file etag in the server, when there is a conflict. No conflict =  null
+
+    private boolean mShareWithUser;
 
 
     /**
@@ -119,7 +121,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mRemoteId = source.readString();
         mNeedsUpdateThumbnail = source.readInt() == 1;
         mIsDownloading = source.readInt() == 1;
-        mInConflict = source.readInt() == 1;
+        mEtagInConflict = source.readString();
+        mShareWithUser = source.readInt() == 1;
 
     }
 
@@ -145,7 +148,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         dest.writeString(mRemoteId);
         dest.writeInt(mNeedsUpdateThumbnail ? 1 : 0);
         dest.writeInt(mIsDownloading ? 1 : 0);
-        dest.writeInt(mInConflict ? 1 : 0);
+        dest.writeString(mEtagInConflict);
+        dest.writeInt(mShareWithUser ? 1 : 0);
     }
 
     /**
@@ -343,7 +347,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mRemoteId = null;
         mNeedsUpdateThumbnail = false;
         mIsDownloading = false;
-        mInConflict = false;
+        mEtagInConflict = null;
+        mShareWithUser = false;
     }
 
     /**
@@ -584,11 +589,20 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         this.mIsDownloading = isDownloading;
     }
 
-    public boolean isInConflict() {
-        return mInConflict;
+    public String getEtagInConflict() {
+        return mEtagInConflict;
+    }
+
+    public void setEtagInConflict(String etagInConflict) {
+        mEtagInConflict = etagInConflict;
     }
 
-    public void setInConflict(boolean inConflict) {
-        mInConflict = inConflict;
+    public boolean isShareWithUser() {
+        return mShareWithUser;
     }
+
+    public void setShareWithUser(boolean shareWithUser) {
+        this.mShareWithUser = shareWithUser;
+    }
+
 }