Create DownloadRemoteFileOperation and reorder classes

2026-08-18 11:52:56 +00:00 · 2018-05-25 12:27:37 +02:00
parent 0f14e89d7c
commit 81120ac7ad
12 changed files with 152 additions and 78 deletions
@@ -34,8 +34,7 @@ import android.content.Context;
 import android.net.Uri;

 import com.owncloud.android.lib.refactor.Log_OC;
-import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 import com.owncloud.android.lib.refactor.authentication.credentials.OCBasicCredentials;
 import com.owncloud.android.lib.refactor.authentication.credentials.OCBearerCredentials;
 import com.owncloud.android.lib.refactor.authentication.credentials.OCCredentials;
@@ -26,7 +26,7 @@

 package com.owncloud.android.lib.refactor.authentication.oauth;

-import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;

 public interface OAuth2RequestBuilder {

@@ -29,7 +29,7 @@ package com.owncloud.android.lib.refactor.authentication.oauth;
 import android.net.Uri;

 import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 import com.owncloud.android.lib.refactor.authentication.oauth.operations.OAuth2GetAccessTokenOperation;
 import com.owncloud.android.lib.refactor.authentication.oauth.operations.OAuth2RefreshAccessTokenOperation;

@@ -26,18 +26,15 @@

 package com.owncloud.android.lib.refactor.authentication.oauth.operations;

-import android.net.Uri;
-
 import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperationResult;
+import com.owncloud.android.lib.refactor.operations.RemoteOperationResult;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2Constants;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2ResponseParser;
 import com.owncloud.android.lib.refactor.authentication.oauth.OwnCloudOAuth2Provider;
-import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;

 import org.json.JSONObject;

-import java.util.ArrayList;
 import java.util.Map;

 import okhttp3.MultipartBody;
@@ -22,9 +22,9 @@
 package com.owncloud.android.lib.refactor.authentication.oauth.operations;

 import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperationResult;
+import com.owncloud.android.lib.refactor.operations.RemoteOperationResult;
 import com.owncloud.android.lib.refactor.Log_OC;
-import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2Constants;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2GrantType;
 import com.owncloud.android.lib.refactor.authentication.oauth.OAuth2ResponseParser;
@@ -32,7 +32,6 @@ import com.owncloud.android.lib.refactor.authentication.oauth.OwnCloudOAuth2Prov

 import org.json.JSONObject;

-import java.util.ArrayList;
 import java.util.Map;

 import okhttp3.MultipartBody;
@@ -1,6 +1,8 @@
-package com.owncloud.android.lib.refactor;
+package com.owncloud.android.lib.refactor.operations;
 import android.net.Uri;

+import com.owncloud.android.lib.refactor.OCContext;
+
 import java.io.IOException;
 import java.util.Map;

@@ -22,11 +22,12 @@
 *
 */

-package com.owncloud.android.lib.refactor;
+package com.owncloud.android.lib.refactor.operations;

 import android.accounts.Account;
 import android.accounts.AccountsException;

+import com.owncloud.android.lib.refactor.Log_OC;
 import com.owncloud.android.lib.refactor.exceptions.AccountNotFoundException;
 import com.owncloud.android.lib.refactor.exceptions.CertificateCombinedException;
 import com.owncloud.android.lib.refactor.exceptions.OperationCancelledException;
@@ -50,7 +51,6 @@ import java.util.Map;

 import javax.net.ssl.SSLException;

-import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.exception.ConflictException;
 import at.bitfire.dav4android.exception.DavException;
 import at.bitfire.dav4android.exception.HttpException;
@@ -0,0 +1,63 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ */
+
+package com.owncloud.android.lib.refactor.resources.files;
+
+import com.owncloud.android.lib.refactor.OCContext;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
+import at.bitfire.dav4android.DavOCResource;
+import static com.owncloud.android.lib.refactor.operations.RemoteOperationResult.ResultCode.OK;
+
+/**
+ * @author David González Verdugo
+ */
+public class DownloadRemoteFileOperation extends RemoteOperation<Void> {
+
+    private String mRemotePath;
+    private String mLocalFolderPath;
+
+    public DownloadRemoteFileOperation(OCContext ocContext, String remotePath, String localFolderPath) {
+        super(ocContext);
+        mRemotePath = remotePath.replaceAll("^/+", "");
+        mLocalFolderPath = localFolderPath;
+    }
+
+    @Override
+    public Result exec() {
+
+        try {
+            DavOCResource davOCResource = new DavOCResource(
+                    getClient(),
+                    getWebDavHttpUrl(mRemotePath)
+            );
+            davOCResource.get("*/*");
+
+            //TODO Create local file from the downloaded one
+
+            return new Result(OK);
+
+        } catch (Exception e) {
+            return new Result(e);
+        }
+    }
+}
@@ -22,24 +22,24 @@
 *
 */

-package com.owncloud.android.lib.refactor.operations;
+package com.owncloud.android.lib.refactor.resources.files;

 import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;

 import at.bitfire.dav4android.DavOCResource;
 import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.PropertyUtils;
 import okhttp3.HttpUrl;

-import static com.owncloud.android.lib.refactor.RemoteOperationResult.ResultCode.OK;
+import static com.owncloud.android.lib.refactor.operations.RemoteOperationResult.ResultCode.OK;

 public class PropfindOperation extends RemoteOperation<DavResource> {

    private String mRemotePath;

-    public PropfindOperation(OCContext context, String remotePath) {
-        super(context);
+    public PropfindOperation(OCContext ocContext, String remotePath) {
+        super(ocContext);
        mRemotePath = remotePath;
    }

@@ -19,21 +19,18 @@
 *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 *   THE SOFTWARE.
- *
 */

-package com.owncloud.android.lib.refactor.operations;
+package com.owncloud.android.lib.refactor.resources.files;

 import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperation;
-
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 import java.io.File;
-
 import at.bitfire.dav4android.DavOCResource;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;

-import static com.owncloud.android.lib.refactor.RemoteOperationResult.ResultCode.OK;
+import static com.owncloud.android.lib.refactor.operations.RemoteOperationResult.ResultCode.OK;

 /**
 * @author David González Verdugo
@@ -46,9 +43,9 @@ public class UploadRemoteFileOperation extends RemoteOperation<Void> {
    private String mFileLastModifTimestamp;


-    public UploadRemoteFileOperation(OCContext context, String localPath, String remotePath, String mimetype,
+    public UploadRemoteFileOperation(OCContext ocContext, String localPath, String remotePath, String mimetype,
                                     String fileLastModifTimestamp) {
-        super(context);
+        super(ocContext);

        mFileToUpload = new File(localPath);
        mRemotePath = remotePath.replaceAll("^/+", ""); //Delete leading slashes
@@ -78,10 +75,10 @@ public class UploadRemoteFileOperation extends RemoteOperation<Void> {
                    mFileLastModifTimestamp
            );

+            return new Result(OK);
+
        } catch (Exception e) {
            return new Result(e);
        }
-
-        return new Result(OK);
    }
 }
@@ -1,5 +1,5 @@
 /* ownCloud Android Library is available under MIT license
- *   Copyright (C) 2016 ownCloud GmbH.
+ *   Copyright (C) 2018 ownCloud GmbH.
 *   
 *   Permission is hereby granted, free of charge, to any person obtaining a copy
 *   of this software and associated documentation files (the "Software"), to deal
@@ -24,13 +24,14 @@

 package com.owncloud.android.lib.resources.files;

-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.network.FileRequestEntity;
+import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.common.network.ProgressiveDataTransferer;
+import com.owncloud.android.lib.common.network.WebdavUtils;
+import com.owncloud.android.lib.common.operations.OperationCancelledException;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;

 import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler;
 import org.apache.commons.httpclient.HttpStatus;
@@ -38,22 +39,18 @@ import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.commons.httpclient.params.HttpMethodParams;

-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.network.FileRequestEntity;
-import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
-import com.owncloud.android.lib.common.network.ProgressiveDataTransferer;
-import com.owncloud.android.lib.common.network.WebdavUtils;
-import com.owncloud.android.lib.common.operations.InvalidCharacterExceptionParser;
-import com.owncloud.android.lib.common.operations.OperationCancelledException;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.utils.Log_OC;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;

 /**
 * Remote operation performing the upload of a remote file to the ownCloud server.
 * 
 * @author David A. Velasco
 * @author masensio
+ * @author David González Verdugo
 */

 public class UploadRemoteFileOperation extends RemoteOperation {