Merge lp:~renatofilho/buteo-sync-plugins-contacts/rename-account-service into lp:buteo-sync-plugins-contacts

[Renato Araujo Oliveira Filho]

Append 'buteo' on online account files to avoid conflict with EDS files.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:7
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~renatofilho/buteo-sync-plugins-contacts/rename-account-service/+merge/273532/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-vivid-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-vivid-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-vivid-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-vivid-i386-ci/31

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/rename-account-service]

8. By Renato Araujo Oliveira Filho on 2015-10-06

Renamed uoa related service names, to avoid conflict with old services.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/rename-account-service]

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

Renamed online account service to 'google-contacts'.

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

Revert category name change.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/rename-account-service]

11. By Renato Araujo Oliveira Filho on 2015-10-14

Rename service id to avoid conflicts with EDS.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/rename-account-service]

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

Renamed sync profile teplate to the new service id name.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:12
http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-ci/36/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-vivid-amd64-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-vivid-armhf-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-vivid-i386-ci/36/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/rename-account-service]

13. By Renato Araujo Oliveira Filho on 2015-10-14

Fixed cmake with the new file name.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:13
http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-ci/37/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-vivid-amd64-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-vivid-armhf-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/buteo-sync-plugins-contacts-vivid-i386-ci/37/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/rename-account-service]

14. By Renato Araujo Oliveira Filho on 2015-10-14

Fixed typo on filename.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/rename-account-service]

15. By Renato Araujo Oliveira Filho on 2015-10-15

Updated missing string with the new service name.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/rename-account-service]

16. By Renato Araujo Oliveira Filho on 2015-10-15

Append a extra space in source name to avoid problems with syncevolution.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected?
NO

Is your branch in sync with latest trunk?
YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
YES

Did you successfully run all tests found in your component's Test Plan on device or emulator?
YES

If you changed the UI, was the change specified/approved by design?
NO UI CHANGE.

If you changed UI labels, did you update the pot file?
NO LABEL CHANGED

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
NO PACKAGE CHANGED

[Michael Sheldon (michael-sheldon)]

Code looks good

review: Approve

[lp:~renatofilho/buteo-sync-plugins-contacts/rename-account-service]

17. By Renato Araujo Oliveira Filho on 2015-10-15

Add log info message to be printed on log level 6;

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'accounts/CMakeLists.txt'
--- accounts/CMakeLists.txt	2015-07-09 15:57:07 +0000
+++ accounts/CMakeLists.txt	2015-10-15 19:20:43 +0000
@@ -1,5 +1,5 @@
 set(SERVICE_FILES
-     google-contacts.service
+    google-buteo-contacts.service
 )
 set(APPLICATION_FILES
     address-book-app.application

=== modified file 'accounts/address-book-app.application'
--- accounts/address-book-app.application	2015-07-09 15:57:07 +0000
+++ accounts/address-book-app.application	2015-10-15 19:20:43 +0000
@@ -4,7 +4,7 @@
   <desktop-entry>address-book-app.desktop</desktop-entry>
 
   <service-types>
-    <service-type id="contacts">
+    <service-type id="buteo-contacts">
       <description>Synchronize your contacts</description>
     </service-type>
   </service-types>

=== renamed file 'accounts/google-contacts.service' => 'accounts/google-buteo-contacts.service'
--- accounts/google-contacts.service	2015-07-09 15:57:07 +0000
+++ accounts/google-buteo-contacts.service	2015-10-15 19:20:43 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<service id="google-contacts">
-  <type>contacts</type>
+<service id="google-buteo-contacts">
+  <type>buteo-contacts</type>
   <name>Google Contacts</name>
   <provider>google</provider>
 </service>

=== modified file 'buteo-contact-client/UAuth.cpp'
--- buteo-contact-client/UAuth.cpp	2015-07-21 19:15:51 +0000
+++ buteo-contact-client/UAuth.cpp	2015-10-15 19:20:43 +0000
@@ -69,6 +69,11 @@
 {
     Q_D(UAuth);
 
+    if ((accountId == 0) || serviceName.isEmpty()) {
+        LOG_DEBUG("Invalid account id or service name:" << accountId << serviceName);
+        return false;
+    }
+
     d->mServiceName = serviceName;
     if (d->mAccountManager && d_ptr->mAccount) {
         LOG_DEBUG("GAuth already initialized");

=== modified file 'buteo-contact-client/UContactsBackend.cpp'
--- buteo-contact-client/UContactsBackend.cpp	2015-09-16 13:32:10 +0000
+++ buteo-contact-client/UContactsBackend.cpp	2015-10-15 19:20:43 +0000
@@ -97,7 +97,13 @@
         contact.setType(QContactType::TypeGroup);
 
         QContactDisplayLabel label;
-        label.setLabel(syncTarget);
+        //WORKAROUND: append a extra space in the end of the source name
+        //this is necessary to avoid conflict with old sources used by syncevolution
+        //SyncEvolution sync profile sync contacts from gooble based on the source name
+        //creating a new source with the same name could cause the sync to happen in the
+        //wrong source
+        //FIXME: remove this when syncevolution get removed from image
+        label.setLabel(syncTarget + " ");
         contact.saveDetail(&label);
 
         // set the new source as default
@@ -333,11 +339,11 @@
     QMap<int, QContactManager::Error> errors;
     QMap<int, UContactsStatus> statusMap;
 
-    if(iMgr->removeContacts(aContactIDList , &errors)) {
+    if(aContactIDList.isEmpty() || iMgr->removeContacts(aContactIDList , &errors)) {
         LOG_DEBUG("Successfully Removed all contacts ");
     }
     else {
-        LOG_WARNING("Failed Removing Contacts");
+        LOG_WARNING("Failed Removing Contacts" << errors);
     }
 
     // QContactManager will populate errorMap only for errors, but we use this as a status map,
@@ -356,8 +362,8 @@
         }
         else
         {
-            LOG_DEBUG("contact with id " << contactId << " and index " << i <<" is in error");
             QContactManager::Error errorCode = errors.value(i);
+            LOG_WARNING("Removing contact with id " << contactId << " and index " << i <<" is an error" << errorCode);
             status.errorCode = errorCode;
             statusMap.insert(i, status);
         }

=== modified file 'buteo-contact-client/UContactsClient.cpp'
--- buteo-contact-client/UContactsClient.cpp	2015-09-24 17:49:06 +0000
+++ buteo-contact-client/UContactsClient.cpp	2015-10-15 19:20:43 +0000
@@ -49,8 +49,13 @@
         : mAuth(0),
           mContactBackend(0),
           mRemoteSource(0),
+          mSlowSync(false),
+          mAborted(false),
           mServiceName(serviceName),
-          mAborted(false)
+          mProgress(0),
+          mAccountId(0),
+          mSyncDirection(Buteo::SyncProfile::SYNC_DIRECTION_TWO_WAY),
+          mConflictResPolicy(Buteo::SyncProfile::CR_POLICY_PREFER_REMOTE_CHANGES)
     {
     }
 
@@ -115,6 +120,7 @@
         return false;
     }
 
+    LOG_INFO ("Init sync for account:" << d->mAccountId << d->mServiceName);
     d->mAuth = crateAuthenticator(this);
     if (!d->mAuth || !d->mAuth->init(d->mAccountId, d->mServiceName)) {
         LOG_CRITICAL("Fail to create auth object");
@@ -135,8 +141,6 @@
         goto init_fail;
     }
 
-    d->mItemResults.insert(syncTargetId(), Buteo::DatabaseResults());
-
     // sign in.
     connect(d->mAuth, SIGNAL(success()), SLOT(start()));
     connect(d->mAuth, SIGNAL(failed()), SLOT(onAuthenticationError()));
@@ -150,7 +154,8 @@
     // Take necessary action when sync is finished
     connect(this,
             SIGNAL(syncFinished(Sync::SyncStatus)),
-            SLOT(onSyncFinished(Sync::SyncStatus)));
+            SLOT(onSyncFinished(Sync::SyncStatus)),
+            Qt::QueuedConnection);
 
     return true;
 
@@ -300,11 +305,13 @@
         return false;
     }
 
