Merge lp:~renatofilho/address-book-service/dummy-mode into lp:address-book-service

[Renato Araujo Oliveira Filho]

Allow change the service name using env var "CANONICAL_PIN_SERVICE_NAME";

This is necessary for test purpose.

Running the address-book-service and qtcontacts in dummy mode.

Running address-book-service
===========================

# export CANONICAL_PIN_SERVICE_NAME="com.canonical.test.pim"
# export FOLKS_BACKEND_PATH="/usr/lib/address-book-service/dummy.so"
# export FOLKS_BACKENDS_ALLOWED="dummy"
# export FOLKS_PRIMARY_STORE="dummy"
# /usr/libexec/address-book-service

CANONICAL_PIN_SERVICE_NAME
 - Defines a new address book DBus service name

FOLKS_BACKEND_PATH
 - Defines the path used by folks to find the backend

FOLKS_BACKENDS_ALLOWED
 - Defines which backend folks is allowed to load

FOLKS_PRIMARY_STORE
 - Defines which persona store should be used as primary store

Running any address-book client
===============================

# export CANONICAL_PIN_SERVICE_NAME="com.canonical.test.pim"

CANONICAL_PIN_SERVICE_NAME
 - Defines a new address book DBus service name, should be the same as the server

[lp:~renatofilho/address-book-service/dummy-mode]

101. By Renato Araujo Oliveira Filho on 2014-02-26

Created README.test with instructions of how to run the server in dummy mode.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/160/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/68/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-service/dummy-mode]

102. By Renato Araujo Oliveira Filho on 2014-02-28

Fixed install file for dummy backend.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:102
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/161/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/69/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-service/dummy-mode]

103. By Renato Araujo Oliveira Filho on 2014-02-28

Merged mainline.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:103
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/163/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/71/console

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

review: Needs Fixing (continuous-integration)

[Allan LeSage (allanlesage)]

renato this test failure appears legitimate, I'm witnessing on my device too--have you looked into?

[lp:~renatofilho/address-book-service/dummy-mode]

104. By Renato Araujo Oliveira Filho on 2014-03-05

Keep URLS as read-only fields on dummy backend, for testing purpose

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Omer Akram (om26er)]

one tests failed for me

om26er@chaotic:~/code/canonical/qa/address-book-work/dummy-mode$ ctest
Test project /home/om26er/code/canonical/qa/address-book-work/dummy-mode
    Start 1: clause-test
1/8 Test #1: clause-test ...................... Passed 0.01 sec
    Start 2: sort-clause-test
2/8 Test #2: sort-clause-test ................. Passed 0.01 sec
    Start 3: fetch-hint-test
3/8 Test #3: fetch-hint-test .................. Passed 0.00 sec
    Start 4: contactmap-test
4/8 Test #4: contactmap-test .................. Passed 0.03 sec
    Start 5: addressbook-test
5/8 Test #5: addressbook-test ................. Passed 2.70 sec
    Start 6: service-life-cycle-test
6/8 Test #6: service-life-cycle-test ..........***Failed 0.24 sec
    Start 7: readonly-prop-test
7/8 Test #7: readonly-prop-test ............... Passed 0.08 sec
    Start 8: contact-link-test
8/8 Test #8: contact-link-test ................ Passed 0.10 sec

88% tests passed, 1 tests failed out of 8

Total Test time (real) = 3.19 sec

The following tests FAILED:
   6 - service-life-cycle-test (Failed)
Errors while running CTest

[Omer Akram (om26er)]

So I think I have found a bug. When I start address-book-service as documented by you I still never see com.canonical.test.pim interface and address-book-service still have com.canonical.pim -- note I don't have any existing running address-book-service to begin with.

[Omer Akram (om26er)]

review: Needs Fixing

[lp:~renatofilho/address-book-service/dummy-mode]

105. By Renato Araujo Oliveira Filho on 2014-03-13

Updated README.test with the correct variable name.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-service/dummy-mode]

106. By Renato Araujo Oliveira Filho on 2014-03-13

Removed folks dummy plugin from the main service package.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:106
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/173/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/81/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-service/dummy-mode]

107. By Renato Araujo Oliveira Filho on 2014-03-13

Added back address-book-service binary on install file.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-service/dummy-mode]

108. By Renato Araujo Oliveira Filho on 2014-03-17

Merged lp:~renatofilho/address-book-service/add-multiple-contacts

109. By Renato Araujo Oliveira Filho on 2014-03-17

Merged parent "lp:~renatofilho/address-book-service/add-multiple-contacts"

110. By Renato Araujo Oliveira Filho on 2014-03-17

Merged "lp:~renatofilho/address-book-service/add-multiple-contacts"

111. By Renato Araujo Oliveira Filho on 2014-03-27

Merged parent branch: lp:~renatofilho/address-book-service/add-multiple-contacts

112. By Renato Araujo Oliveira Filho on 2014-03-27

Added support for preload data during the server startup: ADDRESS_BOOK_SERVICE_DEMO_DATA

113. By Renato Araujo Oliveira Filho on 2014-04-09

Merged parent branch.

114. By Renato Araujo Oliveira Filho on 2014-04-09

Removed use of old macro.

Unmerged revisions

=== modified file '3rd_party/folks/dummy/backend/CMakeLists.txt'
--- 3rd_party/folks/dummy/backend/CMakeLists.txt	2013-10-29 16:29:27 +0000
+++ 3rd_party/folks/dummy/backend/CMakeLists.txt	2014-03-17 16:52:27 +0000
@@ -39,5 +39,7 @@
     ${FOLKS_LIBRARIES}
 )
 
+install(TARGETS dummy LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/address-book-service/)
+
 
 

=== modified file '3rd_party/folks/dummy/backend/dummy-backend-factory.vala'
--- 3rd_party/folks/dummy/backend/dummy-backend-factory.vala	2013-11-11 14:21:24 +0000
+++ 3rd_party/folks/dummy/backend/dummy-backend-factory.vala	2014-03-17 16:52:27 +0000
@@ -25,6 +25,7 @@
  */
 
 using Folks;
+using Gee;
 
 /**
  * The dummy backend module entry point.
@@ -34,7 +35,43 @@
  */
 public void module_init (BackendStore backend_store)
 {
-  backend_store.add_backend (new FolksDummy.Backend ());
+  string[] writable_properties =
+    {
+      Folks.PersonaStore.detail_key (PersonaDetail.AVATAR),
+      Folks.PersonaStore.detail_key (PersonaDetail.BIRTHDAY),
+      Folks.PersonaStore.detail_key (PersonaDetail.EMAIL_ADDRESSES),
+      Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME),
+      Folks.PersonaStore.detail_key (PersonaDetail.GENDER),
+      Folks.PersonaStore.detail_key (PersonaDetail.IM_ADDRESSES),
+      Folks.PersonaStore.detail_key (PersonaDetail.IS_FAVOURITE),
+      Folks.PersonaStore.detail_key (PersonaDetail.NICKNAME),
+      Folks.PersonaStore.detail_key (PersonaDetail.PHONE_NUMBERS),
+      Folks.PersonaStore.detail_key (PersonaDetail.POSTAL_ADDRESSES),
+      Folks.PersonaStore.detail_key (PersonaDetail.ROLES),
+      Folks.PersonaStore.detail_key (PersonaDetail.STRUCTURED_NAME),
+      Folks.PersonaStore.detail_key (PersonaDetail.LOCAL_IDS),
+      Folks.PersonaStore.detail_key (PersonaDetail.LOCATION),
+      Folks.PersonaStore.detail_key (PersonaDetail.WEB_SERVICE_ADDRESSES),
+      Folks.PersonaStore.detail_key (PersonaDetail.NOTES),
+      // Keep URLS as read-only fields for testing purpose
+      //Folks.PersonaStore.detail_key (PersonaDetail.URLS),
+      Folks.PersonaStore.detail_key (PersonaDetail.GROUPS),
+      null
+    };
+
+  /* Create a new persona store. */
+  var dummy_persona_store =
+      new FolksDummy.PersonaStore ("dummy-store", "Dummy personas", writable_properties);
+  dummy_persona_store.persona_type = typeof (FolksDummy.FullPersona);
+
+  /* Register it with the backend. */
+  var persona_stores = new HashSet<PersonaStore> ();
+  persona_stores.add (dummy_persona_store);
+
+  var backend = new FolksDummy.Backend ();
+  backend.register_persona_stores (persona_stores);
+  dummy_persona_store.reach_quiescence();
+  backend_store.add_backend (backend);
 }
 
 /**

=== added file 'README.test'
--- README.test	1970-01-01 00:00:00 +0000
+++ README.test	2014-03-17 16:52:27 +0000
@@ -0,0 +1,31 @@
+Running the address-book-service and qtcontacts in dummy mode.
+
+Running address-book-service
+===========================
+
+# export CANONICAL_PIN_SERVICE_NAME="com.canonical.test.pim"
+# export FOLKS_BACKEND_PATH="/usr/lib/address-book-service/dummy.so"
+# export FOLKS_BACKENDS_ALLOWED="dummy"
+# export FOLKS_PRIMARY_STORE="dummy"
+# /usr/libexec/address-book-service
+
+CANONICAL_PIN_SERVICE_NAME
+ - Defines a new address book DBus service name
+
+FOLKS_BACKEND_PATH
+ - Defines the path used by folks to find the backend
+
+FOLKS_BACKENDS_ALLOWED
+ - Defines which backend folks is allowed to load
+
+FOLKS_PRIMARY_STORE
+ - Defines which persona store should be used as primary store
+
+Running any address-book client
+===============================
+
+# export CANONICAL_PIN_SERVICE_NAME="com.canonical.test.pim"
+
+CANONICAL_PIN_SERVICE_NAME
+ - Defines a new address book DBus service name, should be the same as the server
+

=== modified file 'common/dbus-service-defs.h'
--- common/dbus-service-defs.h	2013-06-07 18:54:26 +0000
+++ common/dbus-service-defs.h	2014-03-17 16:52:27 +0000
@@ -19,6 +19,7 @@
 #ifndef __DBUS_SERVICE_DEFS_H__
 #define __DBUS_SERVICE_DEFS_H__
 
+#define ALTERNATIVE_CPIM_SERVICE_NAME       "CANONICAL_PIN_SERVICE_NAME"
 #define CPIM_SERVICE_NAME                   "com.canonical.pim"
 #define CPIM_ADDRESSBOOK_OBJECT_PATH        "/com/canonical/pim/AddressBook"
 #define CPIM_ADDRESSBOOK_IFACE_NAME         "com.canonical.pim.AddressBook"

=== added file 'debian/address-book-service-dummy.install'
--- debian/address-book-service-dummy.install	1970-01-01 00:00:00 +0000
+++ debian/address-book-service-dummy.install	2014-03-17 16:52:27 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/address-book-service/dummy.so

=== modified file 'debian/address-book-service.install'
--- debian/address-book-service.install	2013-07-17 20:53:00 +0000
+++ debian/address-book-service.install	2014-03-17 16:52:27 +0000
@@ -1,3 +1,3 @@
-usr/lib/*/address-book-service/*
+usr/lib/*/address-book-service/address-book-service
 usr/share/dbus-1/services/com.canonical.pim.service
 upstart/address-book-service.conf /usr/share/upstart/sessions

