More fixes to PIN Code activity

[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 9566a19..5cd54f6 100644 (file)
--- 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;
 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;
 
 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
 
     public static final Parcelable.Creator<OCFile> CREATOR = new Parcelable.Creator<OCFile>() {
         @Override


@@ -37,6 +40,8 @@ public class OCFile implements Parcelable {
         }
     };
 
         }
     };
 

+    public static final String PATH_SEPARATOR = "/";
+    

     private long mId;
     private long mParentId;
     private long mLength;
     private long mId;
     private long mParentId;
     private long mLength;


@@ -47,15 +52,21 @@ public class OCFile implements Parcelable {
     private String mMimeType;
     private boolean mNeedsUpdating;
     private long mLastSyncDate;
     private String mMimeType;
     private boolean mNeedsUpdating;
     private long mLastSyncDate;

+    private boolean mKeepInSync;

 
     /**
 
     /**

-     * Create new {@link OCFile} with given path
+     * Create new {@link OCFile} with given path.
+     * 
+     * The path received must be URL-decoded. Path separator must be OCFile.PATH_SEPARATOR, and it must be the first character in 'path'.

      * 
      * 

-     * @param path The remote path of the file
+     * @param path The remote path of the file.

      */
     public OCFile(String path) {
         resetData();
         mNeedsUpdating = false;
      */
     public OCFile(String path) {
         resetData();
         mNeedsUpdating = false;

+        if (path == null || path.length() <= 0 || !path.startsWith(PATH_SEPARATOR)) {
+            throw new IllegalArgumentException("Trying to create a OCFile with a non valid remote path: " + path);
+        }

         mRemotePath = path;
     }
 
         mRemotePath = path;
     }
 


@@ -74,8 +85,25 @@ public class OCFile implements Parcelable {
         mLocalPath = source.readString();
         mMimeType = source.readString();
         mNeedsUpdating = source.readInt() == 0;
         mLocalPath = source.readString();
         mMimeType = source.readString();
         mNeedsUpdating = source.readInt() == 0;

+        mKeepInSync = source.readInt() == 1;
+        mLastSyncDate = source.readLong();

     }
 
     }
 

+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeLong(mId);
+        dest.writeLong(mParentId);
+        dest.writeLong(mLength);
+        dest.writeLong(mCreationTimestamp);
+        dest.writeLong(mModifiedTimestamp);
+        dest.writeString(mRemotePath);
+        dest.writeString(mLocalPath);
+        dest.writeString(mMimeType);
+        dest.writeInt(mNeedsUpdating ? 1 : 0);
+        dest.writeInt(mKeepInSync ? 1 : 0);
+        dest.writeLong(mLastSyncDate);
+    }
+    

     /**
      * Gets the ID of the file
      * 
     /**
      * Gets the ID of the file
      * 


@@ -182,11 +210,8 @@ public class OCFile implements Parcelable {
      * @return The name of the file
      */
     public String getFileName() {
      * @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(getRemotePath());
+        return f.getName().length() == 0 ? "/" : f.getName();

     }
 
     /**
     }
 
     /**


@@ -229,6 +254,8 @@ public class OCFile implements Parcelable {
         mCreationTimestamp = 0;
         mModifiedTimestamp = 0;
         mLastSyncDate = 0;
         mCreationTimestamp = 0;
         mModifiedTimestamp = 0;
         mLastSyncDate = 0;

+        mKeepInSync = false;
+        mNeedsUpdating = false;

     }
 
     /**
     }
 
     /**


@@ -302,29 +329,40 @@ public class OCFile implements Parcelable {
         mLastSyncDate = lastSyncDate;
     }
 
         mLastSyncDate = lastSyncDate;
     }
 

+    public void setKeepInSync(boolean keepInSync) {
+        mKeepInSync = keepInSync;
+    }
+    
+    public boolean keepInSync() {
+        return mKeepInSync;
+    }
+    

     @Override
     public int describeContents() {
         return this.hashCode();
     }
 
     @Override
     @Override
     public int describeContents() {
         return this.hashCode();
     }
 
     @Override

-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeLong(mId);
-        dest.writeLong(mParentId);
-        dest.writeLong(mLength);
-        dest.writeLong(mCreationTimestamp);
-        dest.writeLong(mModifiedTimestamp);
-        dest.writeString(mRemotePath);
-        dest.writeString(mLocalPath);
-        dest.writeString(mMimeType);
-        dest.writeInt(mNeedsUpdating ? 1 : 0);
-        dest.writeLong(mLastSyncDate);
+    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());

     }
 
     }
 

-    @Override

     public boolean equals(Object o) {
     public boolean equals(Object o) {

-        OCFile that = (OCFile) o;
-        return this.mId == that.mId;
+        if(o instanceof OCFile){
+            OCFile that = (OCFile) o;
+            if(that != null){
+                return this.mId == that.mId;
+            }
+        }
+        
+        return false;

     }
 
     @Override
     }
 
     @Override


@@ -333,7 +371,5 @@ public class OCFile implements Parcelable {
         asString = String.format(asString, new Long(mId), getFileName(), mMimeType, isDownloaded(), mLocalPath, mRemotePath);
         return asString;
     }
         asString = String.format(asString, new Long(mId), getFileName(), mMimeType, isDownloaded(), mLocalPath, mRemotePath);
         return asString;
     }

-    
-    

 
 }
 
 }