From 7cb9189fce49c12fa96e8d20a2b0d9342f44e75b Mon Sep 17 00:00:00 2001 From: davigonz Date: Tue, 22 May 2018 17:10:32 +0200 Subject: [PATCH] Keep completing the propfind --- dav4android | 2 +- src/com/owncloud/android/lib/refactor/RemoteOperation.java | 3 ++- .../android/lib/refactor/operations/PropfindOperation.java | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dav4android b/dav4android index 9b39bb9d..9bc069f4 160000 --- a/dav4android +++ b/dav4android @@ -1 +1 @@ -Subproject commit 9b39bb9d05bf27510ceeee105fb6edc2068fe8e2 +Subproject commit 9bc069f4ed25590ba457c2f35067eb63604a0e9a diff --git a/src/com/owncloud/android/lib/refactor/RemoteOperation.java b/src/com/owncloud/android/lib/refactor/RemoteOperation.java index c212845e..d9cb412d 100644 --- a/src/com/owncloud/android/lib/refactor/RemoteOperation.java +++ b/src/com/owncloud/android/lib/refactor/RemoteOperation.java @@ -13,7 +13,7 @@ import okhttp3.Request; public abstract class RemoteOperation { private final OCContext mContext; - private static final String WEBDAV_PATH_4_0 = "remote.php/dav"; + private static final String WEBDAV_PATH_4_0 = "remote.php/dav/files"; private static OkHttpClient mClient = null; protected RemoteOperation(OCContext context) { @@ -50,6 +50,7 @@ public abstract class RemoteOperation { return UrlUtils.INSTANCE.omitTrailingSlash(HttpUrl.parse( getBaseUriBuilder() .appendEncodedPath(WEBDAV_PATH_4_0) + .appendEncodedPath(mContext.getOCAccount().getDisplayName()) .appendEncodedPath(resourcePath) .build() .toString())); diff --git a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java index 6ee5bb9a..07ccfc35 100644 --- a/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java +++ b/src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java @@ -5,7 +5,7 @@ import com.owncloud.android.lib.refactor.RemoteOperation; import com.owncloud.android.lib.refactor.RemoteOperationResult; import at.bitfire.dav4android.DavResource; -import at.bitfire.dav4android.property.DisplayName; +import at.bitfire.dav4android.PropertyUtils; public class PropfindOperation extends RemoteOperation { @@ -21,9 +21,8 @@ public class PropfindOperation extends RemoteOperation { public RemoteOperationResult exec() { try { - DavResource davResource = new DavResource(getClient(), getWebDavHttpUrl("/")); - davResource.propfind(0, DisplayName.NAME); + davResource.propfind(1, PropertyUtils.INSTANCE.getAllPropSet()); } catch (Exception e) { e.printStackTrace();