Merge lp:~renatofilho/address-book-service/fetch-hint into lp:address-book-service

[Renato Araujo Oliveira Filho]

Initial implementation of FetchHint.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/35/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-saucy-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-saucy-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-saucy-armhf-ci/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-saucy-i386-ci/35

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-service-ci/35/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-service/fetch-hint]

46. By Renato Araujo Oliveira Filho on 2013-06-26

Implemented fetchContactById

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:46
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/36/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-saucy-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-saucy-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-saucy-armhf-ci/36/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-saucy-i386-ci/36

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-service-ci/36/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'common/CMakeLists.txt'
--- common/CMakeLists.txt	2013-06-13 14:35:08 +0000
+++ common/CMakeLists.txt	2013-06-26 15:26:36 +0000
@@ -2,12 +2,14 @@
 
 set(GALERA_COMMON_LIB_SRC
     filter.cpp
+    fetch-hint.cpp
     sort-clause.cpp
     vcard-parser.cpp
 )
 
 set(GALERA_COMMON_LIB_HEADERS
     filter.h
+    fetch-hint.h
     sort-clause.h
     vcard-parser.h
     dbus-service-defs.h

=== added file 'common/fetch-hint.cpp'
--- common/fetch-hint.cpp	1970-01-01 00:00:00 +0000
+++ common/fetch-hint.cpp	2013-06-26 15:26:36 +0000
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of contact-service-app.
+ *
+ * contact-service-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * contact-service-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "fetch-hint.h"
+
+#include <QtContacts/qcontactdetails.h>
+
+using namespace QtContacts;
+
+namespace galera
+{
+
+FetchHint::FetchHint()
+{
+    //empty
+}
+
+FetchHint::FetchHint(const QtContacts::QContactFetchHint &hint)
+    : m_hint(hint)
+{
+    update();
+}
+
+bool FetchHint::isEmpty() const
+{
+    return m_strHint.isEmpty();
+}
+
+FetchHint::FetchHint(const QString &hint)
+    : m_hint(buildFilter(hint))
+{
+    update();
+}
+
+FetchHint::FetchHint(const FetchHint &other)
+    : m_hint(other.m_hint)
+{
+    update();
+}
+
+QString FetchHint::toString() const
+{
+    return m_strHint;
+}
+
+QStringList FetchHint::fields() const
+{
+    return m_fields;
+}
+
+void FetchHint::update()
+{
+    m_strHint.clear();
+    m_fields.clear();
+
+    QMap<QString, QtContacts::QContactDetail::DetailType> map = contactFieldNames();
+    Q_FOREACH(QContactDetail::DetailType type, m_hint.detailTypesHint()) {
+        QString fieldName = map.key(type, "");
+        if (!fieldName.isEmpty()) {
+            m_fields << fieldName;
+        }
+    }
+
+    if (!m_fields.isEmpty()) {
+        m_strHint = QString("FIELDS:") + m_fields.join(",");
+    }
+}
+
+QtContacts::QContactFetchHint FetchHint::toContactFetchHint() const
+{
+    return m_hint;
+}
+
+QMap<QString, QtContacts::QContactDetail::DetailType> FetchHint::contactFieldNames()
+{
+    static QMap<QString, QContactDetail::DetailType> map;
+    if (map.isEmpty()) {
+        map.insert("ADR", QContactAddress::Type);
+        map.insert("BDAY", QContactBirthday::Type);
+        map.insert("EMAIL", QContactEmailAddress::Type);
+        map.insert("FN", QContactDisplayLabel::Type);
+        map.insert("GENDER", QContactGender::Type);
+        map.insert("N", QContactName::Type);
+        map.insert("NICKNAME", QContactNickname::Type);
+        map.insert("NOTE", QContactNote::Type);
+        map.insert("ORG", QContactOrganization::Type);
+        map.insert("PHOTO", QContactAvatar::Type);
+        map.insert("TEL", QContactPhoneNumber::Type);
+        map.insert("URL", QContactUrl::Type);
+    }
+    return map;
+}
+
+QList<QContactDetail::DetailType> FetchHint::parseFieldNames(QStringList fieldNames)
+{
+    QList<QContactDetail::DetailType> result;
+    const QMap<QString, QtContacts::QContactDetail::DetailType> map = contactFieldNames();
+    Q_FOREACH(QString fieldName, fieldNames) {
+        if (map.contains(fieldName)) {
+            result << map[fieldName];
+        }
+    }
+    return result;
+}
+
+
+// Parse string
+// Format: <KEY0>:VALUE0,VALUE1;<KEY1>:VALUE0,VALUE1
+QtContacts::QContactFetchHint FetchHint::buildFilter(const QString &originalHint)
+{
+    QString hint = QString(originalHint).replace(" ","");
+    QContactFetchHint result;
+    QStringList groups = hint.split(";");
+    Q_FOREACH(QString group, groups) {
+        QStringList values = group.split(":");
+
+        if (values.count() == 2) {
+            if (values[0] == "FIELDS") {
+                QList<QContactDetail::DetailType> fields;
+                QMap<QString, QtContacts::QContactDetail::DetailType> map = contactFieldNames();
+                Q_FOREACH(QString field, values[1].split(",")) {
+                    if (map.contains(field)) {
+                        fields << map[field];
+                    }
+                }
+                result.setDetailTypesHint(fields);
+            }
+        } else {
+            qWarning() << "invalid fech hint: " << values;
+        }
+    }
+
+    return result;
+}
+
+}
+
+

=== added file 'common/fetch-hint.h'
--- common/fetch-hint.h	1970-01-01 00:00:00 +0000
+++ common/fetch-hint.h	2013-06-26 15:26:36 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of contact-service-app.
+ *
+ * contact-service-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * contact-service-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GALERA_FETCH_HINT_H__
+#define __GALERA_FETCH_HINT_H__
+
+#include <QtContacts/QContactFetchHint>
+#include <QtContacts/QContactDetail>
+#include <QtContacts/QContact>
+
+namespace galera
+{
+
+class FetchHint
+{
+public:
+    FetchHint(const QtContacts::QContactFetchHint &hint);
+    FetchHint(const QString &hint);
+    FetchHint(const FetchHint &other);
+    FetchHint();
+
+    bool isEmpty() const;
+    QString toString() const;
+    QStringList fields() const;
+    QtContacts::QContactFetchHint toContactFetchHint() const;
+    static QMap<QString, QtContacts::QContactDetail::DetailType> contactFieldNames();
+    static QList<QtContacts::QContactDetail::DetailType> parseFieldNames(QStringList fieldNames);
+
+private:
+    QtContacts::QContactFetchHint m_hint;
+    QString m_strHint;
+    QStringList m_fields;
+
+
+
+    void update();
+    static QtContacts::QContactFetchHint buildFilter(const QString &originalHint);
+};
+
+}
+
+#endif

=== modified file 'qcontacts/contacts-service.cpp'
--- qcontacts/contacts-service.cpp	2013-06-20 13:15:48 +0000
+++ qcontacts/contacts-service.cpp	2013-06-26 15:26:36 +0000
@@ -22,6 +22,7 @@
 
 #include "common/vcard-parser.h"
 #include "common/filter.h"
+#include "common/fetch-hint.h"
 #include "common/sort-clause.h"
 #include "common/dbus-service-defs.h"
 
@@ -146,27 +147,49 @@
     return !m_iface.isNull();
 }
 
