Merge branch 'develop' into setup_buttons

[pub/Android/ownCloud.git] / src / com / owncloud / android / operations / SynchronizeFolderOperation.java

diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index 7b157c3..25f7ed3 100644 (file)
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@ -28,20 +28,21 @@ import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
 import java.util.Map;
 import java.util.Vector;
 

-import org.apache.commons.httpclient.Header;

 import org.apache.http.HttpStatus;
 import org.apache.http.HttpStatus;

+import org.apache.jackrabbit.webdav.DavConstants;

 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 

-import android.accounts.Account;
-import android.content.Context;
-

 import com.owncloud.android.Log_OC;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.utils.FileStorageUtils;
 
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.utils.FileStorageUtils;
 

+import android.accounts.Account;
+import android.content.Context;
+
+

 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavEntry;
 import eu.alefzero.webdav.WebdavUtils;
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavEntry;
 import eu.alefzero.webdav.WebdavUtils;


@@ -135,7 +136,9 @@ public class SynchronizeFolderOperation extends RemoteOperation {
             Log_OC.d(TAG, "Synchronizing " + mAccount.name + ", fetching files in " + mRemotePath);
             
             // remote request 
             Log_OC.d(TAG, "Synchronizing " + mAccount.name + ", fetching files in " + mRemotePath);
             
             // remote request 

-            query = new PropFindMethod(client.getBaseUri() + WebdavUtils.encodePath(mRemotePath));
+            query = new PropFindMethod(client.getBaseUri() + WebdavUtils.encodePath(mRemotePath),
+                    DavConstants.PROPFIND_ALL_PROP,
+                    DavConstants.DEPTH_1);

             int status = client.executeMethod(query);
             
             // check and process response   - /// TODO take into account all the possible status per child-resource
             int status = client.executeMethod(query);
             
             // check and process response   - /// TODO take into account all the possible status per child-resource


@@ -243,16 +246,10 @@ public class SynchronizeFolderOperation extends RemoteOperation {
                     result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT);   // should be different result, but will do the job
                             
                 } else {
                     result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT);   // should be different result, but will do the job
                             
                 } else {

-                    result = new RemoteOperationResult(true, status);
-                    Header hCookie = query.getResponseHeader("Cookie");
-                    if (hCookie != null) {
-                        Log_OC.e(TAG, "PROPFIND cookie: " + hCookie.getValue());
-                    } else {
-                        Log_OC.e(TAG, "PROPFIND NO COOKIE");
-                    }
+                    result = new RemoteOperationResult(true, status, query.getResponseHeaders());

                 }
             } else {
                 }
             } else {

-                result = new RemoteOperationResult(false, status);
+                result = new RemoteOperationResult(false, status, query.getResponseHeaders());

             }
             
             
             }
             
             


@@ -364,5 +361,4 @@ public class SynchronizeFolderOperation extends RemoteOperation {
         }
     }
 
         }
     }
 

-

 }
 }