Branch 'kolab/integration/4.13.0' - resources/kolab

[Christian Mollekopf]

 resources/kolab/kolabchangeitemstagstask.cpp |    3 ++-
 resources/kolab/kolabchangetagtask.cpp       |    2 +-
 resources/kolab/kolabhelpers.cpp             |    1 +
 resources/kolab/tagchangehelper.cpp          |    4 ++--
 resources/kolab/tagchangehelper.h            |    2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 7e027132b687e26de3ebd2eb38e3a28bca851c2e
Author: Sandro Knauß <mail at sandroknauss.de>
Date:   Wed Dec 10 16:20:44 2014 +0100

    Create valid memberUrls for tags.
    
    KOLAB: 4052

diff --git a/resources/kolab/kolabchangeitemstagstask.cpp b/resources/kolab/kolabchangeitemstagstask.cpp
index c4d66d7..ae55c7c 100644
--- a/resources/kolab/kolabchangeitemstagstask.cpp
+++ b/resources/kolab/kolabchangeitemstagstask.cpp
@@ -90,6 +90,7 @@ void KolabChangeItemsTagsTask::onTagFetchDone(KJob *job)
     // TODO: does the fetch already limit to resource local items?
     fetch->fetchScope().setAncestorRetrieval(Akonadi::ItemFetchScope::All);
     fetch->fetchScope().setFetchGid(true);
+    fetch->fetchScope().fetchFullPayload(true);
     fetch->setProperty("tag", QVariant::fromValue(tags.first()));
     connect(fetch, SIGNAL(result(KJob*)), this, SLOT(onItemsFetchDone(KJob*)));
 }
@@ -115,7 +116,7 @@ void KolabChangeItemsTagsTask::onItemsFetchDone(KJob *job)
 
     const Akonadi::Tag tag = job->property("tag").value<Akonadi::Tag>();
     Q_ASSERT(tag.isValid());
-    changeHelper->start(tag, mTagConverter->createMessage(tag, items), mSession);
+    changeHelper->start(tag, mTagConverter->createMessage(tag, items, resourceState()->userName()), mSession);
 }
 
 void KolabChangeItemsTagsTask::onApplyCollectionChanged(const Akonadi::Collection &collection)
diff --git a/resources/kolab/kolabchangetagtask.cpp b/resources/kolab/kolabchangetagtask.cpp
index 942f403..64c9068 100644
--- a/resources/kolab/kolabchangetagtask.cpp
+++ b/resources/kolab/kolabchangetagtask.cpp
@@ -61,7 +61,7 @@ void KolabChangeTagTask::onItemsFetchDone(KJob *job)
     connect(changeHelper, SIGNAL(cancelTask(QString)), this, SLOT(onCancelTask(QString)));
     connect(changeHelper, SIGNAL(changeCommitted()), this, SLOT(onChangeCommitted()));
 
-    changeHelper->start(resourceState()->tag(), mTagConverter->createMessage(resourceState()->tag(), items), mSession);
+    changeHelper->start(resourceState()->tag(), mTagConverter->createMessage(resourceState()->tag(), items, resourceState()->userName()), mSession);
 }
 
 void KolabChangeTagTask::onApplyCollectionChanged(const Akonadi::Collection &collection)
diff --git a/resources/kolab/kolabhelpers.cpp b/resources/kolab/kolabhelpers.cpp
index 839fc1f..6f04fe2 100644
--- a/resources/kolab/kolabhelpers.cpp
+++ b/resources/kolab/kolabhelpers.cpp
@@ -486,6 +486,7 @@ QString KolabHelpers::createMemberUrl(const Akonadi::Item &item, const QString &
         member.user = user;
         member.subject = msg->subject()->asUnicodeString();
         member.messageId = msg->messageID()->asUnicodeString();
+        member.date = msg->date()->asUnicodeString();
         member.mailbox = ancestorChain(item.parentCollection());
     } else {
         if (item.gid().isEmpty()) {
diff --git a/resources/kolab/tagchangehelper.cpp b/resources/kolab/tagchangehelper.cpp
index c41445e..641c8e9 100644
--- a/resources/kolab/tagchangehelper.cpp
+++ b/resources/kolab/tagchangehelper.cpp
@@ -45,12 +45,12 @@ TagChangeHelper::TagChangeHelper(KolabRelationResourceTask *parent)
 {
 }
 
-KMime::Message::Ptr TagConverter::createMessage(const Akonadi::Tag &tag, const Akonadi::Item::List &items)
+KMime::Message::Ptr TagConverter::createMessage(const Akonadi::Tag &tag, const Akonadi::Item::List &items, const QString &username)
 {
     QStringList itemRemoteIds;
     itemRemoteIds.reserve(items.count());
     Q_FOREACH (const Akonadi::Item &item, items) {
-        const QString memberUrl = KolabHelpers::createMemberUrl(item, QLatin1String("user at test.org"));
+        const QString memberUrl = KolabHelpers::createMemberUrl(item, username);
         if (!memberUrl.isEmpty()) {
             itemRemoteIds << memberUrl;
         }
diff --git a/resources/kolab/tagchangehelper.h b/resources/kolab/tagchangehelper.h
index ee1b7d6..5d25e40 100644
--- a/resources/kolab/tagchangehelper.h
+++ b/resources/kolab/tagchangehelper.h
@@ -40,7 +40,7 @@ class KolabRelationResourceTask;
 
 struct TagConverter
 {
-    virtual KMime::Message::Ptr createMessage(const Akonadi::Tag &tag, const Akonadi::Item::List &items);
+    virtual KMime::Message::Ptr createMessage(const Akonadi::Tag &tag, const Akonadi::Item::List &items, const QString &username);
 };
 
 class TagChangeHelper : public QObject