=== modified file 'debian/control'
--- debian/control	2013-10-30 00:19:00 +0000
+++ debian/control	2014-03-17 16:52:27 +0000
@@ -28,6 +28,15 @@
 Description: Ubuntu contact service
  A contact aggregator service, that exports all contact information through dbus.
 
+Package: address-book-service-dummy
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: A fork of folks dummy backend
+ A fork of folks dummy backend to be used as standalone backend to test address-book-service.
+
+
 Package: qtcontact5-galera
 Architecture: any
 Multi-Arch: same

=== modified file 'lib/addressbook.cpp'
--- lib/addressbook.cpp	2014-02-24 12:21:08 +0000
+++ lib/addressbook.cpp	2014-03-17 16:52:27 +0000
@@ -117,6 +117,12 @@
       m_notifyIsQuiescentHandlerId(0),
       m_connection(QDBusConnection::sessionBus())
 {
+    if (qEnvironmentVariableIsSet(ALTERNATIVE_CPIM_SERVICE_NAME)) {
+        m_serviceName = qgetenv(ALTERNATIVE_CPIM_SERVICE_NAME);
+        qDebug() << "Using alternative service name:" << m_serviceName;
+    } else {
+        m_serviceName = CPIM_SERVICE_NAME;
+    }
     prepareUnixSignals();
 }
 