+void GaleraContactsService::fetchContactsById(QtContacts::QContactFetchByIdRequest *request)
+{
+    qDebug() << Q_FUNC_INFO;
+
+    if (!isOnline()) {
+        RequestData::setError(request);
+        return;
+    }
+
+    QContactIdFilter filter;
+    filter.setIds(request->contactIds());
+    QString filterStr = Filter(filter).toString();
+    QDBusMessage result = m_iface->call("query", filterStr, "", QStringList());
+    if (result.type() == QDBusMessage::ErrorMessage) {
+        qWarning() << result.errorName() << result.errorMessage();
+        RequestData::setError(request);
+        return;
+    }
+    QDBusObjectPath viewObjectPath = result.arguments()[0].value<QDBusObjectPath>();
+    QDBusInterface *view = new QDBusInterface(CPIM_SERVICE_NAME,
+                                             viewObjectPath.path(),
+                                             CPIM_ADDRESSBOOK_VIEW_IFACE_NAME);
+
+    RequestData *requestData = new RequestData(request, view, FetchHint());
+    m_runningRequests << requestData;
+    QMetaObject::invokeMethod(this, "fetchContactsPage", Qt::QueuedConnection, Q_ARG(galera::RequestData*, requestData));
+}
+
 void GaleraContactsService::fetchContacts(QtContacts::QContactFetchRequest *request)
 {
     qDebug() << Q_FUNC_INFO;
 
     if (!isOnline()) {
-        QContactManagerEngine::updateContactFetchRequest(request, QList<QContact>(),
-                                                         QContactManager::UnspecifiedError,
-                                                         QContactAbstractRequest::FinishedState);
+        RequestData::setError(request);
         return;
     }
-    QContactFetchRequest *r = static_cast<QContactFetchRequest*>(request);
-    //QContactFetchHint fetchHint = r->fetchHint();
-
-    QString sortStr = SortClause(r->sorting()).toString();
+    QString sortStr = SortClause(request->sorting()).toString();
     QString filterStr = Filter(request->filter()).toString();
+    FetchHint fetchHint = FetchHint(request->fetchHint()).toString();
     QDBusMessage result = m_iface->call("query", filterStr, sortStr, QStringList());
     if (result.type() == QDBusMessage::ErrorMessage) {
         qWarning() << result.errorName() << result.errorMessage();
-        QContactManagerEngine::updateContactFetchRequest(request, QList<QContact>(),
-                                                         QContactManager::UnspecifiedError,
-                                                         QContactAbstractRequest::FinishedState);
+        RequestData::setError(request);
         return;
     }
     QDBusObjectPath viewObjectPath = result.arguments()[0].value<QDBusObjectPath>();
@@ -174,7 +197,7 @@
                                              viewObjectPath.path(),
                                              CPIM_ADDRESSBOOK_VIEW_IFACE_NAME);
 
