2 files changed, 16 insertions, 6 deletions

diff --git a/common/domain/typeimplementations.cpp b/common/domain/typeimplementations.cpp
index bb3f455..aedf889 100644
--- a/common/domain/typeimplementations.cpp
+++ b/common/domain/typeimplementations.cpp
@@ -56,7 +56,8 @@ typedef IndexConfig<Folder,
     > FolderIndexConfig;
 
 typedef IndexConfig<Contact,
-        ValueIndex<Contact::Uid>
+        ValueIndex<Contact::Uid>,
+        ValueIndex<Contact::Addressbook>
     > ContactIndexConfig;
 
 typedef IndexConfig<Addressbook,
@@ -65,12 +66,14 @@ typedef IndexConfig<Addressbook,
 
 typedef IndexConfig<Event,
         ValueIndex<Event::Uid>,
+        ValueIndex<Event::Calendar>,
         SortedIndex<Event::StartTime>,
         SampledPeriodIndex<Event::StartTime, Event::EndTime>
     > EventIndexConfig;
 
 typedef IndexConfig<Todo,
-        ValueIndex<Todo::Uid>
+        ValueIndex<Todo::Uid>,
+        ValueIndex<Todo::Calendar>
     > TodoIndexConfig;
 
 typedef IndexConfig<Calendar,
diff --git a/examples/webdavcommon/webdav.cpp b/examples/webdavcommon/webdav.cpp
index ffda34a..0dfb6c0 100644
--- a/examples/webdavcommon/webdav.cpp
+++ b/examples/webdavcommon/webdav.cpp
@@ -157,13 +157,20 @@ KAsync::Job<void> WebDavSynchronizer::synchronizeWithSource(const Sink::QueryBas
                     return KAsync::null<void>();
                 }
 
-                SinkTrace() << "Syncing collection:" << collectionResourceID;
+                SinkTrace() << "Syncing collection:" << collectionResourceID << collection.displayName();
                 auto itemsResourceIDs = QSharedPointer<QSet<QByteArray>>::create();
                 return synchronizeCollection(collection, progress, total, itemsResourceIDs)
                 .then([=] {
-                    scanForRemovals(mEntityType, [&itemsResourceIDs](const QByteArray &remoteId) {
-                        return itemsResourceIDs->contains(remoteId);
-                    });
+                    const auto collectionLocalId = collectionLocalResourceID(collection);
+                    scanForRemovals(mEntityType,
+                        [&](const std::function<void(const QByteArray &)> &callback) {
+                            //FIXME: The collection type just happens to have the same name as the parent collection property
+                            const auto collectionProperty = mCollectionType;
+                            store().indexLookup(mEntityType, collectionProperty, collectionLocalId, callback);
+                        },
+                        [&itemsResourceIDs](const QByteArray &remoteId) {
+                            return itemsResourceIDs->contains(remoteId);
+                        });
                 });
             })
             .then([=]() {