From 4ee11fa748960d24c4627adfaaaddf6e91c9b70d Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Tue, 30 Oct 2012 11:24:09 +0100 Subject: [PATCH] Fixed folder detection, now WebDAV compliant --- src/eu/alefzero/webdav/WebdavEntry.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/eu/alefzero/webdav/WebdavEntry.java b/src/eu/alefzero/webdav/WebdavEntry.java index 84c96fbd..773276d8 100644 --- a/src/eu/alefzero/webdav/WebdavEntry.java +++ b/src/eu/alefzero/webdav/WebdavEntry.java @@ -57,13 +57,15 @@ public class WebdavEntry { if (mContentType.indexOf(";") >= 0) { mContentType = mContentType.substring(0, mContentType.indexOf(";")); } - } else { - mContentType = "DIR"; - /* - * prop = propSet.get(DavPropertyName.ISCOLLECTION); if (prop != - * null && Boolean.parseBoolean((String) prop.getValue())) - * mContentType = "DIR"; - */ + } + + // check if it's a folder in the standard way: see RFC2518 12.2 , or RFC4918 14.3 + prop = propSet.get(DavPropertyName.RESOURCETYPE); + if (prop!= null) { + Object value = prop.getValue(); + if (value != null) { + mContentType = "DIR"; // a specific attribute would be better, but this is enough; unless while we have no reason to distinguish MIME types for folders + } } prop = propSet.get(DavPropertyName.GETCONTENTLENGTH); -- 2.11.0