From: Bartek Przybylski Date: Mon, 21 May 2012 20:20:18 +0000 (+0200) Subject: fix webdav path sync for oc3 and oc4 X-Git-Tag: oc-android-1.4.3~403 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/cfe4273de5fd5d54f3933a9cb8b53cdd35e1b11d?ds=sidebyside fix webdav path sync for oc3 and oc4 --- diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java index 8bd0a575..85f9cbb3 100644 --- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java +++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java @@ -81,7 +81,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { resp = query.getResponseBodyAsMultiStatus(); if (resp.getResponses().length > 0) { - WebdavEntry we = new WebdavEntry(resp.getResponses()[0]); + WebdavEntry we = new WebdavEntry(resp.getResponses()[0], getUri().getPath()); OCFile file = fillOCFile(we); file.setParentId(0); getStorageManager().saveFile(file); @@ -110,7 +110,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { MultiStatus resp = null; resp = query.getResponseBodyAsMultiStatus(); for (int i = 1; i < resp.getResponses().length; ++i) { - WebdavEntry we = new WebdavEntry(resp.getResponses()[i]); + WebdavEntry we = new WebdavEntry(resp.getResponses()[i], getUri().getPath()); OCFile file = fillOCFile(we); file.setParentId(parentId); getStorageManager().saveFile(file); diff --git a/src/eu/alefzero/webdav/WebdavEntry.java b/src/eu/alefzero/webdav/WebdavEntry.java index e7222772..032d996a 100644 --- a/src/eu/alefzero/webdav/WebdavEntry.java +++ b/src/eu/alefzero/webdav/WebdavEntry.java @@ -30,12 +30,12 @@ public class WebdavEntry { private String mName, mPath, mUri, mContentType; private long mContentLength, mCreateTimestamp, mModifiedTimestamp; - public WebdavEntry(MultiStatusResponse ms) { + public WebdavEntry(MultiStatusResponse ms, String splitElement) { resetData(); if (ms.getStatus().length != 0) { mUri = ms.getHref(); - mPath = mUri.split("webdav.php", 2)[1]; + mPath = mUri.split(splitElement, 2)[1]; int status = ms.getStatus()[0].getStatusCode(); DavPropertySet propSet = ms.getProperties(status);