Fixed: Rotating screen after viewing a file would return you to the

[pub/Android/ownCloud.git] / 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 71c161a..6861933 100644 (file)
--- a/src/eu/alefzero/owncloud/datamodel/OCFile.java
+++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java
@@ -23,7 +23,7 @@ import java.io.File;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-public class OCFile implements Parcelable {
+public class OCFile implements Parcelable, Comparable<OCFile> {
 
     public static final Parcelable.Creator<OCFile> CREATOR = new Parcelable.Creator<OCFile>() {
         @Override
@@ -46,12 +46,12 @@ 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
      */
     public OCFile(String path) {
         resetData();
@@ -62,8 +62,7 @@ public class OCFile implements Parcelable {
     /**
      * Reconstruct from parcel
      * 
-     * @param source
-     *            The source parcel
+     * @param source The source parcel
      */
     private OCFile(Parcel source) {
         mId = source.readLong();
@@ -87,11 +86,11 @@ 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;
     }
 
@@ -120,7 +119,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 +134,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 +152,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 +170,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;
@@ -206,10 +202,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 +228,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 +243,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 +252,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 +261,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 +293,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 +317,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 getFileName().toLowerCase().compareTo(another.getFileName().toLowerCase());
+        } else if (isDirectory()) {
+            return -1;
+        } else if (another.isDirectory()) {
+            return 1;
+        }
+        return getFileName().toLowerCase().compareTo(another.getFileName().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;
     }
 
 }