-    RequestData *requestData = new RequestData(request, view);
+    RequestData *requestData = new RequestData(request, view, fetchHint);
     m_runningRequests << requestData;
     QMetaObject::invokeMethod(this, "fetchContactsPage", Qt::QueuedConnection, Q_ARG(galera::RequestData*, requestData));
 }
@@ -183,29 +206,26 @@
 {
     qDebug() << Q_FUNC_INFO;
     if (!isOnline()) {
-        QContactManagerEngine::updateContactFetchRequest(static_cast<QContactFetchRequest*>(request->request()),
-                                                         QList<QContact>(),
-                                                         QContactManager::UnspecifiedError,
-                                                         QContactAbstractRequest::FinishedState);
+        request->setError(QContactManager::UnspecifiedError);
         destroyRequest(request);
         return;
     }
+
     // Load contacs async
-    QDBusPendingCall pcall = request->view()->asyncCall("contactsDetails", QStringList(), request->offset(), FETCH_PAGE_SIZE);
+    QDBusPendingCall pcall = request->view()->asyncCall("contactsDetails", request->fields(), request->offset(), FETCH_PAGE_SIZE);
     if (pcall.isError()) {
         qWarning() << pcall.error().name() << pcall.error().message();
-        QContactManagerEngine::updateContactFetchRequest(static_cast<QContactFetchRequest*>(request->request()),
-                                                         QList<QContact>(),
-                                                         QContactManager::UnspecifiedError,
-                                                         QContactAbstractRequest::FinishedState);
+        request->setError(QContactManager::UnspecifiedError);
         destroyRequest(request);
         return;
     }
+
     QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, 0);
     QObject::connect(watcher, &QDBusPendingCallWatcher::finished,
                      [=](QDBusPendingCallWatcher *call) {
                         this->fetchContactsDone(request, call);
                      });
+
     request->updateWatcher(watcher);
 }
 
@@ -215,6 +235,7 @@
     QContactManager::Error opError = QContactManager::NoError;
     QContactAbstractRequest::State opState = QContactAbstractRequest::FinishedState;
     QDBusPendingReply<QStringList> reply = *call;
+    QList<QContact> contacts;
 
     if (reply.isError()) {
         qWarning() << reply.error().name() << reply.error().message();
@@ -225,7 +246,7 @@
             opState = QContactAbstractRequest::ActiveState;
         }
         if (!vcards.isEmpty()) {
-            QList<QContact> contacts = VCardParser::vcardToContact(vcards);
+            contacts = VCardParser::vcardToContact(vcards);
             QList<QContactId> contactsIds;
 
             QList<QContact>::iterator contact;
@@ -239,16 +260,12 @@
                     contactsIds << newId;
                 }
             }
-
             m_contacts += contacts;
             m_contactIds += contactsIds;
-            request->appendResult(contacts);
         }
     }
