X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/80f6250604e0309a7053adbdd1c4b48ff249791a..ec19a11a385ff21d3e85a94e618d48d8be9ef20d:/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 ae2376db..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; @@ -66,6 +66,9 @@ public class OCFile implements Parcelable, Comparable { private String mPublicLink; private String mPermissions; + private String mRemoteId; + + private boolean mNeedsUpdateThumbnail; /** @@ -107,6 +110,9 @@ public class OCFile implements Parcelable, Comparable { mShareByLink = source.readInt() == 1; mPublicLink = source.readString(); mPermissions = source.readString(); + mRemoteId = source.readString(); + mNeedsUpdateThumbnail = source.readInt() == 0; + } @Override @@ -128,6 +134,8 @@ public class OCFile implements Parcelable, Comparable { dest.writeInt(mShareByLink ? 1 : 0); dest.writeString(mPublicLink); dest.writeString(mPermissions); + dest.writeString(mRemoteId); + dest.writeInt(mNeedsUpdateThumbnail ? 1 : 0); } /** @@ -339,6 +347,8 @@ public class OCFile implements Parcelable, Comparable { mShareByLink = false; mPublicLink = null; mPermissions = null; + mRemoteId = null; + mNeedsUpdateThumbnail = false; } /** @@ -404,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; } @@ -442,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 @@ -531,4 +549,12 @@ public class OCFile implements Parcelable, Comparable { this.mPermissions = permissions; } + public String getRemoteId() { + return mRemoteId; + } + + public void setRemoteId(String remoteId) { + this.mRemoteId = remoteId; + } + }