projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update data_folder value
[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
aaca935
..
0236a13
100644
(file)
--- a/
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@
-28,7
+28,6
@@
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.jackrabbit.webdav.MultiStatus;
import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
import org.apache.http.HttpStatus;
import org.apache.jackrabbit.webdav.MultiStatus;
import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
@@
-243,14
+242,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.d(TAG, "PROPFIND cookie: " + hCookie.getValue());
- }
+ result = new RemoteOperationResult(true, status, query.getResponseHeaders());
}
} else {
}
} else {
- result = new RemoteOperationResult(false, status);
+ result = new RemoteOperationResult(false, status
, query.getResponseHeaders()
);
}
}