X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/0db4fc9b17d0988c64a2949093dbb37230e1db2d..3306e5a0ddd574a74b5d5931dfb53adb22722931:/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 e9facf15..4fcd4394 100644 --- a/src/com/owncloud/android/datamodel/OCFile.java +++ b/src/com/owncloud/android/datamodel/OCFile.java @@ -31,13 +31,11 @@ import java.io.File; import third_parties.daveKoeller.AlphanumComparator; public class OCFile implements Parcelable, Comparable { - public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { - @Override + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { public OCFile createFromParcel(Parcel source) { return new OCFile(source); } - @Override public OCFile[] newArray(int size) { return new OCFile[size]; } @@ -76,9 +74,11 @@ public class OCFile implements Parcelable, Comparable { private boolean mIsDownloading; + private boolean mShowGridView; + private String mEtagInConflict; // Save file etag in the server, when there is a conflict. No conflict = null - private boolean mShareWithUser; + private boolean mShareWithSharee; /** @@ -124,7 +124,7 @@ public class OCFile implements Parcelable, Comparable { mNeedsUpdateThumbnail = source.readInt() == 1; mIsDownloading = source.readInt() == 1; mEtagInConflict = source.readString(); - mShareWithUser = source.readInt() == 1; + mShareWithSharee = source.readInt() == 1; } @@ -151,7 +151,7 @@ public class OCFile implements Parcelable, Comparable { dest.writeInt(mNeedsUpdateThumbnail ? 1 : 0); dest.writeInt(mIsDownloading ? 1 : 0); dest.writeString(mEtagInConflict); - dest.writeInt(mShareWithUser ? 1 : 0); + dest.writeInt(mShareWithSharee ? 1 : 0); } /** @@ -350,7 +350,7 @@ public class OCFile implements Parcelable, Comparable { mNeedsUpdateThumbnail = false; mIsDownloading = false; mEtagInConflict = null; - mShareWithUser = false; + mShareWithSharee = false; } /** @@ -600,12 +600,12 @@ public class OCFile implements Parcelable, Comparable { mEtagInConflict = etagInConflict; } - public boolean isSharedViaUsers() { - return mShareWithUser; + public boolean isSharedWithSharee() { + return mShareWithSharee; } - public void setShareViaUsers(boolean shareWithUser) { - this.mShareWithUser = shareWithUser; + public void setShareWithSharee(boolean shareWithSharee) { + this.mShareWithSharee = shareWithSharee; } public boolean isSharedWithMe() {