X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/e6bf6968fa081d06d75af8d7a7625f0b79375df3..e901b609baa4dd5f681e2a5257c9e504997e3377:/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 2d8f59e3..392d03bc 100644 --- a/src/com/owncloud/android/datamodel/OCFile.java +++ b/src/com/owncloud/android/datamodel/OCFile.java @@ -20,8 +20,8 @@ package com.owncloud.android.datamodel; import java.io.File; -import com.owncloud.android.utils.Log_OC; - +import com.owncloud.android.lib.common.utils.Log_OC; +import third_parties.daveKoeller.AlphanumComparator; import android.os.Parcel; import android.os.Parcelable; @@ -65,6 +65,11 @@ public class OCFile implements Parcelable, Comparable { private boolean mShareByLink; private String mPublicLink; + private String mPermissions; + private String mRemoteId; + + private boolean mNeedsUpdateThumbnail; + /** * Create new {@link OCFile} with given path. @@ -102,8 +107,12 @@ public class OCFile implements Parcelable, Comparable { mLastSyncDateForProperties = source.readLong(); mLastSyncDateForData = source.readLong(); mEtag = source.readString(); - mShareByLink = source.readInt() == 0; + mShareByLink = source.readInt() == 1; mPublicLink = source.readString(); + mPermissions = source.readString(); + mRemoteId = source.readString(); + mNeedsUpdateThumbnail = source.readInt() == 0; + } @Override @@ -124,6 +133,9 @@ public class OCFile implements Parcelable, Comparable { dest.writeString(mEtag); dest.writeInt(mShareByLink ? 1 : 0); dest.writeString(mPublicLink); + dest.writeString(mPermissions); + dest.writeString(mRemoteId); + dest.writeInt(mNeedsUpdateThumbnail ? 1 : 0); } /** @@ -334,6 +346,9 @@ public class OCFile implements Parcelable, Comparable { mEtag = null; mShareByLink = false; mPublicLink = null; + mPermissions = null; + mRemoteId = null; + mNeedsUpdateThumbnail = false; } /** @@ -399,6 +414,14 @@ public class OCFile implements Parcelable, Comparable { return mNeedsUpdating; } + public boolean needsUpdateThumbnail() { + return mNeedsUpdateThumbnail; + } + + public void setNeedsUpdateThumbnail(boolean needsUpdateThumbnail) { + this.mNeedsUpdateThumbnail = needsUpdateThumbnail; + } + public long getLastSyncDateForProperties() { return mLastSyncDateForProperties; } @@ -437,7 +460,7 @@ public class OCFile implements Parcelable, Comparable { } else if (another.isFolder()) { return 1; } - return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase()); + return new AlphanumComparator().compare(this, another); } @Override @@ -518,4 +541,20 @@ public class OCFile implements Parcelable, Comparable { return (result != null) ? result : ""; } + public String getPermissions() { + return mPermissions; + } + + public void setPermissions(String permissions) { + this.mPermissions = permissions; + } + + public String getRemoteId() { + return mRemoteId; + } + + public void setRemoteId(String remoteId) { + this.mRemoteId = remoteId; + } + }