Merge lp:~renatofilho/address-book-service/fix-1222994 into lp:address-book-service

[Renato Araujo Oliveira Filho]

Fixed service respaw on QContact plugin.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

this doesn't fix the bug but does change the behavior. if I stop address-book-service the contacts view still shows the existing contacts which is different (the list used to be cleared). But then if I click on a contact to see it's details nothing happens. I would have expected an error or expected the service to be auto started by dbus activation when I'm requesting a detail.

Also, if service is stopped and you try to add a new contact the UI just spins an animation forever when you press the save button. It should either display an error or auto start the service via dbus activation

review: Needs Fixing

[lp:~renatofilho/address-book-service/fix-1222994]

68. By Renato Araujo Oliveira Filho on 2013-09-11

Clear contact list if the service disappear;
Re-start the service if the service disappear;

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'qcontacts/contacts-service.cpp'
--- qcontacts/contacts-service.cpp	2013-09-10 18:44:50 +0000
+++ qcontacts/contacts-service.cpp	2013-09-11 22:08:54 +0000
@@ -82,13 +82,11 @@
 {
     while(!m_pendingRequests.isEmpty()) {
         QPointer<QContactAbstractRequest> request = m_pendingRequests.takeFirst();
-        if (request) {
-            QContactManagerEngine::updateRequestState(request,
-                                                      QContactAbstractRequest::CanceledState);
-        }
+        request->cancel();
+        request->waitForFinished();
     }
+    m_runningRequests.clear();
 
-    Q_ASSERT(m_runningRequests.size() == 0);
     delete m_serviceWatcher;
 }
 
@@ -98,10 +96,10 @@
     if (name == CPIM_SERVICE_NAME) {
         if (!newOwner.isEmpty()) {
             // service appear
-            QMetaObject::invokeMethod(this, "initialize", Qt::QueuedConnection);
+            initialize();
         } else if (!m_iface.isNull()) {
             // lost service
-            QMetaObject::invokeMethod(this, "deinitialize", Qt::QueuedConnection);
+            deinitialize();
         }
     }
 }
@@ -138,15 +136,32 @@
 
 void GaleraContactsService::deinitialize()
 {
+    Q_FOREACH(RequestData* rData, m_runningRequests) {
+        rData->cancel();
+        rData->request()->waitForFinished();
+        rData->setError(QContactManager::UnspecifiedError);
+    }
+
+    //clear contacts
+    Q_EMIT contactsRemoved(m_contactIds);
+
     if (!m_iface.isNull()) {
         m_id.clear();
         m_contacts.clear();
         m_contactIds.clear();
         m_relationships.clear();
         m_orderedRelationships.clear();
-        m_iface.clear();
         Q_EMIT serviceChanged();
     }
+
+    // this will make the service re-initialize
+    QDBusMessage result = m_iface->call("ping");
+    if (result.type() == QDBusMessage::ErrorMessage) {
+        qWarning() << result.errorName() << result.errorMessage();
+        m_serviceIsReady = false;
+    } else {
+        m_serviceIsReady = m_iface.data()->property("isReady").toBool();
+    }
 }
 
 bool GaleraContactsService::isOnline() const
