Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e3814d6 authored by jabarros's avatar jabarros
Browse files

Merge pull request #32 from owncloud/accept_200_as_ok_for_propfind 

Accept 200 as a valid response for PROPFIND
parents e72fec72 78fa8930

src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -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());

src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -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);