X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/00ef45c1e3a4da1a1a64f0a11d833f9f504137ac..d4f8391f509b4b211d6742db6db546b80e8277c7:/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 68619337..ce9c03b5 100644
--- a/src/eu/alefzero/owncloud/datamodel/OCFile.java
+++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java
@@ -19,7 +19,10 @@
 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;
 
@@ -47,16 +50,27 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     private String mMimeType;
     private boolean mNeedsUpdating;
     private long mLastSyncDate;
+    private boolean mKeepInSync;
 
     /**
      * Create new {@link OCFile} with given path
      * 
      * @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), "/");
     }
 
     /**
@@ -74,8 +88,25 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         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
      * 
@@ -95,6 +126,15 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     }
 
     /**
+     * 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
      * 
@@ -182,11 +222,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
      * @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();
     }
 
     /**
@@ -229,6 +266,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mCreationTimestamp = 0;
         mModifiedTimestamp = 0;
         mLastSyncDate = 0;
+        mKeepInSync = false;
+        mNeedsUpdating = false;
     }
 
     /**
@@ -302,35 +341,29 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mLastSyncDate = lastSyncDate;
     }
 
+    public void setKeepInSync(boolean keepInSync) {
+        mKeepInSync = keepInSync;
+    }
+    
+    public boolean keepInSync() {
+        return mKeepInSync;
+    }
+    
     @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);
-    }
-
-    @Override
     public int compareTo(OCFile another) {
         if (isDirectory() && another.isDirectory()) {
-            return getFileName().toLowerCase().compareTo(another.getFileName().toLowerCase());
+            return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase());
         } else if (isDirectory()) {
             return -1;
         } else if (another.isDirectory()) {
             return 1;
         }
-        return getFileName().toLowerCase().compareTo(another.getFileName().toLowerCase());
+        return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase());
     }
 
     public boolean equals(Object o) {