Merge lp:~renatofilho/address-book-service/remove-updater into lp:address-book-service

[Renato Araujo Oliveira Filho]

Remove updater app.
Reverted changes for 'safeMode'.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:165
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/433/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-armhf-ci/117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-i386-ci/117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4534/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4531/console

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

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

We decided to use address-book-updater.

Unmerged revisions

165. By Renato Araujo Oliveira Filho on 2015-10-07

Reverted changes for 'safeMode'.

SafeMode is not necessary anymore. We do not run an account update.

164. By Renato Araujo Oliveira Filho on 2015-10-07

Remove updater app.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-09-23 12:36:13 +0000
+++ CMakeLists.txt	2015-10-07 13:33:41 +0000
@@ -96,7 +96,6 @@
 add_subdirectory(lib)
 add_subdirectory(src)
 add_subdirectory(contacts)
-add_subdirectory(updater)
 add_subdirectory(upstart)
 add_subdirectory(dbus)
 add_subdirectory(po)

=== modified file 'config.h.in'
--- config.h.in	2015-09-21 13:56:06 +0000
+++ config.h.in	2015-10-07 13:33:41 +0000
@@ -3,13 +3,6 @@
 
 #define SETTINGS_APPLICATION               "AddressBookService"
 #define SETTINGS_ORG                       "Canonical"
-#define SETTINGS_SAFE_MODE_KEY             "safe-mode"
-#define SETTINGS_INVISIBLE_SOURCES         "invisible-sources"
-#define ADDRESS_BOOK_SAFE_MODE             "ADDRESS_BOOK_SAFE_MODE"
-#define ADDRESS_BOOK_SHOW_INVISIBLE_PROP   "show-invisible"
-
-//updater
-#define SETTINGS_BUTEO_KEY                  "Buteo/migration_complete"
 
 #define QT_PLUGINS_BINARY_DIR               "@CMAKE_BINARY_DIR@"
 #define TEST_DATA_DIR                       "@TEST_DATA_DIR@"

=== modified file 'contacts/contacts-service.cpp'
--- contacts/contacts-service.cpp	2015-09-18 14:58:37 +0000
+++ contacts/contacts-service.cpp	2015-10-07 13:33:41 +0000
@@ -196,7 +196,6 @@
         if (!m_iface->lastError().isValid()) {
             m_serviceIsReady = m_iface.data()->property("isReady").toBool();
             connect(m_iface.data(), SIGNAL(readyChanged()), this, SLOT(onServiceReady()));
-            connect(m_iface.data(), SIGNAL(safeModeChanged()), this, SIGNAL(serviceChanged()));
             connect(m_iface.data(), SIGNAL(contactsAdded(QStringList)), this, SLOT(onContactsAdded(QStringList)));
             connect(m_iface.data(), SIGNAL(contactsRemoved(QStringList)), this, SLOT(onContactsRemoved(QStringList)));
             connect(m_iface.data(), SIGNAL(contactsUpdated(QStringList)), this, SLOT(onContactsUpdated(QStringList)));
@@ -248,7 +247,6 @@
     QDBusMessage result = m_iface->call("query",
                                         filterStr, "",
                                         request->fetchHint().maxCountHint(),
-                                        m_showInvisibleContacts,
                                         QStringList());
     if (result.type() == QDBusMessage::ErrorMessage) {
         qWarning() << result.errorName() << result.errorMessage();
@@ -309,7 +307,6 @@
                                                 filterStr,
                                                 sortStr,
                                                 request->fetchHint().maxCountHint(),
-                                                m_showInvisibleContacts,
                                                 QStringList());
     if (pcall.isError()) {
         qWarning() << pcall.error().name() << pcall.error().message();
@@ -779,11 +776,6 @@
     }
 }
 
