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 8bd0a57..85f9cbb 100644 (file)
--- 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();\r
 \r
             if (resp.getResponses().length > 0) {\r
             resp = query.getResponseBodyAsMultiStatus();\r
 \r
             if (resp.getResponses().length > 0) {\r

-                WebdavEntry we = new WebdavEntry(resp.getResponses()[0]);\r
+                WebdavEntry we = new WebdavEntry(resp.getResponses()[0], getUri().getPath());\r

                 OCFile file = fillOCFile(we);\r
                 file.setParentId(0);\r
                 getStorageManager().saveFile(file);\r
                 OCFile file = fillOCFile(we);\r
                 file.setParentId(0);\r
                 getStorageManager().saveFile(file);\r


@@ -110,7 +110,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             MultiStatus resp = null;\r
             resp = query.getResponseBodyAsMultiStatus();\r
             for (int i = 1; i < resp.getResponses().length; ++i) {\r
             MultiStatus resp = null;\r
             resp = query.getResponseBodyAsMultiStatus();\r
             for (int i = 1; i < resp.getResponses().length; ++i) {\r

-                WebdavEntry we = new WebdavEntry(resp.getResponses()[i]);\r
+                WebdavEntry we = new WebdavEntry(resp.getResponses()[i], getUri().getPath());\r

                 OCFile file = fillOCFile(we);\r
                 file.setParentId(parentId);\r
                 getStorageManager().saveFile(file);\r
                 OCFile file = fillOCFile(we);\r
                 file.setParentId(parentId);\r
                 getStorageManager().saveFile(file);\r

diff --git a/src/eu/alefzero/webdav/WebdavEntry.java b/src/eu/alefzero/webdav/WebdavEntry.java
index e722277..032d996 100644 (file)
--- 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;
 
     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();
 
         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);
 
             int status = ms.getStatus()[0].getStatusCode();
             DavPropertySet propSet = ms.getProperties(status);