X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/435b31ba4f3597cc7a43270cd4a54fb0180956c1..890bf7fa51135aa24e07ab8d02c002b22a66716a:/src/eu/alefzero/owncloud/datamodel/OCFile.java diff --git a/src/eu/alefzero/owncloud/datamodel/OCFile.java b/src/eu/alefzero/owncloud/datamodel/OCFile.java index 71c161a8..ca454d15 100644 --- a/src/eu/alefzero/owncloud/datamodel/OCFile.java +++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java @@ -19,11 +19,14 @@ package eu.alefzero.owncloud.datamodel; import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; -public class OCFile implements Parcelable { +public class OCFile implements Parcelable, Comparable { public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override @@ -46,24 +49,33 @@ public class OCFile implements Parcelable { private String mLocalPath; private String mMimeType; private boolean mNeedsUpdating; + private long mLastSyncDate; /** * Create new {@link OCFile} with given path * - * @param path - * The remote path of the file + * @param path The remote path of the file + * @throws MalformedURLException */ public OCFile(String path) { resetData(); mNeedsUpdating = false; - mRemotePath = path; + /// dvelasco: the encoding / decoding problem should be completely translated to WebdavClient & WebdavEntry, but at this moment we are in a little hurry + if (path != null && path.length() > 0) { + try { + new URL("http://silly.test.com:8888" + path); + } catch (MalformedURLException e) { + throw new RuntimeException("Trying to create a OCFile with a non valid remote path: " + path , e); + } + } else throw new RuntimeException("Trying to create a OCFile with a non valid remote path: " + path); + // save encoded paths have a problem: normalization; this is a quick&dirty fix to avoid duplications + mRemotePath = Uri.encode(Uri.decode(path), "/"); } /** * Reconstruct from parcel * - * @param source - * The source parcel + * @param source The source parcel */ private OCFile(Parcel source) { mId = source.readLong(); @@ -87,15 +99,24 @@ public class OCFile implements Parcelable { } /** - * Returns the path of the file + * Returns the remote path of the file on ownCloud * - * @return The path + * @return The remote path to the file */ - public String getPath() { + public String getRemotePath() { return mRemotePath; } /** + * Returns the remote path of the file on ownCloud + * + * @return The remote path to the file + */ + public String getURLDecodedRemotePath() { + return Uri.decode(mRemotePath); + } + + /** * Can be used to check, whether or not this file exists in the database * already * @@ -120,7 +141,7 @@ public class OCFile implements Parcelable { * @return true if it is */ public boolean isDownloaded() { - return mLocalPath != null || mLocalPath.equals(""); + return mLocalPath != null && !mLocalPath.equals(""); } /** @@ -135,8 +156,7 @@ public class OCFile implements Parcelable { /** * Can be used to set the path where the file is stored * - * @param storage_path - * to set + * @param storage_path to set */ public void setStoragePath(String storage_path) { mLocalPath = storage_path; @@ -154,8 +174,7 @@ public class OCFile implements Parcelable { /** * Set a UNIX timestamp of the time the file was created * - * @param creation_timestamp - * to set + * @param creation_timestamp to set */ public void setCreationTimestamp(long creation_timestamp) { mCreationTimestamp = creation_timestamp; @@ -173,8 +192,7 @@ public class OCFile implements Parcelable { /** * Set a UNIX timestamp of the time the time the file was modified. * - * @param modification_timestamp - * to set + * @param modification_timestamp to set */ public void setModificationTimestamp(long modification_timestamp) { mModifiedTimestamp = modification_timestamp; @@ -186,11 +204,8 @@ public class OCFile implements Parcelable { * @return The name of the file */ public String getFileName() { - if (mRemotePath != null) { - File f = new File(mRemotePath); - return f.getName().equals("") ? "/" : f.getName(); - } - return null; + File f = new File(getURLDecodedRemotePath()); + return f.getName().length() == 0 ? "/" : f.getName(); } /** @@ -206,10 +221,9 @@ public class OCFile implements Parcelable { * Adds a file to this directory. If this file is not a directory, an * exception gets thrown. * - * @param file - * to add - * @throws IllegalStateException - * if you try to add a something and this is not a directory + * @param file to add + * @throws IllegalStateException if you try to add a something and this is + * not a directory */ public void addFile(OCFile file) throws IllegalStateException { if (isDirectory()) { @@ -233,13 +247,13 @@ public class OCFile implements Parcelable { mLength = 0; mCreationTimestamp = 0; mModifiedTimestamp = 0; + mLastSyncDate = 0; } /** * Sets the ID of the file * - * @param file_id - * to set + * @param file_id to set */ public void setFileId(long file_id) { mId = file_id; @@ -248,8 +262,7 @@ public class OCFile implements Parcelable { /** * Sets the Mime-Type of the * - * @param mimetype - * to set + * @param mimetype to set */ public void setMimetype(String mimetype) { mMimeType = mimetype; @@ -258,8 +271,7 @@ public class OCFile implements Parcelable { /** * Sets the ID of the parent folder * - * @param parent_id - * to set + * @param parent_id to set */ public void setParentId(long parent_id) { mParentId = parent_id; @@ -268,8 +280,7 @@ public class OCFile implements Parcelable { /** * Sets the file size in bytes * - * @param file_len - * to set + * @param file_len to set */ public void setFileLength(long file_len) { mLength = file_len; @@ -301,6 +312,14 @@ public class OCFile implements Parcelable { public boolean needsUpdatingWhileSaving() { return mNeedsUpdating; } + + public long getLastSyncDate() { + return mLastSyncDate; + } + + public void setLastSyncDate(long lastSyncDate) { + mLastSyncDate = lastSyncDate; + } @Override public int describeContents() { @@ -317,8 +336,38 @@ public class OCFile implements Parcelable { dest.writeString(mRemotePath); dest.writeString(mLocalPath); dest.writeString(mMimeType); - dest.writeInt(mNeedsUpdating ? 0 : 1); // No writeBoolean method exists - // - yay :D + dest.writeInt(mNeedsUpdating ? 1 : 0); + dest.writeLong(mLastSyncDate); + } + + @Override + public int compareTo(OCFile another) { + if (isDirectory() && another.isDirectory()) { + return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase()); + } else if (isDirectory()) { + return -1; + } else if (another.isDirectory()) { + return 1; + } + return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase()); + } + + public boolean equals(Object o) { + if(o instanceof OCFile){ + OCFile that = (OCFile) o; + if(that != null){ + return this.mId == that.mId; + } + } + + return false; + } + + @Override + public String toString() { + String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s]"; + asString = String.format(asString, new Long(mId), getFileName(), mMimeType, isDownloaded(), mLocalPath, mRemotePath); + return asString; } }