4 files changed, 18 insertions, 0 deletions

diff --git a/common/domain/event.cpp b/common/domain/event.cpp
index 83a6906..87e13bc 100644
--- a/common/domain/event.cpp
+++ b/common/domain/event.cpp
@@ -58,6 +58,14 @@ void TypeImplementation<Event>::index(const QByteArray &identifier, const Buffer
     }
 }
 
+void TypeImplementation<Event>::removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction)
+{
+    const auto uid = bufferAdaptor.getProperty("uid");
+    if (uid.isValid()) {
+        Index("event.index.uid", transaction).remove(uid.toByteArray(), identifier);
+    }
+}
+
 QSharedPointer<ReadPropertyMapper<TypeImplementation<Event>::Buffer> > TypeImplementation<Event>::initializeReadPropertyMapper()
 {
     auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer> >::create();
diff --git a/common/domain/event.h b/common/domain/event.h
index e9ba52a..577367b 100644
--- a/common/domain/event.h
+++ b/common/domain/event.h
@@ -57,6 +57,7 @@ public:
      */
     static ResultSet queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet<QByteArray> &appliedFilters, Akonadi2::Storage::Transaction &transaction);
     static void index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction);
+    static void removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction);
     static QSharedPointer<ReadPropertyMapper<Buffer> > initializeReadPropertyMapper();
     static QSharedPointer<WritePropertyMapper<BufferBuilder> > initializeWritePropertyMapper();
 };
diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index ffe322e..5373ac6 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -58,6 +58,14 @@ void TypeImplementation<Mail>::index(const QByteArray &identifier, const BufferA
     }
 }
 
+void TypeImplementation<Mail>::removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction)
+{
+    const auto uid = bufferAdaptor.getProperty("uid");
+    if (uid.isValid()) {
+        Index("mail.index.uid", transaction).remove(uid.toByteArray(), identifier);
+    }
+}
+
 QSharedPointer<ReadPropertyMapper<TypeImplementation<Mail>::Buffer> > TypeImplementation<Mail>::initializeReadPropertyMapper()
 {
     auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer> >::create();
diff --git a/common/domain/mail.h b/common/domain/mail.h
index 38f1d03..d1ef8d6 100644
--- a/common/domain/mail.h
+++ b/common/domain/mail.h
@@ -52,6 +52,7 @@ public:
      */
     static ResultSet queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet<QByteArray> &appliedFilters, Akonadi2::Storage::Transaction &transaction);
     static void index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction);
+    static void removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction);
     static QSharedPointer<ReadPropertyMapper<Buffer> > initializeReadPropertyMapper();
     static QSharedPointer<WritePropertyMapper<BufferBuilder> > initializeWritePropertyMapper();
 };