webdav: rid now is path only + formatting

1 files changed, 13 insertions, 29 deletions

diff --git a/examples/webdavcommon/webdav.cpp b/examples/webdavcommon/webdav.cpp
index f97a866..e5f4fab 100644
--- a/examples/webdavcommon/webdav.cpp
+++ b/examples/webdavcommon/webdav.cpp
@@ -241,27 +241,22 @@ KAsync::Job<void> WebDavSynchronizer::synchronizeItem(const KDAV2::DavItem &item
 KAsync::Job<void> WebDavSynchronizer::createItem(const KDAV2::DavItem &item)
 {
     auto job = new KDAV2::DavItemCreateJob(item);
-    return runJob(job).then([] {
-            SinkLog() << "Done creating item";
-        });
+    return runJob(job).then([] { SinkTrace() << "Done creating item"; });
 }
 
 KAsync::Job<void> WebDavSynchronizer::removeItem(const KDAV2::DavItem &item)
 {
     auto job = new KDAV2::DavItemDeleteJob(item);
-    return runJob(job).then([] {
-            SinkLog() << "Done removing item";
-            });
+    return runJob(job).then([] { SinkTrace() << "Done removing item"; });
 }
 
 KAsync::Job<void> WebDavSynchronizer::modifyItem(const KDAV2::DavItem &item)
 {
     auto job = new KDAV2::DavItemModifyJob(item);
-    return runJob(job).then([] {
-            SinkLog() << "Done modifying item";
-            });
+    return runJob(job).then([] { SinkTrace() << "Done modifying item"; });
 }
 
+// There is no "DavCollectionCreateJob"
 /*
 KAsync::Job<void> WebDavSynchronizer::createCollection(const KDAV2::DavCollection &collection)
 {
@@ -273,45 +268,34 @@ KAsync::Job<void> WebDavSynchronizer::createCollection(const KDAV2::DavCollectio
 KAsync::Job<void> WebDavSynchronizer::removeCollection(const KDAV2::DavUrl &url)
 {
     auto job = new KDAV2::DavCollectionDeleteJob(url);
-    return runJob(job);
+    return runJob(job).then([] { SinkLog() << "Done removing collection"; });
 }
 
+// Useless without using the `setProperty` method of DavCollectionModifyJob
+/*
 KAsync::Job<void> WebDavSynchronizer::modifyCollection(const KDAV2::DavUrl &url)
 {
     auto job = new KDAV2::DavCollectionModifyJob(url);
-    return runJob(job);
-}
-
-/*
-KAsync::Job<QByteArray> WebDavSynchronizer::replay(const Contact &, Sink::Operation operation,
-    const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties)
-{
-    return replayItem(Sink::ApplicationDomain::getTypeName<Contact>(), operation, oldRemoteId,
-changedProperties);
-}
-
-KAsync::Job<QByteArray> WebDavSynchronizer::replay(const Addressbook &, Sink::Operation operation,
-    const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties)
-{
-    return replayCollection(Sink::ApplicationDomain::getTypeName<Addressbook>(), operation,
-        oldRemoteId, changedProperties);
+    return runJob(job).then([] { SinkLog() << "Done modifying collection"; });
 }
 */
 
 QByteArray WebDavSynchronizer::resourceID(const KDAV2::DavCollection &collection)
 {
-    return collection.url().url().toEncoded();
+    return collection.url().url().path().toUtf8();
 }
 
 QByteArray WebDavSynchronizer::resourceID(const KDAV2::DavItem &item)
 {
-    return item.url().url().toEncoded();
+    return item.url().url().path().toUtf8();
 }
 
 KDAV2::DavUrl WebDavSynchronizer::urlOf(const QByteArray &remoteId)
 {
-    auto url = QUrl::fromEncoded(remoteId);
     auto davurl = serverUrl();
+    auto url = davurl.url();
+    url.setPath(remoteId);
+    SinkLog() << "Returning URL:" << url.toEncoded();
     davurl.setUrl(url);
     return davurl;
 }