-    if (!d->mContactBackend->init(d->mAccountId, d->mAuth->accountDisplayName())) {
+    if (!d->mContactBackend->init(d->mAccountId,
+                                  d->mAuth->accountDisplayName())) {
         LOG_WARNING("Fail to init contact backend");
         return false;
     }
 
+    d->mItemResults.insert(syncTargetId(), Buteo::DatabaseResults());
     switch (d->mSyncDirection)
     {
     case Buteo::SyncProfile::SYNC_DIRECTION_TWO_WAY:
@@ -788,6 +795,8 @@
     FUNCTION_CALL_TRACE;
     Q_D(UContactsClient);
 
+    LOG_INFO("Sync finished with state:" << aState);
+
     switch(aState)
     {
         case Sync::SYNC_ERROR:

=== modified file 'google/GContactsClient.cpp'
--- google/GContactsClient.cpp	2015-07-21 19:15:51 +0000
+++ google/GContactsClient.cpp	2015-10-15 19:20:43 +0000
@@ -38,7 +38,7 @@
 
 #include "buteosyncfw_p.h"
 
-static const QString GOOGLE_CONTACTS_SERVICE          ("google-contacts");
+static const QString GOOGLE_CONTACTS_SERVICE          ("google-buteo-contacts");
 
 extern "C" GContactsClient* createPlugin(const QString& aPluginName,
                                          const Buteo::SyncProfile& aProfile,

=== modified file 'google/xmls/sync/CMakeLists.txt'
--- google/xmls/sync/CMakeLists.txt	2015-07-09 15:57:07 +0000
+++ google/xmls/sync/CMakeLists.txt	2015-10-15 19:20:43 +0000
@@ -1,3 +1,3 @@
-install(FILES google-contacts.xml
+install(FILES google-buteo-contacts.xml
     DESTINATION "/etc/buteo/profiles/sync"
 )

=== renamed file 'google/xmls/sync/google-contacts.xml' => 'google/xmls/sync/google-buteo-contacts.xml'
--- google/xmls/sync/google-contacts.xml	2015-07-17 13:52:41 +0000
+++ google/xmls/sync/google-buteo-contacts.xml	2015-10-15 19:20:43 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <profile type="sync" name="google-contacts">
     <key value="contacts" name="category"/>
-    <key value="google-contacts" name="remote_service_name"/>
+    <key value="google-buteo-contacts" name="remote_service_name"/>
     <key value="online" name="destinationtype"/>
     <key value="false" name="enabled"/>
     <key value="true" name="hidden"/>