-void GaleraContactsService::setShowInvisibleContacts(bool show)
-{
-    m_showInvisibleContacts = show;
-}
-
 void GaleraContactsService::addRequest(QtContacts::QContactAbstractRequest *request)
 {
     if (!isOnline()) {

=== modified file 'contacts/contacts-service.h'
--- contacts/contacts-service.h	2015-09-16 13:28:23 +0000
+++ contacts/contacts-service.h	2015-10-07 13:33:41 +0000
@@ -66,7 +66,6 @@
     void cancelRequest(QtContacts::QContactAbstractRequest *request);
     void waitRequest(QtContacts::QContactAbstractRequest *request);
     void releaseRequest(QtContacts::QContactAbstractRequest *request);
-    void setShowInvisibleContacts(bool show);
 
 Q_SIGNALS:
     void contactsAdded(QList<QContactId> ids);
@@ -87,7 +86,6 @@
     QDBusServiceWatcher *m_serviceWatcher;
     bool m_serviceIsReady;
     int m_pageSize;
-    bool m_showInvisibleContacts;
 
     QSharedPointer<QDBusInterface> m_iface;
     QString m_serviceName;

=== modified file 'contacts/qcontact-backend.cpp'
--- contacts/qcontact-backend.cpp	2015-09-16 15:57:58 +0000
+++ contacts/qcontact-backend.cpp	2015-10-07 13:33:41 +0000
@@ -64,7 +64,6 @@
 GaleraManagerEngine* GaleraManagerEngine::createEngine(const QMap<QString, QString> &parameters)
 {
     GaleraManagerEngine *engine = new GaleraManagerEngine();
-    engine->m_service->setShowInvisibleContacts(parameters.value(ADDRESS_BOOK_SHOW_INVISIBLE_PROP, "false").toLower() == "true");
     return engine;
 }
 

=== removed file 'debian/address-book-updater.install'
--- debian/address-book-updater.install	2015-09-03 20:09:42 +0000
+++ debian/address-book-updater.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/lib/*/address-book-service/address-book-updater
-usr/share/upstart/sessions/address-book-updater.conf
-usr/share/dbus-1/services/com.canonical.pim.updater.service

=== modified file 'debian/control'
--- debian/control	2015-10-01 14:48:00 +0000
+++ debian/control	2015-10-07 13:33:41 +0000
@@ -32,8 +32,7 @@
 Package: address-book-service
 Architecture: any
 Multi-Arch: same
-Depends: address-book-updater (= ${binary:Version}),
-         evolution-data-server(>= 3.12.11),
+Depends: evolution-data-server(>= 3.12.11),
          libfolks-eds25,
          ${misc:Depends},
          ${shlibs:Depends},
@@ -65,15 +64,3 @@
          ${shlibs:Depends},
 Description: QtContacts backend for galera contact service.
  A QContactEngine implementation using address-book-service.
-
-Package: address-book-updater
-Architecture: any
-Multi-Arch: same
-Depends: buteo-sync-plugins-contacts-google,
-         indicator-transfer-buteo,
-         qtcontact5-galera (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Description: Ubuntu contact service updater
- A helper program to update address book service and address book app configuration and sync files.
-

=== modified file 'lib/addressbook-adaptor.cpp'
--- lib/addressbook-adaptor.cpp	2015-09-29 14:37:03 +0000
+++ lib/addressbook-adaptor.cpp	2015-10-07 13:33:41 +0000
@@ -30,7 +30,6 @@
 {
     setAutoRelaySignals(true);
     connect(m_addressBook, SIGNAL(readyChanged()), SIGNAL(readyChanged()));
-    connect(m_addressBook, SIGNAL(safeModeChanged()), SIGNAL(safeModeChanged()));
 }
 
 AddressBookAdaptor::~AddressBookAdaptor()
@@ -106,9 +105,9 @@
     return QString();
 }
 
-QDBusObjectPath AddressBookAdaptor::query(const QString &clause, const QString &sort, int maxCount, bool showInvisible, const QStringList &sources)
+QDBusObjectPath AddressBookAdaptor::query(const QString &clause, const QString &sort, int maxCount, const QStringList &sources)
 {
-    View *v = m_addressBook->query(clause, sort, maxCount, showInvisible, sources);
+    View *v = m_addressBook->query(clause, sort, maxCount, sources);
     v->registerObject(m_connection);
     return QDBusObjectPath(v->dynamicObjectPath());
 }
@@ -174,14 +173,4 @@
     m_addressBook->shutdown();
 }
 
-bool AddressBookAdaptor::safeMode() const
-{
-    return m_addressBook->isSafeMode();
-}
-
-void AddressBookAdaptor::setSafeMode(bool flag)
-{
-    m_addressBook->setSafeMode(flag);
-}
-
 } //namespace

=== modified file 'lib/addressbook-adaptor.h'
--- lib/addressbook-adaptor.h	2015-09-16 13:28:23 +0000
+++ lib/addressbook-adaptor.h	2015-10-07 13:33:41 +0000
@@ -38,7 +38,6 @@
     Q_CLASSINFO("D-Bus Introspection", ""
 "  <interface name=\"com.canonical.pim.AddressBook\">\n"
 "    <property name=\"isReady\" type=\"b\" access=\"read\"/>\n"
-"    <property name=\"safeMode\" type=\"b\" access=\"readwrite\"/>\n"
 "    <signal name=\"contactsUpdated\">\n"
 "      <arg direction=\"out\" type=\"as\" name=\"ids\"/>\n"
 "    </signal>\n"
@@ -52,7 +51,6 @@
 "      <arg direction=\"out\" type=\"a(ss)\" name=\"errorMap\"/>\n"
 "    </signal>\n"
 "    <signal name=\"readyChanged\"/>\n"
-"    <signal name=\"safeModeChanged\"/>\n"
 "    <method name=\"ping\">\n"
 "      <arg direction=\"out\" type=\"b\"/>\n"
 "    </method>\n"
@@ -67,14 +65,14 @@
 "    <method name=\"createSource\">\n"
 "      <arg direction=\"in\" type=\"s\"/>\n"
 "      <arg direction=\"in\" type=\"b\"/>\n"
-"      <arg direction=\"out\" type=\"(sb)\"/>\n"
+"      <arg direction=\"out\" type=\"(ssssubb)\"/>\n"
 "      <annotation value=\"Source\" name=\"com.trolltech.QtDBus.QtTypeName.Out0\"/>\n"
 "    </method>\n"
 "    <method name=\"createSourceForAccount\">\n"
 "      <arg direction=\"in\" type=\"s\"/>\n"
 "      <arg direction=\"in\" type=\"u\"/>\n"
 "      <arg direction=\"in\" type=\"b\"/>\n"
-"      <arg direction=\"out\" type=\"(sb)\"/>\n"
+"      <arg direction=\"out\" type=\"(ssssubb)\"/>\n"
 "      <annotation value=\"Source\" name=\"com.trolltech.QtDBus.QtTypeName.Out0\"/>\n"
 "    </method>\n"
 "    <method name=\"removeSource\">\n"
@@ -88,7 +86,6 @@
 "      <arg direction=\"in\" type=\"s\" name=\"clause\"/>\n"
 "      <arg direction=\"in\" type=\"s\" name=\"sort\"/>\n"
 "      <arg direction=\"in\" type=\"i\" name=\"maxCount\"/>\n"
-"      <arg direction=\"in\" type=\"b\" name=\"showDiabledContacts\"/>\n"
 "      <arg direction=\"in\" type=\"as\" name=\"sources\"/>\n"
 "      <arg direction=\"out\" type=\"o\"/>\n"
 "    </method>\n"
@@ -122,14 +119,11 @@
 "  </interface>\n"
         "")
     Q_PROPERTY(bool isReady READ isReady NOTIFY readyChanged)
-    Q_PROPERTY(bool safeMode READ safeMode WRITE setSafeMode NOTIFY safeModeChanged)
 
 public:
     AddressBookAdaptor(const QDBusConnection &connection, AddressBook *parent);
     virtual ~AddressBookAdaptor();
 
-    void setSafeMode(bool flag);
-
 public Q_SLOTS:
     SourceList availableSources(const QDBusMessage &message);
     Source source(const QDBusMessage &message);
@@ -140,19 +134,17 @@
                                   const QDBusMessage &message);
     bool removeSource(const QString &sourceId, const QDBusMessage &message);
     QStringList sortFields();
-    QDBusObjectPath query(const QString &clause, const QString &sort, int maxCount, bool showInvisible, const QStringList &sources);
+    QDBusObjectPath query(const QString &clause, const QString &sort, int maxCount, const QStringList &sources);
     int removeContacts(const QStringList &contactIds, const QDBusMessage &message);
     QString createContact(const QString &contact, const QString &source, const QDBusMessage &message);
     QStringList updateContacts(const QStringList &contacts, const QDBusMessage &message);
     QString linkContacts(const QStringList &contacts);
     bool unlinkContacts(const QString &parentId, const QStringList &contactsIds);
     bool isReady();
-    bool safeMode() const;
     bool ping();
     void purgeContacts(const QString &since, const QString &sourceId, const QDBusMessage &message);
     void shutDown() const;
 
-
 Q_SIGNALS:
     void contactsAdded(const QStringList &ids);
     void contactsRemoved(const QStringList &ids);
@@ -160,7 +152,6 @@
     void asyncOperationResult(QMap<QString, QString> errors);
     void readyChanged();
     void reloaded();
-    void safeModeChanged();
 
 private:
     AddressBook *m_addressBook;

=== modified file 'lib/addressbook.cpp'
--- lib/addressbook.cpp	2015-09-29 12:52:30 +0000
+++ lib/addressbook.cpp	2015-10-07 13:33:41 +0000
@@ -143,7 +143,6 @@
 namespace galera
 {
 int AddressBook::m_sigQuitFd[2] = {0, 0};
-QSettings AddressBook::m_settings(SETTINGS_ORG, SETTINGS_APPLICATION);
 
 AddressBook::AddressBook(QObject *parent)
     : QObject(parent),
@@ -157,9 +156,7 @@
       m_isAboutToReload(false),
       m_individualsChangedDetailedId(0),
       m_notifyIsQuiescentHandlerId(0),
-      m_connection(QDBusConnection::sessionBus()),
-      m_messagingMenu(0),
-      m_messagingMenuMessage(0)
+      m_connection(QDBusConnection::sessionBus())
 {
     if (qEnvironmentVariableIsSet(ALTERNATIVE_CPIM_SERVICE_NAME)) {
         m_serviceName = qgetenv(ALTERNATIVE_CPIM_SERVICE_NAME);
@@ -170,21 +167,10 @@
     prepareUnixSignals();
     connectWithEDS();
     connect(this, SIGNAL(readyChanged()), SLOT(checkCompatibility()));
-    connect(this, SIGNAL(safeModeChanged()), SLOT(onSafeModeChanged()));
 }
 
 AddressBook::~AddressBook()
 {
-    if (m_messagingMenuMessage) {
-        g_object_unref(m_messagingMenuMessage);
-        m_messagingMenuMessage = 0;
-    }
-
-    if (m_messagingMenu) {
-        g_object_unref(m_messagingMenu);
-        m_messagingMenu = 0;
-    }
-
     if (m_individualAggregator) {
         qWarning() << "Addressbook destructor called while running, you should call shutdown first";
         shutdown();
@@ -285,44 +271,6 @@
     }
 }
 
-void AddressBook::checkCompatibility()
-{
-    QByteArray envSafeMode = qgetenv(ADDRESS_BOOK_SAFE_MODE);
-    if (!envSafeMode.isEmpty()) {
-        return;
-    }
-    GError *gError = NULL;
-    ESourceRegistry *r = e_source_registry_new_sync(NULL, &gError);
-    if (gError) {
-        qWarning() << "Fail to check compatibility" << gError->message;
-        g_error_free(gError);
-        return;
-    }
-
-    bool enableSafeMode = false;
-    GList *sources = e_source_registry_list_sources(r, E_SOURCE_EXTENSION_ADDRESS_BOOK);
-    for(GList *l = sources; l != NULL; l = l->next) {
-        ESource *s = E_SOURCE(l->data);
-        if ((strcmp(e_source_get_uid(s), "system-address-book") != 0)  &&
-            !e_source_has_extension(s, E_SOURCE_EXTENSION_UBUNTU)) {
-            qDebug() << "Source does not contains UBUNTU extension" << QString::fromUtf8(e_source_get_display_name(s));
-            enableSafeMode = true;
-            break;
-        }
-    }
-
-    g_list_free_full(sources, g_object_unref);
-    g_object_unref(r);
-
-    if (enableSafeMode) {
-        qWarning() << "Enabling safe mode";
-        setSafeMode(true);
-        Q_EMIT safeModeChanged();
-    } else {
-        qDebug() << "Safe mode not necessary";
-    }
-}
-
 void AddressBook::shutdown()
 {
     m_isAboutToQuit = true;
@@ -619,64 +567,6 @@
     self->prepareFolks();
 }
 
-void AddressBook::onSafeModeMessageActivated(MessagingMenuMessage *message,
-                                             const char *actionId,
-                                             GVariant *param,
-                                             AddressBook *self)
-{
-    if (self->m_messagingMenu) {
-        if (self->m_messagingMenuMessage) {
-             messaging_menu_app_remove_message(self->m_messagingMenu, self->m_messagingMenuMessage);
-             g_object_unref(self->m_messagingMenuMessage);
-             self->m_messagingMenuMessage = 0;
-        }
-
-        messaging_menu_app_unregister(self->m_messagingMenu);
-        g_object_unref(self->m_messagingMenu);
-        self->m_messagingMenu = 0;
-    }
-
-    url_dispatch_send("application:///address-book-app.desktop", NULL, NULL);
-}
-
-bool AddressBook::isSafeMode()
-{
-    QByteArray envSafeMode = qgetenv(ADDRESS_BOOK_SAFE_MODE);
-    if (!envSafeMode.isEmpty()) {
-        return (envSafeMode.toLower() == "on" ? true : false);
-    } else {
-        return m_settings.value(SETTINGS_SAFE_MODE_KEY, false).toBool();
-    }
-}
-
-void AddressBook::setSafeMode(bool flag)
-{
-    QByteArray envSafeMode = qgetenv(ADDRESS_BOOK_SAFE_MODE);
-    if (!envSafeMode.isEmpty()) {
-        return;
-    }
-
-    if (m_settings.value(SETTINGS_SAFE_MODE_KEY, false).toBool() != flag) {
-        m_settings.setValue(SETTINGS_SAFE_MODE_KEY, flag);
-        if (!flag) {
-            // make all contacts visible
-            Q_FOREACH(ContactEntry *entry, m_contacts->values()) {
-                QIndividual *i = entry->individual();
-                if (!i->isVisible()) {
-                    i->setVisible(true);
-                }
-            }
-            // clear invisible sources list
-            m_settings.setValue(SETTINGS_INVISIBLE_SOURCES, QStringList());
-        }
-        m_settings.sync();
-        // avoid send a ton of signals since the service will be reseted after the
-        // 'safeModeChanged' signal
-        m_notifyContactUpdate->clear();
-        Q_EMIT safeModeChanged();
-    }
-}
-
 void AddressBook::createSourceDone(GObject *source,
                                    GAsyncResult *res,
                                    void *data)
@@ -700,14 +590,6 @@
                      cData->m_accountId,
                      false,
                      cData->m_setAsPrimary);
-        // if in safe mode source will be invisible, we use that to avoid invalid states
-        if (isSafeMode()) {
-            qDebug() << "Source will be invisible until safe mode is gone" << cData->m_sourceId << e_source_get_uid(cData->m_source);
-            QStringList iSources = cData->m_addressbook->m_settings.value(SETTINGS_INVISIBLE_SOURCES).toStringList();
-            iSources << e_source_get_uid(cData->m_source);
-            cData->m_addressbook->m_settings.setValue(SETTINGS_INVISIBLE_SOURCES, iSources);
-            cData->m_addressbook->m_settings.sync();
-        }
     }
     g_object_unref(source);
     QDBusMessage reply = cData->m_message.createReply(QVariant::fromValue<Source>(src));
@@ -839,12 +721,6 @@
                 }
             }
 
-            // If running on safe mode only the system-address-book is writable
-            if (isSafeMode() && (id != "system-address-book")) {
-                qDebug() << "Running safe mode for source" << id << displayName;
-                canWrite = false;
-            }
-
             result << Source(id, displayName, applicationId, providerName, accountId, !canWrite, isPrimary);
             g_object_unref(store);
         }
@@ -939,9 +815,9 @@
     return "";
 }
 
-View *AddressBook::query(const QString &clause, const QString &sort, int maxCount, bool showInvisible, const QStringList &sources)
+View *AddressBook::query(const QString &clause, const QString &sort, int maxCount, const QStringList &sources)
 {
-    View *view = new View(clause, sort, maxCount, showInvisible, sources, m_ready ? m_contacts : 0, this);
+    View *view = new View(clause, sort, maxCount, sources, m_ready ? m_contacts : 0, this);
     m_views << view;
     connect(view, SIGNAL(closed()), this, SLOT(viewClosed()));
     return view;
@@ -954,9 +830,7 @@
 
 void AddressBook::individualChanged(QIndividual *individual)
 {
-    if (individual->isVisible()) {
-        m_notifyContactUpdate->insertChangedContacts(QSet<QString>() << individual->id());
-    }
+    m_notifyContactUpdate->insertChangedContacts(QSet<QString>() << individual->id());
 }
 
 void AddressBook::onEdsServiceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner)
@@ -971,44 +845,6 @@
     }
 }
 
-void AddressBook::onSafeModeChanged()
-{
-    GIcon *icon = g_themed_icon_new("address-book-app");
-    bool showUpdateComplete = false;
-
-    if (m_messagingMenu == 0) {
-        m_messagingMenu = messaging_menu_app_new("address-book-app.desktop");
-        messaging_menu_app_register(m_messagingMenu);
-        messaging_menu_app_append_source(m_messagingMenu, MESSAGING_MENU_SOURCE_ID, icon, C::gettext("Address book service"));
-    }
-
-    if (m_messagingMenuMessage) {
-        messaging_menu_app_remove_message(m_messagingMenu, m_messagingMenuMessage);
-        g_object_unref (m_messagingMenuMessage);
-        m_messagingMenuMessage = 0;
-    }
-
-    if (isSafeMode()) {
-        m_messagingMenuMessage = messaging_menu_message_new("address-book-service-safe-mode",
-                                                            icon,
-                                                            C::gettext("Update required"),
-                                                            NULL,
-                                                            C::gettext("Your Contacts app needs to be upgraded. Only local contacts will be editable until upgrade is complete"),
-                                                            QDateTime::currentMSecsSinceEpoch() * 1000); // the value is expected to be in microseconds
-    } else {
-        m_messagingMenuMessage = messaging_menu_message_new("address-book-service-safe-mode",
-                                                            icon,
-                                                            C::gettext("Update complete"),
-                                                            NULL,
-                                                            C::gettext("Your Contacts app update is complete."),
-                                                            QDateTime::currentMSecsSinceEpoch() * 1000); // the value is expected to be in microseconds
-    }
-
-    g_signal_connect(m_messagingMenuMessage, "activate", G_CALLBACK(&AddressBook::onSafeModeMessageActivated), this);
-    messaging_menu_app_append_message(m_messagingMenu, m_messagingMenuMessage, MESSAGING_MENU_SOURCE_ID, true);
-    g_object_unref(icon);
-}
-
 int AddressBook::removeContacts(const QStringList &contactIds, const QDBusMessage &message)
 {
     RemoveContactsData *data = new RemoveContactsData;
@@ -1175,32 +1011,28 @@
     }
 }
 
-QString AddressBook::removeContact(FolksIndividual *individual, bool *visible)
+QString AddressBook::removeContact(FolksIndividual *individual)
 {
     QString contactId = QString::fromUtf8(folks_individual_get_id(individual));
     ContactEntry *ci = m_contacts->take(contactId);
     if (ci) {
-        *visible = ci->individual()->isVisible();
         delete ci;
         return contactId;
     }
     return QString();
 }
 
-QString AddressBook::addContact(FolksIndividual *individual, bool visible)
+QString AddressBook::addContact(FolksIndividual *individual)
 {
     QString id = QString::fromUtf8(folks_individual_get_id(individual));
     ContactEntry *entry = m_contacts->value(id);
     if (entry) {
         entry->individual()->setIndividual(individual);
-        entry->individual()->setVisible(visible);
-
         // update contact position on map
         m_contacts->updatePosition(entry);
     } else {
         QIndividual *i = new QIndividual(individual, m_individualAggregator);
         i->addListener(this, SLOT(individualChanged(QIndividual*)));
-        i->setVisible(visible);
         m_contacts->insert(new ContactEntry(i));
         //TODO: Notify view
     }
@@ -1217,11 +1049,6 @@
     QSet<QString> removedIds;
     QSet<QString> addedIds;
     QSet<QString> updatedIds;
-    QStringList invisibleSources;
-
-    if (isSafeMode()) {
-        invisibleSources = self->m_settings.value(SETTINGS_INVISIBLE_SOURCES).toStringList();
-    }
 
     GeeSet *removed = gee_multi_map_get_keys(changes);
     GeeIterator *iter = gee_iterable_iterator(GEE_ITERABLE(removed));
@@ -1231,9 +1058,8 @@
             continue;
         }
 
-        bool visible = true;
-        QString cId = self->removeContact(individual, &visible);
-        if (visible && !cId.isEmpty()) {
+        QString cId = self->removeContact(individual);
+        if (!cId.isEmpty()) {
             removedIds << cId;
         }
         g_object_unref(individual);
@@ -1255,24 +1081,11 @@
             continue;
         }
 
-        bool visible = true;
-        if (!invisibleSources.isEmpty()) {
-            GeeSet *personas = folks_individual_get_personas(individual);
-            GeeIterator *iter = gee_iterable_iterator(GEE_ITERABLE(personas));
-            if (gee_iterator_next(iter)) {
-                FolksPersona *persona = FOLKS_PERSONA(gee_iterator_get(iter));
-                FolksPersonaStore *ps = folks_persona_get_store(persona);
-                g_object_unref(persona);
-                visible = !invisibleSources.contains(folks_persona_store_get_id(ps));
-            }
-            g_object_unref(iter);
-        }
-
         bool exists = self->m_contacts->contains(id);
-        QString cId = self->addContact(individual, visible);
-        if (visible && exists) {
+        QString cId = self->addContact(individual);
+        if (exists) {
             updatedIds <<  cId;
-        } else if (visible) {
+        } else {
             addedIds << cId;
         }
 

=== modified file 'lib/addressbook.h'
--- lib/addressbook.h	2015-09-17 15:07:41 +0000
+++ lib/addressbook.h	2015-10-07 13:33:41 +0000
@@ -58,19 +58,16 @@
 
     // Adaptor
     QString linkContacts(const QStringList &contacts);
-    View *query(const QString &clause, const QString &sort, int maxCount, bool showInvisible, const QStringList &sources);
+    View *query(const QString &clause, const QString &sort, int maxCount, const QStringList &sources);
     QStringList sortFields();
     bool unlinkContacts(const QString &parent, const QStringList &contacts);
     bool isReady() const;
-    void setSafeMode(bool flag);
 
-    static bool isSafeMode();
     static int init();
 
 Q_SIGNALS:
     void stopped();
     void readyChanged();
-    void safeModeChanged();
 
 public Q_SLOTS:
     bool start();
@@ -89,7 +86,6 @@
     void viewClosed();
     void individualChanged(QIndividual *individual);
     void onEdsServiceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
-    void onSafeModeChanged();
 
     // Unix signal handlers.
     void handleSigQuit();
@@ -98,9 +94,6 @@
     void checkForEds();
     void unprepareFolks();
 
-    // check compatibility and if the safe mode should be enabled
-    void checkCompatibility();
-
 private:
     FolksIndividualAggregator *m_individualAggregator;
     ContactsMap *m_contacts;
@@ -109,9 +102,6 @@
     // timer to avoid send several updates at the same time
     DirtyContactsNotify *m_notifyContactUpdate;
     QDBusServiceWatcher *m_edsWatcher;
-    MessagingMenuApp *m_messagingMenu;
-    MessagingMenuMessage *m_messagingMenuMessage;
-    static QSettings m_settings;
 
     bool m_edsIsLive;
     bool m_ready;
@@ -153,8 +143,8 @@
     void continueShutdown();
     void setIsReady(bool isReady);
     bool registerObject(QDBusConnection &connection);
-    QString removeContact(FolksIndividual *individual, bool *visible);
-    QString addContact(FolksIndividual *individual, bool visible);
+    QString removeContact(FolksIndividual *individual);
+    QString addContact(FolksIndividual *individual);
     FolksPersonaStore *getFolksStore(const QString &source);
 
     static void availableSourcesDoneListAllSources(FolksBackendStore *backendStore,

=== modified file 'lib/qindividual.cpp'
--- lib/qindividual.cpp	2015-09-04 18:41:06 +0000
+++ lib/qindividual.cpp	2015-10-07 13:33:41 +0000
@@ -155,8 +155,7 @@
     : m_individual(0),
       m_aggregator(aggregator),
       m_contact(0),
-      m_currentUpdate(0),
-      m_visible(true)
+      m_currentUpdate(0)
 {
     if (m_supportedExtendedDetails.isEmpty()) {
         m_supportedExtendedDetails << X_CREATED_AT
@@ -1214,16 +1213,6 @@
     return m_deletedAt;
 }
 
-bool QIndividual::setVisible(bool visible)
-{
-    m_visible = visible;
-}
-
-bool QIndividual::isVisible() const
-{
-    return m_visible;
-}
-
 void QIndividual::setIndividual(FolksIndividual *individual)
 {
     static QList<QByteArray> individualProperties;

=== modified file 'lib/qindividual.h'
--- lib/qindividual.h	2015-09-04 15:01:52 +0000
+++ lib/qindividual.h	2015-10-07 13:33:41 +0000
@@ -57,8 +57,6 @@
     void flush();
     bool markAsDeleted();
     QDateTime deletedAt();
-    bool setVisible(bool visible);
-    bool isVisible() const;
 
     static QtContacts::QContact copy(const QtContacts::QContact &c, QList<QtContacts::QContactDetail::DetailType> fields);
     static GHashTable *parseDetails(const QtContacts::QContact &contact);
@@ -83,7 +81,6 @@
     QMetaObject::Connection m_updateConnection;
     QMutex m_contactLock;
     QDateTime m_deletedAt;
-    bool m_visible;
     static bool m_autoLink;
     static QStringList m_supportedExtendedDetails;
 

=== modified file 'lib/view.cpp'
--- lib/view.cpp	2015-09-16 13:28:23 +0000
+++ lib/view.cpp	2015-10-07 13:33:41 +0000
@@ -43,13 +43,12 @@
 class FilterThread: public QRunnable
 {
 public:
-    FilterThread(QString filter, QString sort, int maxCount, bool showInvisible, ContactsMap *allContacts, QObject *parent)
+    FilterThread(QString filter, QString sort, int maxCount, ContactsMap *allContacts, QObject *parent)
         : m_parent(parent),
           m_filter(filter),
           m_sortClause(sort),
           m_maxCount(maxCount),
           m_allContacts(allContacts),
-          m_showInvisible(showInvisible),
           m_canceled(false),
           m_running(false),
           m_done(false)
@@ -140,8 +139,7 @@
         // filter contacts if necessary
         if (m_filter.isValid() && m_filter.isEmpty()) {
             Q_FOREACH(ContactEntry *entry, m_allContacts->values()) {
-                if ((m_showInvisible || entry->individual()->isVisible()) &&
-                    !entry->individual()->deletedAt().isValid()) {
+                if (!entry->individual()->deletedAt().isValid()) {
 
                     QContact contact = entry->individual()->contact();
 
@@ -188,8 +186,7 @@
                 QDateTime deletedAt = entry->individual()->deletedAt();
                 m_canceledLock.unlock();
 
-                if ((m_showInvisible || entry->individual()->isVisible()) &&
-                    checkContact(contact, deletedAt)) {
+                if (checkContact(contact, deletedAt)) {
                     if (needSort) {
                         addSorted(&m_contacts, contact, m_sortClause);
                     } else {
@@ -217,7 +214,6 @@
     QList<QContact> m_contacts;
 
     int m_maxCount;
-    bool m_showInvisible;
     bool m_canceled;
     QReadWriteLock m_canceledLock;
     bool m_running;
@@ -229,12 +225,12 @@
     }
 };
 
-View::View(const QString &clause, const QString &sort, int maxCount, bool showInvisible,
+View::View(const QString &clause, const QString &sort, int maxCount,
            const QStringList &sources, ContactsMap *allContacts,
            QObject *parent)
     : QObject(parent),
       m_sources(sources),
-      m_filterThread(new FilterThread(clause, sort, maxCount, showInvisible, allContacts, this)),
+      m_filterThread(new FilterThread(clause, sort, maxCount, allContacts, this)),
       m_adaptor(0),
       m_waiting(0)
 {

=== modified file 'lib/view.h'
--- lib/view.h	2015-09-16 13:28:23 +0000
+++ lib/view.h	2015-10-07 13:33:41 +0000
@@ -42,7 +42,7 @@
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 
 public:
-    View(const QString &clause, const QString &sort, int maxCount, bool showInvisible, const QStringList &sources, ContactsMap *allContacts, QObject *parent);
+    View(const QString &clause, const QString &sort, int maxCount, const QStringList &sources, ContactsMap *allContacts, QObject *parent);
     ~View();
 
     static QString objectPath();

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-09-11 13:30:07 +0000
+++ tests/CMakeLists.txt	2015-10-07 13:33:41 +0000
@@ -4,4 +4,3 @@
              PATHS /usr/lib/evolution/)
 add_subdirectory(data)
 add_subdirectory(unittest)
-add_subdirectory(tst_tools)

=== modified file 'tests/address_book_service_testability/helpers.py'
--- tests/address_book_service_testability/helpers.py	2015-09-17 16:45:14 +0000
+++ tests/address_book_service_testability/helpers.py	2015-10-07 13:33:41 +0000
@@ -24,9 +24,9 @@
 bus = dbus.SessionBus()
 
 
-def query_contacts(fields='', query='', max_count=0, show_invisible=False, sources=[]):
+def query_contacts(fields='', query='', max_count=0, sources=[]):
     iface = _get_contacts_dbus_service_iface()
-    view_path = iface.query(fields, query, max_count, show_invisible, [])
+    view_path = iface.query(fields, query, max_count, [])
     view = bus.get_object(
         'com.canonical.pim', view_path)
     view_iface = dbus.Interface(

=== modified file 'tests/unittest/contact-sort-test.cpp'
--- tests/unittest/contact-sort-test.cpp	2015-09-16 13:28:23 +0000
+++ tests/unittest/contact-sort-test.cpp	2015-10-07 13:33:41 +0000
@@ -100,7 +100,7 @@
         m_serverIface->call("createContact", copyVcard, "dummy-store");
 
         // check if the cotact is listed in the correct order
-        QDBusMessage result = m_serverIface->call("query", "", "", 0, false, QStringList());
+        QDBusMessage result = m_serverIface->call("query", "", "", 0, QStringList());
         QDBusObjectPath viewObjectPath = result.arguments()[0].value<QDBusObjectPath>();
         QDBusInterface *view = new QDBusInterface(m_serverIface->service(),
                                                   viewObjectPath.path(),
@@ -147,7 +147,7 @@
         m_serverIface->call("createContact", copyVcard, "dummy-store");
 
         // check if the cotact is listed in the correct order
-        QDBusMessage result = m_serverIface->call("query", "", "", 0, false, QStringList());
+        QDBusMessage result = m_serverIface->call("query", "", "", 0, QStringList());
         QDBusObjectPath viewObjectPath = result.arguments()[0].value<QDBusObjectPath>();
         QDBusInterface *view = new QDBusInterface(m_serverIface->service(),
                                                   viewObjectPath.path(),
@@ -179,7 +179,7 @@
         m_serverIface->call("updateContact", vcard, "dummy-store");
 
         // check if the cotact still in the correct order
-        result = m_serverIface->call("query", "", "", 0, false, QStringList());
+        result = m_serverIface->call("query", "", "", 0, QStringList());
         viewObjectPath = result.arguments()[0].value<QDBusObjectPath>();
         view = new QDBusInterface(m_serverIface->service(),
                                   viewObjectPath.path(),

=== removed directory 'updater'
=== removed file 'updater/CMakeLists.txt'
--- updater/CMakeLists.txt	2015-09-03 19:09:36 +0000
+++ updater/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-set(ADDRESS_BOOK_UPDATE_LIB address-book-updater-lib)
-set(ADDRESS_BOOK_UPDATE_BIN address-book-updater)
-
-include_directories(
-    ${CMAKE_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/common
-    ${AccountsQt5_INCLUDE_DIRS}
-    ${LIBNOTIFY_INCLUDE_DIRS}
-)
-
-set(ADDRESS_BOOK_UPDATE_LIB_SRCS
-    ab-i18n.h
-    ab-notify-message.h
-    ab-notify-message.cpp
-    ab-update.h
-    ab-update.cpp
-    ab-update-adaptor.h
-    ab-update-adaptor.cpp
-    ab-update-buteo-import.h
-    ab-update-buteo-import.cpp
-    ab-update-module.h
-    ab-update-module.cpp
-)
-
-add_library(${ADDRESS_BOOK_UPDATE_LIB} STATIC
-    ${ADDRESS_BOOK_UPDATE_LIB_SRCS}
-)
-
-target_link_libraries(${ADDRESS_BOOK_UPDATE_LIB}
-    Qt5::Core
-    Qt5::DBus
-    Qt5::Contacts
-    Qt5::Xml
-    Qt5::Network
-    ${AccountsQt5_LIBRARIES}
-    ${LIBNOTIFY_LIBRARIES}
-)
-
-add_executable(${ADDRESS_BOOK_UPDATE_BIN}
-    main.cpp
-)
-
-target_link_libraries(${ADDRESS_BOOK_UPDATE_BIN}
-    ${ADDRESS_BOOK_UPDATE_LIB}
-)
-
-install(TARGETS ${ADDRESS_BOOK_UPDATE_BIN}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR}
-)

=== removed file 'updater/ab-i18n.h'
--- updater/ab-i18n.h	2015-09-03 20:09:42 +0000
+++ updater/ab-i18n.h	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of address-book-service.
- *
- * sync-monitor 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/>.
- */
-
-#pragma once
-
-#include "config.h"
-
-extern "C" {
-#include <libintl.h>
-#define _(String) dgettext (GETTEXT_PACKAGE, String)
-}
-

=== removed file 'updater/ab-notify-message.cpp'
--- updater/ab-notify-message.cpp	2015-09-16 20:57:19 +0000
+++ updater/ab-notify-message.cpp	1970-01-01 00:00:00 +0000
@@ -1,136 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of address-book-service.
- *
- * sync-monitor 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 "ab-notify-message.h"
-#include "ab-i18n.h"
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-
-int ABNotifyMessage::m_instanceCount = 0;
-
-ABNotifyMessage::ABNotifyMessage(bool singleMessage, QObject *parent)
-    : QObject(parent),
-      m_notification(0),
-      m_singleMessage(singleMessage)
-{
-    if (m_instanceCount == 0) {
-        m_instanceCount++;
-        notify_init(QCoreApplication::instance()->applicationName().toUtf8());
-    }
-}
-
-ABNotifyMessage::~ABNotifyMessage()
-{
-    if (m_notification) {
-        g_object_unref(m_notification);
-        m_notification = 0;
-    }
-
-    m_instanceCount--;
-    if (m_instanceCount == 0) {
-        notify_uninit();
-    }
-
-}
-
-void ABNotifyMessage::show(const QString &title, const QString &msg, const QString &iconName)
-{
-    m_notification = notify_notification_new(title.toUtf8().data(),
-                                             msg.toUtf8().data(),
-                                             iconName.isEmpty() ? (const char*) 0 : iconName.toUtf8().constData());
-
-    GError *error = 0;
-    notify_notification_set_timeout(m_notification, NOTIFY_EXPIRES_DEFAULT);
-    notify_notification_show(m_notification, &error);
-    if (error) {
-        qWarning() << "Fail to launch notification" << error->message;
-        g_error_free(error);
-    }
-    g_signal_connect_after(m_notification,
-                           "closed",
-                           (GCallback) ABNotifyMessage::onNotificationClosed,
-                           this);
-}
-
-void ABNotifyMessage::askYesOrNo(const QString &title,
-                                 const QString &msg,
-                                 const QString &iconName)
-{
-    m_notification = notify_notification_new(title.toUtf8().data(),
-                                             msg.toUtf8().data(),
-                                             iconName.isEmpty() ? (const char*) 0 : iconName.toUtf8().constData());
-    notify_notification_set_hint_string(m_notification,
-                                        "x-canonical-snap-decisions",
-                                        "true");
-    notify_notification_set_hint_string(m_notification,
-                                        "x-canonical-private-button-tint",
-                                        "true");
-    notify_notification_set_hint_string(m_notification,
-                                        "x-canonical-non-shaped-icon",
-                                        "true");
-    notify_notification_add_action(m_notification,
-                                   "action_accept", _("Yes"),
-                                   (NotifyActionCallback) ABNotifyMessage::onQuestionAccepted,
-                                   this,
-                                   NULL);
-    notify_notification_add_action(m_notification,
-                                   "action_reject", _("No"),
-                                   (NotifyActionCallback) ABNotifyMessage::onQuestionRejected,
-                                   this,
-                                   NULL);
-    notify_notification_show(m_notification, 0);
-    g_signal_connect_after(m_notification,
-                           "closed",
-                           (GCallback) ABNotifyMessage::onNotificationClosed,
-                           this);
-}
-
-int ABNotifyMessage::closedReason() const
-{
-    if (m_notification) {
-        return notify_notification_get_closed_reason(m_notification);
-    } else {
-        return 0;
-    }
-}
-
-void ABNotifyMessage::onQuestionAccepted(NotifyNotification *notification, char *action, ABNotifyMessage *self)
-{
-    Q_UNUSED(notification)
-    Q_UNUSED(action)
-
-    Q_EMIT self->questionAccepted();
-}
-
-void ABNotifyMessage::onQuestionRejected(NotifyNotification *notification, char *action, ABNotifyMessage *self)
-{
-    Q_UNUSED(notification)
-    Q_UNUSED(action)
-
-    Q_EMIT self->questionRejected();
-}
-
-void ABNotifyMessage::onNotificationClosed(NotifyNotification *notification, ABNotifyMessage *self)
-{
-    Q_UNUSED(notification)
-    Q_EMIT self->messageClosed();
-    if (self->m_singleMessage) {
-        self->deleteLater();
-    }
-}

=== removed file 'updater/ab-notify-message.h'
--- updater/ab-notify-message.h	2015-09-16 20:57:19 +0000
+++ updater/ab-notify-message.h	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of address-book-service.
- *
- * sync-monitor 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/>.
- */
-
-#pragma once
-#include <QtCore/QString>
-#include <QtCore/QObject>
-
-#include <libnotify/notify.h>
-
-class ABNotifyMessage : public QObject
-{
-    Q_OBJECT
-public:
-    ABNotifyMessage(bool singleMessage, QObject *parent = 0);
-    ~ABNotifyMessage();
-
-    void show(const QString &title, const QString &msg, const QString &iconName);
-    void askYesOrNo(const QString &title, const QString &msg, const QString &iconName);
-    int closedReason() const;
-
-Q_SIGNALS:
-    void questionAccepted();
-    void questionRejected();
-    void messageClosed();
-
-private:
-    NotifyNotification *m_notification;
-    bool m_singleMessage;
-    static int m_instanceCount;
-
-    static void onQuestionAccepted(NotifyNotification *notification,
-                                   char *action,
-                                   ABNotifyMessage *self);
-    static void onQuestionRejected(NotifyNotification *notification,
-                                   char *action,
-                                   ABNotifyMessage *self);
-    static void onNotificationClosed(NotifyNotification *notification,
-                                     ABNotifyMessage *self);
-};

=== removed file 'updater/ab-update-adaptor.cpp'
--- updater/ab-update-adaptor.cpp	2015-09-16 00:33:43 +0000
+++ updater/ab-update-adaptor.cpp	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of address-book-service.
- *
- * sync-monitor 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 "ab-update-adaptor.h"
-
-ABUpdateAdaptor::ABUpdateAdaptor(ABUpdate *parent)
-    : QDBusAbstractAdaptor(parent),
-      m_abUpdate(parent)
-{
-    setAutoRelaySignals(true);
-}
-
-ABUpdateAdaptor::~ABUpdateAdaptor()
-{
-}
-
-bool ABUpdateAdaptor::needsUpdate() const
-{
-    return !m_abUpdate->needsUpdate().isEmpty();
-}
-
-bool ABUpdateAdaptor::isRunning() const
-{
-    return m_abUpdate->isRunning();
-}
-
-void ABUpdateAdaptor::startUpdate()
-{
-    m_abUpdate->startUpdate();
-}
-
-void ABUpdateAdaptor::cancelUpdate()
-{
-    m_abUpdate->cancelUpdate();
-}

=== removed file 'updater/ab-update-adaptor.h'
--- updater/ab-update-adaptor.h	2015-09-16 00:33:43 +0000
+++ updater/ab-update-adaptor.h	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of address-book-service.
- *
- * sync-monitor 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/>.
- */
-
-#pragma once
-#include <QtCore/QObject>
-#include <QtDBus/QDBusAbstractAdaptor>
-
-#include "ab-update.h"
-#include "dbus-service-defs.h"
-#include "config.h"
-
-class ABUpdateAdaptor : public QDBusAbstractAdaptor
-{
-    Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", CPIM_UPDATE_OBJECT_IFACE_NAME)
-    Q_CLASSINFO("D-Bus Introspection", ""
-"  <interface name=\"com.canonical.pim.Updater\">\n"
-"    <property name=\"needsUpdate\" type=\"b\" access=\"read\"/>\n"
-"    <property name=\"isRunning\" type=\"b\" access=\"read\"/>\n"
-"    <signal name=\"updateDone\"/>\n"
-"    <signal name=\"updateError\">\n"
-"      <arg direction=\"out\" type=\"s\" name=\"errorMessage\"/>\n"
-"    </signal>\n"
-"    <method name=\"startUpdate\"/>\n"
-"    <method name=\"cancelUpdate\"/>\n"
-"  </interface>\n"
-"")
-    Q_PROPERTY(bool needsUpdate READ needsUpdate NOTIFY onNeedsUpdateChanged)
-    Q_PROPERTY(bool isRunning READ isRunning NOTIFY onIsRunningChanged)
-
-public:
-    ABUpdateAdaptor(ABUpdate *parent = 0);
-    ~ABUpdateAdaptor();
-
-    bool needsUpdate() const;
-    bool isRunning() const;
-
-public Q_SLOTS:
-    void startUpdate();
-    void cancelUpdate();
-
-Q_SIGNALS:
-    void onNeedsUpdateChanged();
-    void onIsRunningChanged();
-    void updateDone();
-    void updateError(const QString &errorMessage);
-
-private:
-    ABUpdate *m_abUpdate;
-    bool m_needsUpdate;
-    bool m_isRunning;
-};

=== removed file 'updater/ab-update-buteo-import.cpp'
--- updater/ab-update-buteo-import.cpp	2015-09-29 14:15:42 +0000
+++ updater/ab-update-buteo-import.cpp	1970-01-01 00:00:00 +0000
@@ -1,730 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of address-book-service.
- *
- * sync-monitor 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 "ab-update-buteo-import.h"
-
-#include <Accounts/Manager>
-#include <Accounts/Account>
-#include <Accounts/AccountService>
-
-#include <QtCore/QDebug>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QTimer>
-
-#include <QtDBus/QDBusReply>
-
-#include <QtXml/QDomDocument>
-
-#include <QtContacts/QContactManager>
-#include <QtContacts/QContact>
-#include <QtContacts/QContactGuid>
-#include <QtContacts/QContactExtendedDetail>
-#include <QtContacts/QContactDetailFilter>
-#include <QtContacts/QContactIntersectionFilter>
-#include <QtContacts/QContactFavorite>
-#include <QtContacts/QContactName>
-#include <QtContacts/QContactPhoneNumber>
-#include <QtContacts/QContactEmailAddress>
-
-#include "config.h"
-
-#define BUTEO_DBUS_SERVICE_NAME   "com.meego.msyncd"
-#define BUTEO_DBUS_OBJECT_PATH    "/synchronizer"
-#define BUTEO_DBUS_INTERFACE      "com.meego.msyncd"
-
-using namespace QtContacts;
-
-ButeoImport::ButeoImport(QObject *parent)
-    : ABUpdateModule(parent)
-{
-}
-
-ButeoImport::~ButeoImport()
-{
-}
-
-QString ButeoImport::name() const
-{
-    return QStringLiteral("Buteo");
-}
-
-bool ButeoImport::loadAccounts(QList<quint32> &accountsToUpdate, QList<quint32> &newAccounts)
-{
-    // check which account already has a source
-    Accounts::Manager mgr;
-    accountsToUpdate = mgr.accountList("contacts");
-
-    qDebug() << "Accounts" << accountsToUpdate;
-    // check which account does not have a source
-    QMap<QString, quint32> srcs = sources();
-    for(QMap<QString, uint>::const_iterator i = srcs.begin();
-        i != srcs.end();
-        i++) {
-        qDebug() << "Source" << i.key() << "Account" << i.value();
-        // remove ids that already has a source from the idList
-        if (i.value() > 0) {
-            newAccounts << i.value();
-            accountsToUpdate.removeOne(i.value());
-        }
-    }
-
-    // no accounts to update
-    if (accountsToUpdate.isEmpty() && newAccounts.isEmpty()) {
-        return true;
-    }
-
-    if (!prepareButeo()) {
-        qWarning() << "Fail to connect with buteo service";
-        return false;
-    }
-
-    // check if all new accounts has a sync profile
-    Q_FOREACH(const quint32 &accountId, newAccounts) {
-        QDBusReply<QStringList> reply = m_buteoInterface->call("syncProfilesByKey",
-                                                               "accountid",
-                                                               QString::number(accountId));
-        if (reply.value().isEmpty()) {
-            qDebug() << "Account does not have a sync profile" << accountId;
-            accountsToUpdate << accountId;
-            newAccounts.removeOne(accountId);
-        }
-    }
-
-    return true;
-}
-
-bool ButeoImport::enableContactsService(quint32 accountId)
-{
-    Accounts::Manager mgr;
-    QScopedPointer<Accounts::Account> account(mgr.account(accountId));
-
-    if (account) {
-        Q_FOREACH(Accounts::Service service, account->services()) {
-            if (service.serviceType() == "contacts") {
-                account->selectService(service);
-                account->setEnabled(true);
-                account->syncAndBlock();
-            }
-        }
-        return true;
-    } else {
-        return false;
-    }
-}
-
-QString ButeoImport::accountName(quint32 accountId)
-{
-    Accounts::Manager mgr;
-    QScopedPointer<Accounts::Account> account(mgr.account(accountId));
-    return account ? account->displayName() : QString();
-}
-
-QStringList ButeoImport::runningSyncs() const
-{
-    if (m_buteoInterface.isNull()) {
-        return QStringList();
-    }
-
-    QDBusReply<QStringList> result = m_buteoInterface->call("runningSyncs");
-    if (result.error().isValid()) {
-        qWarning() << "Fail to retrieve running syncs" << result.error();
-        return QStringList();
-    }
-
-    return result.value();
-}
-
-QString ButeoImport::profileName(const QString &xml) const
-{
-    QDomDocument doc;
-    QString errorMsg;
-    int errorLine;
-    int errorColumn;
-
-    if (doc.setContent(xml, &errorMsg, &errorLine, &errorColumn)) {
-       QDomNodeList profileElements = doc.elementsByTagName("profile");
-       if (!profileElements.isEmpty()) {
-             QDomElement e = profileElements.item(0).toElement();
-             return e.attribute("name");
-       } else {
-           qWarning() << "Invalid profile" << xml;
-       }
-    } else {
-        qWarning() << "Fail to parse profile:" << xml;
-        qWarning() << "Error:" << errorMsg << errorLine << errorColumn;
-    }
-    return QString();
-}
-
-QString ButeoImport::profileName(quint32 accountId) const
-{
-    if (m_buteoInterface.isNull()) {
-        return QString();
-    }
-
-    QDBusReply<QStringList> reply = m_buteoInterface->call("syncProfilesByKey",
-                                                           "accountid",
-                                                           QString::number(accountId));
-    if (!reply.value().isEmpty()) {
-        return this->profileName(reply.value().first());
-    }
-    return QString();
-}
-
-bool ButeoImport::startSync(const QString &profile) const
-{
-    if (m_buteoInterface.isNull()) {
-        qWarning() << "Buteo interface is not valid";
-        return false;
-    }
-
-    QDBusReply<bool> result = m_buteoInterface->call("startSync", profile);
-    if (result.error().isValid()) {
-        qWarning() << "Fail to start sync for profile" << profile << result.error().message();
-        return false;
-    }
-
-    return result.value();
-}
-
-bool ButeoImport::matchFavorites()
-{
-    QMap<QString, QString> parameters;
-    parameters.insert(ADDRESS_BOOK_SHOW_INVISIBLE_PROP, "true");
-    QScopedPointer<QContactManager> manager(new QContactManager("galera", parameters));
-
-    // load old favorites
-    QContactDetailFilter folksFavorite;
-    folksFavorite.setDetailType(QContactDetail::TypeFavorite, QContactFavorite::FieldFavorite);
-    folksFavorite.setValue(true);
-
-    QContactFetchHint hint;
-    hint.setDetailTypesHint(QList<QContactDetail::DetailType>()
-                            << QContactDetail::TypeName
-                            << QContactDetail::TypeEmailAddress
-                            << QContactDetail::TypePhoneNumber);
-    QList<QContact> favorites = manager->contacts(folksFavorite, QList<QContactSortOrder>(), hint);
-    qDebug() << "number of folks favorites" << favorites.size();
-
-    // try to match with new contacts
-    QList<QContact> toUpdate;
-
-    Q_FOREACH(const QContact &f, favorites) {
-        QContactIntersectionFilter iFilter;
-
-        qDebug() << "Try to match contact" << f;
-        // No favorite
-        QContactDetailFilter noFavorite;
-        noFavorite.setDetailType(QContactDetail::TypeFavorite, QContactFavorite::FieldFavorite);
-        noFavorite.setValue(false);
-        iFilter.append(noFavorite);
-
-        // By name
-        QContactDetailFilter firstNameFilter;
-        firstNameFilter.setDetailType(QContactDetail::TypeName, QContactName::FieldFirstName);
-        firstNameFilter.setValue(f.detail<QContactName>().firstName());
-        iFilter.append(firstNameFilter);
-
-        QContactDetailFilter lastNameFilter;
-        lastNameFilter.setDetailType(QContactDetail::TypeName, QContactName::FieldLastName);
-        lastNameFilter.setValue(f.detail<QContactName>().lastName());
-        iFilter.append(lastNameFilter);
-
-        // By Email
-        Q_FOREACH(const QContactEmailAddress &e, f.details<QContactEmailAddress>()) {
-            QContactDetailFilter emailFilter;
-            emailFilter.setDetailType(QContactDetail::TypeEmailAddress, QContactEmailAddress::FieldEmailAddress);
-            emailFilter.setValue(e.emailAddress());
-            iFilter.append(emailFilter);
-        }
-
-        // By Phone
-        Q_FOREACH(const QContactPhoneNumber &p, f.details<QContactPhoneNumber>()) {
-            QContactDetailFilter phoneFilter;
-            phoneFilter.setDetailType(QContactDetail::TypePhoneNumber, QContactPhoneNumber::FieldNumber);
-            phoneFilter.setValue(p.number());
-            iFilter.append(phoneFilter);
-        }
-
-        QList<QContact> contacts = manager->contacts(iFilter);
-        qDebug() << "Number of contacts that match with old favorite" << contacts.size();
-
-        Q_FOREACH(QContact c, contacts) {
-            qDebug() << "Mark new contact as favorite" << c;
-            QContactFavorite fav = c.detail<QContactFavorite>();
-            fav.setFavorite(true);
-            c.saveDetail(&fav);
-            toUpdate << c;
-        }
-    }
-
-
-    if (!toUpdate.isEmpty()) {
-        if (!manager->saveContacts(&toUpdate)) {
-            qWarning() << "Fail to save favorite contacts";
-            return false;
-        }
-    }
-    return true;
-
-}
-
-ABUpdateModule::ImportError ButeoImport::parseError(int errorCode) const
-{
-    switch (errorCode)
-    {
-    case 9: //SYNC_AUTHENTICATION_FAILURE:
-        return ABUpdateModule::FailToAuthenticate;
-    case 11: //SYNC_CONNECTION_ERROR:
-        return ABUpdateModule::ConnectionError;
-    case 14: //SYNC_PLUGIN_ERROR:
-    case 15: //SYNC_PLUGIN_TIMEOUT:
-        return ABUpdateModule::FailToConnectWithButeo;
-    default:
-        return ABUpdateModule::SyncError;
-    }
-}
-
-bool ButeoImport::needsUpdate()
-{
-    // check settings
-    QSettings settings;
-    if (settings.value(SETTINGS_BUTEO_KEY, false).toBool()) {
-        qDebug() << "Buteo has already been updated.";
-        return false;
-    }
-
-    // check if we have old sources that need to be updated
-    QList<quint32> accountsToUpdate;
-    QList<quint32> newAccounts;
-    if (loadAccounts(accountsToUpdate, newAccounts)) {
-        if (accountsToUpdate.isEmpty() && newAccounts.isEmpty()) {
-            qDebug() << "No account to update";
-            // update settings key
-            QSettings settings;
-            settings.setValue(SETTINGS_BUTEO_KEY, true);
-            settings.sync();
-            return false;
-        }
-        qDebug() << accountsToUpdate.size() << "accounts, to update";
-        qDebug() << newAccounts.size() << "accounts, to sync";
-    } else {
-        qWarning() << "Fail to load online accounts";
-    }
-
-    return true;
-}
-
-bool ButeoImport::prepareToUpdate()
-{
-    return true;
-}
-
-bool ButeoImport::update()
-{
-    if (!m_importLock.tryLock()) {
-        qWarning() << "Fail to lock import mutex";
-        onError("", ButeoImport::InernalError);
-        return false;
-    }
-
-    m_initialAccountToProfiles.clear();
-    m_pendingAccountToProfiles.clear();
-    m_failToSyncProfiles.clear();
-
-    QList<quint32> accountsToUpdate;
-    QList<quint32> newAccounts;
-    if (!loadAccounts(accountsToUpdate, newAccounts)) {
-        // fail to load accounts information
-        m_importLock.unlock();
-        qWarning() << "Fail to load accounts information";
-        onError("", ButeoImport::OnlineAccountNotFound);
-        return false;
-    }
-
-    if (accountsToUpdate.isEmpty() && newAccounts.isEmpty()) {
-        qDebug() << "No accounts to update";
-        // if there is not account to update just commit the update
-        m_importLock.unlock();
-        Q_EMIT updated();
-        return true;
-    }
-
-
-    if (!accountsToUpdate.isEmpty()) {
-        qDebug() << "Will create buteo profile for" << accountsToUpdate << "accounts";
-        m_initialAccountToProfiles = createProfileForAccounts(accountsToUpdate);
-        if (m_initialAccountToProfiles.isEmpty()) {
-            // fail to create profiles
-            m_importLock.unlock();
-            qWarning() << "Fail to create profiles";
-            onError("", ButeoImport::FailToCreateButeoProfiles);
-            return false;
-        }
-    }
-
-    // start sync for new accounts to make sure that they are all in sync
-    Q_FOREACH(quint32 accountId, newAccounts) {
-        QString profileName = this->profileName(accountId);
-        if (!profileName.isEmpty()) {
-            qDebug() << "Manually start sync for" << profileName;
-            m_initialAccountToProfiles.insert(accountId, profileName);
-            if (!startSync(profileName)) {
-                qWarning() << "Fail to start sync" << profileName;
-                m_initialAccountToProfiles.remove(accountId);
-            }
-        }
-    }
-
-    m_pendingAccountToProfiles = m_initialAccountToProfiles;
-
-    return true;
-}
-
-QMap<QString, quint32> ButeoImport::sources() const
-{
-    QMap<QString, quint32> result;
-    QScopedPointer<QContactManager> manager(new QContactManager("galera"));
-    QContactDetailFilter sourceFilter;
-    sourceFilter.setDetailType(QContactDetail::TypeType, QContactType::FieldType);
-    sourceFilter.setValue( QContactType::TypeGroup);
-    Q_FOREACH(const QContact &c, manager->contacts(sourceFilter)) {
-        uint accountId = 0;
-        // skip local source
-        if (c.id().toString().endsWith("source@system-address-book")) {
-            continue;
-        }
-
-        Q_FOREACH(const QContactExtendedDetail &xDet, c.details<QContactExtendedDetail>()) {
-            if (xDet.name() == "ACCOUNT-ID") {
-                if (xDet.data().isValid()) {
-                    accountId = xDet.data().toString().toUInt();
-                }
-                break;
-            }
-        }
-
-        result.insert(c.id().toString(), accountId);
-    }
-
-    return result;
-}
-
-bool ButeoImport::prepareButeo()
-{
-    if (!m_buteoInterface.isNull()) {
-        return true;
-    }
-
-    m_buteoInterface.reset(new QDBusInterface(BUTEO_DBUS_SERVICE_NAME,
-                                              BUTEO_DBUS_OBJECT_PATH,
-                                              BUTEO_DBUS_INTERFACE));
-
-    if (!m_buteoInterface->isValid()) {
-        m_buteoInterface.reset();
-        qWarning() << "Fail to connect with syncfw";
-        return false;
-    }
-
-    connect(m_buteoInterface.data(),
-            SIGNAL(signalProfileChanged(QString, int, QString)),
-            SLOT(onProfileChanged(QString, int, QString)));
-    connect(m_buteoInterface.data(),
-            SIGNAL(syncStatus(QString,int,QString,int)),
-            SLOT(onSyncStatusChanged(QString,int,QString,int)));
-
-    return true;
-}
-
-QMap<quint32, QString> ButeoImport::createProfileForAccounts(QList<quint32> ids)
-{
-    QMap<quint32, QString> map;
-    if (m_buteoInterface.isNull()) {
-        qWarning() << "Buteo interface is not valid";
-        return map;
-    }
-
-    Q_FOREACH(quint32 id, ids) {
-        if (!enableContactsService(id)) {
-            qWarning() << "Fail to enable contacts service for account:" << id;
-            continue;
-        }
-
-        QDBusReply<QString> result = m_buteoInterface->call("createSyncProfileForAccount", id);
-        if (result.error().isValid()) {
-            qWarning() << "Fail to create profile for account" << id << result.error();
-        } else if (!result.value().isEmpty()) {
-            qDebug() << "Profile created" << result.value() << id;
-            map.insert(id, result.value());
-        } else {
-            qWarning() << "Fail to create profile for account" << id;
-        }
-    }
-    return map;
-}
-
-bool ButeoImport::removeProfile(const QString &profileId)
-{
-    if (m_buteoInterface.isNull()) {
-        qWarning() << "Buteo interface is not valid";
-        return false;
-    }
-
-    // check for account
-    quint32 accountId = m_initialAccountToProfiles.key(profileId, 0);
-    if (accountId == 0) {
-        qWarning() << "Fail to find account related with profile" << profileId;
-        return false;
-    }
-
-    // check for source
-    QMap<QString, quint32> listOfSources = sources();
-    QString sourceId = listOfSources.key(accountId, "");
-
-    // remove source
-    if (!sourceId.isEmpty()) {
-        QScopedPointer<QContactManager> manager(new QContactManager("galera"));
-        if (!manager->removeContact(QContactId::fromString(sourceId))) {
-            qWarning() << "Fail to remove contact source:" << sourceId;
-            return false;
-        } else {
-            qDebug() << "Source removed" << sourceId;
-        }
-    } else {
-        qDebug() << "No source was created for account" << accountId;
-    }
-
-    // remove profile
-    return buteoRemoveProfile(profileId);
-}
-
-bool ButeoImport::buteoRemoveProfile(const QString &profileId) const
-{
-    QDBusReply<bool> result = m_buteoInterface->call("removeProfile", profileId);
-    if (result.error().isValid()) {
-        qWarning() << "Fail to remove profile" << profileId << result.error();
-        return false;
-    }
-    return true;
-}
-
-bool ButeoImport::removeSources(const QStringList &sources)
-{
-    if (sources.isEmpty()) {
-        return true;
-    }
-
-    bool result = true;
-    QScopedPointer<QContactManager> manager(new QContactManager("galera"));
-    Q_FOREACH(const QString &source, sources) {
-        if (!manager->removeContact(QContactId::fromString(source))) {
-            qWarning() << "Fail to remove source" << source;
-            result = false;
-        }
-    }
-
-    return result;
-}
-
-bool ButeoImport::commit()
-{
-    Q_ASSERT(m_accountToProfiles.isEmpty());
-
-    // update new favorites
-    matchFavorites();
-
-    // remove old sources
-    QStringList oldSources;
-    QMap<QString, quint32> srcs = sources();
-
-    for(QMap<QString, uint>::const_iterator i = srcs.begin();
-        i != srcs.end();
-        i++) {
-        if (i.value() == 0) {
-            qDebug() << "Remove source" << i.key();
-            oldSources << i.key();
-        }
-    }
-    removeSources(oldSources);
-
-    // all accounts synced
-    m_importLock.unlock();
-
-    // update settings key
-    QSettings settings;
-    settings.setValue(SETTINGS_BUTEO_KEY, true);
-    settings.sync();
-
-    // disable address-book-service safe-mode
-    QDBusMessage setSafeMode = QDBusMessage::createMethodCall("com.canonical.pim",
-                                                              "/com/canonical/pim/AddressBook",
-                                                              "org.freedesktop.DBus.Properties",
-                                                              "Set");
-    QList<QVariant> args;
-    args << "com.canonical.pim.AddressBook"
-         << "safeMode"
-         << QVariant::fromValue(QDBusVariant(false));
-    setSafeMode.setArguments(args);
-    QDBusReply<void> reply = QDBusConnection::sessionBus().call(setSafeMode);
-    if (reply.error().isValid()) {
-        qWarning() << "Fail to disable safe-mode" << reply.error().message();
-    } else {
-        qDebug() << "Server safe mode disabled";
-    }
-
-    // WORKAROUND: wait 4 secs to fire update done, this is necessary because the contacts will be set as favorite
-    // just after the signal be fired and the changes can not have the same timestamp that the creation
-    QTimer::singleShot(4000, this, SIGNAL(updated()));
-    return true;
-}
-
-bool ButeoImport::rollback()
-{
-    // remove all profiles and new sources
-    Q_FOREACH(const QString &profile, m_failToSyncProfiles) {
-        removeProfile(profile);
-    }
-    m_failToSyncProfiles.clear();
-    return true;
-}
-
-void ButeoImport::onError(const QString &accountName, int errorCode)
-{
-    m_lastError = ABUpdateModule::ImportError(errorCode);
-    Q_EMIT updateError(accountName, m_lastError);
-}
-
-bool ButeoImport::requireInternetConnection()
-{
-    return true;
-}
-
-bool ButeoImport::canUpdate()
-{
-    if (!prepareButeo()) {
-        qWarning() << "Fail to connect with contact sync service. We can not continue the upgrade";
-        return false;
-    }
-
-    // check for any running sync
-    QStringList syncs = runningSyncs();
-    if (!syncs.isEmpty()) {
-        qWarning() << "Sync running" << syncs << "no way to check for outdated information";
-        return false;
-    }
-
-    return true;
-}
-
-ButeoImport::ImportError ButeoImport::lastError() const
-{
-    return m_lastError;
-}
-
-void ButeoImport::onProfileChanged(const QString &profileName, int changeType, const QString &profileAsXml)
-{
-    Q_UNUSED(profileAsXml);
-    /*
-    *      0 (ADDITION): Profile was added.
-    *      1 (MODIFICATION): Profile was modified.
-    *      2 (DELETION): Profile was deleted.
-    */
-    switch(changeType) {
-    case 0:
-        // profile created sync should start soon
-        qDebug() << "Profile created" << profileName;
-        break;
-    case 1:
-        break;
-    case 2:
-        {
-            quint32 accountId = m_initialAccountToProfiles.key(profileName, 0);
-            if (accountId > 0) {
-                qDebug() << "Profile removed" << accountId << profileName;
-                m_pendingAccountToProfiles.remove(accountId);
-                if (m_pendingAccountToProfiles.isEmpty()) {
-                    // all accounts removed
-                    m_importLock.unlock();
-                }
-            }
-            break;
-        }
-    }
-}
-
-void ButeoImport::onSyncStatusChanged(const QString &profileName,
-                                      int status,
-                                      const QString &message,
-                                      int moreDetails)
-{
-    Q_UNUSED(message);
-    Q_UNUSED(moreDetails);
-
-    if (!m_pendingAccountToProfiles.values().contains(profileName)) {
-        qDebug() << "Profile not found" << profileName;
-        return;
-    }
-    quint32 accountId = m_pendingAccountToProfiles.key(profileName, 0);
-    qDebug() << "SyncStatus"
-             << "\n\tProfile:" << profileName
-             << "\n\tAccount:" << accountId
-             << "\n\tStatus:" << status
-             << "\n\tMessage:" << message
-             << "\n\tDetails:" << moreDetails;
-    /*
-    *      0 (QUEUED): Sync request has been queued or was already in the
-    *          queue when sync start was requested.
-    *      1 (STARTED): Sync session has been started.
-    *      2 (PROGRESS): Sync session is progressing.
-    *      3 (ERROR): Sync session has encountered an error and has been stopped,
-    *          or the session could not be started at all.
-    *      4 (DONE): Sync session was successfully completed.
-    *      5 (ABORTED): Sync session was aborted.
-    */
-    switch(status) {
-    case 0:
-    case 1:
-    case 2:
-        return;
-    case 3:
-        qWarning() << "Sync error for account:" << accountId  << "and profile" << profileName;
-        m_failToSyncProfiles << profileName;
-        m_lastError = parseError(moreDetails);
-        break;
-    case 4:
-        qDebug() << "Sync finished for account:" << accountId  << "and profile" << profileName;
-        break;
-    case 5:
-        qWarning() << "Sync aborted for account:" << accountId  << "and profile" << profileName;
-        m_failToSyncProfiles << profileName;
-        break;
-    }
-
-    if (accountId > 0) {
-        m_pendingAccountToProfiles.remove(accountId);
-        if (m_pendingAccountToProfiles.isEmpty()) {
-            qDebug() << "All accounts has fineshed the sync, number of accounts that fail to sync:" << m_failToSyncProfiles.size();
-            if (m_failToSyncProfiles.isEmpty()) {
-                Q_EMIT updated();
-            } else {
-                QMetaObject::invokeMethod(this, "onError", Qt::QueuedConnection,
-                                          Q_ARG(QString, ""), Q_ARG(int, m_lastError));
-            }
-        }
-    }
-}

=== removed file 'updater/ab-update-buteo-import.h'
--- updater/ab-update-buteo-import.h	2015-09-29 14:37:03 +0000
+++ updater/ab-update-buteo-import.h	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of address-book-service.
- *
- * sync-monitor 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 <QtCore/QObject>
-#include <QtCore/QMap>
-#include <QtCore/QMutex>
-#include <QtCore/QEventLoop>
-#include <QtDBus/QDBusInterface>
-
-#include "ab-update-module.h"
-
-class ButeoImport : public ABUpdateModule
-{
-    Q_OBJECT
-public:
-    ButeoImport(QObject *parent = 0);
-    ~ButeoImport();
-
-    QString name() const override;
-    bool needsUpdate() override;
-    bool prepareToUpdate() override;
-    bool update() override;
-    bool requireInternetConnection() override;
-    bool canUpdate() override;
-    bool commit() override;
-    bool rollback() override;
-    ImportError lastError() const override;
-
-private Q_SLOTS:
-    void onProfileChanged(const QString &profileName, int changeType, const QString &profileAsXml);
-    void onSyncStatusChanged(const QString &aProfileName, int aStatus, const QString &aMessage, int aMoreDetails);
-    void onError(const QString &accountName, int errorCode);
-
-private:
-    QScopedPointer<QDBusInterface> m_buteoInterface;
-    QMap<quint32, QString> m_initialAccountToProfiles;
-    QMap<quint32, QString> m_pendingAccountToProfiles;
-    QStringList m_failToSyncProfiles;
-    QMutex m_importLock;
-    ImportError m_lastError;
-
-    QMap<QString, quint32> sources() const;
-    QMap<quint32, QString> createProfileForAccounts(QList<quint32> ids);
-    bool prepareButeo();
-    bool createAccounts(QList<quint32> ids);
-    bool removeProfile(const QString &profileId);
-    bool buteoRemoveProfile(const QString &profileId) const;
-    bool removeSources(const QStringList &sources);
-
-    bool loadAccounts(QList<quint32> &accountsToUpdate, QList<quint32> &newAccounts);
-    bool enableContactsService(quint32 accountId);
-    QString accountName(quint32 accountId);
-    QStringList runningSyncs() const;
-    QString profileName(const QString &xml) const;
-    QString profileName(quint32 accountId) const;
-    bool startSync(const QString &profile) const;
-    bool matchFavorites();
-    ImportError parseError(int errorCode) const;
-};

=== removed file 'updater/ab-update-module.cpp'
--- updater/ab-update-module.cpp	2015-09-03 19:09:36 +0000
+++ updater/ab-update-module.cpp	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of address-book-service.
- *
- * sync-monitor 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 "ab-update-module.h"
-
-ABUpdateModule::ABUpdateModule(QObject *parent)
-    : QObject(parent)
-{
-}
-
-ABUpdateModule::~ABUpdateModule()
-{
-}

=== removed file 'updater/ab-update-module.h'
--- updater/ab-update-module.h	2015-09-29 14:15:42 +0000
+++ updater/ab-update-module.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of address-book-service.
- *
- * sync-monitor 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/>.
- */
-
-#pragma once
-#include <QtCore/QObject>
-
-class ABUpdateModule : public QObject
-{
-    Q_OBJECT
-    Q_ENUMS(ImportError)
-
-public:
-    enum ImportError {
-        ApplicationAreadyUpdated = 0,
-        ConnectionError,
-        FailToConnectWithButeo,
-        FailToCreateButeoProfiles,
-        FailToAuthenticate,
-        InernalError,
-        OnlineAccountNotFound,
-        SyncAlreadyRunning,
-        SyncError
-    };
-
-    ABUpdateModule(QObject *parent = 0);
-    ~ABUpdateModule() override;
-
-    virtual QString name() const = 0;
-    virtual bool needsUpdate() = 0;
-    virtual bool prepareToUpdate() = 0;
-    virtual bool update() = 0;
-    virtual bool canUpdate() = 0;
-    virtual bool requireInternetConnection() = 0;
-    virtual bool commit() = 0;
-    virtual bool rollback() = 0;
-    virtual ImportError lastError() const = 0;
-
-Q_SIGNALS:
-    void updated();
-    void updateError(const QString &accountName,  ABUpdateModule::ImportError errorCode);
-};

=== removed file 'updater/ab-update.cpp'
--- updater/ab-update.cpp	2015-09-29 14:37:03 +0000
+++ updater/ab-update.cpp	1970-01-01 00:00:00 +0000
@@ -1,366 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of address-book-service.
- *
- * sync-monitor 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 "ab-update.h"
-#include "ab-update-module.h"
-#include "ab-update-buteo-import.h"
-#include "ab-notify-message.h"
-#include "ab-i18n.h"
-
-#include <QtCore/QDebug>
-#include <QtCore/QTimer>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtNetwork/QNetworkConfiguration>
-
-#define TRANSFER_ICON           "/usr/share/icons/suru/status/scalable/transfer-progress.svg"
-#define TRANSFER_ICON_PAUSED    "/usr/share/icons/suru/status/scalable/transfer-paused.svg"
-#define TRANSFER_ICON_ERROR     "/usr/share/icons/suru/status/scalable/transfer-error.svg"
-
-
-ABUpdate::ABUpdate(QObject *parent)
-    : QObject(parent),
-      m_netManager(new QNetworkConfigurationManager),
-      m_needsUpdate(false),
-      m_isRunning(false),
-      m_activeModule(-1),
-      m_skipNetworkTest(false),
-      m_silenceMode(false),
-      m_lockFile(QDir::tempPath() + "/address-book-updater.lock")
-{
-    // load update modules (this can be a plugin system in the future)
-    m_updateModules << new ButeoImport;
-    m_lockFile.setStaleLockTime(0);
-}
-
-ABUpdate::~ABUpdate()
-{
-    qDeleteAll(m_updateModules);
-}
-
-QList<ABUpdateModule*> ABUpdate::needsUpdate() const
-{
-    QList<ABUpdateModule*> result;
-    Q_FOREACH(ABUpdateModule *module, m_updateModules) {
-        bool mNeedsUpdate = module->needsUpdate();
-        qDebug() << "Check if module needs update" << module->name() << ":" << mNeedsUpdate;
-        if (mNeedsUpdate) {
-            result << module;
-        }
-    }
-    return result;
-}
-
-bool ABUpdate::isRunning()
-{
-    if (m_lock.tryLock()) {
-        m_lock.unlock();
-        return false;
-    }
-    return true;
-}
-
-void ABUpdate::skipNetworkTest()
-{
-    m_skipNetworkTest = true;
-}
-
-void ABUpdate::setSilenceMode(bool flag)
-{
-    m_silenceMode = flag;
-}
-
-void ABUpdate::startUpdate()
-{
-    qDebug() << "Start update...";
-    if (!m_lockFile.tryLock()) {
-        qWarning() << "Lock file is locked. Removing it...";
-        m_lockFile.removeStaleLockFile();
-    }
-
-    if (m_waitingForIntenert) {
-        m_waitingForIntenert = false;
-        m_netManager->disconnect(this);
-    }
-
-    if (isRunning()) {
-        qWarning() << "Update already running.";
-        if (!m_silenceMode) {
-            ABNotifyMessage *msg = new ABNotifyMessage(true, this);
-            //if force is set and the app is waiting for internet continue anyway
-            msg->show(_("Account update"),
-                      QString(_("%1 contact sync account upgrade already in progress")).arg("Google"),
-                      TRANSFER_ICON);
-        }
-        return;
-    }
-
-    // check if any module needs a upgrade
-    QList<ABUpdateModule*> modulesToUpdate = needsUpdate();
-    if (modulesToUpdate.isEmpty()) {
-        qDebug() << "No module to update.";
-        notifyDone();
-        return;
-    }
-
-    m_lock.lock();
-    m_modulesToUpdate = modulesToUpdate;
-    qDebug() << "Modules to update" << m_modulesToUpdate.size();
-    if (isOnline(false)) {
-        notifyStart();
-    } else {
-        qWarning() << "No internet abort";
-        notifyNoInternet();
-        updateNextModule();
-    }
-}
-
-void ABUpdate::startUpdateWhenConnected()
-{
-    qDebug() << "Start update when connected...";
-
-    if (isRunning()) {
-        qWarning() << "Update already running.";
-        return;
-    }
-
-    if (isOnline(true)) {
-        startUpdate();
-    } else {
-        notifyNoInternet();
-        waitForInternet();
-    }
-}
-
-void ABUpdate::startUpdate(ABUpdateModule *module)
-{
-    qDebug() << "Start update for" << module->name();
-    m_activeModule = m_updateModules.indexOf(module);
-    if (!module->canUpdate()) {
-        qWarning() << "Module can not be updated" << module->name();
-        onModuleUpdateError("", ABUpdateModule::InernalError);
-    } else {
-        if (!module->prepareToUpdate()) {
-            qWarning() << "Fail to prepare to update:" << module->name();
-            updateNextModule();
-        } else {
-            connect(module,
-                    SIGNAL(updated()),
-                    SLOT(onModuleUpdated()));
-            connect(module,
-                    SIGNAL(updateError(QString,  ABUpdateModule::ImportError)),
-                    SLOT(onModuleUpdateError(QString,  ABUpdateModule::ImportError)));
-            module->update();
-        }
-    }
-}
-
-bool ABUpdate::isOnline(bool checkConnectionType) const
-{
-    if (m_skipNetworkTest) {
-        return true;
-    }
-
-    if (!m_netManager->isOnline()) {
-        return false;
-    } else if (checkConnectionType) {
-        QNetworkConfiguration::BearerType bearerType = m_netManager->defaultConfiguration().bearerType();
-        return ((bearerType == QNetworkConfiguration::BearerWLAN) ||
-                (bearerType == QNetworkConfiguration::BearerEthernet));
-    } else {
-        return true;
-    }
-}
-
-void ABUpdate::waitForInternet()
-{
-    qDebug() << "Not internet connection wait before start upgrade";
-    m_waitingForIntenert = true;
-    connect(m_netManager.data(),
-            SIGNAL(onlineStateChanged(bool)),
-            SLOT(onOnlineStateChanged()));
-    connect(m_netManager.data(),
-            SIGNAL(updateCompleted()),
-            SLOT(onOnlineStateChanged()));
-    connect(m_netManager.data(),
-            SIGNAL(configurationAdded(QNetworkConfiguration)),
-            SLOT(onOnlineStateChanged()));
-    connect(m_netManager.data(),
-            SIGNAL(configurationChanged(QNetworkConfiguration)),
-            SLOT(onOnlineStateChanged()));
-    connect(m_netManager.data(),
-            SIGNAL(configurationRemoved(QNetworkConfiguration)),
-            SLOT(onOnlineStateChanged()));
-}
-
-QString ABUpdate::errorMessage(ABUpdateModule::ImportError error) const
-{
-    switch (error)
-    {
-    case ABUpdateModule::ApplicationAreadyUpdated:
-        return _("Contacts app is updated already!");
-    case ABUpdateModule::ConnectionError:
-        return _("Fail to connect to internet!");
-    case ABUpdateModule::FailToConnectWithButeo:
-        return _("Fail to connect to contact sync service!");
-    case ABUpdateModule::FailToCreateButeoProfiles:
-        return _("Fail to create sync profile!");
-    case ABUpdateModule::FailToAuthenticate:
-        return _("Fail to authenticate!");
-    case ABUpdateModule::InernalError:
-        return _("Internal error during the sync!");
-    case ABUpdateModule::OnlineAccountNotFound:
-        return _("Online account not found!");
-    case ABUpdateModule::SyncAlreadyRunning:
-        return _("Update already in progress!");
-    case ABUpdateModule::SyncError:
-    default:
-        return _("Fail to sync contacts!");
-    }
-}
-
-void ABUpdate::updateNextModule()
-{
-    qDebug() << "Update next module" << m_modulesToUpdate.size();
-    if (m_modulesToUpdate.isEmpty()) {
-        notifyDone();
-    } else {
-        startUpdate(m_modulesToUpdate.takeFirst());
-    }
-}
-
-
-void ABUpdate::cancelUpdate()
-{
-}
-
-void ABUpdate::onModuleUpdated()
-{
-    ABUpdateModule *module = m_updateModules.at(m_activeModule);
-    module->disconnect(this);
-    if (!module->commit()) {
-        qDebug() << "Fail to commit final changes for module" << module->name();
-        onModuleUpdateError("", ABUpdateModule::InernalError);
-        return;
-    }
-
-    qDebug() << "Update complete for:" << module->name();
-    if (m_silenceMode) {
-        updateNextModule();
-    } else {
-        ABNotifyMessage *msg = new ABNotifyMessage(true, this);
-        msg->show(_("Account update"),
-                  _("Contact sync upgrade complete."),
-                  TRANSFER_ICON);
-        connect(msg, SIGNAL(messageClosed()), SLOT(updateNextModule()));
-    }
-}
-
-void ABUpdate::onModuleUpdateError(const QString &accountName, ABUpdateModule::ImportError error)
-{
-    ABUpdateModule *module = m_updateModules.at(m_activeModule);
-    module->disconnect(this);
-
-    qWarning() << "Fail to update module" << module->name() << accountName << module->lastError();
-    module->rollback();
-
-    if (m_silenceMode) {
-        updateNextModule();
-    } else {
-        ABNotifyMessage *msg = new ABNotifyMessage(true, this);
-        msg->setProperty("MODULE", QVariant::fromValue<QObject*>(module));
-        msg->askYesOrNo(_("Fail to update"),
-                        QString(_("%1.\nDo you want to retry now?")).arg(errorMessage(error)),
-                        TRANSFER_ICON_ERROR);
-        connect(msg, SIGNAL(questionAccepted()), this, SLOT(onModuleUpdateRetry()));
-        connect(msg, SIGNAL(questionRejected()), SLOT(onModuleUpdateNoRetry()));
-        connect(msg, SIGNAL(messageClosed()), SLOT(onModuleUpdateNoRetry()));
-    }
-}
-
-void ABUpdate::onModuleUpdateRetry()
-{
-    QObject *sender = QObject::sender();
-    disconnect(sender);
-
-    ABUpdateModule *module = qobject_cast<ABUpdateModule*>(sender->property("MODULE").value<QObject*>());
-    m_modulesToUpdate << module;
-    updateNextModule();
-}
-
-void ABUpdate::onModuleUpdateNoRetry()
-{
-    QObject *sender = QObject::sender();
-    disconnect(sender);
-
-    ABNotifyMessage *msg = new ABNotifyMessage(true, this);
-    msg->show(_("Fail to update"),
-              _("To retry later open Contacts app and press the sync button."),
-              TRANSFER_ICON);
-    connect(msg, SIGNAL(messageClosed()), SLOT(updateNextModule()));
-}
-
-void ABUpdate::onOnlineStateChanged()
-{
-    if (isOnline(true)) {
-        qDebug() << "Network is online resume upddate process.";
-        m_waitingForIntenert = false;
-        m_netManager->disconnect(this);
-        QTimer::singleShot(5000, this, SLOT(continueUpdateWithInternet()));
-    }
-}
-
-void ABUpdate::continueUpdateWithInternet()
-{
-    if (isOnline(true)) {
-        startUpdate();
-    } else {
-        waitForInternet();
-    }
-}
-
-void ABUpdate::notifyStart()
-{
-    if (m_silenceMode) {
-        updateNextModule();
-    } else {
-        ABNotifyMessage *msg = new ABNotifyMessage(true, this);
-        msg->show(_("Account update"),
-                  QString(_("%1 contact sync account upgrade in progress")).arg("Google"),
-                  TRANSFER_ICON);
-        connect(msg, SIGNAL(messageClosed()), SLOT(updateNextModule()));
-    }
-}
-
-void ABUpdate::notifyNoInternet()
-{
-    if (!m_silenceMode) {
-        ABNotifyMessage *msg = new ABNotifyMessage(true, this);
-        msg->show(_("Account update"),
-                  QString(_("%1 contact sync account needs upgrade. Please connect with the internet.")).arg("Google"),
-                  TRANSFER_ICON_PAUSED);
-    }
-}
-
-void ABUpdate::notifyDone()
-{
-    m_activeModule = -1;
-    m_lock.unlock();
-    qDebug() << "Send update done";
-    Q_EMIT updateDone();
-}

=== removed file 'updater/ab-update.h'
--- updater/ab-update.h	2015-09-18 13:24:00 +0000
+++ updater/ab-update.h	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of address-book-service.
- *
- * sync-monitor 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/>.
- */
-
-#pragma once
-
-#include "ab-update-module.h"
-
-#include <QtCore/QObject>
-#include <QtCore/QMutex>
-#include <QtCore/QLockFile>
-#include <QtCore/QScopedPointer>
-#include <QtNetwork/QNetworkConfigurationManager>
-
-
-class ABUpdate : public QObject
-{
-    Q_OBJECT
-public:
-    ABUpdate(QObject *parent = 0);
-    ~ABUpdate() override;
-
-    QList<ABUpdateModule*> needsUpdate() const;
-    bool isRunning();
-
-    // test
-    void skipNetworkTest();
-    void setSilenceMode(bool flag);
-
-public Q_SLOTS:
-    void startUpdate();
-    void startUpdateWhenConnected();
-    void cancelUpdate();
-
-Q_SIGNALS:
-    void onNeedsUpdateChanged();
-    void onIsRunningChanged();
-    void updateDone();
-    void updateError(const QString &accountName, ABUpdateModule::ImportError);
-
-private Q_SLOTS:
-    void onModuleUpdated();
-    void onModuleUpdateError(const QString &accountName, ABUpdateModule::ImportError error);
-    void onOnlineStateChanged();
-    void continueUpdateWithInternet();
-    void updateNextModule();
-    void onModuleUpdateRetry();
-    void onModuleUpdateNoRetry();
-
-private:
-    QScopedPointer<QNetworkConfigurationManager> m_netManager;
-    QList<ABUpdateModule*> m_updateModules;
-    QList<ABUpdateModule*> m_modulesToUpdate;
-    QMutex m_lock;
-    QLockFile m_lockFile;
-    bool m_needsUpdate;
-    bool m_isRunning;
-    bool m_waitingForIntenert;
-    int m_activeModule;
-    bool m_skipNetworkTest;
-    bool m_silenceMode;
-
-    void notifyStart();
-    void notifyNoInternet();
-    void notifyDone();
-
-    void startUpdate(ABUpdateModule *module);
-    bool isOnline(bool checkConnectionType) const;
-    void waitForInternet();
-    QString errorMessage(ABUpdateModule::ImportError error) const;
-
-};
-

=== removed file 'updater/main.cpp'
--- updater/main.cpp	2015-09-16 20:57:19 +0000
+++ updater/main.cpp	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of address-book-service.
- *
- * sync-monitor 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 <QtCore/QCoreApplication>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QTimer>
-#include <QtCore/QDebug>
-#include <QtCore/QDateTime>
-#include <QtDBus/QDBusConnection>
-
-#include "ab-update-adaptor.h"
-#include "ab-update.h"
-#include "dbus-service-defs.h"
-#include "config.h"
-
-namespace C {
-#include <libintl.h>
-}
-
-int main(int argc, char **argv)
-{
-    QCoreApplication::setOrganizationName(SETTINGS_ORG);
-    QCoreApplication::setApplicationName("AddressBookUpdate");
-
-    setlocale(LC_ALL, "");
-    C::bindtextdomain(GETTEXT_PACKAGE, GETTEXT_LOCALEDIR);
-    C::bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-
-    QCoreApplication app(argc, argv);
-
-    // AddressBook updater
-    QScopedPointer<ABUpdate> abUpdate(new ABUpdate);
-    QScopedPointer<ABUpdateAdaptor> abUpdateAdaptor(new ABUpdateAdaptor(abUpdate.data()));
-
-
-    // connect to D-Bus and register as an object:
-    QDBusConnection connection = QDBusConnection::sessionBus();
-    bool ret = connection.registerService(CPIM_UPDATE_SERVICE_NAME);
-    if (!ret) {
-        qWarning() << "Fail to register service:" << CPIM_UPDATE_SERVICE_NAME;
-        return -1;
-    }
-
-    ret = connection.registerObject(CPIM_UPDATE_OBJECT_PATH, abUpdate.data());
-    if (!ret) {
-        qWarning() << "Fail to register object:" << CPIM_UPDATE_SERVICE_NAME;
-        return -2;
-    }
-
-    if (app.arguments().contains("--sync")) {
-        QTimer::singleShot(0, abUpdate.data(), SLOT(startUpdateWhenConnected()));
-    }
-    QObject::connect(abUpdate.data(), SIGNAL(updateDone()),
-                     &app, SLOT(quit()));
-
-    qDebug() << "Updater started" << QDateTime::currentDateTime();
-    app.exec();
-    qDebug() << "Updater finished" << QDateTime::currentDateTime();
-
-    connection.unregisterObject(CPIM_UPDATE_OBJECT_PATH);
-    connection.unregisterService(CPIM_UPDATE_SERVICE_NAME);
-}

=== modified file 'upstart/CMakeLists.txt'
--- upstart/CMakeLists.txt	2015-09-03 17:03:46 +0000
+++ upstart/CMakeLists.txt	2015-10-07 13:33:41 +0000
@@ -1,7 +1,5 @@
 configure_file(address-book-service.conf.in ${CMAKE_CURRENT_BINARY_DIR}/address-book-service.conf)
-configure_file(address-book-updater.conf.in ${CMAKE_CURRENT_BINARY_DIR}/address-book-updater.conf)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/address-book-service.conf
-              ${CMAKE_CURRENT_BINARY_DIR}/address-book-updater.conf
         DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/upstart/sessions/)
 

=== removed file 'upstart/address-book-updater.conf.in'
--- upstart/address-book-updater.conf.in	2015-09-16 01:06:33 +0000
+++ upstart/address-book-updater.conf.in	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-description "address-book-update"
-author "Renato Araujo Oliveira Filho <[e-mail]>"
-
-start on started address-book-service and started msyncd
-stop on runlevel [06]
-
-exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/address-book-updater --sync