-    QContactManagerEngine::updateContactFetchRequest(static_cast<QContactFetchRequest*>(request->request()),
-                                                     request->result(),
-                                                     opError,
-                                                     opState);
+
+    request->update(contacts, opState, opError);
 
     if (opState == QContactAbstractRequest::ActiveState) {
         request->updateOffset(FETCH_PAGE_SIZE);
@@ -294,11 +311,7 @@
 {
     qDebug() << Q_FUNC_INFO;
     if (!isOnline()) {
-        QContactManagerEngine::updateContactSaveRequest(request,
-                                                        QList<QContact>(),
-                                                        QContactManager::UnspecifiedError,
-                                                        QMap<int, QContactManager::Error>(),
-                                                        QContactAbstractRequest::FinishedState);
+        RequestData::setError(request);
         return;
     }
 
@@ -310,7 +323,7 @@
     Q_FOREACH(QString contact, contacts) {
         QDBusPendingCall pcall = m_iface->asyncCall("createContact", contact, "");
         QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, 0);
-        RequestData *requestData = new RequestData(request, 0, watcher);
+        RequestData *requestData = new RequestData(request, watcher);
         m_runningRequests << requestData;
         QObject::connect(watcher, &QDBusPendingCallWatcher::finished,
                          [=](QDBusPendingCallWatcher *call) {
@@ -325,7 +338,6 @@
     qDebug() << Q_FUNC_INFO;
     QDBusPendingReply<QString> reply = *call;
     QList<QContact> contacts;
-    QMap<int, QContactManager::Error> errorMap;
     QContactManager::Error opError = QContactManager::NoError;
 
     if (reply.isError()) {
@@ -343,26 +355,14 @@
         }
     }
 
-    if (opError != QContactManager::NoError) {
-        QContactManagerEngine::updateContactSaveRequest(static_cast<QContactSaveRequest*>(request->request()),
-                                                        contacts,
-                                                        opError,
-                                                        errorMap,
-                                                        QContactAbstractRequest::FinishedState);
-    } else {
-        QContactManagerEngine::updateRequestState(request->request(),
-                                                  QContactAbstractRequest::FinishedState);
-    }
+    request->update(contacts, QContactAbstractRequest::FinishedState, opError);
     destroyRequest(request);
 }
 
 void GaleraContactsService::removeContact(QContactRemoveRequest *request)
 {
     if (!isOnline()) {
-        QContactManagerEngine::updateContactRemoveRequest(request,
-                                                          QContactManager::UnspecifiedError,
-                                                          QMap<int, QContactManager::Error>(),
-                                                          QContactAbstractRequest::FinishedState);
+        RequestData::setError(request);
         return;
     }
 
@@ -376,13 +376,10 @@
     QDBusPendingCall pcall = m_iface->asyncCall("removeContacts", ids);
     if (pcall.isError()) {
         qWarning() <<  "Error" << pcall.error().name() << pcall.error().message();
-        QContactManagerEngine::updateContactRemoveRequest(request,
-                                                          QContactManager::UnspecifiedError,
-                                                          QMap<int, QContactManager::Error>(),
-                                                          QContactAbstractRequest::FinishedState);
+        RequestData::setError(request);
     } else {
         QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, 0);
-        RequestData *requestData = new RequestData(request, 0, watcher);
+        RequestData *requestData = new RequestData(request, watcher);
         m_runningRequests << requestData;
         QObject::connect(watcher, &QDBusPendingCallWatcher::finished,
                          [=](QDBusPendingCallWatcher *call) {
@@ -403,16 +400,7 @@
         opError = QContactManager::UnspecifiedError;
     }
 
-
-    if (opError != QContactManager::NoError) {
-        QContactManagerEngine::updateContactRemoveRequest(static_cast<QContactRemoveRequest*>(request->request()),
-                                                          opError,
-                                                          errorMap,
-                                                          QContactAbstractRequest::FinishedState);
-    } else {
-        QContactManagerEngine::updateRequestState(request->request(), QContactAbstractRequest::FinishedState);
-    }
-
+    request->update(QContactAbstractRequest::FinishedState, opError);
     destroyRequest(request);
 }
 
@@ -420,25 +408,17 @@
 {
     qDebug() << Q_FUNC_INFO;
     if (!isOnline()) {
-        QContactManagerEngine::updateContactSaveRequest(request,
-                                                        QList<QContact>(),
-                                                        QContactManager::UnspecifiedError,
-                                                        QMap<int, QContactManager::Error>(),
-                                                        QContactAbstractRequest::FinishedState);
+        RequestData::setError(request);
         return;
     }
 
     QDBusPendingCall pcall = m_iface->asyncCall("updateContacts", contacts);
     if (pcall.isError()) {
         qWarning() <<  "Error" << pcall.error().name() << pcall.error().message();
-        QContactManagerEngine::updateContactSaveRequest(request,
-                                                        QList<QContact>(),
-                                                        QContactManager::UnspecifiedError,
-                                                        QMap<int, QContactManager::Error>(),
-                                                        QContactAbstractRequest::FinishedState);
+        RequestData::setError(request);
     } else {
         QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, 0);
-        RequestData *requestData = new RequestData(request, 0, watcher);
+        RequestData *requestData = new RequestData(request, watcher);
         m_runningRequests << requestData;
         QObject::connect(watcher, &QDBusPendingCallWatcher::finished,
                          [=](QDBusPendingCallWatcher *call) {
@@ -471,16 +451,7 @@
         }
     }
 
-    if (opError != QContactManager::NoError) {
-        QContactManagerEngine::updateContactSaveRequest(static_cast<QContactSaveRequest*>(request->request()),
-                                                        contacts,
-                                                        opError,
-                                                        saveError,
-                                                        QContactAbstractRequest::FinishedState);
-    } else {
-        QContactManagerEngine::updateRequestState(request->request(),
-                                                  QContactAbstractRequest::FinishedState);
-    }
+    request->update(contacts, QContactAbstractRequest::FinishedState, opError, saveError);
     destroyRequest(request);
 }
 
@@ -501,7 +472,7 @@
             fetchContacts(static_cast<QContactFetchRequest*>(request));
             break;
         case QContactAbstractRequest::ContactFetchByIdRequest:
-            qDebug() << "Not implemented: ContactFetchByIdRequest";
+            fetchContactsById(static_cast<QContactFetchByIdRequest*>(request));
             break;
         case QContactAbstractRequest::ContactIdFetchRequest:
             qDebug() << "Not implemented: ContactIdFetchRequest";

=== modified file 'qcontacts/contacts-service.h'
--- qcontacts/contacts-service.h	2013-06-20 01:26:15 +0000
+++ qcontacts/contacts-service.h	2013-06-26 15:26:36 +0000
@@ -92,6 +92,7 @@
     bool isOnline() const;
 
     void fetchContacts(QtContacts::QContactFetchRequest *request);
+    void fetchContactsById(QtContacts::QContactFetchByIdRequest *request);
     Q_INVOKABLE void fetchContactsPage(galera::RequestData *request);
     void fetchContactsDone(RequestData *request, QDBusPendingCallWatcher *call);
 

=== modified file 'qcontacts/request-data.cpp'
--- qcontacts/request-data.cpp	2013-06-12 22:41:11 +0000
+++ qcontacts/request-data.cpp	2013-06-26 15:26:36 +0000
@@ -18,15 +18,37 @@
 
 #include "request-data.h"
 
+#include <QtContacts/QContactManagerEngine>
+
 using namespace QtContacts;
 namespace galera
 {
 
 RequestData::RequestData(QContactAbstractRequest *request,
                          QDBusInterface *view,
+                         const FetchHint &hint,
+                         QDBusPendingCallWatcher *watcher)
+    : m_offset(0),
+      m_hint(hint)
+{
+    init(request, view, watcher);
+}
+
+RequestData::RequestData(QtContacts::QContactAbstractRequest *request,
                          QDBusPendingCallWatcher *watcher)
     : m_offset(0)
 {
+    init(request, 0, watcher);
+}
+
+RequestData::~RequestData()
+{
+}
+
+void RequestData::init(QtContacts::QContactAbstractRequest *request,
+                       QDBusInterface *view,
+                       QDBusPendingCallWatcher *watcher)
+{
     m_request = QSharedPointer<QContactAbstractRequest>(request, RequestData::deleteRequest);
 
     if (view) {
@@ -36,10 +58,7 @@
     if (watcher) {
         m_watcher = QSharedPointer<QDBusPendingCallWatcher>(watcher, RequestData::deleteWatcher);
     }
-}
 
-RequestData::~RequestData()
-{
 }
 
 QContactAbstractRequest* RequestData::request() const
@@ -57,6 +76,11 @@
     return m_view.data();
 }
 
+QStringList RequestData::fields() const
+{
+    return m_hint.fields();
+}
+
 void RequestData::updateWatcher(QDBusPendingCallWatcher *watcher)
 {
     m_watcher.clear();
@@ -70,26 +94,73 @@
     m_offset += offset;
 }
 
-void RequestData::setResults(QList<QContact> result)
-{
-    m_result = result;
-}
-
 QList<QContact> RequestData::result() const
 {
     return m_result;
 }
 
-void RequestData::appendResult(QList<QContact> result)
+void RequestData::setError(QContactManager::Error error)
+{
+    m_result.clear();
+    update(QContactAbstractRequest::FinishedState, error);
+}
+
+void RequestData::update(QList<QContact> result,
+                         QContactAbstractRequest::State state,
+                         QContactManager::Error error,
+                         QMap<int, QContactManager::Error> errorMap)
 {
     m_result += result;
-}
+    update(state, error, errorMap);
+}
+
+void RequestData::update(QContactAbstractRequest::State state,
+                         QContactManager::Error error,
+                         QMap<int, QContactManager::Error> errorMap)
+{
+    switch (m_request->type()) {
+        case QContactAbstractRequest::ContactFetchRequest:
+            QContactManagerEngine::updateContactFetchRequest(static_cast<QContactFetchRequest*>(m_request.data()),
+                                                             m_result,
+                                                             error,
+                                                             state);
+            break;
+        case QContactAbstractRequest::ContactFetchByIdRequest:
+            QContactManagerEngine::updateContactFetchByIdRequest(static_cast<QContactFetchByIdRequest*>(m_request.data()),
+                                                                 m_result,
+                                                                 error,
+                                                                 errorMap,
+                                                                 state);
+            break;
+        case QContactAbstractRequest::ContactSaveRequest:
+            QContactManagerEngine::updateContactSaveRequest(static_cast<QContactSaveRequest*>(m_request.data()),
+                                                            m_result,
+                                                            error,
+                                                            QMap<int, QContactManager::Error>(),
+                                                            state);
+        case QContactAbstractRequest::ContactRemoveRequest:
+            QContactManagerEngine::updateContactRemoveRequest(static_cast<QContactRemoveRequest*>(m_request.data()),
+                                                              error,
+                                                              errorMap,
+                                                              state);
+            break;
+        default:
+            break;
+    }
+}
+
 
 void RequestData::registerMetaType()
 {
     qRegisterMetaType<galera::RequestData*>();
 }
 
+void RequestData::setError(QContactAbstractRequest *request, QContactManager::Error error)
+{
+    RequestData r(request);
+    r.setError(error);
+}
+
 void RequestData::deleteRequest(QContactAbstractRequest *obj)
 {
     //nothing

=== modified file 'qcontacts/request-data.h'
--- qcontacts/request-data.h	2013-06-12 22:41:11 +0000
+++ qcontacts/request-data.h	2013-06-26 15:26:36 +0000
@@ -19,6 +19,8 @@
 #ifndef __GALERA_REQUEST_DATA_H__
 #define __GALERA_REQUEST_DATA_H__
 
+#include <common/fetch-hint.h>
+
 #include <QtCore/QList>
 #include <QtCore/QSharedPointer>
 
@@ -34,22 +36,38 @@
 public:
     RequestData(QtContacts::QContactAbstractRequest *request,
                 QDBusInterface *view,
-                QDBusPendingCallWatcher *watcher=0);
+                const FetchHint &hint,
+                QDBusPendingCallWatcher *watcher=0);
+
+    RequestData(QtContacts::QContactAbstractRequest *request,
+                QDBusPendingCallWatcher *watcher=0);
+
 
     ~RequestData();
 
     QtContacts::QContactAbstractRequest* request() const;
     QDBusInterface* view() const;
+    QStringList fields() const;
+
 
     void updateWatcher(QDBusPendingCallWatcher *watcher);
 
     void updateOffset(int offset);
     int offset() const;
 
-    void setResults(QList<QtContacts::QContact> result);
-    void appendResult(QList<QtContacts::QContact> result);
     QList<QtContacts::QContact> result() const;
 
+    void setError(QtContacts::QContactManager::Error error);
+    void update(QList<QtContacts::QContact> result,
+                QtContacts::QContactAbstractRequest::State state,
+                QtContacts::QContactManager::Error error = QtContacts::QContactManager::NoError,
+                QMap<int, QtContacts::QContactManager::Error> errorMap = QMap<int, QtContacts::QContactManager::Error>());
+    void update(QtContacts::QContactAbstractRequest::State state,
+                QtContacts::QContactManager::Error error = QtContacts::QContactManager::NoError,
+                QMap<int, QtContacts::QContactManager::Error> errorMap = QMap<int, QtContacts::QContactManager::Error>());
+
+    static void setError(QtContacts::QContactAbstractRequest *request,
+                         QtContacts::QContactManager::Error error = QtContacts::QContactManager::UnspecifiedError);
     static void registerMetaType();
 
 private:
@@ -58,7 +76,9 @@
     QSharedPointer<QDBusPendingCallWatcher> m_watcher;
     QList<QtContacts::QContact> m_result;
     int m_offset;
+    FetchHint m_hint;
 
+    void init(QtContacts::QContactAbstractRequest *request, QDBusInterface *view, QDBusPendingCallWatcher *watcher);
     static void deleteRequest(QtContacts::QContactAbstractRequest *obj);
     static void deleteView(QDBusInterface *view);
     static void deleteWatcher(QDBusPendingCallWatcher *watcher);

=== modified file 'src/qindividual.cpp'
--- src/qindividual.cpp	2013-06-26 15:26:36 +0000
+++ src/qindividual.cpp	2013-06-26 15:26:36 +0000
@@ -689,18 +689,13 @@
     return details;
 }
 
-bool QIndividual::fieldsContains(Fields fields, Field value) const
-{
-    return (fields.testFlag(QIndividual::All) || fields.testFlag(value));
-}
-
-QtContacts::QContact QIndividual::copy(Fields fields)
+QtContacts::QContact QIndividual::copy(QList<QContactDetail::DetailType> fields)
 {
     QList<QContactDetail> details;
     QContact result;
 
 
-    if (fields.testFlag(QIndividual::All)) {
+    if (fields.isEmpty()) {
         result = contact();
     } else {
         QContact fullContact = contact();
@@ -711,61 +706,57 @@
             details << det;
         }
 
-        if (fieldsContains(fields, QIndividual::Name)) {
+        if (fields.contains(QContactDetail::TypeName)) {
             details << fullContact.detail<QContactName>();
         }
 
 
-        if (fieldsContains(fields, QIndividual::FullName)) {
+        if (fields.contains(QContactDetail::TypeDisplayLabel)) {
             details << fullContact.detail<QContactDisplayLabel>();
         }
 
-        if (fieldsContains(fields, QIndividual::NickName)) {
+        if (fields.contains(QContactDetail::TypeNickname)) {
             details << fullContact.detail<QContactNickname>();
         }
 
-        if (fieldsContains(fields, QIndividual::Birthday)) {
+        if (fields.contains(QContactDetail::TypeBirthday)) {
             details << fullContact.detail<QContactBirthday>();
         }
 
-        if (fieldsContains(fields, QIndividual::Photo)) {
+        if (fields.contains(QContactDetail::TypeAvatar)) {
             details << fullContact.detail<QContactAvatar>();
         }
 
-        if (fieldsContains(fields, QIndividual::Role)) {
+        if (fields.contains(QContactDetail::TypeOrganization)) {
             Q_FOREACH(QContactDetail det, fullContact.details<QContactOrganization>()) {
                 details << det;
             }
         }
 
-        if (fieldsContains(fields, QIndividual::Email)) {
+        if (fields.contains(QContactDetail::TypeEmailAddress)) {
             Q_FOREACH(QContactDetail det, fullContact.details<QContactEmailAddress>()) {
                 details << det;
             }
         }
 
-        if (fieldsContains(fields, QIndividual::Phone)) {
+        if (fields.contains(QContactDetail::TypePhoneNumber)) {
             Q_FOREACH(QContactDetail det, fullContact.details<QContactPhoneNumber>()) {
                 details << det;
             }
         }
 
-        if (fieldsContains(fields, QIndividual::Address)) {
+        if (fields.contains(QContactDetail::TypeAddress)) {
             Q_FOREACH(QContactDetail det, fullContact.details<QContactAddress>()) {
                 details << det;
             }
         }
 
-        if (fieldsContains(fields, QIndividual::Url)) {
+        if (fields.contains(QContactDetail::TypeUrl)) {
             Q_FOREACH(QContactDetail det, fullContact.details<QContactUrl>()) {
                 details << det;
             }
         }
 
-        if (fieldsContains(fields, QIndividual::TimeZone)) {
-            //TODO
-        }
-
         Q_FOREACH(QContactDetail det, details) {
             result.appendDetail(det);
         }

=== modified file 'src/qindividual.h'
--- src/qindividual.h	2013-06-26 15:26:36 +0000
+++ src/qindividual.h	2013-06-26 15:26:36 +0000
@@ -37,28 +37,11 @@
 class QIndividual
 {
 public:
-    enum Field {
-        All = 0x0000,
-        Name = 0x0001,
-        FullName = 0x0002,
-        NickName = 0x0004,
-        Birthday = 0x0008,
-        Photo = 0x0016,
-        Role = 0x0032,
-        Email = 0x0064,
-        Phone = 0x0128,
-        Address = 0x0256,
-        Im = 0x512,
-        TimeZone = 0x1024,
-        Url = 0x2048
-    };
-    Q_DECLARE_FLAGS(Fields, Field)
-
     QIndividual(FolksIndividual *individual, FolksIndividualAggregator *aggregator);
     ~QIndividual();
 
     QtContacts::QContact &contact();
-    QtContacts::QContact copy(Fields fields = QIndividual::All);
+    QtContacts::QContact copy(QList<QtContacts::QContactDetail::DetailType> fields);
     bool update(const QString &vcard, QObject *object, const char *slot);
     bool update(const QtContacts::QContact &contact, QObject *object, const char *slot);
     FolksIndividual *individual() const;
@@ -72,7 +55,6 @@
     QtContacts::QContact m_contact;
     QMap<QString, QPair<QtContacts::QContactDetail, FolksAbstractFieldDetails*> > m_fieldsMap;
 
-    bool fieldsContains(Fields fields, Field value) const;
     QMultiHash<QString, QString> parseDetails(FolksAbstractFieldDetails *details) const;
     void updateContact();
 

=== modified file 'src/view.cpp'
--- src/view.cpp	2013-06-26 15:26:36 +0000
+++ src/view.cpp	2013-06-26 15:26:36 +0000
@@ -23,6 +23,7 @@
 
 #include "common/vcard-parser.h"
 #include "common/filter.h"
+#include "common/fetch-hint.h"
 #include "common/dbus-service-defs.h"
 
 #include <QtContacts/QContact>
@@ -127,7 +128,7 @@
 {
     m_filterThread->start();
 
-    connect(m_filterThread, SIGNAL(finished()), SIGNAL(countChanged(int)));
+    connect(m_filterThread, SIGNAL(finished()), SIGNAL(countChanged()));
 }
 
 View::~View()
@@ -171,16 +172,10 @@
 
     QList<QContact> contacts;
     for(int i = startIndex, iMax = (startIndex + pageSize); i < iMax; i++) {
-        // TODO: filter fields
-        contacts << entries[i]->individual()->contact();
+        contacts << entries[i]->individual()->copy(FetchHint::parseFieldNames(fields));
     }
 
     QStringList ret =  VCardParser::contactToVcard(contacts);
-    qDebug() << "fetch" << ret;
-    QList<QContact> cs = VCardParser::vcardToContact(ret);
-    QStringList ret2 =  VCardParser::contactToVcard(cs);
-    qDebug() << "fetch2" << ret2;
-
     QDBusMessage reply = message.createReply(ret);
     QDBusConnection::sessionBus().send(reply);
     return ret;

=== modified file 'src/view.h'
--- src/view.h	2013-06-26 15:26:36 +0000
+++ src/view.h	2013-06-26 15:26:36 +0000
@@ -66,7 +66,7 @@
 
 Q_SIGNALS:
     void closed();
-    void countChanged(int count);
+    void countChanged(int count=0);
 
 private:
     QStringList m_sources;

=== modified file 'tests/unittest/CMakeLists.txt'
--- tests/unittest/CMakeLists.txt	2013-06-11 13:00:01 +0000
+++ tests/unittest/CMakeLists.txt	2013-06-26 15:26:36 +0000
@@ -39,3 +39,4 @@
 declare_test(clause-test)
 declare_test(contactmap-test)
 declare_test(sort-clause-test)
+declare_test(fetch-hint-test)

=== added file 'tests/unittest/fetch-hint-test.cpp'
--- tests/unittest/fetch-hint-test.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittest/fetch-hint-test.cpp	2013-06-26 15:26:36 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of contact-service-app.
+ *
+ * contact-service-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * contact-service-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <QObject>
+#include <QtTest>
+#include <QDebug>
+
+#include <QtContacts>
+
+#include "common/fetch-hint.h"
+
+using namespace QtContacts;
+using namespace galera;
+
+class FetchHintTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void testSimpleFields()
+    {
+        const QString strHint = QString("FIELDS:N,TEL");
+        FetchHint hint(strHint);
+
+        QVERIFY(!hint.isEmpty());
+        QCOMPARE(hint.fields(), QStringList() << "N" << "TEL");
+
+        QContactFetchHint cHint;
+        cHint.setDetailTypesHint(QList<QContactDetail::DetailType>() << QContactDetail::TypeName
+                                                                     << QContactDetail::TypePhoneNumber);
+        QVERIFY(cHint.detailTypesHint() == hint.toContactFetchHint().detailTypesHint());
+
+        FetchHint hint2(cHint);
+        QCOMPARE(hint2.toString(), strHint);
+    }
+
+    void testInvalidHint()
+    {
+        const QString strHint = QString("FIELDSS:N,TEL");
+        FetchHint hint(strHint);
+
+        QVERIFY(hint.isEmpty());
+    }
+
+    void testInvalidFieldName()
+    {
+        const QString strHint = QString("FIELDS:N,NONE,TEL,INVALID");
+        FetchHint hint(strHint);
+
+        QVERIFY(!hint.isEmpty());
+        QCOMPARE(hint.fields(), QStringList() << "N" << "TEL");
+    }
+
+    void testParseFieldNames()
+    {
+        QList<QContactDetail::DetailType> fields = FetchHint::parseFieldNames(QStringList() << "ADR" << "BDAY" << "N" << "TEL");
+        QList<QContactDetail::DetailType> expectedFields;
+        expectedFields << QContactDetail::TypeAddress
+                       << QContactDetail::TypeBirthday
+                       << QContactDetail::TypeName
+                       << QContactDetail::TypePhoneNumber;
+
+        QCOMPARE(fields, expectedFields);
+    }
+};
+
+QTEST_MAIN(FetchHintTest)
+
+#include "fetch-hint-test.moc"