Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/android-library.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Scherzinger <info@andy-scherzinger.de>2020-04-03 20:16:43 +0300
committerGitHub <noreply@github.com>2020-04-03 20:16:43 +0300
commitba57213b08105879dcc81dd48aa3ce1d3070774c (patch)
tree5f9a1dad379008db94d35eef9214a099c4f56c20
parentfbd15ec476d83b607d4c68960b9ad1f7b5424fdf (diff)
parentd592d41628fa3bcc8cf10e40ff985595cad8cc04 (diff)
Merge pull request #419 from nextcloud/backport/418/stable-2.1rc-2.1.1-012.1.1stable-2.1
[stable-2.1] Reduced chunk properties
-rw-r--r--src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java11
-rw-r--r--src/main/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperation.java3
2 files changed, 13 insertions, 1 deletions
diff --git a/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java b/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java
index ae465c45..f0e3421f 100644
--- a/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java
+++ b/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java
@@ -177,6 +177,17 @@ public class WebdavUtils {
}
/**
+ * Builds a DavPropertyNameSet with properties for chunks
+ */
+ public static DavPropertyNameSet getChunksPropSet() {
+ DavPropertyNameSet propSet = new DavPropertyNameSet();
+ propSet.add(DavPropertyName.GETCONTENTTYPE);
+ propSet.add(DavPropertyName.RESOURCETYPE);
+
+ return propSet;
+ }
+
+ /**
*
* @param rawEtag
* @return
diff --git a/src/main/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperation.java b/src/main/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperation.java
index 228c2e34..e437cadf 100644
--- a/src/main/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperation.java
+++ b/src/main/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperation.java
@@ -87,7 +87,8 @@ public class ChunkedFileUploadRemoteOperation extends UploadFileRemoteOperation
client.executeMethod(createFolder, 30000, 5000);
// list chunks
- PropFindMethod listChunks = new PropFindMethod(uploadFolderUri, WebdavUtils.getFilePropSet(),
+ PropFindMethod listChunks = new PropFindMethod(uploadFolderUri,
+ WebdavUtils.getChunksPropSet(),
DavConstants.DEPTH_1);
client.executeMethod(listChunks);