Merge lp:~renatofilho/buteo-sync-plugins-contacts/no-default-account into lp:buteo-sync-plugins-contacts

[Renato Araujo Oliveira Filho]

Does not set new sources as default.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:9
http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-vivid-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-vivid-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-vivid-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-vivid-i386-ci/42

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/buteo-sync-plugins-contacts-ci/42/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

[lp:~renatofilho/buteo-sync-plugins-contacts/no-default-account]

10. By Renato Araujo Oliveira Filho on 2015-12-09

Create a workaround to avoid problems with bug #1517252.

11. By Renato Araujo Oliveira Filho on 2015-12-11

Abort sync and remove syncTarget if the account get removed while the sync is running.

=== modified file 'buteo-contact-client/UAuth.cpp'
--- buteo-contact-client/UAuth.cpp	2015-10-15 19:20:20 +0000
+++ buteo-contact-client/UAuth.cpp	2015-12-11 14:23:51 +0000
@@ -94,6 +94,7 @@
             LOG_DEBUG("Account is not created... Cannot authenticate");
             return false;
         }
+        connect(d->mAccount.data(), SIGNAL(removed()), SIGNAL(accountRemoved()));
         mDisplayName = d->mAccount->displayName();
     }
 

=== modified file 'buteo-contact-client/UAuth.h'
--- buteo-contact-client/UAuth.h	2015-07-21 19:15:51 +0000
+++ buteo-contact-client/UAuth.h	2015-12-11 14:23:51 +0000
@@ -55,6 +55,7 @@
 signals:
     void success();
     void failed();
+    void accountRemoved();
 
 protected:
     QString mToken;

=== modified file 'buteo-contact-client/UContactsBackend.cpp'
--- buteo-contact-client/UContactsBackend.cpp	2015-10-15 19:20:20 +0000
+++ buteo-contact-client/UContactsBackend.cpp	2015-12-11 14:23:51 +0000
@@ -80,6 +80,15 @@
     filter.setValue(QContactType::TypeGroup);
 
     QList<QContact> sources = iMgr->contacts(filter);
+
+    // WORKAROUND: sometimes EDS crash while querying for sources we use a second
+    // query to make sure that the source does not exists.
+    // The crash happens on sqlite3 library, check bug #1517252 for more info
+    // FIXME: Remove this when bug #1517252 get fixed.
+    if (sources.isEmpty()) {
+        sources = iMgr->contacts(filter);
+    }
+
     Q_FOREACH(const QContact &contact, sources) {
         QContactExtendedDetail exd = UContactsCustomDetail::getCustomField(contact,
                                                                            "ACCOUNT-ID");
@@ -106,12 +115,6 @@
         label.setLabel(syncTarget + " ");
         contact.saveDetail(&label);
 
-        // set the new source as default
-        QContactExtendedDetail isDefault;
-        isDefault.setName("IS-PRIMARY");
-        isDefault.setData(true);
-        contact.saveDetail(&isDefault);
-
         // Link source with account
         QContactExtendedDetail accountId;
         accountId.setName("ACCOUNT-ID");
@@ -508,6 +511,13 @@
     }
 }
 
+void UContactsBackend::removeSyncTarget()
+{
+    if (iMgr && !mSyncTargetId.isEmpty()) {
+        iMgr->removeContact(QContactId::fromString(QString("qtcontacts:galera::source@%1").arg(mSyncTargetId)));
+    }
+}
+
 QString
 UContactsBackend::getRemoteId(const QContact &contact)
 {

=== modified file 'buteo-contact-client/UContactsBackend.h'
--- buteo-contact-client/UContactsBackend.h	2015-09-14 18:29:11 +0000
+++ buteo-contact-client/UContactsBackend.h	2015-12-11 14:23:51 +0000
@@ -213,6 +213,10 @@
      */
     void reloadCache();
 
+    /*!
+     * \brief Remove backend source
+     */
+    void removeSyncTarget();
 
     QContactManager *manager() const;
 

=== modified file 'buteo-contact-client/UContactsClient.cpp'
--- buteo-contact-client/UContactsClient.cpp	2015-10-15 19:20:20 +0000
+++ buteo-contact-client/UContactsClient.cpp	2015-12-11 14:23:51 +0000
@@ -142,6 +142,7 @@
     }
 
     // sign in.
+    connect(d->mAuth, SIGNAL(accountRemoved()), SLOT(onAccountRemoved()));
     connect(d->mAuth, SIGNAL(success()), SLOT(start()));
     connect(d->mAuth, SIGNAL(failed()), SLOT(onAuthenticationError()));
 
@@ -269,6 +270,18 @@
     emit syncFinished (Sync::SYNC_AUTHENTICATION_FAILURE);
 }
 
+void UContactsClient::onAccountRemoved()
+{
+    Q_D(UContactsClient);
+
+    LOG_WARNING("ABORT: Account removed while syncing");
+    d->mAborted = true;
+    d->mRemoteSource->abort();
+    d->mContactBackend->removeSyncTarget();
+
+    emit syncFinished(Sync::SYNC_ABORTED);
+}
+
 bool
 UContactsClient::start()
 {

=== modified file 'buteo-contact-client/UContactsClient.h'
--- buteo-contact-client/UContactsClient.h	2015-08-04 18:54:37 +0000
+++ buteo-contact-client/UContactsClient.h	2015-12-11 14:23:51 +0000
@@ -140,6 +140,7 @@
 private slots:
     bool start();
     void onAuthenticationError();
+    void onAccountRemoved();
     void onStateChanged(int progress);
     void onSyncFinished(Sync::SyncStatus status);
     void fireSyncFinishedSucessfully();