@@ -156,9 +171,8 @@
 
 void GaleraContactsService::fetchContactsById(QtContacts::QContactFetchByIdRequest *request)
 {
-    qDebug() << Q_FUNC_INFO;
-
     if (!isOnline()) {
+        qWarning() << "Server is not online";
         RequestData::setError(request);
         return;
     }
@@ -184,9 +198,8 @@
 
 void GaleraContactsService::fetchContacts(QtContacts::QContactFetchRequest *request)
 {
-    qDebug() << Q_FUNC_INFO;
-
     if (!isOnline()) {
+        qWarning() << "Server is not online";
         RequestData::setError(request);
         return;
     }
@@ -238,8 +251,8 @@
 
 void GaleraContactsService::fetchContactsPage(RequestData *request)
 {
-    qDebug() << Q_FUNC_INFO;
     if (!isOnline() || !request->isLive()) {
+        qWarning() << "Server is not online";
         destroyRequest(request);
         return;
     }
@@ -264,8 +277,6 @@
 
 void GaleraContactsService::fetchContactsDone(RequestData *request, QDBusPendingCallWatcher *call)
 {
-    qDebug() << Q_FUNC_INFO;
-
     if (!request->isLive()) {
         destroyRequest(request);
         return;
@@ -319,7 +330,6 @@
 
 void GaleraContactsService::saveContact(QtContacts::QContactSaveRequest *request)
 {
-    qDebug() << Q_FUNC_INFO;
     QList<QContact> contacts = request->contacts();
     QStringList vcards = VCardParser::contactToVcard(contacts);
 
@@ -349,8 +359,8 @@
 }
 void GaleraContactsService::createContacts(QtContacts::QContactSaveRequest *request, QStringList &contacts)
 {
-    qDebug() << Q_FUNC_INFO;
     if (!isOnline()) {
+        qWarning() << "Server is not online";
         RequestData::setError(request);
         return;
     }
@@ -375,8 +385,6 @@
 
 void GaleraContactsService::createContactsDone(RequestData *request, QDBusPendingCallWatcher *call)
 {
-    qDebug() << Q_FUNC_INFO;
-
     if (!request->isLive()) {
         destroyRequest(request);
         return;
@@ -408,6 +416,7 @@
 void GaleraContactsService::removeContact(QContactRemoveRequest *request)
 {
     if (!isOnline()) {
+        qWarning() << "Server is not online";
         RequestData::setError(request);
         return;
     }
@@ -460,6 +469,7 @@
 {
     qDebug() << Q_FUNC_INFO;
     if (!isOnline()) {
+        qWarning() << "Server is not online";
         RequestData::setError(request);
         return;
     }
@@ -536,14 +546,18 @@
 void GaleraContactsService::addRequest(QtContacts::QContactAbstractRequest *request)
 {
     qDebug() << Q_FUNC_INFO << request->state();
+
     if (!m_serviceIsReady) {
         m_pendingRequests << QPointer<QtContacts::QContactAbstractRequest>(request);
         return;
     }
+
     if (!isOnline()) {
+        qWarning() << "Server is not online";
         QContactManagerEngine::updateRequestState(request, QContactAbstractRequest::FinishedState);
         return;
     }
+
     Q_ASSERT(request->state() == QContactAbstractRequest::ActiveState);
     switch (request->type()) {
         case QContactAbstractRequest::ContactFetchRequest:
 
=== modified file 'src/addressbook-adaptor.cpp'
--- src/addressbook-adaptor.cpp	2013-06-20 13:18:10 +0000
+++ src/addressbook-adaptor.cpp	2013-09-11 22:08:54 +0000
@@ -103,4 +103,9 @@
     return m_addressBook->isReady();
 }
 
+bool AddressBookAdaptor::ping()
+{
+    return true;
+}
+
 } //namespace
 
=== modified file 'src/addressbook-adaptor.h'
--- src/addressbook-adaptor.h	2013-06-20 13:18:10 +0000
+++ src/addressbook-adaptor.h	2013-09-11 22:08:54 +0000
@@ -51,6 +51,9 @@
 "      <arg direction=\"out\" type=\"a(ss)\" name=\"errorMap\"/>\n"
 "    </signal>\n"
 "    <signal name=\"ready\"/>\n"
+"    <method name=\"ping\">\n"
+"      <arg direction=\"out\" type=\"b\"/>\n"
+"    </method>\n"
 "    <method name=\"availableSources\">\n"
 "      <arg direction=\"out\" type=\"a(sb)\"/>\n"
 "      <annotation value=\"SourceList\" name=\"com.trolltech.QtDBus.QtTypeName.Out0\"/>\n"
@@ -107,6 +110,7 @@
     QString linkContacts(const QStringList &contacts);
     bool unlinkContacts(const QString &parentId, const QStringList &contactsIds);
     bool isReady();
+    bool ping();
 
 Q_SIGNALS:
     void contactsAdded(const QStringList &ids);