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

Fix read remote file operation

Browse Source
This commit is contained in:
davigonz 2018-06-15 11:18:31 +02:00
parent ff17ab6837
commit 82fce2944b
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,10 +23,6 @@
*/ */
package com.owncloud.android.lib.resources.files; package com.owncloud.android.lib.resources.files;
import java.util.ArrayList;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.http.HttpConstants; import com.owncloud.android.lib.common.http.HttpConstants;
import com.owncloud.android.lib.common.http.methods.webdav.DavUtils; import com.owncloud.android.lib.common.http.methods.webdav.DavUtils;
@ -36,11 +32,14 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.common.utils.Log_OC;
import java.util.ArrayList;
import java.util.concurrent.TimeUnit;
import at.bitfire.dav4android.DavResource; import at.bitfire.dav4android.DavResource;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;
import static com.owncloud.android.lib.common.http.methods.webdav.DavConstants.DEPTH_0; import static com.owncloud.android.lib.common.http.methods.webdav.DavConstants.DEPTH_0;
import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;
/** /**
* Remote operation performing the read a file from the ownCloud server. * Remote operation performing the read a file from the ownCloud server.
@ -57,7 +56,6 @@ public class ReadRemoteFileOperation extends RemoteOperation {
private String mRemotePath; private String mRemotePath;
/** /**
* Constructor * Constructor
* *
@ -74,8 +72,8 @@ public class ReadRemoteFileOperation extends RemoteOperation {
*/ */
@Override @Override
protected RemoteOperationResult run(OwnCloudClient client) { protected RemoteOperationResult run(OwnCloudClient client) {
PropfindMethod propfind = null; PropfindMethod propfind;
RemoteOperationResult result = null; RemoteOperationResult result;
/// take the duty of check the server for the current state of the file there /// take the duty of check the server for the current state of the file there
try { try {
@ -92,14 +90,14 @@ public class ReadRemoteFileOperation extends RemoteOperation {
if (status == HttpConstants.HTTP_MULTI_STATUS if (status == HttpConstants.HTTP_MULTI_STATUS
|| status == HttpConstants.HTTP_OK) { || status == HttpConstants.HTTP_OK) {
// Parse response // Parse response
final DavResource resource = propfind.getMembers().iterator().next(); final DavResource resource = propfind.getDavResource();
final RemoteFile file = new RemoteFile(resource, client.getAccount().getDisplayName()); final RemoteFile file = new RemoteFile(resource, client.getAccount().getDisplayName());
ArrayList<Object> files = new ArrayList<>(); ArrayList<Object> files = new ArrayList<>();
files.add(file); files.add(file);
result = new RemoteOperationResult(RemoteOperationResult.ResultCode.OK); result = new RemoteOperationResult(OK);
result.setData(files); result.setData(files);
} else { } else {
@ -116,5 +114,4 @@ public class ReadRemoteFileOperation extends RemoteOperation {
return result; return result;
} }
}
}