Trying to improve synchronization performance with database batched operations

[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 3a720b9..ce9c03b 100644 (file)
--- a/src/eu/alefzero/owncloud/datamodel/OCFile.java
+++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java
@@ -50,6 +50,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     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


@@ -60,7 +61,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     public OCFile(String path) {
         resetData();
         mNeedsUpdating = false;
     public OCFile(String path) {
         resetData();
         mNeedsUpdating = false;

-        // dvelasco: let's make mandatory that mRemotePath is a valid URL always; this will make our life easier with the URL-encoding/decoding
+        /// 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);
         if (path != null && path.length() > 0) {
             try {
                 new URL("http://silly.test.com:8888" + path);


@@ -68,7 +69,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
                 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);
                 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);

-        mRemotePath = path;
+        // save encoded paths have a problem: normalization; this is a quick&dirty fix to avoid duplications
+        mRemotePath = Uri.encode(Uri.decode(path), "/");

     }
 
     /**
     }
 
     /**


@@ -86,8 +88,25 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         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
      * 


@@ -247,6 +266,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mCreationTimestamp = 0;
         mModifiedTimestamp = 0;
         mLastSyncDate = 0;
         mCreationTimestamp = 0;
         mModifiedTimestamp = 0;
         mLastSyncDate = 0;

+        mKeepInSync = false;
+        mNeedsUpdating = false;

     }
 
     /**
     }
 
     /**


@@ -320,26 +341,20 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         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);
-    }
-
-    @Override

     public int compareTo(OCFile another) {
         if (isDirectory() && another.isDirectory()) {
             return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase());
     public int compareTo(OCFile another) {
         if (isDirectory() && another.isDirectory()) {
             return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase());