flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-08 00:16:09 +00:00
Code Issues Releases Wiki Activity

Merge pull request #32 from owncloud/accept_200_as_ok_for_propfind

Browse Source 
Accept 200 as a valid response for PROPFIND
This commit is contained in:
jabarros 2014-07-14 10:48:01 +02:00
commit 4e3814d6c0
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java
View File

@ -82,8 +82,11 @@ public class ReadRemoteFileOperation extends RemoteOperation {
int status; int status;
status = client.executeMethod(propfind, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT); status = client.executeMethod(propfind, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT);
boolean isMultiStatus = status == HttpStatus.SC_MULTI_STATUS; boolean isSuccess = (
if (isMultiStatus) { status == HttpStatus.SC_MULTI_STATUS ||
status == HttpStatus.SC_OK
);
if (isSuccess) {
// Parse response // Parse response
MultiStatus resp = propfind.getResponseBodyAsMultiStatus(); MultiStatus resp = propfind.getResponseBodyAsMultiStatus();
WebdavEntry we = new WebdavEntry(resp.getResponses()[0], client.getWebdavUri().getPath()); WebdavEntry we = new WebdavEntry(resp.getResponses()[0], client.getWebdavUri().getPath());

6
src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
View File

@ -80,7 +80,11 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
int status = client.executeMethod(query); int status = client.executeMethod(query);
// check and process response // check and process response
if (isMultiStatus(status)) { boolean isSuccess = (
status == HttpStatus.SC_MULTI_STATUS ||
status == HttpStatus.SC_OK
);
if (isSuccess) {
// get data from remote folder // get data from remote folder
MultiStatus dataInServer = query.getResponseBodyAsMultiStatus(); MultiStatus dataInServer = query.getResponseBodyAsMultiStatus();
readData(dataInServer, client); readData(dataInServer, client);