@@ -137,11 +143,11 @@
 
 bool AddressBook::registerObject(QDBusConnection &connection)
 {
-    if (connection.interface()->isServiceRegistered(CPIM_SERVICE_NAME)) {
+    if (connection.interface()->isServiceRegistered(m_serviceName)) {
         qWarning() << "Galera pin service already registered";
         return false;
-    } else if (!connection.registerService(CPIM_SERVICE_NAME)) {
-        qWarning() << "Could not register service!" << CPIM_SERVICE_NAME;
+    } else if (!connection.registerService(m_serviceName)) {
+        qWarning() << "Could not register service!" << m_serviceName;
         return false;
     }
 
@@ -204,8 +210,8 @@
             m_connection.interface()->isValid()) {
 
             m_connection.unregisterObject(objectPath());
-            if (m_connection.interface()->isServiceRegistered(CPIM_SERVICE_NAME)) {
-                m_connection.unregisterService(CPIM_SERVICE_NAME);
+            if (m_connection.interface()->isServiceRegistered(m_serviceName)) {
+                m_connection.unregisterService(m_serviceName);
             }
         }
 

=== modified file 'lib/addressbook.h'
--- lib/addressbook.h	2014-02-09 00:22:52 +0000
+++ lib/addressbook.h	2014-03-17 16:52:27 +0000
@@ -102,8 +102,12 @@
 
     // Unix signals
     static int m_sigQuitFd[2];
-
     QSocketNotifier *m_snQuit;
+
+    // dbus service name
+    QString m_serviceName;
+
+
     // Disable copy contructor
     AddressBook(const AddressBook&);
 

=== modified file 'qcontacts/CMakeLists.txt'
--- qcontacts/CMakeLists.txt	2013-06-12 22:41:11 +0000
+++ qcontacts/CMakeLists.txt	2014-03-17 16:52:27 +0000
@@ -2,19 +2,27 @@
 
 set(QCONTACTS_BACKEND_SRCS
     qcontact-backend.cpp
-    qcontact-engineid.cpp
+    qcontact-engineid.cpp    
+    qcontactfetchrequest-data.cpp
+    qcontactfetchbyidrequest-data.cpp
+    qcontactremoverequest-data.cpp
+    qcontactrequest-data.cpp
+    qcontactsaverequest-data.cpp
     contacts-service.cpp
-    request-data.cpp
 )
 
 set(QCONTACTS_BACKEND_HDRS
     qcontact-backend.h
     qcontact-engineid.h
+    qcontactfetchrequest-data.h
+    qcontactfetchbyidrequest-data.h
+    qcontactremoverequest-data.h
+    qcontactrequest-data.h
+    qcontactsaverequest-data.h
     contacts-service.h
-    request-data.h
 )
 
-add_library(${QCONTACTS_BACKEND} MODULE
+add_library(${QCONTACTS_BACKEND} SHARED
     ${QCONTACTS_BACKEND_SRCS}
     ${QCONTACTS_BACKEND_HDRS}
 )

=== modified file 'qcontacts/contacts-service.cpp'
--- qcontacts/contacts-service.cpp	2014-02-27 02:20:32 +0000
+++ qcontacts/contacts-service.cpp	2014-03-17 16:52:27 +0000
@@ -18,7 +18,11 @@
 
 #include "contacts-service.h"
 #include "qcontact-engineid.h"
-#include "request-data.h"
+#include "qcontactrequest-data.h"
+#include "qcontactfetchrequest-data.h"
+#include "qcontactfetchbyidrequest-data.h"
+#include "qcontactremoverequest-data.h"
+#include "qcontactsaverequest-data.h"
 
 #include "common/vcard-parser.h"
 #include "common/filter.h"
@@ -34,6 +38,7 @@
 #include <QtDBus/QDBusPendingReply>
 #include <QtDBus/QDBusConnectionInterface>
 
+#include <QtContacts/QContact>
 #include <QtContacts/QContactChangeSet>
 #include <QtContacts/QContactName>
 #include <QtContacts/QContactPhoneNumber>
@@ -58,9 +63,13 @@
       m_serviceIsReady(false),
       m_iface(0)
 {
-    RequestData::registerMetaType();
+    if (qEnvironmentVariableIsSet(ALTERNATIVE_CPIM_SERVICE_NAME)) {
+        m_serviceName = qgetenv(ALTERNATIVE_CPIM_SERVICE_NAME);
+    } else {
+        m_serviceName = CPIM_SERVICE_NAME;
+    }
 
-    m_serviceWatcher = new QDBusServiceWatcher(CPIM_SERVICE_NAME,
+    m_serviceWatcher = new QDBusServiceWatcher(m_serviceName,
                                                QDBusConnection::sessionBus(),
                                                QDBusServiceWatcher::WatchForOwnerChange,
                                                this);
@@ -94,7 +103,7 @@
 void GaleraContactsService::serviceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner)
 {
     Q_UNUSED(oldOwner);
-    if (name == CPIM_SERVICE_NAME) {
+    if (name == m_serviceName) {
         if (!newOwner.isEmpty()) {
             // service appear
             initialize();
@@ -119,7 +128,7 @@
 void GaleraContactsService::initialize()
 {
     if (m_iface.isNull()) {
-        m_iface = QSharedPointer<QDBusInterface>(new QDBusInterface(CPIM_SERVICE_NAME,
+        m_iface = QSharedPointer<QDBusInterface>(new QDBusInterface(m_serviceName,
                                                                     CPIM_ADDRESSBOOK_OBJECT_PATH,
                                                                     CPIM_ADDRESSBOOK_IFACE_NAME));
         if (!m_iface->lastError().isValid()) {
@@ -137,10 +146,10 @@
 
 void GaleraContactsService::deinitialize()
 {
-    Q_FOREACH(RequestData* rData, m_runningRequests) {
+    Q_FOREACH(QContactRequestData* rData, m_runningRequests) {
         rData->cancel();
         rData->request()->waitForFinished();
-        rData->setError(QContactManager::UnspecifiedError);
+        rData->finish(QContactManager::UnspecifiedError);
     }
 
     if (!m_iface.isNull()) {
@@ -167,7 +176,7 @@
 {
     if (!isOnline()) {
         qWarning() << "Server is not online";
-        RequestData::setError(request);
+        QContactFetchByIdRequestData::notifyError(request);
         return;
     }
 
@@ -177,26 +186,28 @@
     QDBusMessage result = m_iface->call("query", filterStr, "", QStringList());
     if (result.type() == QDBusMessage::ErrorMessage) {
         qWarning() << result.errorName() << result.errorMessage();
-        RequestData::setError(request);
+        QContactFetchByIdRequestData::notifyError(request);
         return;
     }
+
     QDBusObjectPath viewObjectPath = result.arguments()[0].value<QDBusObjectPath>();
-    QDBusInterface *view = new QDBusInterface(CPIM_SERVICE_NAME,
+    QDBusInterface *view = new QDBusInterface(m_serviceName,
                                              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));
+    QContactFetchByIdRequestData *data = new QContactFetchByIdRequestData(request, view);
+    m_runningRequests << data;
+    fetchContactsPage(data);
 }
 
 void GaleraContactsService::fetchContacts(QtContacts::QContactFetchRequest *request)
 {
     if (!isOnline()) {
         qWarning() << "Server is not online";
-        RequestData::setError(request);
+        QContactFetchRequestData::notifyError(request);
         return;
     }
+
     QString sortStr = SortClause(request->sorting()).toString();
     QString filterStr = Filter(request->filter()).toString();
     FetchHint fetchHint = FetchHint(request->fetchHint()).toString();
@@ -204,26 +215,27 @@
     QDBusPendingCall pcall = m_iface->asyncCall("query", filterStr, sortStr, QStringList());
     if (pcall.isError()) {
         qWarning() << pcall.error().name() << pcall.error().message();
-        RequestData::setError(request);
+        QContactFetchRequestData::notifyError(request);
         return;
     }
 
-    RequestData *requestData = new RequestData(request, 0, fetchHint);
-    m_runningRequests << requestData;
+    QContactFetchRequestData *data = new QContactFetchRequestData(request, 0, fetchHint);
+    m_runningRequests << data;
 
     QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, 0);
+    data->updateWatcher(watcher);
     QObject::connect(watcher, &QDBusPendingCallWatcher::finished,
                      [=](QDBusPendingCallWatcher *call) {
-                        this->fetchContactsContinue(requestData, call);
+                        this->fetchContactsContinue(data, call);
                      });
 }
 
 
-void GaleraContactsService::fetchContactsContinue(RequestData *request,
+void GaleraContactsService::fetchContactsContinue(QContactFetchRequestData *data,
                                                   QDBusPendingCallWatcher *call)
 {
-    if (!request->isLive()) {
-        destroyRequest(request);
+    if (!data->isLive()) {
+        destroyRequest(data);
         return;
     }
 
@@ -231,47 +243,51 @@
 
     if (reply.isError()) {
         qWarning() << reply.error().name() << reply.error().message();
-        destroyRequest(request);
+        destroyRequest(data);
     } else {
         QDBusObjectPath viewObjectPath = reply.value();
-        QDBusInterface *view = new QDBusInterface(CPIM_SERVICE_NAME,
+        QDBusInterface *view = new QDBusInterface(m_serviceName,
                                                   viewObjectPath.path(),
                                                   CPIM_ADDRESSBOOK_VIEW_IFACE_NAME);
-        request->updateView(view);
-        QMetaObject::invokeMethod(this, "fetchContactsPage", Qt::QueuedConnection, Q_ARG(galera::RequestData*, request));
+        data->updateView(view);
+        fetchContactsPage(data);
     }
 }
 
-void GaleraContactsService::fetchContactsPage(RequestData *request)
+void GaleraContactsService::fetchContactsPage(QContactFetchRequestData *data)
 {
-    if (!isOnline() || !request->isLive()) {
+    if (!isOnline() || !data->isLive()) {
         qWarning() << "Server is not online";
-        destroyRequest(request);
+        destroyRequest(data);
         return;
     }
 
     // Load contacs async
-    QDBusPendingCall pcall = request->view()->asyncCall("contactsDetails", request->fields(), request->offset(), FETCH_PAGE_SIZE);
+    QDBusPendingCall pcall = data->view()->asyncCall("contactsDetails",
+                                                     data->fields(),
+                                                     data->offset(),
+                                                     FETCH_PAGE_SIZE);
     if (pcall.isError()) {
         qWarning() << pcall.error().name() << pcall.error().message();
-        request->setError(QContactManager::UnspecifiedError);
-        destroyRequest(request);
+        data->finish(QContactManager::UnspecifiedError);
+        destroyRequest(data);
         return;
     }
 
     QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, 0);
     QObject::connect(watcher, &QDBusPendingCallWatcher::finished,
                      [=](QDBusPendingCallWatcher *call) {
-                        this->fetchContactsDone(request, call);
+                        this->fetchContactsDone(data, call);
                      });
 
-    request->updateWatcher(watcher);
+    data->updateWatcher(watcher);
 }
 
-void GaleraContactsService::fetchContactsDone(RequestData *request, QDBusPendingCallWatcher *call)
+void GaleraContactsService::fetchContactsDone(QContactFetchRequestData *data,
+                                              QDBusPendingCallWatcher *call)
 {
-    if (!request->isLive()) {
-        destroyRequest(request);
+    if (!data->isLive()) {
+        destroyRequest(data);
         return;
     }
 
@@ -316,187 +332,155 @@
         }
     }
 
-    request->update(contacts, opState, opError);
+    data->update(contacts, opState, opError);
 
     if (opState == QContactAbstractRequest::ActiveState) {
-        request->updateOffset(FETCH_PAGE_SIZE);
-        request->updateWatcher(0);
-
-        QMetaObject::invokeMethod(this, "fetchContactsPage", Qt::QueuedConnection, Q_ARG(galera::RequestData*, request));
+        data->updateOffset(FETCH_PAGE_SIZE);
+        data->updateWatcher(0);
+        fetchContactsPage(data);
     } else {
-        destroyRequest(request);
+        destroyRequest(data);
     }
 }
 
 void GaleraContactsService::saveContact(QtContacts::QContactSaveRequest *request)
 {
-    QList<QContact> contacts = request->contacts();
-    QStringList vcards = VCardParser::contactToVcard(contacts);
-
-    if (vcards.size() != contacts.size()) {
-        qWarning() << "Fail to convert contacts";
-        return;
-    }
-
-    QStringList oldContacts;
-    QStringList newContacts;
-
-    for(int i=0, iMax=contacts.size(); i < iMax; i++) {
-        if (contacts.at(i).id().isNull()) {
-            newContacts << vcards[i];
-        } else {
-            oldContacts << vcards[i];
-        }
-    }
-
-    if (!oldContacts.isEmpty()) {
-        updateContacts(request, oldContacts);
-    }
-
-    if (!newContacts.isEmpty()) {
-        createContacts(request, newContacts);
-    }
-}
-void GaleraContactsService::createContacts(QtContacts::QContactSaveRequest *request, QStringList &contacts)
-{
-    if (!isOnline()) {
-        qWarning() << "Server is not online";
-        RequestData::setError(request);
-        return;
-    }
-
-    if (contacts.count() > 1) {
-        qWarning() << "TODO: implement contact creation support to more then one contact.";
-        return;
-    }
-
-    Q_FOREACH(QString contact, contacts) {
-        QDBusPendingCall pcall = m_iface->asyncCall("createContact", contact, "");
-        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, 0);
-        RequestData *requestData = new RequestData(request, watcher);
-        m_runningRequests << requestData;
-        QObject::connect(watcher, &QDBusPendingCallWatcher::finished,
-                         [=](QDBusPendingCallWatcher *call) {
-                            this->createContactsDone(requestData, call);
-                         });
-
-    }
-}
-
-void GaleraContactsService::createContactsDone(RequestData *request, QDBusPendingCallWatcher *call)
-{
-    if (!request->isLive()) {
-        destroyRequest(request);
+    QContactSaveRequestData *data = new QContactSaveRequestData(request);
+    m_runningRequests << data;
+
+    // firts create the new contacts
+    data->prepareToCreate();
+    createContactsStart(data);
+}
+
+void GaleraContactsService::createContactsStart(QContactSaveRequestData *data)
+{
+    if (!data->isLive()) {
+        data->finish(QContactManager::UnspecifiedError);
+        destroyRequest(data);
+        return;
+    }
+
+    if(!data->hasNext()) {
+        // go to update contacts
+        data->prepareToUpdate();
+        updateContacts(data);
+        return;
+    }
+
+    QString contact = data->nextContact();
+
+    QDBusPendingCall pcall = m_iface->asyncCall("createContact", contact, "");
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, 0);
+    data->updateWatcher(watcher);
+    QObject::connect(watcher, &QDBusPendingCallWatcher::finished,
+                     [=](QDBusPendingCallWatcher *call) {
+                        this->createContactsDone(data, call);
+                     });
+
+}
+
+void GaleraContactsService::createContactsDone(QContactSaveRequestData *data,
+                                               QDBusPendingCallWatcher *call)
+{
+    if (!data->isLive()) {
+        data->finish(QContactManager::UnspecifiedError);
+        destroyRequest(data);
         return;
     }
 
     QDBusPendingReply<QString> reply = *call;
-    QList<QContact> contacts;
-    QContactManager::Error opError = QContactManager::NoError;
-
     if (reply.isError()) {
         qWarning() << reply.error().name() << reply.error().message();
-        opError = QContactManager::UnspecifiedError;
+        data->notifyUpdateError(QContactManager::UnspecifiedError);
     } else {
         const QString id = reply.value();
         if (!id.isEmpty()) {
-            contacts = static_cast<QtContacts::QContactSaveRequest *>(request->request())->contacts();
             GaleraEngineId *engineId = new GaleraEngineId(id, m_managerUri);
-            QContactId contactId(engineId);
-            contacts[0].setId(QContactId(contactId));
+            data->updateCurrentContactId(engineId);
         } else {
-            opError = QContactManager::UnspecifiedError;
+            data->notifyUpdateError(QContactManager::UnspecifiedError);
         }
     }
 
-    request->update(contacts, QContactAbstractRequest::FinishedState, opError);
-    destroyRequest(request);
+    // go to next contact
+    createContactsStart(data);
 }
 
 void GaleraContactsService::removeContact(QContactRemoveRequest *request)
 {
     if (!isOnline()) {
         qWarning() << "Server is not online";
-        RequestData::setError(request);
+        QContactRemoveRequestData::notifyError(request);
         return;
     }
 
-    QStringList ids;
-
-    Q_FOREACH(QContactId contactId, request->contactIds()) {
-        // TODO: find a better way to get the contactId
-        ids << contactId.toString().split(":").last();
-    }
-
-    QDBusPendingCall pcall = m_iface->asyncCall("removeContacts", ids);
+    QContactRemoveRequestData *data = new QContactRemoveRequestData(request);
+    m_runningRequests << data;
+
+    QDBusPendingCall pcall = m_iface->asyncCall("removeContacts", data->pendingIds());
     if (pcall.isError()) {
         qWarning() <<  "Error" << pcall.error().name() << pcall.error().message();
-        RequestData::setError(request);
+        data->finish(QContactManager::UnspecifiedError);
+        destroyRequest(data);
     } else {
         QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, 0);
-        RequestData *requestData = new RequestData(request, watcher);
-        m_runningRequests << requestData;
+        data->updateWatcher(watcher);
         QObject::connect(watcher, &QDBusPendingCallWatcher::finished,
                          [=](QDBusPendingCallWatcher *call) {
-                            this->removeContactDone(requestData, call);
+                            this->removeContactDone(data, call);
                          });
     }
 }
 
-void GaleraContactsService::removeContactDone(RequestData *request, QDBusPendingCallWatcher *call)
+void GaleraContactsService::removeContactDone(QContactRemoveRequestData *data, QDBusPendingCallWatcher *call)
 {
-    if (!request->isLive()) {
-        destroyRequest(request);
+    if (!data->isLive()) {
+        destroyRequest(data);
         return;
     }
 
     QDBusPendingReply<int> reply = *call;
-    QContactManager::Error opError = QContactManager::NoError;
-    QMap<int, QContactManager::Error> errorMap;
-
     if (reply.isError()) {
         qWarning() << reply.error().name() << reply.error().message();
-        opError = QContactManager::UnspecifiedError;
+        data->finish(QContactManager::UnspecifiedError);
+    } else {
+        data->finish();
     }
-
-    request->update(QContactAbstractRequest::FinishedState, opError);
-    destroyRequest(request);
+    destroyRequest(data);
 }
 
-void GaleraContactsService::updateContacts(QtContacts::QContactSaveRequest *request, QStringList &contacts)
+void GaleraContactsService::updateContacts(QContactSaveRequestData *data)
 {
     if (!isOnline()) {
-        qWarning() << "Server is not online";
-        RequestData::setError(request);
+        destroyRequest(data);
         return;
     }
 
-    QDBusPendingCall pcall = m_iface->asyncCall("updateContacts", contacts);
+    QDBusPendingCall pcall = m_iface->asyncCall("updateContacts", data->allPendingContacts());
     if (pcall.isError()) {
         qWarning() <<  "Error" << pcall.error().name() << pcall.error().message();
-        RequestData::setError(request);
+        data->finish(QtContacts::QContactManager::UnspecifiedError);
+        destroyRequest(data);
     } else {
         QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, 0);
-        RequestData *requestData = new RequestData(request, watcher);
-        m_runningRequests << requestData;
+        data->updateWatcher(watcher);
         QObject::connect(watcher, &QDBusPendingCallWatcher::finished,
                          [=](QDBusPendingCallWatcher *call) {
-                            this->updateContactDone(requestData, call);
+                            this->updateContactDone(data, call);
                          });
     }
 }
 
 
-void GaleraContactsService::updateContactDone(RequestData *request, QDBusPendingCallWatcher *call)
+void GaleraContactsService::updateContactDone(QContactSaveRequestData *data, QDBusPendingCallWatcher *call)
 {
-    if (!request->isLive()) {
-        destroyRequest(request);
+    if (!data->isLive()) {
+        destroyRequest(data);
         return;
     }
 
     QDBusPendingReply<QStringList> reply = *call;
-    QList<QContact> contacts;
-    QMap<int, QContactManager::Error> saveError;
     QContactManager::Error opError = QContactManager::NoError;
 
     if (reply.isError()) {
@@ -504,23 +488,16 @@
         opError = QContactManager::UnspecifiedError;
     } else {
         const QStringList vcards = reply.value();
-        if (!vcards.isEmpty()) {
-            QMap<int, QVersitContactImporter::Error> importErrors;
-            //TODO report parse errors
-            contacts = VCardParser::vcardToContact(vcards);
-            Q_FOREACH(int key, importErrors.keys()) {
-                saveError.insert(key, QContactManager::BadArgumentError);
-            }
-        }
+        data->updatePendingContacts(vcards);
     }
 
-    request->update(contacts, QContactAbstractRequest::FinishedState, opError, saveError);
-    destroyRequest(request);
+    data->finish(opError);
+    destroyRequest(data);
 }
 
 void GaleraContactsService::cancelRequest(QtContacts::QContactAbstractRequest *request)
 {
-    Q_FOREACH(RequestData* rData, m_runningRequests) {
+    Q_FOREACH(QContactRequestData *rData, m_runningRequests) {
         if (rData->request() == request) {
             rData->cancel();
             return;
@@ -530,7 +507,7 @@
 
 void GaleraContactsService::waitRequest(QtContacts::QContactAbstractRequest *request)
 {
-    Q_FOREACH(RequestData* rData, m_runningRequests) {
+    Q_FOREACH(QContactRequestData *rData, m_runningRequests) {
         if (rData->request() == request) {
             rData->wait();
             return;
@@ -584,7 +561,7 @@
     }
 }
 
-void GaleraContactsService::destroyRequest(RequestData *request)
+void GaleraContactsService::destroyRequest(QContactRequestData *request)
 {
     m_runningRequests.remove(request);
     delete request;

=== modified file 'qcontacts/contacts-service.h'
--- qcontacts/contacts-service.h	2014-02-24 12:39:48 +0000
+++ qcontacts/contacts-service.h	2014-03-17 16:52:27 +0000
@@ -39,7 +39,11 @@
 using namespace QtContacts; // necessary for signal signatures
 
 namespace galera {
-class RequestData;
+
+class QContactRequestData;
+class QContactSaveRequestData;
+class QContactFetchRequestData;
+class QContactRemoveRequestData;
 
 class GaleraContactsService : public QObject
 {
@@ -80,7 +84,8 @@
     bool m_serviceIsReady;
 
     QSharedPointer<QDBusInterface> m_iface;
-    QSet<RequestData*> m_runningRequests;
+    QString m_serviceName;
+    QSet<QContactRequestData*> m_runningRequests;
     QQueue<QPointer<QtContacts::QContactAbstractRequest> > m_pendingRequests;
 
     Q_INVOKABLE void initialize();
@@ -89,24 +94,26 @@
     bool isOnline() const;
 
     void fetchContacts(QtContacts::QContactFetchRequest *request);
-    void fetchContactsContinue(RequestData *request,
+    void fetchContactsContinue(QContactFetchRequestData *data,
                                QDBusPendingCallWatcher *call);
     void fetchContactsById(QtContacts::QContactFetchByIdRequest *request);
-    Q_INVOKABLE void fetchContactsPage(galera::RequestData *request);
-    void fetchContactsDone(RequestData *request, QDBusPendingCallWatcher *call);
+    void fetchContactsPage(QContactFetchRequestData *data);
+    void fetchContactsDone(QContactFetchRequestData *data, QDBusPendingCallWatcher *call);
 
     void saveContact(QtContacts::QContactSaveRequest *request);
-    void createContacts(QtContacts::QContactSaveRequest *request, QStringList &contacts);
-    void updateContacts(QtContacts::QContactSaveRequest *request, QStringList &contacts);
-    void updateContactDone(RequestData *request, QDBusPendingCallWatcher *call);
-    void createContactsDone(RequestData *request, QDBusPendingCallWatcher *call);
+    void createContacts(QContactSaveRequestData *data);
+    void createContactsStart(QContactSaveRequestData *data);
+    void updateContacts(QContactSaveRequestData *data);
+    void updateContactDone(QContactSaveRequestData *data, QDBusPendingCallWatcher *call);
+    void createContactsDone(QContactSaveRequestData *data, QDBusPendingCallWatcher *call);
 
     void removeContact(QtContacts::QContactRemoveRequest *request);
-    void removeContactDone(RequestData *request, QDBusPendingCallWatcher *call);
+    void removeContactDone(QContactRemoveRequestData *data, QDBusPendingCallWatcher *call);
 
-    void destroyRequest(RequestData *request);
+    void destroyRequest(QContactRequestData *request);
 
     QList<QContactId> parseIds(QStringList ids) const;
+
 };
 
 }

=== added file 'qcontacts/qcontactfetchbyidrequest-data.cpp'
--- qcontacts/qcontactfetchbyidrequest-data.cpp	1970-01-01 00:00:00 +0000
+++ qcontacts/qcontactfetchbyidrequest-data.cpp	2014-03-17 16:52:27 +0000
@@ -0,0 +1,55 @@
+/*
+ * 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 "qcontactfetchbyidrequest-data.h"
+
+#include <QtCore/QDebug>
+
+#include <QtContacts/QContactManagerEngine>
+
+using namespace QtContacts;
+namespace galera
+{
+
+QContactFetchByIdRequestData::QContactFetchByIdRequestData(QContactFetchByIdRequest *request,
+                                                           QDBusInterface *view)
+    : QContactFetchRequestData(request, view)
+{
+}
+
+void QContactFetchByIdRequestData::notifyError(QContactFetchByIdRequest *request,
+                                               QContactManager::Error error)
+{
+    QContactManagerEngine::updateContactFetchByIdRequest(request,
+                                                         QList<QContact>(),
+                                                         error,
+                                                         QMap<int, QContactManager::Error>(),
+                                                         QContactAbstractRequest::FinishedState);
+}
+
+void QContactFetchByIdRequestData::updateRequest(QContactAbstractRequest::State state, QContactManager::Error error, QMap<int, QContactManager::Error> errorMap)
+{
+    QContactManagerEngine::updateContactFetchByIdRequest(static_cast<QContactFetchByIdRequest*>(m_request.data()),
+                                                         m_result,
+                                                         error,
+                                                         errorMap,
+                                                         state);
+}
+
+
+} //namespace

=== added file 'qcontacts/qcontactfetchbyidrequest-data.h'
--- qcontacts/qcontactfetchbyidrequest-data.h	1970-01-01 00:00:00 +0000
+++ qcontacts/qcontactfetchbyidrequest-data.h	2014-03-17 16:52:27 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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_QCONTACTFETCHREQUESTBYID_DATA_H__
+#define __GALERA_QCONTACTFETCHREQUESTBYID_DATA_H__
+
+#include "qcontactfetchrequest-data.h"
+
+#include <common/fetch-hint.h>
+#include <QtContacts/QContactFetchByIdRequest>
+
+namespace galera
+{
+class QContactFetchByIdRequestData : public QContactFetchRequestData
+{
+public:
+    QContactFetchByIdRequestData(QtContacts::QContactFetchByIdRequest *request,
+                                 QDBusInterface *view);
+
+    static void notifyError(QtContacts::QContactFetchByIdRequest *request,
+                            QtContacts::QContactManager::Error error = QtContacts::QContactManager::NotSupportedError);
+
+protected:
+    virtual void updateRequest(QtContacts::QContactAbstractRequest::State state,
+                               QtContacts::QContactManager::Error error,
+                               QMap<int, QtContacts::QContactManager::Error> errorMap);
+};
+
+}
+
+#endif

=== added file 'qcontacts/qcontactfetchrequest-data.cpp'
--- qcontacts/qcontactfetchrequest-data.cpp	1970-01-01 00:00:00 +0000
+++ qcontacts/qcontactfetchrequest-data.cpp	2014-03-17 16:52:27 +0000
@@ -0,0 +1,118 @@
+/*
+ * 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 "qcontactfetchrequest-data.h"
+
+#include <QtCore/QDebug>
+#include <QtContacts/QContactManagerEngine>
+
+using namespace QtContacts;
+namespace galera
+{
+
+QContactFetchRequestData::QContactFetchRequestData(QContactAbstractRequest *request,
+                                                   QDBusInterface *view,
+                                                   const FetchHint &hint)
+    : QContactRequestData(request),
+      m_view(0),
+      m_offset(0),
+      m_hint(hint)
+{
+    if (view) {
+        updateView(view);
+    }
+}
+
+QContactFetchRequestData::~QContactFetchRequestData()
+{
+}
+
+int QContactFetchRequestData::offset() const
+{
+    return m_offset;
+}
+
+QDBusInterface* QContactFetchRequestData::view() const
+{
+    return m_view.data();
+}
+
+void QContactFetchRequestData::updateView(QDBusInterface* view)
+{
+    m_view = QSharedPointer<QDBusInterface>(view, QContactFetchRequestData::deleteView);
+}
+
+QStringList QContactFetchRequestData::fields() const
+{
+    return m_hint.fields();
+}
+
+void QContactFetchRequestData::updateOffset(int offset)
+{
+    m_offset += offset;
+}
+
+QList<QContact> QContactFetchRequestData::result() const
+{
+    return m_result;
+}
+
+void QContactFetchRequestData::update(QContactAbstractRequest::State state,
+                                      QContactManager::Error error,
+                                      QMap<int, QContactManager::Error> errorMap)
+{
+    if (error != QtContacts::QContactManager::NoError) {
+        m_result.clear();
+    }
+    QContactRequestData::update(state, error, errorMap);
+}
+
+void QContactFetchRequestData::update(QList<QContact> result,
+                                      QContactAbstractRequest::State state,
+                                      QContactManager::Error error,
+                                      QMap<int, QContactManager::Error> errorMap)
+{
+    m_result = result;
+    QContactRequestData::update(state, error, errorMap);
+}
+
+void QContactFetchRequestData::notifyError(QContactFetchRequest *request, QContactManager::Error error)
+{
+    QContactManagerEngine::updateContactFetchRequest(request,
+                                                     QList<QContact>(),
+                                                     error,
+                                                     QContactAbstractRequest::FinishedState);
+}
+
+void QContactFetchRequestData::updateRequest(QContactAbstractRequest::State state, QContactManager::Error error, QMap<int, QContactManager::Error> errorMap)
+{
+    QContactManagerEngine::updateContactFetchRequest(static_cast<QContactFetchRequest*>(m_request.data()),
+                                                     m_result,
+                                                     error,
+                                                     state);
+}
+
+void QContactFetchRequestData::deleteView(QDBusInterface *view)
+{
+    if (view) {
+        view->call("close");
+        view->deleteLater();
+    }
+}
+
+} //namespace

=== added file 'qcontacts/qcontactfetchrequest-data.h'
--- qcontacts/qcontactfetchrequest-data.h	1970-01-01 00:00:00 +0000
+++ qcontacts/qcontactfetchrequest-data.h	2014-03-17 16:52:27 +0000
@@ -0,0 +1,82 @@
+/*
+ * 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_QCONTACTFETCHREQUEST_DATA_H__
+#define __GALERA_QCONTACTFETCHREQUEST_DATA_H__
+
+#include "qcontactrequest-data.h"
+#include <common/fetch-hint.h>
+
+#include <QtCore/QList>
+#include <QtCore/QSharedPointer>
+
+#include <QtContacts/QContactAbstractRequest>
+#include <QtContacts/QContactFetchRequest>
+
+#include <QtDBus/QDBusInterface>
+
+namespace galera
+{
+class QContactFetchRequestData : public QContactRequestData
+{
+public:
+    QContactFetchRequestData(QtContacts::QContactAbstractRequest *request,
+                             QDBusInterface *view,
+                             const FetchHint &hint = FetchHint());
+    ~QContactFetchRequestData();
+
+    QStringList fields() const;
+
+    void updateOffset(int offset);
+    int offset() const;
+
+    void updateView(QDBusInterface *view);
+    QDBusInterface* view() const;
+
+    QList<QtContacts::QContact> result() const;
+
+    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>());
+
+    static void notifyError(QtContacts::QContactFetchRequest *request,
+                            QtContacts::QContactManager::Error error = QtContacts::QContactManager::NotSupportedError);
+
+protected:
+    QList<QtContacts::QContact> m_result;
+
+    virtual void updateRequest(QtContacts::QContactAbstractRequest::State state,
+                               QtContacts::QContactManager::Error error,
+                               QMap<int, QtContacts::QContactManager::Error> errorMap);
+
+    virtual void update(QtContacts::QContactAbstractRequest::State state,
+                QtContacts::QContactManager::Error error = QtContacts::QContactManager::NoError,
+                QMap<int, QtContacts::QContactManager::Error> errorMap = QMap<int, QtContacts::QContactManager::Error>());
+
+private:
+    QSharedPointer<QDBusInterface> m_view;
+    int m_offset;
+    FetchHint m_hint;
+
+    static void deleteView(QDBusInterface *view);
+};
+
+}
+
+#endif

=== added file 'qcontacts/qcontactremoverequest-data.cpp'
--- qcontacts/qcontactremoverequest-data.cpp	1970-01-01 00:00:00 +0000
+++ qcontacts/qcontactremoverequest-data.cpp	2014-03-17 16:52:27 +0000
@@ -0,0 +1,61 @@
+/*
+ * 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 "qcontactremoverequest-data.h"
+
+#include <QtCore/QDebug>
+
+#include <QtContacts/QContactManagerEngine>
+
+using namespace QtContacts;
+
+namespace galera
+{
+
+QContactRemoveRequestData::QContactRemoveRequestData(QContactRemoveRequest *request)
+    : QContactRequestData(request)
+{
+    Q_FOREACH(QContactId contactId, request->contactIds()) {
+        m_pendingIds << contactId.toString().split(":").last();
+    }
+}
+
+QStringList QContactRemoveRequestData::pendingIds() const
+{
+    return m_pendingIds;
+}
+
+void QContactRemoveRequestData::notifyError(QContactRemoveRequest *request, QContactManager::Error error)
+{
+    QContactManagerEngine::updateContactRemoveRequest(request,
+                                                      error,
+                                                      QMap<int, QContactManager::Error>(),
+                                                      QContactAbstractRequest::FinishedState);
+}
+
+void QContactRemoveRequestData::updateRequest(QContactAbstractRequest::State state,
+                                              QContactManager::Error error,
+                                              QMap<int, QContactManager::Error> errorMap)
+{
+    QContactManagerEngine::updateContactRemoveRequest(static_cast<QContactRemoveRequest*>(m_request.data()),
+                                                      error,
+                                                      errorMap,
+                                                      state);
+}
+
+} //namespace

=== added file 'qcontacts/qcontactremoverequest-data.h'
--- qcontacts/qcontactremoverequest-data.h	1970-01-01 00:00:00 +0000
+++ qcontacts/qcontactremoverequest-data.h	2014-03-17 16:52:27 +0000
@@ -0,0 +1,49 @@
+/*
+ * 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_QCONTACTREMOVEREQUEST_DATA_H__
+#define __GALERA_QCONTACTREMOVEREQUEST_DATA_H__
+
+#include "qcontactrequest-data.h"
+
+#include <QtCore/QStringList>
+
+#include <QtContacts/QContactRemoveRequest>
+
+namespace galera
+{
+class QContactRemoveRequestData : public QContactRequestData
+{
+public:
+    QContactRemoveRequestData(QtContacts::QContactRemoveRequest *request);
+    QStringList pendingIds() const;
+
+    static void notifyError(QtContacts::QContactRemoveRequest *request,
+                            QtContacts::QContactManager::Error error = QtContacts::QContactManager::NotSupportedError);
+protected:
+    virtual void updateRequest(QtContacts::QContactAbstractRequest::State state,
+                               QtContacts::QContactManager::Error error,
+                               QMap<int, QtContacts::QContactManager::Error> errorMap);
+
+private:
+    QStringList m_pendingIds;
+};
+
+}
+
+#endif

=== added file 'qcontacts/qcontactrequest-data.cpp'
--- qcontacts/qcontactrequest-data.cpp	1970-01-01 00:00:00 +0000
+++ qcontacts/qcontactrequest-data.cpp	2014-03-17 16:52:27 +0000
@@ -0,0 +1,117 @@
+/*
+ * 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 "qcontactrequest-data.h"
+
+#include <QtCore/QDebug>
+#include <QtContacts/QContactManagerEngine>
+
+using namespace QtContacts;
+namespace galera
+{
+
+QContactRequestData::QContactRequestData(QContactAbstractRequest *request,
+                                         QDBusPendingCallWatcher *watcher)
+    : m_request(request),
+      m_canceled(false),
+      m_eventLoop(0)
+{
+    updateWatcher(watcher);
+}
+
+QContactRequestData::~QContactRequestData()
+{
+    if (!m_request.isNull() && m_canceled) {
+        update(QContactAbstractRequest::CanceledState);
+    }
+    m_request.clear();
+}
+
+QContactAbstractRequest* QContactRequestData::request() const
+{
+    return m_request.data();
+}
+
+bool QContactRequestData::isLive() const
+{
+    return !m_request.isNull() &&
+           (m_request->state() == QContactAbstractRequest::ActiveState);
+}
+
+void QContactRequestData::cancel()
+{
+    m_watcher.clear();
+    m_canceled = true;
+}
+
+bool QContactRequestData::canceled() const
+{
+    return m_canceled;
+}
+
+void QContactRequestData::wait()
+{
+    if (m_eventLoop) {
+        qWarning() << "Recursive wait call";
+        Q_ASSERT(false);
+    }
+
+    if (isLive()) {
+        QEventLoop eventLoop;
+        m_eventLoop = &eventLoop;
+        eventLoop.exec();
+        m_eventLoop = 0;
+    }
+}
+
+void QContactRequestData::finish(QContactManager::Error error)
+{
+    update(QContactAbstractRequest::FinishedState, error, m_errorMap);
+}
+
+void QContactRequestData::updateWatcher(QDBusPendingCallWatcher *watcher)
+{
+    m_watcher.clear();
+    if (watcher) {
+        m_watcher = QSharedPointer<QDBusPendingCallWatcher>(watcher, QContactRequestData::deleteWatcher);
+    }
+}
+
+void QContactRequestData::update(QContactAbstractRequest::State state,
+                                 QContactManager::Error error,
+                                 QMap<int, QContactManager::Error> errorMap)
+{
+    if (!isLive()) {
+        return;
+    }
+
+    updateRequest(state, error, errorMap);
+
+    if (m_eventLoop && (state != QContactAbstractRequest::ActiveState)) {
+        m_eventLoop->quit();
+    }
+}
+
+void QContactRequestData::deleteWatcher(QDBusPendingCallWatcher *watcher)
+{
+    if (watcher) {
+        watcher->deleteLater();
+    }
+}
+
+} //namespace

=== added file 'qcontacts/qcontactrequest-data.h'
--- qcontacts/qcontactrequest-data.h	1970-01-01 00:00:00 +0000
+++ qcontacts/qcontactrequest-data.h	2014-03-17 16:52:27 +0000
@@ -0,0 +1,81 @@
+/*
+ * 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_QCONTACTREQUEST_DATA_H__
+#define __GALERA_QCONTACTREQUEST_DATA_H__
+
+#include <common/fetch-hint.h>
+
+#include <QtCore/QList>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QEventLoop>
+#include <QtCore/QPointer>
+
+#include <QtContacts/QContactAbstractRequest>
+
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusPendingCallWatcher>
+
+namespace galera
+{
+class QContactRequestData
+{
+public:
+    QContactRequestData(QtContacts::QContactAbstractRequest *request, QDBusPendingCallWatcher *watcher = 0);
+    virtual ~QContactRequestData();
+
+    QtContacts::QContactAbstractRequest* request() const;
+
+    void updateWatcher(QDBusPendingCallWatcher *watcher);
+
+    bool isLive() const;
+    void cancel();
+    bool canceled() const;
+    void wait();
+    void finish(QtContacts::QContactManager::Error error = QtContacts::QContactManager::NoError);
+
+    virtual void update(QtContacts::QContactAbstractRequest::State state,
+                QtContacts::QContactManager::Error error = QtContacts::QContactManager::NoError,
+                QMap<int, QtContacts::QContactManager::Error> errorMap = QMap<int, QtContacts::QContactManager::Error>());
+
+protected:
+    QPointer<QtContacts::QContactAbstractRequest> m_request;
+    QMap<int, QtContacts::QContactManager::Error> m_errorMap;
+
+    virtual void updateRequest(QtContacts::QContactAbstractRequest::State state,
+                               QtContacts::QContactManager::Error error,
+                               QMap<int, QtContacts::QContactManager::Error> errorMap) = 0;
+
+private:
+    QSharedPointer<QDBusPendingCallWatcher> m_watcher;
+    bool m_canceled;
+    QEventLoop *m_eventLoop;
+
+    void init(QtContacts::QContactAbstractRequest *request,
+              QDBusInterface *view,
+              QDBusPendingCallWatcher *watcher);
+
+    static void deleteRequest(QtContacts::QContactAbstractRequest *obj);
+    static void deleteWatcher(QDBusPendingCallWatcher *watcher);
+};
+
+}
+
+Q_DECLARE_METATYPE(galera::QContactRequestData*)
+
+#endif

=== added file 'qcontacts/qcontactsaverequest-data.cpp'
--- qcontacts/qcontactsaverequest-data.cpp	1970-01-01 00:00:00 +0000
+++ qcontacts/qcontactsaverequest-data.cpp	2014-03-17 16:52:27 +0000
@@ -0,0 +1,146 @@
+/*
+ * 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 "qcontactsaverequest-data.h"
+#include "common/vcard-parser.h"
+#include "qcontact-engineid.h"
+
+#include <QtCore/QDebug>
+
+#include <QtContacts/QContactManagerEngine>
+
+#include <QtVersit/QVersitContactImporter>
+
+using namespace QtContacts;
+using namespace QtVersit;
+
+namespace galera
+{
+
+QContactSaveRequestData::QContactSaveRequestData(QContactSaveRequest *request)
+    : QContactRequestData(request)
+{
+    int index = 0;
+    Q_FOREACH(const QContact &contact, request->contacts()) {
+        if (contact.id().isNull()) {
+            m_contactsToCreate.insert(index, contact);
+        } else {
+            m_contactsToUpdate.insert(index, contact);
+        }
+        index++;
+    }
+}
+
+void QContactSaveRequestData::prepareContacts(QMap<int, QtContacts::QContact> contacts)
+{
+    if (!contacts.isEmpty()) {
+        QStringList vcards = VCardParser::contactToVcard(contacts.values());
+        if (vcards.count() != contacts.count()) {
+            qWarning() << "Fail to parse contacts to Update";
+            return;
+        }
+        int i = 0;
+        Q_FOREACH(int index, contacts.keys()) {
+            m_pendingContacts.insert(index, vcards[i]);
+        }
+    }
+}
+
+void QContactSaveRequestData::prepareToUpdate()
+{
+    Q_ASSERT(m_pendingContacts.count() == 0);
+    prepareContacts(m_contactsToUpdate);
+}
+
+void QContactSaveRequestData::prepareToCreate()
+{
+    Q_ASSERT(m_pendingContacts.count() == 0);
+    prepareContacts(m_contactsToCreate);
+    qDebug() << "Contacts to create" << m_pendingContacts.count();
+}
+
+
+bool QContactSaveRequestData::hasNext() const
+{
+    return (m_pendingContacts.count() > 0);
+}
+
+QString QContactSaveRequestData::nextContact()
+{
+    Q_ASSERT(m_pendingContacts.count() > 0);
+    qDebug() << "SIZEEEE" << m_pendingContacts.count() << "Has next:" << hasNext();
+    m_currentContact = m_pendingContacts.begin();
+
+    qDebug() << "next contact" << m_currentContact.key() << m_currentContact.value();
+    return m_currentContact.value();
+}
+
+void QContactSaveRequestData::updateCurrentContactId(GaleraEngineId *engineId)
+{
+    QContactId contactId(engineId);
+    QContact &contact = m_contactsToCreate[m_currentContact.key()];
+    contact.setId(contactId);
+    m_pendingContacts.remove(m_currentContact.key());
+    qDebug() << "After update id" << m_pendingContacts.count();
+}
+
+void QContactSaveRequestData::updatePendingContacts(QStringList vcards)
+{
+    if (!vcards.isEmpty()) {
+        QList<QContact> contacts = VCardParser::vcardToContact(vcards);
+        if (contacts.count() != m_pendingContacts.count()) {
+            qWarning() << "Fail to parse vcards to contacts";
+        }
+
+        // update the contacts on update list
+        QList<int> indexs = m_contactsToUpdate.keys();
+        Q_FOREACH(const QContact &contact, contacts) {
+            m_contactsToUpdate.insert(indexs.takeFirst(), contact);
+        }
+    }
+}
+
+void QContactSaveRequestData::notifyUpdateError(QContactManager::Error error)
+{
+    m_contactsToUpdate.remove(m_currentContact.key());
+    m_errorMap.insert(m_currentContact.key(), error);
+    m_pendingContacts.remove(m_currentContact.key());
+}
+
+QStringList QContactSaveRequestData::allPendingContacts() const
+{
+    return m_pendingContacts.values();
+}
+
+void QContactSaveRequestData::updateRequest(QContactAbstractRequest::State state, QContactManager::Error error, QMap<int, QContactManager::Error> errorMap)
+{
+    // join back contacts to update and create
+    QMap<int, QtContacts::QContact> allContacts = m_contactsToUpdate;
+
+    Q_FOREACH(int key, m_contactsToCreate.keys()) {
+        allContacts.insert(key, m_contactsToCreate[key]);
+    }
+
+    QContactManagerEngine::updateContactSaveRequest(static_cast<QContactSaveRequest*>(m_request.data()),
+                                                    allContacts.values(),
+                                                    error,
+                                                    errorMap,
+                                                    state);
+}
+
+} //namespace

=== added file 'qcontacts/qcontactsaverequest-data.h'
--- qcontacts/qcontactsaverequest-data.h	1970-01-01 00:00:00 +0000
+++ qcontacts/qcontactsaverequest-data.h	2014-03-17 16:52:27 +0000
@@ -0,0 +1,72 @@
+/*
+ * 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_QCONTACTSAVEREQUESTDATA_DATA_H__
+#define __GALERA_QCONTACTSAVEREQUESTDATA_DATA_H__
+
+
+#include "qcontactrequest-data.h"
+#include <common/fetch-hint.h>
+
+#include <QtCore/QList>
+
+#include <QtContacts/QContactSaveRequest>
+
+namespace galera
+{
+class GaleraEngineId;
+
+class QContactSaveRequestData : public QContactRequestData
+{
+public:
+    QContactSaveRequestData(QtContacts::QContactSaveRequest *request);
+
+    void prepareToUpdate();
+    void updatePendingContacts(QStringList vcards);
+
+    void prepareToCreate();
+    void updateCurrentContactId(GaleraEngineId *engineId);
+
+    void notifyUpdateError(QtContacts::QContactManager::Error error);
+
+    bool hasNext() const;
+    QString nextContact();
+
+    void notifyError(QtContacts::QContactManager::Error error);
+    QStringList allPendingContacts() const;
+
+protected:
+    virtual void updateRequest(QtContacts::QContactAbstractRequest::State state,
+                               QtContacts::QContactManager::Error error,
+                               QMap<int, QtContacts::QContactManager::Error> errorMap);
+
+private:
+    QMap<int, QtContacts::QContact> m_contactsToUpdate;
+    QMap<int, QtContacts::QContact> m_contactsToCreate;
+
+    QMap<int, QString> m_pendingContacts;
+    QMap<int, QString>::Iterator m_currentContact;
+
+    void prepareContacts(QMap<int, QtContacts::QContact> contacts);
+};
+
+}
+
+Q_DECLARE_METATYPE(galera::QContactSaveRequestData*)
+
+#endif

=== removed file 'qcontacts/request-data.cpp'
--- qcontacts/request-data.cpp	2014-02-04 19:12:46 +0000
+++ qcontacts/request-data.cpp	1970-01-01 00:00:00 +0000
@@ -1,236 +0,0 @@
-/*
- * 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 "request-data.h"
-
-#include <QtCore/QDebug>
-#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),
-      m_canceled(false),
-      m_eventLoop(0)
-{
-    init(request, view, watcher);
-}
-
-RequestData::RequestData(QtContacts::QContactAbstractRequest *request,
-                         QDBusPendingCallWatcher *watcher)
-    : m_offset(0),
-      m_canceled(false),
-      m_eventLoop(0)
-{
-    init(request, 0, watcher);
-}
-
-RequestData::~RequestData()
-{
-    if (!m_request.isNull() && m_canceled) {
-        update(QContactAbstractRequest::CanceledState);
-    }
-    m_request.clear();
-}
-
-void RequestData::init(QtContacts::QContactAbstractRequest *request,
-                       QDBusInterface *view,
-                       QDBusPendingCallWatcher *watcher)
-{
-    m_request = request;
-
-    if (view) {
-        updateView(view);
-    }
-
-    if (watcher) {
-        m_watcher = QSharedPointer<QDBusPendingCallWatcher>(watcher, RequestData::deleteWatcher);
-    }
-
-}
-
-QContactAbstractRequest* RequestData::request() const
-{
-    return m_request.data();
-}
-
-int RequestData::offset() const
-{
-    return m_offset;
-}
-
-bool RequestData::isLive() const
-{
-    return !m_request.isNull() &&
-           (m_request->state() == QContactAbstractRequest::ActiveState);
-}
-
-void RequestData::cancel()
-{
-    m_watcher.clear();
-    m_canceled = true;
-}
-
-bool RequestData::canceled() const
-{
-    return m_canceled;
-}
-
-void RequestData::wait()
-{
-    if (m_eventLoop) {
-        qWarning() << "Recursive wait call";
-        Q_ASSERT(false);
-    }
-
-    if (isLive()) {
-        QEventLoop eventLoop;
-        m_eventLoop = &eventLoop;
-        eventLoop.exec();
-        m_eventLoop = 0;
-    }
-}
-
-QDBusInterface* RequestData::view() const
-{
-    return m_view.data();
-}
-
-void RequestData::updateView(QDBusInterface* view)
-{
-    m_view = QSharedPointer<QDBusInterface>(view, RequestData::deleteView);
-}
-
-QStringList RequestData::fields() const
-{
-    return m_hint.fields();
-}
-
-void RequestData::updateWatcher(QDBusPendingCallWatcher *watcher)
-{
-    m_watcher.clear();
-    if (watcher) {
-        m_watcher = QSharedPointer<QDBusPendingCallWatcher>(watcher, RequestData::deleteWatcher);
-    }
-}
-
-void RequestData::updateOffset(int offset)
-{
-    m_offset += offset;
-}
-
-QList<QContact> RequestData::result() const
-{
-    return m_result;
-}
-
-void RequestData::setError(QContactManager::Error error)
-{
-    m_result.clear();
-    update(QContactAbstractRequest::FinishedState, error);
-    if (m_eventLoop) {
-        m_eventLoop->quit();
-    }
-}
-
-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)
-{
-    if (!isLive()) {
-        return;
-    }
-
-    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;
-    }
-
-    if (m_eventLoop && (state != QContactAbstractRequest::ActiveState)) {
-        m_eventLoop->quit();
-    }
-}
-
-
-void RequestData::registerMetaType()
-{
-    qRegisterMetaType<galera::RequestData*>();
-}
-
-void RequestData::setError(QContactAbstractRequest *request, QContactManager::Error error)
-{
-    RequestData r(request);
-    r.setError(error);
-}
-
-void RequestData::deleteView(QDBusInterface *view)
-{
-    if (view) {
-        view->call("close");
-        view->deleteLater();
-    }
-}
-
-void RequestData::deleteWatcher(QDBusPendingCallWatcher *watcher)
-{
-    if (watcher) {
-        watcher->deleteLater();
-    }
-}
-
-} //namespace

=== removed file 'qcontacts/request-data.h'
--- qcontacts/request-data.h	2013-09-10 18:44:50 +0000
+++ qcontacts/request-data.h	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-/*
- * 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_REQUEST_DATA_H__
-#define __GALERA_REQUEST_DATA_H__
-
-#include <common/fetch-hint.h>
-
-#include <QtCore/QList>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QPointer>
-#include <QtCore/QEventLoop>
-
-#include <QtContacts/QContactAbstractRequest>
-
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusPendingCallWatcher>
-
-namespace galera
-{
-class RequestData
-{
-public:
-    RequestData(QtContacts::QContactAbstractRequest *request,
-                QDBusInterface *view,
-                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 updateView(QDBusInterface* view);
-
-    void updateOffset(int offset);
-    int offset() const;
-    bool isLive() const;
-    void cancel();
-    bool canceled() const;
-    void wait();
-
-    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:
-    QPointer<QtContacts::QContactAbstractRequest> m_request;
-    QSharedPointer<QDBusInterface> m_view;
-    QSharedPointer<QDBusPendingCallWatcher> m_watcher;
-    QList<QtContacts::QContact> m_result;
-    int m_offset;
-    FetchHint m_hint;
-    bool m_canceled;
-    QEventLoop *m_eventLoop;
-
-    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);
-};
-
-}
-
-Q_DECLARE_METATYPE(galera::RequestData*)
-
-#endif

=== modified file 'tests/unittest/base-client-test.cpp'
--- tests/unittest/base-client-test.cpp	2013-11-05 19:26:25 +0000
+++ tests/unittest/base-client-test.cpp	2014-03-17 16:52:27 +0000
@@ -30,7 +30,15 @@
 void BaseClientTest::initTestCase()
 {
     galera::Source::registerMetaType();
-    m_serverIface = new QDBusInterface(CPIM_SERVICE_NAME,
+
+    QString serviceName;
+    if (qEnvironmentVariableIsSet(ALTERNATIVE_CPIM_SERVICE_NAME)) {
+        serviceName = qgetenv(ALTERNATIVE_CPIM_SERVICE_NAME);
+    } else {
+        serviceName = CPIM_SERVICE_NAME;
+    }
+
+    m_serverIface = new QDBusInterface(serviceName,
                                        CPIM_ADDRESSBOOK_OBJECT_PATH,
                                        CPIM_ADDRESSBOOK_IFACE_NAME);
     QVERIFY(!m_serverIface->lastError().isValid());

=== modified file 'tests/unittest/dummy-backend.cpp'
--- tests/unittest/dummy-backend.cpp	2014-02-13 14:32:48 +0000
+++ tests/unittest/dummy-backend.cpp	2014-03-17 16:52:27 +0000
@@ -147,8 +147,12 @@
 
     m_backend = FOLKS_DUMMY_BACKEND(folks_backend_store_dup_backend_by_name(m_backendStore, "dummy"));
 
+    // get the primary store
+    GeeMap *stores = folks_backend_get_persona_stores(FOLKS_BACKEND(m_backend));
+    m_primaryPersonaStore = FOLKS_DUMMY_PERSONA_STORE(gee_map_get(stores, "dummy-store"));
+    qDebug() << "Primary store:" << (void*) m_primaryPersonaStore;
+
     Q_ASSERT(m_backend != 0);
-    configurePrimaryStore();
     m_isReady = true;
     Q_EMIT ready();
 }
@@ -210,40 +214,10 @@
     return i->id();
 }
 
-void DummyBackendProxy::configurePrimaryStore()
-{
-    static const char* writableProperties[] = {
-        folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_FULL_NAME),
-        folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_ALIAS),
-        folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_NICKNAME),
-        folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_STRUCTURED_NAME),
-        folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_IS_FAVOURITE),
-        folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_EMAIL_ADDRESSES),
-        folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_PHONE_NUMBERS),
-        0
-    };
-
-    m_primaryPersonaStore = folks_dummy_persona_store_new("dummy-store",
-                                                          "Dummy personas",
-                                                          const_cast<char**>(writableProperties), 7);
-    folks_dummy_persona_store_set_persona_type(m_primaryPersonaStore, FOLKS_DUMMY_TYPE_FULL_PERSONA);
-    folks_dummy_persona_store_update_trust_level(m_primaryPersonaStore, FOLKS_PERSONA_STORE_TRUST_FULL);
-
-    GeeHashSet *personaStores = gee_hash_set_new(FOLKS_TYPE_PERSONA_STORE,
-                                                 (GBoxedCopyFunc) g_object_ref, g_object_unref,
-                                                 NULL, NULL, NULL, NULL, NULL, NULL);
-
-    gee_abstract_collection_add(GEE_ABSTRACT_COLLECTION(personaStores), m_primaryPersonaStore);
-    folks_dummy_backend_register_persona_stores(m_backend, GEE_SET(personaStores), true);
-    folks_dummy_persona_store_reach_quiescence(m_primaryPersonaStore);
-    g_object_unref(personaStores);
-}
-
 void DummyBackendProxy::backendEnabled(FolksBackendStore *backendStore,
                                        GAsyncResult *res,
                                        DummyBackendProxy *self)
 {
-    folks_backend_store_enable_backend_finish(backendStore, res);
     self->m_eventLoop->quit();
     self->m_eventLoop = 0;
 }

=== modified file 'tests/unittest/dummy-backend.h'
--- tests/unittest/dummy-backend.h	2014-02-11 17:58:56 +0000
+++ tests/unittest/dummy-backend.h	2014-03-17 16:52:27 +0000
@@ -77,7 +77,6 @@
 
     bool registerObject();
     void initFolks();
-    void configurePrimaryStore();
     void initEnviroment();
     void prepareAggregator();
     static void mkpath(const QString &path);