Merge lp:~renatofilho/buteo-sync-plugins-contacts/new-code into lp:buteo-sync-plugins-contacts

[Renato Araujo Oliveira Filho]

Implemented buteo contacts sync plugin for google, heavily based on:
  - https://github.com/nemomobile-graveyard/buteo-sync-plugins-google
  - https://github.com/nemomobile/buteo-sync-plugins-social

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

6. By Renato Araujo Oliveira Filho on 2015-07-09

Added support for ringtones sync.
Fixed Notes parse.
Fixed Gender parse.

7. By Renato Araujo Oliveira Filho on 2015-07-09

Trunk merged.

8. By Renato Araujo Oliveira Filho on 2015-07-13

Create contact source linked with the online account id.

9. By Renato Araujo Oliveira Filho on 2015-07-14

Use online account display name as local address book name.

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

Update contact avatar with a empty string if its fail to download.

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

Added coverage support on cmake. (use with make lcov)
Write more unit tests.

12. By Renato Araujo Oliveira Filho on 2015-07-15

Increased test coverability.

13. By Renato Araujo Oliveira Filho on 2015-07-15

Check for "gd:etag" tag on photo link.

if a contact does not have a photo, then the photo link element has no gd:etag attribute.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

14. By Renato Araujo Oliveira Filho on 2015-07-16

Fixed avatar parse.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

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

Changed build to allow mock GContactImageUploader;
Created test for GContactImageUploader;

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

16. By Renato Araujo Oliveira Filho on 2015-07-16

Fix QContactOrganization parse.

17. By Renato Araujo Oliveira Filho on 2015-07-16

Set 60s as interval for sync on change.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

18. By Renato Araujo Oliveira Filho on 2015-07-17

Added 'remote_service_name' key into sync profile template.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

19. By Renato Araujo Oliveira Filho on 2015-07-19

Changed page result size from 50 to 30.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

I see that you've now marked the buteo-sync-plugins-contacts-google package as conflicting with evolution-data-server-online-accounts, is it not possible to name the buteo plugin differently so that the two can co-exist? It might not be an issue on the phone, but I imagine a lot of desktop users might want to continue using evolution when in desktop mode.

review: Needs Information

[Michael Sheldon (michael-sheldon)]

It is correct to say that these files are part of buteo-gcontact-plugins in the copyright statements, or is this effectively a new project derived from buteo-gcontact-plugins?

I've also added a number of small things in the diff comments (mostly just typos, but also a couple of questions about some TODOs and an unused variable).

(I've only reviewed the first 1000 lines of the diff so far, so there'll be more to come)

review: Needs Fixing

[Michael Sheldon (michael-sheldon)]

Highlighted a number of places where you're using qDebug (most of the rest of the code uses LOG_DEBUG), I've only checked on the part of the diff shown on the MR (the first 5000 lines) so you may want to quickly grep the rest of the code as well.

review: Needs Fixing

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

20. By Renato Araujo Oliveira Filho on 2015-07-20

Replaced use of qDebug() to LOG_DEBUG

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

More in-line comments (only as far as line 2000 at the moment), mostly small typos but also a couple of questions in there too.

[Renato Araujo Oliveira Filho (renatofilho)]

> I see that you've now marked the buteo-sync-plugins-contacts-google package as
> conflicting with evolution-data-server-online-accounts, is it not possible to
> name the buteo plugin differently so that the two can co-exist? It might not
> be an issue on the phone, but I imagine a lot of desktop users might want to
> continue using evolution when in desktop mode.

The problem is that both install an online-account contact service file "google-contacts.service". And since they have the same functionality (Sync google contacts into EDS database). I do not see a use case where the user will want to have both packages installed.

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

21. By Renato Araujo Oliveira Filho on 2015-07-20

Fixed typos.
Fixed project name on license header.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

22. By Renato Araujo Oliveira Filho on 2015-07-20

Fixed typos.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Up to line 3000 now, still mostly just small corrections and a few questions.

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

23. By Renato Araujo Oliveira Filho on 2015-07-20

Purge contacts removed since last sync only.
Fixed sync time report.

24. By Renato Araujo Oliveira Filho on 2015-07-20

Handle error in case of contact removed remote during a previous sync.

25. By Renato Araujo Oliveira Filho on 2015-07-20

Uncomment handleUploadError function call.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

26. By Renato Araujo Oliveira Filho on 2015-07-20

Delay 2 secs before fire sync finished signal. To wait until galera backed propagate the changes.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Added diff comments up to line 5000, noticed a few seemingly unnecessary string conversions, otherwise just more tiny things and questions.

[Michael Sheldon (michael-sheldon)]

Up to line 7000, Launchpad can't seem to handle more than 5000 lines, so I'll include further remarks in comments:

Line 5137
+ QContactExtendedDetail group;
+ group.setName(UContactsCustomDetail::FieldGroupMembershipInfo);
+ group.setData("6");

Can you add a comment explaining the significance of "6"? (Judging from later code I'm guessing this is the 'My Contacts' group?)

Line 5472
+ protocolMap.insert(QContactOnlineAccount::ProtocolJabber, "JABBER");
+ protocolMap.insert(QContactOnlineAccount::ProtocolAim, "AIM");
+ protocolMap.insert(QContactOnlineAccount::ProtocolIcq, "ICQ");
+ protocolMap.insert(QContactOnlineAccount::ProtocolMsn, "MSN");
+ protocolMap.insert(QContactOnlineAccount::ProtocolQq, "QQ");
+ protocolMap.insert(QContactOnlineAccount::ProtocolYahoo, "YAHOO");
+ protocolMap.insert(QContactOnlineAccount::ProtocolSkype, "SKYPE");
+ protocolMap.insert(QContactOnlineAccount::ProtocolIrc, "IRC");

I notice that this list doesn't include GOOGLE_TALK but an earlier one did, should they not match?

Line 6089
+ // keep downloader object live while GRemoreSource exists to avoid remove
+ // the temporary files used to store avatars

GRemoreSource -> GRemoteSource, remove -> removing

Line 6522
+ // FIXME
+ // m_unsupportedXmlElements[accountId].insert(
+ // c.detail<QContactGuid>().guid(),
+ // remoteAddModContacts[i].second);
+ // m_contactEtags[accountId].insert(c.detail<QContactGuid>().guid(), c.detail<QContactOriginMetadata>().id());
+ // c.setId(QContactId::fromString(m_contactIds[accountId].value(c.detail<QContactGuid>().guid())));
+ // m_remoteAddMods[accountId].append(c);

Can you add details about what needs fixing here? Also the same for line 6542

Line 6604
+ // TODO: If interested, check the value of error. But
+ // it is enough to say that it is a SYNC_CONNECTION_ERROR
+ //emit syncFinished (Sync::SYNC_CONNECTION_ERROR);

The code following this looks like it is now checking the type of sync error, so this TODO can probably be removed.

I also just noticed that all the updated copyright notices have a typo in the name, they should be "buteo-sync-plugins-google" not "buteo-sync-plugins-goole" (missing "g" in google).

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

27. By Renato Araujo Oliveira Filho on 2015-07-21

Handle contact not found '404', during a contact update.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

28. By Renato Araujo Oliveira Filho on 2015-07-21

Use "ClientId", "ClientSecret" values already present in account information.

29. By Renato Araujo Oliveira Filho on 2015-07-21

Replaced use of "QLatin1String" in favor or "QStringLiteral"

30. By Renato Araujo Oliveira Filho on 2015-07-21

Predefine string to keep consistence.

31. By Renato Araujo Oliveira Filho on 2015-07-21

Does not parse google online account as jabber account.

[Renato Araujo Oliveira Filho (renatofilho)]

> Up to line 7000, Launchpad can't seem to handle more than 5000 lines, so I'll
> include further remarks in comments:
>
>
> Line 5137
> + QContactExtendedDetail group;
> + group.setName(UContactsCustomDetail::FieldGroupMembershipInfo);
> + group.setData("6");
>
> Can you add a comment explaining the significance of "6"? (Judging from later
> code I'm guessing this is the 'My Contacts' group?)
Fixed rev. 32

>
>
> Line 5472
> + protocolMap.insert(QContactOnlineAccount::ProtocolJabber, "JABBER");
> + protocolMap.insert(QContactOnlineAccount::ProtocolAim, "AIM");
> + protocolMap.insert(QContactOnlineAccount::ProtocolIcq, "ICQ");
> + protocolMap.insert(QContactOnlineAccount::ProtocolMsn, "MSN");
> + protocolMap.insert(QContactOnlineAccount::ProtocolQq, "QQ");
> + protocolMap.insert(QContactOnlineAccount::ProtocolYahoo, "YAHOO");
> + protocolMap.insert(QContactOnlineAccount::ProtocolSkype, "SKYPE");
> + protocolMap.insert(QContactOnlineAccount::ProtocolIrc, "IRC");
>
> I notice that this list doesn't include GOOGLE_TALK but an earlier one did,
> should they not match?
QContactOnlineAccount does not support "google talk" as a protocol, in this case if the protocol value is not in the protocolMap we fallback to serviceProvider() name.

    QString protocolName = protocolMap.value(onlineAccount.protocol(),
                                             onlineAccount.serviceProvider());
Fixed in Rev. 31

>
>
> Line 6089
> + // keep downloader object live while GRemoreSource exists to avoid remove
> + // the temporary files used to store avatars
>
> GRemoreSource -> GRemoteSource, remove -> removing
Fixed rev 33.

>
>
> Line 6522
> + // FIXME
> + // m_unsupportedXmlElements[accountId].insert(
> + // c.detail<QContactGuid>().guid(),
> + // remoteAddModContacts[i].second);
> + //
> m_contactEtags[accountId].insert(c.detail<QContactGuid>().guid(),
> c.detail<QContactOriginMetadata>().id());
> + // c.setId(QContactId::fromString(m_contactIds[accountId].val
> ue(c.detail<QContactGuid>().guid())));
> + // m_remoteAddMods[accountId].append(c);
>
> Can you add details about what needs fixing here? Also the same for line 6542
Fixed rev. 34

>
>
> Line 6604
> + // TODO: If interested, check the value of error. But
> + // it is enough to say that it is a SYNC_CONNECTION_ERROR
> + //emit syncFinished (Sync::SYNC_CONNECTION_ERROR);
>
> The code following this looks like it is now checking the type of sync error,
> so this TODO can probably be removed.
Fixed rev. 35.

>
>
> I also just noticed that all the updated copyright notices have a typo in the
> name, they should be "buteo-sync-plugins-google" not "buteo-sync-plugins-
> goole" (missing "g" in google).
Fixed rev. 36

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

32. By Renato Araujo Oliveira Filho on 2015-07-21

Added "FiXME" message for hardcoded google default group.

33. By Renato Araujo Oliveira Filho on 2015-07-21

Fixed typos in comments.

34. By Renato Araujo Oliveira Filho on 2015-07-21

Added more information about the FIXME comment.

35. By Renato Araujo Oliveira Filho on 2015-07-21

Removed old TODO comment.

36. By Renato Araujo Oliveira Filho on 2015-07-21

Fixed typo.

37. By Renato Araujo Oliveira Filho on 2015-07-21

Added missing test data file.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

38. By Renato Araujo Oliveira Filho on 2015-07-22

Propagate error from remote source to UContactsClient.
Handle error contact not found during a update operation, on UContactsClient class.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

39. By Renato Araujo Oliveira Filho on 2015-07-22

[google-contact] Make sure that the old contact avatar ulr get copied back to remote contact before return it back to UContactClient.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

This is the last batch of issues going all the way to the end of the diff, so once these have been addressed I'll do a quick check over the previous corrections and then we should be good to approve this from a general code review stand point.

Line 7321
+ // Include "X-HTTP-Method-Override: DELETE" in the delete POST method to avoid blocking of HTTP DELETE message by firewalls
+ //const void DELETE( const QString contactId );

Should this still be here (currently commented out)?

I think you need to add Canonical and yourself to google/LICENSE

Line 8099,
+ /*! \brief constructor
+ */
+ ~ContactsChangeNotifier();

constructor -> destructor

google/Makefile is currently in version control, presumably this can be removed as it's a generated file?

tests/unittest/CMakeLists.txt appears to have DOS line endings (just a quick run through dos2unix will fix this)

Line 11156
+ // remote source will be initialized after sucess
sucess -> success

Line 11187
+ QTest::newRow("page division exaclty") << 5
exaclty -> exactly

Line 11258
+ // trasaction commit will be fired once with empty list
trasaction -> transaction

Line 11751
+ // chek if avatar still the same
chek -> check

Line 11843
+ // check if the repported error is correct
repported -> reported

Line 11923
+ // check each contat details
contat -> contact

Line 12769
+ // Anniversay
Anniversay -> Anniversary

All the test VCF files except for tests/unittest/data/slow_sync_with_pages_remote.vcf have DOS style line endings.

Is there any package that supplies QContactMemoryBackend in a way that could be linked against to remove the need to including the source for it as part of this package?

[Renato Araujo Oliveira Filho (renatofilho)]

> Line 7321
> + // Include "X-HTTP-Method-Override: DELETE" in the delete POST method to
> avoid blocking of HTTP DELETE message by firewalls
> + //const void DELETE( const QString contactId );
>
> Should this still be here (currently commented out)?
Fixed rev. 40

>
> I think you need to add Canonical and yourself to google/LICENSE
Fixed rev. 41

>
>
> Line 8099,
> + /*! \brief constructor
> + */
> + ~ContactsChangeNotifier();
>
> constructor -> destructor
Fixed rev. 42
>
>
> google/Makefile is currently in version control, presumably this can be
> removed as it's a generated file?
Fixed rev. 43

>
>
> tests/unittest/CMakeLists.txt appears to have DOS line endings (just a quick
> run through dos2unix will fix this)
Fixed rev. 44

>
>
> Line 11156
> + // remote source will be initialized after sucess
> sucess -> success
>
>
> Line 11187
> + QTest::newRow("page division exaclty") << 5
> exaclty -> exactly
>
>
> Line 11258
> + // trasaction commit will be fired once with empty list
> trasaction -> transaction
>
>
> Line 11751
> + // chek if avatar still the same
> chek -> check
>
>
> Line 11843
> + // check if the repported error is correct
> repported -> reported
>
>
> Line 11923
> + // check each contat details
> contat -> contact
>
>
> Line 12769
> + // Anniversay
> Anniversay -> Anniversary
>
>
> All the test VCF files except for
> tests/unittest/data/slow_sync_with_pages_remote.vcf have DOS style line
> endings.
The default EOL for vcards is the DOS format.

>
> Is there any package that supplies QContactMemoryBackend in a way that could
> be linked against to remove the need to including the source for it as part of
> this package?
Yes QtPim package contains the memory backend. But I copied it to the porjects because I need some small changes necessary to help me to run my tests. And these changes does not make sens upstream they are very specific.

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

40. By Renato Araujo Oliveira Filho on 2015-07-24

Removed commented code.

41. By Renato Araujo Oliveira Filho on 2015-07-24

Updated LICENSE file.

42. By Renato Araujo Oliveira Filho on 2015-07-24

Fixed typo.

43. By Renato Araujo Oliveira Filho on 2015-07-24

Removed old file.

44. By Renato Araujo Oliveira Filho on 2015-07-24

Fixed file EOL syntax.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Changes all look good, but I'm still rather concerned over the file name conflict as it means any existing apps that use evolution-data-server can't make use of online sync functionality if installed alongside address-book-app (e.g. pidgin, evolution, gnome-shell, etc.), which may put a number of desktop users off from trying address-book-app (or any other SDK apps depending on buteo).

It seems an unnecessary restriction when the file could just be renamed to google-contacts-buteo.service?

[Renato Araujo Oliveira Filho (renatofilho)]

> Changes all look good, but I'm still rather concerned over the file name
> conflict as it means any existing apps that use evolution-data-server can't
> make use of online sync functionality if installed alongside address-book-app
> (e.g. pidgin, evolution, gnome-shell, etc.), which may put a number of desktop
> users off from trying address-book-app (or any other SDK apps depending on
> buteo).
>
> It seems an unnecessary restriction when the file could just be renamed to
> google-contacts-buteo.service?

It will conflict with "evolution-data-server-online-accounts" because both packages install google contacts service files. And both packages provide the same service, read contacts from google.

It is not buteo which conflicts with this package it is buteo-google-contacts, you can still have "evolution-data-server-online-accounts" installed and buteo main package, but you can not have "buteo-google-contacts" and "evolution-data-server-online-accounts" because of the online account service. This "evolution-data-server-online-accounts" this package contains a EDS extension that automatically configure a "google" EDS source for each account. Having both package will result in duplicated contacts.

The address-book-app does not depend on "buteo-google-contact" you can have the app installed and any other EDS extension.

[Renato Araujo Oliveira Filho (renatofilho)]

> (e.g. pidgin, evolution, gnome-shell, etc.), which may put a number of desktop
> users off from trying address-book-app (or any other SDK apps depending on
> buteo).

My pidgin does not depend on "evolution-data-server-online-accounts" which package exactly?
Yeah if the gnome-shell depends on "evolution-data-server-online-accounts" then you can have a problem if you try to install "buteo-google-contacts" but since it is not mandatory for any app, do you still be able to run any Ubuntu-touch app. ("buteo-google-contacts" probably will be a dependency of ubuntu-toutch meta package.

[Michael Sheldon (michael-sheldon)]

Okay, as long as it's possible on a desktop system to have address-book-app and gnome-shell/evolution/etc. installed I'm happy to approve.

review: Approve

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

45. By Renato Araujo Oliveira Filho on 2015-08-03

Fixed typos.

46. By Renato Araujo Oliveira Filho on 2015-08-03

Only fetch contacts from "My Contacts" group.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

47. By Renato Araujo Oliveira Filho on 2015-08-04

Implemented sync progress notification.

48. By Renato Araujo Oliveira Filho on 2015-08-04

Updated unit test.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

49. By Renato Araujo Oliveira Filho on 2015-08-04

Updated unittest.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

50. By Renato Araujo Oliveira Filho on 2015-09-14

Optimize queries by remote-id using a cache.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

51. By Renato Araujo Oliveira Filho on 2015-09-14

Keep remoteId map in sync to avoid slow query.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

52. By Renato Araujo Oliveira Filho on 2015-09-15

Ask for invisible contacts during the sync.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

53. By Renato Araujo Oliveira Filho on 2015-09-15

Only uses 'invisible' filter if sync target is set.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

54. By Renato Araujo Oliveira Filho on 2015-09-16

Use "show-invisible" engine parameter to retrieve invisible contacts from server.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

55. By Renato Araujo Oliveira Filho on 2015-09-18

Initialize contacts backend after authentication.

Avoid to create the contacts source if the authentication failed.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/buteo-sync-plugins-contacts/new-code]

56. By Renato Araujo Oliveira Filho on 2015-09-24

Implemented abort function for GRemoteSource.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

I'm unclear on the use of stateChanged in UContactsClient now, it seems from the method definition that this has changed from providing one of a few predefined states to providing the progress percentage, however in the code there are places where it's still being called with the old states, e.g.

stateChanged(Sync::SYNC_PROGRESS_SENDING_ITEMS);

vs.

stateChanged(qRound(progress*100));

review: Needs Information

[Renato Araujo Oliveira Filho (renatofilho)]

> I'm unclear on the use of stateChanged in UContactsClient now, it seems from
> the method definition that this has changed from providing one of a few
> predefined states to providing the progress percentage, however in the code
> there are places where it's still being called with the old states, e.g.
>
> stateChanged(Sync::SYNC_PROGRESS_SENDING_ITEMS);
>
> vs.
>
> stateChanged(qRound(progress*100));

In fact it can be used for both, the enums values like SYNC_PROGRESS_SENDING_ITEMS has values > 200.Because of that we can say that any values 0..100 is a progress status, values > 200 is a error or a real state change.

[Michael Sheldon (michael-sheldon)]

Ah, okay; in that case this all looks good to me.

review: Approve

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2015-09-24 17:49:24 +0000
@@ -0,0 +1,59 @@
+project(buteo-sync-plugins-google)
+cmake_minimum_required(VERSION 2.8.9)
+
+# Find includes in corresponding build directories
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+# Instruct CMake to run moc automatically when needed.
+set(CMAKE_AUTOMOC ON)
+
+# Standard install paths
+include(GNUInstallDirs)
+
+find_package(PkgConfig REQUIRED)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5DBus REQUIRED)
+find_package(Qt5Contacts REQUIRED)
+find_package(Qt5Network REQUIRED)
+find_package(Qt5Versit REQUIRED)
+
+pkg_check_modules(BUTEOSYNCFW REQUIRED buteosyncfw5)
+pkg_check_modules(ACCOUNTS REQUIRED accounts-qt5>=1.10)
+pkg_check_modules(LIBSIGNON REQUIRED libsignon-qt5)
+
+set(BUTEOSYNCFW_PLUGIN_PATH "/usr/lib/buteo-plugins-qt5")
+
+# config file
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/config.h"
+               IMMEDIATE @ONLY)
+
+
+# Coverage tools
+OPTION(ENABLE_COVERAGE "Build with coverage analysis support" OFF)
+if(ENABLE_COVERAGE)
+    message(STATUS "Using coverage flags")
+    find_program(COVERAGE_COMMAND gcov)
+    if(NOT COVERAGE_COMMAND)
+        message(FATAL_ERROR "gcov command not found")
+    endif()
+    SET(CMAKE_C_FLAGS "-g -O0 -Wall -fprofile-arcs -ftest-coverage")
+    SET(CMAKE_CXX_FLAGS "-g -O0 -Wall -fprofile-arcs -ftest-coverage")
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage -lgcov")
+    include(${CMAKE_SOURCE_DIR}/cmake/lcov.cmake)
+endif()
+
+enable_testing()
+
+add_subdirectory(storage-change-notifier)
+add_subdirectory(buteo-contact-client)
+add_subdirectory(google)
+add_subdirectory(accounts)
+add_subdirectory(tests)
+
+# uninstall target
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+               IMMEDIATE @ONLY)
+add_custom_target(uninstall "${CMAKE_COMMAND}"
+                  -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

=== added directory 'accounts'
=== added file 'accounts/CMakeLists.txt'
--- accounts/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ accounts/CMakeLists.txt	2015-09-24 17:49:24 +0000
@@ -0,0 +1,14 @@
+set(SERVICE_FILES
+     google-contacts.service
+)
+set(APPLICATION_FILES
+    address-book-app.application
+)
+
+install(FILES ${SERVICE_FILES}
+    DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/accounts/services
+)
+
+install(FILES ${APPLICATION_FILES}
+    DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/accounts/applications
+)

=== added file 'accounts/address-book-app.application'
--- accounts/address-book-app.application	1970-01-01 00:00:00 +0000
+++ accounts/address-book-app.application	2015-09-24 17:49:24 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application id="address-book-app">
+  <description>Contacts</description>
+  <desktop-entry>address-book-app.desktop</desktop-entry>
+
+  <service-types>
+    <service-type id="contacts">
+      <description>Synchronize your contacts</description>
+    </service-type>
+  </service-types>
+</application>

=== added file 'accounts/google-contacts.service'
--- accounts/google-contacts.service	1970-01-01 00:00:00 +0000
+++ accounts/google-contacts.service	2015-09-24 17:49:24 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service id="google-contacts">
+  <type>contacts</type>
+  <name>Google Contacts</name>
+  <provider>google</provider>
+</service>

=== added directory 'buteo-contact-client'
=== added file 'buteo-contact-client/CMakeLists.txt'
--- buteo-contact-client/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ buteo-contact-client/CMakeLists.txt	2015-09-24 17:49:24 +0000
@@ -0,0 +1,37 @@
+project(buteo-contact-client)
+
+set(UBUNTU_CONTACTS_CLIENT ubuntu-contact-client)
+set(UBUNTU_CONTACTS_CLIENT_SRCS
+    UAbstractRemoteSource.h
+    UAbstractRemoteSource.cpp
+    UAuth.cpp
+    UAuth.h
+    UContactsBackend.cpp
+    UContactsBackend.h
+    UContactsClient.cpp
+    UContactsClient.h
+    UContactsCustomDetail.cpp
+    UContactsCustomDetail.h
+)
+
+
+add_library(${UBUNTU_CONTACTS_CLIENT} STATIC
+    ${UBUNTU_CONTACTS_CLIENT_SRCS}
+)
+
+include_directories(
+    ${CMAKE_BINARY_DIR}
+    ${ACCOUNTS_INCLUDE_DIRS}
+    ${BUTEOSYNCFW_INCLUDE_DIRS}
+    ${LIBSIGNON_INCLUDE_DIRS}
+)
+
+target_link_libraries(${UBUNTU_CONTACTS_CLIENT}
+    Qt5::Core
+    Qt5::Network
+    Qt5::DBus
+    Qt5::Contacts
+    ${ACCOUNTS_LIBRARIES}
+    ${BUTEOSYNCFW_LIBRARIES}
+    ${LIBSIGNON_LIBRARIES}
+)

=== added file 'buteo-contact-client/UAbstractRemoteSource.cpp'
--- buteo-contact-client/UAbstractRemoteSource.cpp	1970-01-01 00:00:00 +0000
+++ buteo-contact-client/UAbstractRemoteSource.cpp	2015-09-24 17:49:24 +0000
@@ -0,0 +1,178 @@
+/*
+ * This file is part of buteo-sync-plugins-contacts package
+ *
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * Contributors: Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "UAbstractRemoteSource.h"
+#include "UContactsBackend.h"
+
+#include <QDebug>
+
+QTCONTACTS_USE_NAMESPACE
+
+class UContactsBackendBatchOperation
+{
+public:
+    enum BatchOperation {
+        BATCH_UPDATE = 0,
+        BATCH_DELETE,
+        BATCH_CREATE,
+        BATCH_NONE,
+    };
+
+    UContactsBackendBatchOperation()
+        : m_op(BATCH_NONE)
+    {
+    }
+
+    UContactsBackendBatchOperation(BatchOperation op, const QContact &contact)
+        : m_op(op),
+          m_contact(contact)
+    {
+    }
+
+    BatchOperation operation() const
+    {
+        return m_op;
+    }
+
+    QContact contact() const
+    {
+        return m_contact;
+    }
+
+    bool isValid() const
+    {
+        return (m_op != BATCH_NONE);
+    }
+
+private:
+    BatchOperation m_op;
+    QContact m_contact;
+};
+
+class UAbstractRemoteSourcePrivate
+{
+public:
+    UAbstractRemoteSourcePrivate()
+        : m_batchMode(false)
+    {
+    }
+
+    bool m_batchMode;
+    QList<UContactsBackendBatchOperation> m_operations;
+};
+
+UAbstractRemoteSource::UAbstractRemoteSource(QObject *parent)
+    : QObject(parent),
+      d_ptr(new UAbstractRemoteSourcePrivate)
+{
+}
+
+UAbstractRemoteSource::~UAbstractRemoteSource()
+{
+}
+
+void UAbstractRemoteSource::transaction()
+{
+    Q_D(UAbstractRemoteSource);
+
+    d->m_batchMode = true;
+}
+
+bool UAbstractRemoteSource::commit()
+{
+    Q_D(UAbstractRemoteSource);
+
+    if (d->m_operations.isEmpty()) {
+        transactionCommited(QList<QContact>(),
+                            QList<QContact>(),
+                            QStringList(),
+                            QMap<QString, int>(),
+                            Sync::SYNC_DONE);
+        return true;
+    }
+
+    QList<QContact> create;
+    QList<QContact> update;
+    QList<QContact> remove;
+
+    foreach(const UContactsBackendBatchOperation &op, d->m_operations) {
+        switch(op.operation()) {
+        case UContactsBackendBatchOperation::BATCH_CREATE:
+            create << op.contact();
+            break;
+        case UContactsBackendBatchOperation::BATCH_UPDATE:
+            update << op.contact();
+            break;
+        case UContactsBackendBatchOperation::BATCH_DELETE:
+            remove << op.contact();
+            break;
+        default:
+            qWarning() << "Invalid operation";
+        }
+    }
+
+    batch(create, update, remove);
+    d->m_operations.clear();
+    d->m_batchMode = false;
+    return true;
+}
+
+bool UAbstractRemoteSource::rollback()
+{
+    Q_D(UAbstractRemoteSource);
+
+    d->m_operations.clear();
+    d->m_batchMode = false;
+    return true;
+}
+
+void UAbstractRemoteSource::saveContacts(const QList<QContact> &contacts)
+{
+    Q_D(UAbstractRemoteSource);
+
+    if (d->m_batchMode) {
+        foreach(const QContact &contact, contacts) {
+            UContactsBackendBatchOperation::BatchOperation op;
+            QString remoteId = UContactsBackend::getRemoteId(contact);
+            op = remoteId.isEmpty() ? UContactsBackendBatchOperation::BATCH_CREATE :
+                                      UContactsBackendBatchOperation::BATCH_UPDATE;
+            d->m_operations << UContactsBackendBatchOperation(op, contact);
+        }
+    } else {
+        saveContactsNonBatch(contacts);
+    }
+}
+
+void UAbstractRemoteSource::removeContacts(const QList<QContact> &contacts)
+{
+    Q_D(UAbstractRemoteSource);
+
+    if (d->m_batchMode) {
+        foreach(const QContact &contact, contacts) {
+            d->m_operations << UContactsBackendBatchOperation(UContactsBackendBatchOperation::BATCH_DELETE,
+                                                              contact);
+        }
+    } else {
+        removeContactsNonBatch(contacts);
+    }
+}

=== added file 'buteo-contact-client/UAbstractRemoteSource.h'
--- buteo-contact-client/UAbstractRemoteSource.h	1970-01-01 00:00:00 +0000
+++ buteo-contact-client/UAbstractRemoteSource.h	2015-09-24 17:49:24 +0000
@@ -0,0 +1,125 @@
+/*
+ * This file is part of buteo-sync-plugins-contacts package
+ *
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * Contributors: Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef UABSTRACTREMOTESOURCE_H
+#define UABSTRACTREMOTESOURCE_H
+
+#include <QObject>
+#include <QDateTime>
+#include <QVariantMap>
+
+#include <QtContacts/QContact>
+
+#include <SyncCommonDefs.h>
+
+class UAbstractRemoteSourcePrivate;
+
+class UAbstractRemoteSource : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(UAbstractRemoteSource)
+
+public:
+
+    UAbstractRemoteSource(QObject *parent = 0);
+    ~UAbstractRemoteSource();
+
+    virtual void abort() = 0;
+    virtual bool init(const QVariantMap &properties) = 0;
+    virtual void fetchContacts(const QDateTime &since, bool includeDeleted, bool fetchAvatar = true) = 0;
+
+    /*!
+     * \brief Begins a transaction on the remote database.
+     */
+    void transaction();
+
+    /*!
+     * \brief Commits a transaction to the remote database.
+     */
+    bool commit();
+
+    /*!
+     * \brief Rolls back a transaction on the remote database.
+     */
+    bool rollback();
+
+    virtual void saveContacts(const QList<QtContacts::QContact> &contacts);
+    virtual void removeContacts(const QList<QtContacts::QContact> &contacts);
+
+signals:
+    void contactsFetched(const QList<QtContacts::QContact> &contacts,
+                         Sync::SyncStatus status,
+                         qreal progress);
+
+    /*!
+     * \brief This signal is emitted, when a remote contact is created
+     * \param contacts A list of created contacts
+     * \param status The operation status
+     */
+    void contactsCreated(const QList<QtContacts::QContact> &contacts, Sync::SyncStatus status);
+
+    /*!
+     * \brief This signal is emitted, when a remote contact is changed
+     * \param contacts A list of changed contacts
+     * \param status The operation status
+     */
+    void contactsChanged(const QList<QtContacts::QContact> &contacts, Sync::SyncStatus status);
+
+    /*!
+     * \brief This signal is emitted, when a remote contact is removed
+     * \param ids A list with remoteId of removed contacts
+     * \param status The operation status
+     */
+    void contactsRemoved(const QStringList &ids, Sync::SyncStatus status);
+
+    /*!
+     * \brief This signal is emitted, when a batch operation finishes
+     * \param createdContacts A list of created contacts
+     * \param updatedContacts A list of updated contacts
+     * \param removedContacts A list with remoteId of removed contacts
+     * \param errorMap A map with the list of errors found during the batch operation
+     * the key value contains the contact local id and the value is a int based
+     * on QContactManager::Error enum
+     * \param status The operation status
+     */
+    void transactionCommited(const QList<QtContacts::QContact> &createdContacts,
+                             const QList<QtContacts::QContact> &updatedContacts,
+                             const QStringList &removedContacts,
+                             const QMap<QString, int> &errorMap,
+                             Sync::SyncStatus status);
+
+protected:
+    virtual void batch(const QList<QtContacts::QContact> &contactsToCreate,
+                       const QList<QtContacts::QContact> &contactsToUpdate,
+                       const QList<QtContacts::QContact> &contactsToRemove) = 0;
+
+    virtual void saveContactsNonBatch(const QList<QtContacts::QContact> contacts) = 0;
+    virtual void removeContactsNonBatch(const QList<QtContacts::QContact> contacts) = 0;
+
+private:
+    QScopedPointer<UAbstractRemoteSourcePrivate> d_ptr;
+};
+
+Q_DECLARE_METATYPE(QList<QtContacts::QContact>)
+
+#endif // UABSTRACTREMOTESOURCE_H

=== added file 'buteo-contact-client/UAuth.cpp'
--- buteo-contact-client/UAuth.cpp	1970-01-01 00:00:00 +0000
+++ buteo-contact-client/UAuth.cpp	2015-09-24 17:49:24 +0000
@@ -0,0 +1,181 @@
+/*
+ * This file is part of buteo-sync-plugins-contacts package
+ *
+ * Copyright (C) 2013 Jolla Ltd. and/or its subsidiary(-ies).
+ *               2015 Canonical Ltd
+ *
+ * Contributors: Sateesh Kavuri <[e-mail]>
+ *               Mani Chandrasekar <[e-mail]>
+ *               Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "config.h"
+#include "UAuth.h"
+
+#include <QVariantMap>
+#include <QTextStream>
+#include <QFile>
+#include <QStringList>
+#include <QDebug>
+
+#include <Accounts/AccountService>
+
+#include <ProfileEngineDefs.h>
+#include <LogMacros.h>
+
+using namespace Accounts;
+using namespace SignOn;
+
+class UAuthPrivate
+{
+public:
+    UAuthPrivate() {}
+    ~UAuthPrivate() {}
+
+    QPointer<Accounts::Manager> mAccountManager;
+    QPointer<SignOn::Identity> mIdentity;
+    QPointer<SignOn::AuthSession> mSession;
+    QPointer<Accounts::Account> mAccount;
+    QString mServiceName;
+};
+
+UAuth::UAuth(QObject *parent)
+    : QObject(parent),
+      d_ptr(new UAuthPrivate)
+{
+}
+
+UAuth::~UAuth()
+{
+}
+
+bool
+UAuth::init(const quint32 accountId, const QString serviceName)
+{
+    Q_D(UAuth);
+
+    d->mServiceName = serviceName;
+    if (d->mAccountManager && d_ptr->mAccount) {
+        LOG_DEBUG("GAuth already initialized");
+        return false;
+    }
+
+    if (!d->mAccountManager) {
+        d->mAccountManager = new Accounts::Manager();
+        if (d->mAccountManager == NULL) {
+            LOG_DEBUG("Account manager is not created... Cannot authenticate");
+            return false;
+        }
+    }
+
+    if (!d->mAccount) {
+        d->mAccount = Accounts::Account::fromId(d->mAccountManager.data(), accountId, this);
+        if (d->mAccount == NULL) {
+            LOG_DEBUG("Account is not created... Cannot authenticate");
+            return false;
+        }
+        mDisplayName = d->mAccount->displayName();
+    }
+
+    return true;
+}
+
+void
+UAuth::sessionResponse(const SessionData &sessionData)
+{
+    SignOn::AuthSession *session = qobject_cast<SignOn::AuthSession*>(sender());
+    Q_ASSERT(session);
+    session->disconnect(this);
+
+    mToken = sessionData.getProperty(QStringLiteral("AccessToken")).toString();
+    LOG_DEBUG("Authenticated !!!");
+
+    emit success();
+}
+
+bool
+UAuth::authenticate()
+{
+    Q_D(UAuth);
+    if (d->mSession) {
+        LOG_WARNING(QString("error: Account %1 Authenticate already requested")
+                .arg(d->mAccount->displayName()));
+        return true;
+    }
+
+    Accounts::Service srv(d->mAccountManager->service(d->mServiceName));
+    if (!srv.isValid()) {
+        LOG_WARNING(QString("error: Service [%1] not found for account [%2].")
+                .arg(d->mServiceName)
+                .arg(d->mAccount->displayName()));
+        return false;
+    }
+    d->mAccount->selectService(srv);
+
+    Accounts::AccountService *accSrv = new Accounts::AccountService(d->mAccount, srv);
+    if (!accSrv) {
+        LOG_WARNING(QString("error: Account %1 has no valid account service")
+                .arg(d->mAccount->displayName()));
+        return false;
+    }
+    if (!accSrv->isEnabled()) {
+        LOG_WARNING(QString("error: Service %1 not enabled for account %2.")
+                .arg(d->mServiceName)
+                .arg(d->mAccount->displayName()));
+        return false;
+    }
+
+    AuthData authData = accSrv->authData();
+    d->mIdentity = SignOn::Identity::existingIdentity(authData.credentialsId());
+    if (!d->mIdentity) {
+        LOG_WARNING(QString("error: Account %1 has no valid credentials")
+                .arg(d->mAccount->displayName()));
+        return false;
+    }
+
+    d->mSession = d->mIdentity->createSession(authData.method());
+    if (!d->mSession) {
+        LOG_WARNING(QString("error: could not create signon session for Google account %1")
+                .arg(d->mAccount->displayName()));
+        accSrv->deleteLater();
+        return false;
+    }
+    connect(d->mSession.data(),SIGNAL(response(SignOn::SessionData)),
+            SLOT(sessionResponse(SignOn::SessionData)), Qt::QueuedConnection);
+    connect(d->mSession.data(), SIGNAL(error(SignOn::Error)),
+            SLOT(error(SignOn::Error)), Qt::QueuedConnection);
+
+    QVariantMap signonSessionData = authData.parameters();
+    signonSessionData.insert("UiPolicy", SignOn::NoUserInteractionPolicy);
+    d->mSession->process(signonSessionData, authData.mechanism());
+    accSrv->deleteLater();
+    return true;
+}
+
+void UAuth::credentialsStored(const quint32 id)
+{
+    Q_D(UAuth);
+    d->mAccount->setCredentialsId(id);
+    d->mAccount->sync();
+}
+
+void UAuth::error(const SignOn::Error & error)
+{
+    LOG_WARNING("LOGIN ERROR:" << error.message());
+    emit failed();
+}

=== added file 'buteo-contact-client/UAuth.h'
--- buteo-contact-client/UAuth.h	1970-01-01 00:00:00 +0000
+++ buteo-contact-client/UAuth.h	2015-09-24 17:49:24 +0000
@@ -0,0 +1,72 @@
+/*
+ * This file is part of buteo-sync-plugins-contacts package
+ *
+ * Copyright (C) 2013 Jolla Ltd. and/or its subsidiary(-ies).
+ *               2015 Canonical Ltd
+ *
+ * Contributors: Sateesh Kavuri <[e-mail]>
+ *               Mani Chandrasekar <[e-mail]>
+ *               Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef UAUTH_H
+#define UAUTH_H
+
+#include <QObject>
+#include <QScopedPointer>
+
+#include <SignOn/AuthService>
+#include <SignOn/Identity>
+
+#include <Accounts/Account>
+#include <Accounts/Manager>
+
+class UAuthPrivate;
+
+class UAuth : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(UAuth)
+public:
+    explicit UAuth(QObject *parent = 0);
+    ~UAuth();
+
+    virtual bool authenticate();
+    virtual bool init(const quint32 accountId, const QString serviceName);
+
+    inline QString accountDisplayName() const { return mDisplayName; }
+    inline QString token() const { return mToken; }
+
+signals:
+    void success();
+    void failed();
+
+protected:
+    QString mToken;
+    QString mDisplayName;
+
+private:
+    QScopedPointer<UAuthPrivate> d_ptr;
+
+private slots:
+    void credentialsStored(const quint32);
+    void error(const SignOn::Error &);
+    void sessionResponse(const SignOn::SessionData &);
+};
+
+#endif // UAUTH_H

=== added file 'buteo-contact-client/UContactsBackend.cpp'
--- buteo-contact-client/UContactsBackend.cpp	1970-01-01 00:00:00 +0000
+++ buteo-contact-client/UContactsBackend.cpp	2015-09-24 17:49:24 +0000
@@ -0,0 +1,572 @@
+/*
+ * This file is part of buteo-sync-plugins-contacts package
+ *
+ * Copyright (C) 2013 Jolla Ltd. and/or its subsidiary(-ies).
+ *               2015 Canonical Ltd
+ *
+ * Contributors: Sateesh Kavuri <[e-mail]>
+ *               Mani Chandrasekar <[e-mail]>
+ *               Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "config.h"
+#include "UContactsBackend.h"
+#include "UContactsCustomDetail.h"
+
+#include <LogMacros.h>
+
+#include <QContactTimestamp>
+#include <QContactIdFilter>
+#include <QContactIntersectionFilter>
+#include <QContactSyncTarget>
+#include <QContactDetailFilter>
+#include <QContactGuid>
+#include <QContactDisplayLabel>
+#include <QContactExtendedDetail>
+#include <QContactSyncTarget>
+
+#include <QBuffer>
+#include <QSet>
+#include <QHash>
+
+#include <QDBusInterface>
+#include <QDBusReply>
+
+static const QString CPIM_SERVICE_NAME             ("com.canonical.pim");
+static const QString CPIM_ADDRESSBOOK_OBJECT_PATH  ("/com/canonical/pim/AddressBook");
+static const QString CPIM_ADDRESSBOOK_IFACE_NAME   ("com.canonical.pim.AddressBook");
+
+UContactsBackend::UContactsBackend(const QString &managerName, QObject* parent)
+    : QObject (parent)
+{
+    QMap<QString, QString> parameters;
+    parameters.insert("show-invisible", "true");
+    iMgr = new QContactManager(managerName, parameters);
+    FUNCTION_CALL_TRACE;
+}
+
+UContactsBackend::~UContactsBackend()
+{
+    FUNCTION_CALL_TRACE;
+
+    delete iMgr;
+    iMgr = NULL;
+}
+
+bool
+UContactsBackend::init(uint syncAccount, const QString &syncTarget)
+{
+    FUNCTION_CALL_TRACE;
+
+    // create address book it it does not exists
+    // check if the source already exists
+    QContactDetailFilter filter;
+    filter.setDetailType(QContactDetail::TypeType, QContactType::FieldType);
+    filter.setValue(QContactType::TypeGroup);
+
+    QList<QContact> sources = iMgr->contacts(filter);
+    Q_FOREACH(const QContact &contact, sources) {
+        QContactExtendedDetail exd = UContactsCustomDetail::getCustomField(contact,
+                                                                           "ACCOUNT-ID");
+        if (!exd.isEmpty() && (exd.data().toUInt() == syncAccount)) {
+            mSyncTargetId = contact.detail<QContactGuid>().guid();
+            reloadCache();
+            return true;
+        }
+    }
+
+    // memory/mock manager does not support syncTarget
+    if (iMgr->managerName() != "mock") {
+        // create a new source if necessary
+        QContact contact;
+        contact.setType(QContactType::TypeGroup);
+
+        QContactDisplayLabel label;
+        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");
+        accountId.setData(syncAccount);
+        contact.saveDetail(&accountId);
+
+        if (!iMgr->saveContact(&contact)) {
+            qWarning() << "Fail to create contact source:" << syncTarget;
+            return false;
+        }
+
+        mSyncTargetId = contact.detail<QContactGuid>().guid();
+    }
+
+    return true;
+}
+
+bool
+UContactsBackend::uninit()
+{
+    FUNCTION_CALL_TRACE;
+    mRemoteIdToLocalId.clear();
+
+    return true;
+}
+
+QList<QContactId>
+UContactsBackend::getAllContactIds()
+{
+    FUNCTION_CALL_TRACE;
+    Q_ASSERT (iMgr);
+    return iMgr->contactIds(getSyncTargetFilter());
+}
+
+RemoteToLocalIdMap
+UContactsBackend::getAllNewContactIds(const QDateTime &aTimeStamp)
+{
+    FUNCTION_CALL_TRACE;
+    LOG_DEBUG("Retrieve New Contacts Since " << aTimeStamp);
+
+    RemoteToLocalIdMap idList;
+    const QContactChangeLogFilter::EventType eventType =
+            QContactChangeLogFilter::EventAdded;
+
+    getSpecifiedContactIds(eventType, aTimeStamp, &idList);
+
+    return idList;
+}
+
+RemoteToLocalIdMap
+UContactsBackend::getAllModifiedContactIds(const QDateTime &aTimeStamp)
+{
+
+    FUNCTION_CALL_TRACE;
+
+    LOG_DEBUG("Retrieve Modified Contacts Since " << aTimeStamp);
+
+    RemoteToLocalIdMap idList;
+    const QContactChangeLogFilter::EventType eventType =
+            QContactChangeLogFilter::EventChanged;
+
+    getSpecifiedContactIds(eventType, aTimeStamp, &idList);
+
+    return idList;
+}
+
+RemoteToLocalIdMap
+UContactsBackend::getAllDeletedContactIds(const QDateTime &aTimeStamp)
+{
+    FUNCTION_CALL_TRACE;
+    LOG_DEBUG("Retrieve Deleted Contacts Since " << aTimeStamp);
+
+    RemoteToLocalIdMap idList;
+    const QContactChangeLogFilter::EventType eventType =
+            QContactChangeLogFilter::EventRemoved;
+
+    getSpecifiedContactIds(eventType, aTimeStamp, &idList);
+
+    return idList;
+}
+
+bool
+UContactsBackend::addContacts(QList<QContact>& aContactList,
+                              QMap<int, UContactsStatus> *aStatusMap)
+{
+    FUNCTION_CALL_TRACE;
+    Q_ASSERT(iMgr);
+    Q_ASSERT(aStatusMap);
+
+    QMap<int, QContactManager::Error> errorMap;
+
+    // Check if contact already exists if it exists set the contact id
+    // to cause an update instead of create a new one
+    for(int i=0; i < aContactList.size(); i++) {
+        QContact &c = aContactList[i];
+        QString remoteId = getRemoteId(c);
+        QContactId id = entryExists(remoteId);
+        if (!id.isNull()) {
+            c.setId(id);
+        } else {
+            // make sure that all contacts retrieved are saved on the correct sync target
+            QContactSyncTarget syncTarget = c.detail<QContactSyncTarget>();
+            syncTarget.setSyncTarget(syncTargetId());
+            c.saveDetail(&syncTarget);
+        }
+
+        // remove guid field if it exists
+        QContactGuid guid = c.detail<QContactGuid>();
+        if (!guid.isEmpty()) {
+            c.removeDetail(&guid);
+        }
+    }
+
+    bool retVal = iMgr->saveContacts(&aContactList, &errorMap);
+    if (!retVal) {
+        LOG_WARNING( "Errors reported while saving contacts:" << iMgr->error() );
+    }
+
+    // QContactManager will populate errorMap only for errors, but we use this as a status map,
+    // so populate NoError if there's no error.
+    for (int i = 0; i < aContactList.size(); i++)
+    {
+        UContactsStatus status;
+        status.id = i;
+        if (!errorMap.contains(i)) {
+            status.errorCode = QContactManager::NoError;
+
+            // update remote id map
+            const QContact &c = aContactList.at(i);
+            QString remoteId = getRemoteId(c);
+            mRemoteIdToLocalId.insert(remoteId, c.id());
+        } else {
+            LOG_WARNING("Contact with id " <<  aContactList.at(i).id() << " and index " << i <<" is in error");
+            status.errorCode = errorMap.value(i);
+        }
+        aStatusMap->insert(i, status);
+    }
+
+    return retVal;
+}
+
+QMap<int,UContactsStatus>
+UContactsBackend::modifyContacts(QList<QContact> *aContactList)
+{
+    FUNCTION_CALL_TRACE;
+
+    Q_ASSERT (iMgr);
+    UContactsStatus status;
+
+    QMap<int,QContactManager::Error> errors;
+    QMap<int,UContactsStatus> statusMap;
+
+    // WORKAROUND: Our backend uses GUid as contact id due problems with contact id serialization
+    // we can not use this field
+    for (int i = 0; i < aContactList->size(); i++) {
+        QContact &newContact = (*aContactList)[i];
+        QString remoteId = getRemoteId(newContact);
+
+        // if the contact was created the remoteId will not exists on local database
+        QContactId localId = entryExists(remoteId);
+
+        // nt this case we should use the guid stored on contact
+        QContactGuid guid = newContact.detail<QContactGuid>();
+
+        if (localId.isNull() && !guid.isEmpty()) {
+            // try the guid (should contains the local id) field
+            localId = QContactId::fromString(guid.guid());
+        }
+        newContact.setId(localId);
+        newContact.removeDetail(&guid);
+    }
+
+    if(iMgr->saveContacts(aContactList , &errors)) {
+        LOG_DEBUG("Batch Modification of Contacts Succeeded");
+    } else {
+        LOG_DEBUG("Batch Modification of Contacts Failed");
+    }
+
+    // QContactManager will populate errorMap only for errors, but we use this as a status map,
+    // so populate NoError if there's no error.
+    // TODO QContactManager populates indices from the aContactList, but we populate keys, is this OK?
+    for (int i = 0; i < aContactList->size(); i++) {
+        const QContact &c = aContactList->at(i);
+        QContactId contactId = c.id();
+        if( !errors.contains(i) ) {
+            LOG_DEBUG("No error for contact with id " << contactId << " and index " << i);
+            status.errorCode = QContactManager::NoError;
+            statusMap.insert(i, status);
+
+            // update remote it map
+            QString oldRemoteId = mRemoteIdToLocalId.key(c.id());
+            mRemoteIdToLocalId.remove(oldRemoteId);
+
+            QString remoteId = getRemoteId(c);
+            mRemoteIdToLocalId.insert(remoteId, c.id());
+        } else {
+            LOG_DEBUG("contact with id " << contactId << " and index " << i <<" is in error");
+            QContactManager::Error errorCode = errors.value(i);
+            status.errorCode = errorCode;
+            statusMap.insert(i, status);
+        }
+    }
+    return statusMap;
+}
+
+QMap<int, UContactsStatus>
+UContactsBackend::deleteContacts(const QStringList &aContactIDList)
+{
+    FUNCTION_CALL_TRACE;
+
+    QList<QContactId> qContactIdList;
+    foreach (QString id, aContactIDList) {
+        qContactIdList.append(QContactId::fromString(id));
+    }
+
+    return deleteContacts(qContactIdList);
+}
+
+QMap<int, UContactsStatus>
+UContactsBackend::deleteContacts(const QList<QContactId> &aContactIDList) {
+    FUNCTION_CALL_TRACE;
+
+    Q_ASSERT (iMgr);
+    UContactsStatus status;
+    QMap<int, QContactManager::Error> errors;
+    QMap<int, UContactsStatus> statusMap;
+
+    if(iMgr->removeContacts(aContactIDList , &errors)) {
+        LOG_DEBUG("Successfully Removed all contacts ");
+    }
+    else {
+        LOG_WARNING("Failed Removing Contacts");
+    }
+
+    // QContactManager will populate errorMap only for errors, but we use this as a status map,
+    // so populate NoError if there's no error.
+    for (int i = 0; i < aContactIDList.size(); i++) {
+        const QContactId &contactId = aContactIDList.at(i);
+        if( !errors.contains(i) )
+        {
+            LOG_DEBUG("No error for contact with id " << contactId << " and index " << i);
+            status.errorCode = QContactManager::NoError;
+            statusMap.insert(i, status);
+
+            // remove from remote id map
+            QString remoteId = mRemoteIdToLocalId.key(contactId);
+            mRemoteIdToLocalId.remove(remoteId);
+        }
+        else
+        {
+            LOG_DEBUG("contact with id " << contactId << " and index " << i <<" is in error");
+            QContactManager::Error errorCode = errors.value(i);
+            status.errorCode = errorCode;
+            statusMap.insert(i, status);
+        }
+    }
+
+    return statusMap;
+}
+
+
+void
+UContactsBackend::getSpecifiedContactIds(const QContactChangeLogFilter::EventType aEventType,
+                                         const QDateTime& aTimeStamp,
+                                         RemoteToLocalIdMap *aIdList)
+{
+    FUNCTION_CALL_TRACE;
+    Q_ASSERT(aIdList);
+
+    QList<QContactId> localIdList;
+    QContactChangeLogFilter filter(aEventType);
+    filter.setSince(aTimeStamp);
+
+    localIdList = iMgr->contactIds(filter  & getSyncTargetFilter());
+    LOG_DEBUG("Local ID added =  " << localIdList.size() << "    Datetime from when this " << aTimeStamp.toString());
+    // Filter out ids for items that were added after the specified time.
+    if (aEventType != QContactChangeLogFilter::EventAdded)
+    {
+        filter.setEventType(QContactChangeLogFilter::EventAdded);
+        QList<QContactId> addedList = iMgr->contactIds(filter  & getSyncTargetFilter());
+        foreach (const QContactId &id, addedList)
+        {
+            localIdList.removeAll(id);
+        }
+    }
+
+    // This is a defensive procedure to prevent duplicate items being sent.
+    // QSet does not allow duplicates, thus transforming QList to QSet and back
+    // again will remove any duplicate items in the original QList.
+    int originalIdCount = localIdList.size();
+    QSet<QContactId> idSet = localIdList.toSet();
+    int idCountAfterDupRemoval = idSet.size();
+
+    LOG_DEBUG("Item IDs found (returned / incl. duplicates): " << idCountAfterDupRemoval << "/" << originalIdCount);
+    if (originalIdCount != idCountAfterDupRemoval) {
+        LOG_WARNING("Contacts backend returned duplicate items for requested list");
+        LOG_WARNING("Duplicate item IDs have been removed");
+    } // no else
+
+    localIdList = idSet.toList();
+
+    QContactFetchHint remoteIdHint;
+    QList <QContactDetail::DetailType> detailTypes;
+    detailTypes << QContactExtendedDetail::Type;
+    remoteIdHint.setDetailTypesHint(detailTypes);
+
+    QList<QContact> contacts = iMgr->contacts(localIdList, remoteIdHint);
+    foreach (const QContact &contact, contacts) {
+        QString rid = getRemoteId(contact);
+        aIdList->insertMulti(rid, contact.id());
+    }
+}
+
+/*!
+    \fn GContactsBackend::getContact(QContactId aContactId)
+ */
+QContact
+UContactsBackend::getContact(const QContactId& aContactId)
+{
+    FUNCTION_CALL_TRACE;
+    Q_ASSERT (iMgr);
+    QList<QContact> returnedContacts;
+
+    LOG_DEBUG("Contact ID to be retreived = " << aContactId.toString());
+    returnedContacts = iMgr->contacts(QList<QContactId>() << aContactId);
+
+    LOG_DEBUG("Contacts retreived from Contact manager  = " << returnedContacts.count());
+    return returnedContacts.value(0, QContact());
+}
+
+QContact
+UContactsBackend::getContact(const QString& remoteId)
+{
+    FUNCTION_CALL_TRACE;
+    Q_ASSERT (iMgr);
+    LOG_DEBUG("Remote id to be searched for = " << remoteId);
+
+    // use contact id if possible
+    QContactId cId = entryExists(remoteId);
+    if (!cId.isNull()) {
+        return iMgr->contact(cId);
+    }
+    return QContact();
+}
+
+QContactId
+UContactsBackend::entryExists(const QString remoteId)
+{
+    if (remoteId.isEmpty()) {
+        return QContactId();
+    }
+
+    // check cache
+    return mRemoteIdToLocalId.value(remoteId);
+}
+
+QString
+UContactsBackend::syncTargetId() const
+{
+    return mSyncTargetId;
+}
+
+const QStringList
+UContactsBackend::localIds(const QStringList remoteIds)
+{
+    QStringList localIdList;
+    foreach (QString guid , remoteIds) {
+        QString localId = entryExists(guid).toString();
+        if (!localId.isEmpty()) {
+            localIdList << localId;
+        }
+    }
+    Q_ASSERT(localIdList.count() == remoteIds.count());
+    return localIdList;
+}
+
+void UContactsBackend::reloadCache()
+{
+    FUNCTION_CALL_TRACE;
+    QContactFetchHint hint;
+    QList<QContactSortOrder> sortOrder;
+    QContactFilter sourceFilter;
+    if (!mSyncTargetId.isEmpty()) {
+        sourceFilter = getSyncTargetFilter();
+    }
+
+    mRemoteIdToLocalId.clear();
+    hint.setDetailTypesHint(QList<QContactDetail::DetailType>() << QContactExtendedDetail::Type);
+    Q_FOREACH(const QContact &c,  iMgr->contacts(sourceFilter, sortOrder, hint)) {
+        QString remoteId = getRemoteId(c);
+        if (!remoteId.isEmpty()) {
+            mRemoteIdToLocalId.insert(remoteId, c.id());
+        }
+    }
+}
+
+QString
+UContactsBackend::getRemoteId(const QContact &contact)
+{
+    return UContactsCustomDetail::getCustomField(contact, UContactsCustomDetail::FieldRemoteId).data().toString();
+}
+
+void UContactsBackend::setRemoteId(QContact &contact, const QString &remoteId)
+{
+    UContactsCustomDetail::setCustomField(contact, UContactsCustomDetail::FieldRemoteId, QVariant(remoteId));
+}
+
+QString UContactsBackend::getLocalId(const QContact &contact)
+{
+    QContactGuid guid = contact.detail<QContactGuid>();
+    return guid.guid();
+}
+
+void UContactsBackend::setLocalId(QContact &contact, const QString &localId)
+{
+    QContactGuid guid = contact.detail<QContactGuid>();
+    guid.setGuid(localId);
+    contact.saveDetail(&guid);
+}
+
+bool UContactsBackend::deleted(const QContact &contact)
+{
+    QString deletedAt = UContactsCustomDetail::getCustomField(contact, UContactsCustomDetail::FieldDeletedAt).data().toString();
+    return !deletedAt.isEmpty();
+}
+
+void
+UContactsBackend::purgecontacts(const QDateTime &date)
+{
+    QDBusInterface iface(CPIM_SERVICE_NAME,
+                         CPIM_ADDRESSBOOK_OBJECT_PATH,
+                         CPIM_ADDRESSBOOK_IFACE_NAME);
+    QDBusReply<void> reply = iface.call("purgeContacts", date.toString(Qt::ISODate), mSyncTargetId);
+    if (reply.error().isValid()) {
+        LOG_WARNING("Fail to purge contacts" << reply.error());
+    } else {
+        LOG_DEBUG("Purged backend contacts");
+    }
+}
+
+QContactFilter
+UContactsBackend::getSyncTargetFilter() const
+{
+    // user entered contacts, i.e. all other contacts that are not sourcing
+    // from restricted backends or instant messaging service
+    static QContactDetailFilter detailFilterDefaultSyncTarget;
+
+    if (!mSyncTargetId.isEmpty() &&
+        detailFilterDefaultSyncTarget.value().isNull()) {
+        detailFilterDefaultSyncTarget.setDetailType(QContactSyncTarget::Type,
+                                                    QContactSyncTarget::FieldSyncTarget + 1);
+        detailFilterDefaultSyncTarget.setValue(mSyncTargetId);
+    } else if (mSyncTargetId.isEmpty()) {
+        return QContactFilter();
+    }
+
+    return detailFilterDefaultSyncTarget;
+}
+
+
+QtContacts::QContactManager *UContactsBackend::manager() const
+{
+    return iMgr;
+}

=== added file 'buteo-contact-client/UContactsBackend.h'
--- buteo-contact-client/UContactsBackend.h	1970-01-01 00:00:00 +0000
+++ buteo-contact-client/UContactsBackend.h	2015-09-24 17:49:24 +0000
@@ -0,0 +1,254 @@
+/*
+ * This file is part of buteo-sync-plugins-contacts package
+ *
+ * Copyright (C) 2013 Jolla Ltd. and/or its subsidiary(-ies).
+ *               2015 Canonical Ltd
+ *
+ * Contributors: Sateesh Kavuri <[e-mail]>
+ *               Mani Chandrasekar <[e-mail]>
+ *               Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef UCONTACTSBACKEND_H_
+#define UCONTACTSBACKEND_H_
+
+#include <QContact>
+#include <QContactId>
+#include <QContactFetchRequest>
+#include <QContactExtendedDetail>
+#include <QContactChangeLogFilter>
+#include <QContactManager>
+
+#include <QStringList>
+
+QTCONTACTS_USE_NAMESPACE
+
+struct UContactsStatus
+{
+    int id;
+    QContactManager::Error errorCode;
+};
+
+typedef QMultiMap<QString, QContactId> RemoteToLocalIdMap;
+
+//! \brief Harmattan Contact storage plugin backend interface class
+///
+/// This class interfaces with the QtContact backend implementation
+class UContactsBackend : public QObject
+{
+
+public:
+    explicit UContactsBackend(const QString &managerName = "", QObject* parent = 0);
+
+    /*!
+     * \brief Destructor
+     */
+    ~UContactsBackend();
+
+    /*!
+     * \brief Initialize the backend, must be called before any other function
+     * \param syncTarget The name of the collection used to store contacts
+     * \return Returns true if initialized with sucess false otherwise
+     */
+    bool init(uint syncAccount, const QString &syncTarget);
+
+    /*!
+     * \brief releases the resources held.
+     * @returnReturns true if sucess false otherwise
+     */
+    bool uninit();
+
+    /*!
+     * \brief Return ids of all contacts stored locally
+     * @return List of contact IDs
+     */
+    QList<QContactId> getAllContactIds();
+
+
+    /*!
+     * \brief Return all new contacts ids in a QList of QStrings
+     * @param aTimeStamp Timestamp of the oldest contact ID to be returned
+     * @return List of contact IDs
+     */
+    RemoteToLocalIdMap getAllNewContactIds(const QDateTime& aTimeStamp);
+
+    /*!
+     * \brief Return all modified contact ids in a QList of QStrings
+     * @param aTimeStamp Timestamp of the oldest contact ID to be returned
+     * @return List of contact IDs
+     */
+    RemoteToLocalIdMap getAllModifiedContactIds(const QDateTime& aTimeStamp);
+
+
+    /*!
+     * \brief Return all deleted contacts ids in a QList of QStrings
+     * @param aTimeStamp Timestamp of the oldest contact ID to be returned
+     * @return List of contact IDs
+     */
+    RemoteToLocalIdMap getAllDeletedContactIds(const QDateTime& aTimeStamp);
+
+    /*!
+     * \brief Get contact data for a given contact ID as a QContact object
+     * @param aContactId The ID of the contact
+     * @return The data of the contact
+     */
+    QContact getContact(const QContactId& aContactId);
+
+    /*!
+     * \brief Returns a contact for the specified remoteId
+     * @param remoteId The remote id of the contact to be returned
+     * @return The data of the contact
+     */
+    QContact getContact(const QString& remoteId);
+
+    /*!
+     * \brief Batch addition of contacts
+     * @param aContactDataList Contact data
+     * @param aStatusMap Returned status data
+     * @return Errors
+     */
+    bool addContacts(QList<QContact>& aContactList,
+                     QMap<int, UContactsStatus> *aStatusMap );
+
+    // Functions for modifying contacts
+    /*!
+     * \brief Batch modification
+     * @param aContactDataList Contact data
+     * @param aContactsIdList Contact IDs
+     * @return Errors
+     */
+    QMap<int, UContactsStatus> modifyContacts(QList<QtContacts::QContact> *aContactList);
+
+    /*!
+     * \brief Batch deletion of contacts
+     * @param aContactIDList Contact IDs
+     * @return Errors
+     */
+    QMap<int, UContactsStatus> deleteContacts(const QStringList &aContactIDList);
+
+    /*!
+     * \brief Batch deletion of contacts
+     * @param aContactIDList Contact IDs
+     * @return Errors
+     */
+    QMap<int, UContactsStatus> deleteContacts(const QList<QContactId> &aContactIDList);
+
+    /*!
+     * \brief Check if a contact exists
+     * \param remoteId The remoteId of the contact
+     * \return The localId of the contact
+     */
+    QContactId entryExists(const QString remoteId);
+
+    /*!
+     * \brief Retrieve the current address book used by the backend
+     * \return The address book id
+     */
+    QString syncTargetId() const;
+
+    /*!
+     * \brief Retrieve the local id of a list of remote ids
+     * \param remoteIds A list with remote ids
+     * \return A list with local ids
+     */
+    const QStringList localIds(const QStringList remoteIds);
+
+    /*!
+     * \brief Return the value of the remote id field in a contact
+     * \param contact The contact object
+     * \return A string with the remoteId
+     */
+    static QString getRemoteId(const QContact &contact);
+
+    /*!
+     * \brief Update the value of the remote id field in a contact
+     * \param contact The contact object
+     * \param remoteId A string with the remoteId
+     */
+    static void setRemoteId(QContact &contact, const QString &remoteId);
+
+    /*!
+     * \brief Return the valueof the local id field in a contact
+     * \param contact The contact object
+     * \return A string with the localId
+     */
+    static QString getLocalId(const QContact &contact);
+
+    /*!
+     * \brief Update the value of the local id field in a contact
+     * \param contact The contact object
+     * \param remoteId A string with the localId
+     */
+    static void setLocalId(QContact &contact, const QString &localId);
+
+    /*!
+     * \brief Check if the contact is marked as deleted
+     * \param contact The contact object
+     * \return Returns true if the contact is marked as deleted, otherwise returns false
+     */
+    static bool deleted(const QContact &contact);
+
+    /*!
+     * \brief Purge all deleted contacts from the server
+     */
+    void purgecontacts(const QDateTime &date);
+
+    /*!
+     * \brief Reload contact id cache
+     */
+    void reloadCache();
+
+
+    QContactManager *manager() const;
+
+private: // functions
+
+    /*!
+     * \brief Returns contact IDs specified by event type and timestamp
+     * @param aEventType Added/changed/removed contacts
+     * @param aTimeStamp Contacts older than aTimeStamp are filtered out
+     * @param aIdList Returned contact IDs
+     */
+    void getSpecifiedContactIds(const QContactChangeLogFilter::EventType aEventType,
+                                const QDateTime &aTimeStamp,
+                                RemoteToLocalIdMap *aIdList);
+
+    /*!
+     * \brief Constructs and returns the filter for accessing only contacts allowed to be synchronized
+     * Contacts not allowed to be synchronized are Instant messaging contacts and contacts with origin from other sync backends;
+     * those contacts have QContactSyncTarget::SyncTarget value different from address book or buteo sync clients.
+     * It is designed that buteo sync clients don't restrict access to contacts among themselves
+     * - value for QContactSyncTarget::SyncTarget written by this backend is "buteo".
+     */
+    QContactFilter getSyncTargetFilter() const;
+
+private: // data
+
+    // if there is more than one Manager we need to have a list of Managers
+    QContactManager     *iMgr;      ///< A pointer to contact manager
+    QString             mSyncTargetId;
+    QMap<QString, QContactId> mRemoteIdToLocalId;
+
+
+    void createSourceForAccount(uint accountId, const QString &label);
+};
+
+#endif /* CONTACTSBACKEND_H_ */
+
+
+

=== added file 'buteo-contact-client/UContactsClient.cpp'
--- buteo-contact-client/UContactsClient.cpp	1970-01-01 00:00:00 +0000
+++ buteo-contact-client/UContactsClient.cpp	2015-09-24 17:49:24 +0000
@@ -0,0 +1,1028 @@
+/*
+ * This file is part of buteo-sync-plugins-contacts package
+ *
+ * Copyright (C) 2013 Jolla Ltd. and/or its subsidiary(-ies).
+ *               2015 Canonical Ltd
+ *
+ * Contributors: Sateesh Kavuri <[e-mail]>
+ *               Mani Chandrasekar <[e-mail]>
+ *               Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "UContactsClient.h"
+#include "UContactsBackend.h"
+#include "UAbstractRemoteSource.h"
+#include "UAuth.h"
+#include "config.h"
+
+//Buteo
+#include <LogMacros.h>
+#include <ProfileEngineDefs.h>
+#include <ProfileManager.h>
+
+#include <QLibrary>
+#include <QtNetwork>
+#include <QDateTime>
+#include <QContactGuid>
+#include <QContactDetailFilter>
+#include <QContactAvatar>
+
+class UContactsClientPrivate
+{
+public:
+    UContactsClientPrivate(const QString &serviceName)
+        : mAuth(0),
+          mContactBackend(0),
+          mRemoteSource(0),
+          mServiceName(serviceName),
+          mAborted(false)
+    {
+    }
+
+    UAuth*                      mAuth;
+    UContactsBackend*           mContactBackend;
+    UAbstractRemoteSource*      mRemoteSource;
+    bool                        mSlowSync;
+    bool                        mAborted;
+    QString                     mServiceName;
+    // local database information
+    QSet<QContactId>            mAllLocalContactIds;
+    RemoteToLocalIdMap  mAddedContactIds;
+    RemoteToLocalIdMap  mModifiedContactIds;
+    RemoteToLocalIdMap  mDeletedContactIds;
+    // sync report
+    QMap<QString, Buteo::DatabaseResults> mItemResults;
+    Buteo::SyncResults          mResults;
+    qreal                       mProgress;
+    // sync profile
+    QString mSyncTarget;
+    qint32 mAccountId;
+    Buteo::SyncProfile::SyncDirection mSyncDirection;
+    Buteo::SyncProfile::ConflictResolutionPolicy mConflictResPolicy;
+};
+
+UContactsClient::UContactsClient(const QString& aPluginName,
+                                 const Buteo::SyncProfile& aProfile,
+                                 Buteo::PluginCbInterface *aCbInterface, const QString &serviceName)
+    : ClientPlugin(aPluginName, aProfile, aCbInterface),
+      d_ptr(new UContactsClientPrivate(serviceName))
+{
+    FUNCTION_CALL_TRACE;
+}
+
+UContactsClient::~UContactsClient()
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    delete d->mAuth;
+    delete d->mRemoteSource;
+}
+
+bool
+UContactsClient::init()
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    d->mProgress = 0.0;
+    d->mAborted = false;
+
+    if (lastSyncTime().isNull()) {
+        d->mSlowSync = true;
+    } else {
+        d->mSlowSync = false;
+    }
+
+    LOG_DEBUG ("Last sync date:" << lastSyncTime() << "Using slow sync?" << d->mSlowSync);
+    if (!initConfig()) {
+        LOG_CRITICAL("Fail to init configuration");
+        return false;
+    }
+
+    d->mAuth = crateAuthenticator(this);
+    if (!d->mAuth || !d->mAuth->init(d->mAccountId, d->mServiceName)) {
+        LOG_CRITICAL("Fail to create auth object");
+        goto init_fail;
+    }
+
+    d->mContactBackend = createContactsBackend(this);
+    if (!d->mContactBackend) {
+        LOG_CRITICAL("Fail to create contact backend");
+        goto init_fail;
+    }
+
+
+    // remote source must be initialized after mAuth because its uses the account name property
+    d->mRemoteSource = createRemoteSource(this);
+    if (!d->mRemoteSource) {
+        LOG_CRITICAL("Fail to create remote contact backend");
+        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()));
+
+    // syncStateChanged to signal changes from CONNECTING, RECEIVING
+    // SENDING, DISCONNECTING, CLOSED
+    connect(this,
+            SIGNAL(stateChanged(int)),
+            SLOT(onStateChanged(int)));
+
+    // Take necessary action when sync is finished
+    connect(this,
+            SIGNAL(syncFinished(Sync::SyncStatus)),
+            SLOT(onSyncFinished(Sync::SyncStatus)));
+
+    return true;
+
+init_fail:
+
+    delete d->mRemoteSource;
+    delete d->mContactBackend;
+    delete d->mAuth;
+    d->mRemoteSource = 0;
+    d->mContactBackend = 0;
+    d->mAuth = 0;
+    return false;
+}
+
+bool
+UContactsClient::uninit()
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    delete d->mRemoteSource;
+    delete d->mContactBackend;
+    delete d->mAuth;
+    d->mRemoteSource = 0;
+    d->mContactBackend = 0;
+    d->mAuth = 0;
+
+    return true;
+}
+
+bool
+UContactsClient::isReadyToSync() const
+{
+    const Q_D(UContactsClient);
+    return (d->mContactBackend && d->mRemoteSource && d->mAuth);
+}
+
+UContactsBackend *UContactsClient::createContactsBackend(QObject *parent) const
+{
+    return new UContactsBackend(QCONTACTS_BACKEND_NAME, parent);
+}
+
+UAuth *UContactsClient::crateAuthenticator(QObject *parent) const
+{
+    return new UAuth(parent);
+}
+
+bool
+UContactsClient::startSync()
+{
+    FUNCTION_CALL_TRACE;
+
+    if (!isReadyToSync()) {
+        LOG_WARNING ("Ubuntu plugin is not ready to sync.");
+        return false;
+    }
+
+    Q_D(UContactsClient);
+    LOG_DEBUG ("Init done. Continuing with sync");
+
+    stateChanged(Sync::SYNC_PROGRESS_INITIALISING);
+    return d->mAuth->authenticate();
+}
+
+void
+UContactsClient::abortSync(Sync::SyncStatus aStatus)
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    d->mAborted = true;
+    d->mRemoteSource->abort();
+    emit syncFinished(Sync::SYNC_ABORTED);
+}
+
+bool
+UContactsClient::initConfig()
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    //TODO: support multiple remote databases "scopes"
+    QStringList accountList = iProfile.keyValues(Buteo::KEY_ACCOUNT_ID);
+    if (!accountList.isEmpty()) {
+        QString aId = accountList.first();
+        if (aId != NULL) {
+            d->mAccountId = aId.toInt();
+        }
+    } else {
+        d->mAccountId = 0;
+        LOG_WARNING("Account id not found in config profile");
+        return false;
+    }
+
+    QStringList databaseName = iProfile.keyValues(Buteo::KEY_DISPLAY_NAME);
+    if (databaseName.isEmpty()) {
+        LOG_WARNING("\"displayname\" is missing on configuration file");
+        return false;
+    }
+    d->mSyncTarget = databaseName.first();
+    d->mSyncDirection = iProfile.syncDirection();
+    d->mConflictResPolicy = iProfile.conflictResolutionPolicy();
+
+    return true;
+}
+
+void
+UContactsClient::onAuthenticationError()
+{
+    LOG_WARNING("Fail to authenticate with account");
+    emit syncFinished (Sync::SYNC_AUTHENTICATION_FAILURE);
+}
+
+bool
+UContactsClient::start()
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    /*
+      1. If no previous sync, go for slow-sync. Fetch all contacts
+         from server
+      2. Check if previous sync happened (from SyncLog). If yes,
+         fetch the time of last sync
+      3. Using the last sync time, retrieve all contacts from server
+         that were added/modified/deleted
+      4. Fetch all added/modified/deleted items from device
+      5. Check for conflicts. Take the default policy as "server-wins"
+      6. Save the list from the server to device
+      7. Push "client changes" - "conflicting items" to the server
+      8. Save the sync log
+     */
+
+    // Remote source will be create after authentication since it needs some information
+    // about the authentication (auth-token, etc..)
+
+    LOG_INFO("Sync Started at:" << QDateTime::currentDateTime().toUTC().toString(Qt::ISODate));
+    if (d->mAborted) {
+        LOG_WARNING("Sync aborted");
+        return false;
+    }
+
+    stateChanged(Sync::SYNC_PROGRESS_RECEIVING_ITEMS);
+
+    if (!d->mRemoteSource->init(remoteSourceProperties())) {
+        LOG_WARNING("Fail to init remote source");
+        return false;
+    }
+
+    if (!d->mContactBackend->init(d->mAccountId, d->mAuth->accountDisplayName())) {
+        LOG_WARNING("Fail to init contact backend");
+        return false;
+    }
+
+    switch (d->mSyncDirection)
+    {
+    case Buteo::SyncProfile::SYNC_DIRECTION_TWO_WAY:
+    {
+        QDateTime sinceDate = d->mSlowSync ? QDateTime() : lastSyncTime();
+
+        LOG_DEBUG("load all contacts since" << sinceDate << sinceDate.isValid());
+        // load changed contact since the last sync date or all contacts if no
+        // sync was done before
+        loadLocalContacts(sinceDate);
+
+        // load remote contacts
+        if (d->mSlowSync) {
+            connect(d->mRemoteSource,
+                    SIGNAL(contactsFetched(QList<QtContacts::QContact>,Sync::SyncStatus,qreal)),
+                    SLOT(onRemoteContactsFetchedForSlowSync(QList<QtContacts::QContact>,Sync::SyncStatus,qreal)));
+        } else {
+            connect(d->mRemoteSource,
+                    SIGNAL(contactsFetched(QList<QtContacts::QContact>,Sync::SyncStatus,qreal)),
+                    SLOT(onRemoteContactsFetchedForFastSync(QList<QtContacts::QContact>,Sync::SyncStatus, qreal)));
+        }
+        d->mRemoteSource->fetchContacts(sinceDate, !d->mSlowSync, true);
+        break;
+    }
+    case Buteo::SyncProfile::SYNC_DIRECTION_FROM_REMOTE:
+        LOG_WARNING("SYNC_DIRECTION_FROM_REMOTE: not implemented");
+        return false;
+    case Buteo::SyncProfile::SYNC_DIRECTION_TO_REMOTE:
+        LOG_WARNING("SYNC_DIRECTION_TO_REMOTE: not implemented");
+        return false;
+    case Buteo::SyncProfile::SYNC_DIRECTION_UNDEFINED:
+        // Not required
+    default:
+        // throw configuration error
+        return false;
+        break;
+    };
+
+    return true;
+}
+
+QList<QContact>
+UContactsClient::prepareContactsToUpload(UContactsBackend *backend,
+                                         const QSet<QContactId> &ids)
+{
+    QList<QContact> toUpdate;
+
+    foreach(const QContactId &id, ids) {
+        QContact contact = backend->getContact(id);
+        if (!contact.isEmpty()) {
+            toUpdate << contact;
+        } else {
+            LOG_CRITICAL("Fail to find local contact with id:" << id);
+            return QList<QContact>();
+        }
+    }
+
+    return toUpdate;
+}
+
+void
+UContactsClient::onRemoteContactsFetchedForSlowSync(const QList<QContact> contacts,
+                                                    Sync::SyncStatus status,
+                                                    qreal progress)
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    if (d->mAborted) {
+        LOG_WARNING("Sync aborted");
+        return;
+    }
+
+    if ((status != Sync::SYNC_PROGRESS) && (status != Sync::SYNC_STARTED)) {
+        disconnect(d->mRemoteSource);
+    }
+
+    if ((status == Sync::SYNC_PROGRESS) || (status == Sync::SYNC_DONE)) {
+        // save remote contacts locally
+        storeToLocalForSlowSync(contacts);
+
+        if (status == Sync::SYNC_DONE) {
+            stateChanged(Sync::SYNC_PROGRESS_SENDING_ITEMS);
+            QList<QContact> toUpload = prepareContactsToUpload(d->mContactBackend, d->mAllLocalContactIds);
+            connect(d->mRemoteSource,
+                    SIGNAL(transactionCommited(QList<QtContacts::QContact>,
+                                               QList<QtContacts::QContact>,
+                                               QStringList,
+                                               QMap<QString, int>,
+                                               Sync::SyncStatus)),
+                    SLOT(onContactsSavedForSlowSync(QList<QtContacts::QContact>,
+                                                    QList<QtContacts::QContact>,
+                                                    QStringList,
+                                                    QMap<QString, int>,
+                                                    Sync::SyncStatus)));
+
+            d->mRemoteSource->transaction();
+            d->mRemoteSource->saveContacts(toUpload);
+            d->mRemoteSource->commit();
+        } else {
+            stateChanged(qRound(progress * 100));
+        }
+    } else {
+        emit syncFinished(status);
+    }
+}
+
+void
+UContactsClient::onContactsSavedForSlowSync(const QList<QtContacts::QContact> &createdContacts,
+                                            const QList<QtContacts::QContact> &updatedContacts,
+                                            const QStringList &removedContacts,
+                                            const QMap<QString, int> errorMap,
+                                            Sync::SyncStatus status)
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    if (d->mAborted) {
+        LOG_WARNING("Sync aborted");
+        return;
+    }
+
+    LOG_DEBUG("AFTER UPLOAD(Slow sync):"
+                << "\n\tCreated on remote:" << createdContacts.size()
+                << "\n\tUpdated on remote:" << updatedContacts.size()
+                << "\n\tRemoved from remote:" << removedContacts.size()
+                << "\n\tError reported:" << errorMap.size());
+
+    if ((status != Sync::SYNC_PROGRESS) && (status != Sync::SYNC_STARTED)) {
+        disconnect(d->mRemoteSource);
+    }
+
+    if ((status == Sync::SYNC_PROGRESS) || (status == Sync::SYNC_DONE)) {
+        QList<QContact> changedContacts;
+
+        changedContacts += createdContacts;
+        changedContacts += updatedContacts;
+        updateIdsToLocal(changedContacts);
+        handleError(errorMap);
+
+        // sync report
+        addProcessedItem(Sync::ITEM_ADDED,
+                         Sync::REMOTE_DATABASE,
+                         syncTargetId(),
+                         createdContacts.size());
+
+        if (status == Sync::SYNC_PROGRESS) {
+            // sync still in progress
+            return;
+        } else {
+            stateChanged(Sync::SYNC_PROGRESS_FINALISING);
+            // WORKARDOUND: 'galera' contacts service take a while to fire contacts
+            // changed singal, this can cause a new sync due the storage change plugin
+            // lets wait 2 secs before fire sync finished signal
+            QTimer::singleShot(2000, this, SLOT(fireSyncFinishedSucessfully()));
+            return;
+        }
+    }
+
+    emit syncFinished(status);
+}
+
+void UContactsClient::onRemoteContactsFetchedForFastSync(const QList<QContact> contacts,
+                                                         Sync::SyncStatus status,
+                                                         qreal progress)
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    if (d->mAborted) {
+        LOG_WARNING("Sync aborted");
+        return;
+    }
+
+    if ((status != Sync::SYNC_PROGRESS) && (status != Sync::SYNC_STARTED)) {
+        disconnect(d->mRemoteSource);
+    }
+
+    if ((status == Sync::SYNC_PROGRESS) || (status == Sync::SYNC_DONE)) {
+        // save remote contacts locally
+        storeToLocalForFastSync(contacts);
+
+        if (status == Sync::SYNC_DONE) {
+            stateChanged(Sync::SYNC_PROGRESS_SENDING_ITEMS);
+            QList<QContact> contactsToUpload;
+            QList<QContact> contactsToRemove;
+
+            // Contacts created locally
+            LOG_DEBUG("Total number of Contacts ADDED : " << d->mAddedContactIds.count());
+            contactsToUpload = prepareContactsToUpload(d->mContactBackend,
+                                                       d->mAddedContactIds.values().toSet());
+
+            // Contacts modified locally
+            LOG_DEBUG("Total number of Contacts MODIFIED : " << d->mModifiedContactIds.count());
+            contactsToUpload += prepareContactsToUpload(d->mContactBackend,
+                                                        d->mModifiedContactIds.values().toSet());
+
+            // Contacts deleted locally
+            LOG_DEBUG("Total number of Contacts DELETED : " << d->mDeletedContactIds.count());
+            contactsToRemove = prepareContactsToUpload(d->mContactBackend,
+                                                       d->mDeletedContactIds.values().toSet());
+
+            connect(d->mRemoteSource,
+                    SIGNAL(transactionCommited(QList<QtContacts::QContact>,
+                                               QList<QtContacts::QContact>,
+                                               QStringList,
+                                               QMap<QString, int>,
+                                               Sync::SyncStatus)),
+                    SLOT(onContactsSavedForFastSync(QList<QtContacts::QContact>,
+                                                    QList<QtContacts::QContact>,
+                                                    QStringList,
+                                                    QMap<QString, int>,
+                                                    Sync::SyncStatus)));
+
+            d->mRemoteSource->transaction();
+            d->mRemoteSource->saveContacts(contactsToUpload);
+            d->mRemoteSource->removeContacts(contactsToRemove);
+            d->mRemoteSource->commit();
+        } else {
+            stateChanged(qRound(progress*100));
+        }
+    } else {
+        emit syncFinished(status);
+    }
+}
+
+void
+UContactsClient::onContactsSavedForFastSync(const QList<QtContacts::QContact> &createdContacts,
+                                            const QList<QtContacts::QContact> &updatedContacts,
+                                            const QStringList &removedContacts,
+                                            const QMap<QString, int> errorMap,
+                                            Sync::SyncStatus status)
+{
+    Q_UNUSED(updatedContacts)
+    Q_UNUSED(removedContacts)
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    if (d->mAborted) {
+        LOG_WARNING("Sync aborted");
+        return;
+    }
+
+    LOG_DEBUG("AFTER UPLOAD(Fast sync):" << status
+                << "\n\tCreated on remote:" << createdContacts.size()
+                << "\n\tUpdated on remote:" << updatedContacts.size()
+                << "\n\tRemoved from remote:" << removedContacts.size()
+                << "\n\tError reported:" << errorMap.size());
+
+    if ((status != Sync::SYNC_PROGRESS) && (status != Sync::SYNC_STARTED)) {
+        disconnect(d->mRemoteSource);
+    }
+
+    if ((status == Sync::SYNC_PROGRESS) || (status == Sync::SYNC_DONE)) {
+        QList<QContact> changedContacts;
+
+        changedContacts += createdContacts;
+        changedContacts += updatedContacts;
+
+        updateIdsToLocal(changedContacts);
+        handleError(errorMap);
+
+        // we need to call delete again because of error handling
+        d->mContactBackend->deleteContacts(removedContacts);
+
+        // sync report
+        addProcessedItem(Sync::ITEM_ADDED,
+                         Sync::REMOTE_DATABASE,
+                         syncTargetId(),
+                         createdContacts.size());
+        addProcessedItem(Sync::ITEM_MODIFIED,
+                         Sync::REMOTE_DATABASE,
+                         syncTargetId(),
+                         updatedContacts.size());
+        addProcessedItem(Sync::ITEM_DELETED,
+                         Sync::REMOTE_DATABASE,
+                         syncTargetId(),
+                         removedContacts.size());
+
+        if (status == Sync::SYNC_PROGRESS) {
+            // sync still in progress
+            return;
+        } else {
+            stateChanged(Sync::SYNC_PROGRESS_FINALISING);
+            // WORKARDOUND: 'galera' contacts service take a while to fire contacts
+            // changed singal, this can cause a new sync due the storage change plugin
+            // lets wait 2 secs before fire sync finished signal
+            QTimer::singleShot(2000, this, SLOT(fireSyncFinishedSucessfully()));
+            return;
+        }
+    }
+
+    emit syncFinished(status);
+}
+
+void
+UContactsClient::fireSyncFinishedSucessfully()
+{
+    emit syncFinished(Sync::SYNC_DONE);
+}
+
+void UContactsClient::handleError(const QMap<QString, int> &errorMap)
+{
+    Q_D(UContactsClient);
+    QStringList contactToRemove;
+
+    QMap<QString, int>::const_iterator i = errorMap.begin();
+    while(i != errorMap.end()) {
+        switch(i.value()) {
+        case QContactManager::DoesNotExistError:
+            // if the contact does not exists on remote side we will remove it locally
+            LOG_DEBUG("Romoving contact locally due the remote error:" << i.key());
+            contactToRemove << i.key();
+            break;
+        default:
+            LOG_WARNING("Unexpected error:" << i.value());
+            break;
+        }
+        i++;
+    }
+
+    if (!contactToRemove.isEmpty()) {
+        d->mContactBackend->deleteContacts(contactToRemove);
+    }
+}
+
+bool
+UContactsClient::storeToLocalForSlowSync(const QList<QContact> &remoteContacts)
+{
+    FUNCTION_CALL_TRACE;
+
+    Q_D(UContactsClient);
+    Q_ASSERT(d->mSlowSync);
+
+    bool syncSuccess = false;
+
+    LOG_DEBUG ("@@@storeToLocal#SLOW SYNC");
+    // Since we request for all the deleted contacts, if
+    // slow sync is performed many times, even deleted contacts
+    // will appear in *remoteContacts. Filter them out while
+    // saving them to device
+    LOG_DEBUG ("TOTAL REMOTE CONTACTS:" << remoteContacts.size());
+
+    if (!remoteContacts.isEmpty()) {
+        QMap<int, UContactsStatus> statusMap;
+        QList<QContact> cpyContacts(remoteContacts);
+        if (d->mContactBackend->addContacts(cpyContacts, &statusMap)) {
+            // TODO: Saving succeeded. Update sync results
+            syncSuccess = true;
+
+            // sync report
+            addProcessedItem(Sync::ITEM_ADDED,
+                             Sync::LOCAL_DATABASE,
+                             syncTargetId(),
+                             cpyContacts.count());
+        } else {
+            // TODO: Saving failed. Update sync results and probably stop sync
+            syncSuccess = false;
+        }
+    }
+
+    return syncSuccess;
+}
+
+bool
+UContactsClient::storeToLocalForFastSync(const QList<QContact> &remoteContacts)
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+    Q_ASSERT(!d->mSlowSync);
+
+    bool syncSuccess = false;
+    LOG_DEBUG ("@@@storeToLocal#FAST SYNC");
+    QList<QContact> remoteAddedContacts, remoteModifiedContacts, remoteDeletedContacts;
+    filterRemoteAddedModifiedDeletedContacts(remoteContacts,
+                                             remoteAddedContacts,
+                                             remoteModifiedContacts,
+                                             remoteDeletedContacts);
+
+    resolveConflicts(remoteModifiedContacts, remoteDeletedContacts);
+
+    if (!remoteAddedContacts.isEmpty()) {
+        LOG_DEBUG ("***Adding " << remoteAddedContacts.size() << " contacts");
+        QMap<int, UContactsStatus> addedStatusMap;
+        syncSuccess = d->mContactBackend->addContacts(remoteAddedContacts, &addedStatusMap);
+
+        if (syncSuccess) {
+            // sync report
+            addProcessedItem(Sync::ITEM_ADDED,
+                             Sync::LOCAL_DATABASE,
+                             syncTargetId(),
+                             remoteAddedContacts.count());
+        }
+    }
+
+    if (!remoteModifiedContacts.isEmpty()) {
+        LOG_DEBUG ("***Modifying " << remoteModifiedContacts.size() << " contacts");
+        QMap<int, UContactsStatus> modifiedStatusMap =
+                d->mContactBackend->modifyContacts(&remoteModifiedContacts);
+
+        syncSuccess = (modifiedStatusMap.size() > 0);
+
+        if (syncSuccess) {
+            // sync report
+            addProcessedItem(Sync::ITEM_MODIFIED,
+                             Sync::LOCAL_DATABASE,
+                             syncTargetId(),
+                             modifiedStatusMap.size());
+        }
+    }
+
+    if (!remoteDeletedContacts.isEmpty()) {
+        LOG_DEBUG ("***Deleting " << remoteDeletedContacts.size() << " contacts");
+        QStringList guidList;
+        for (int i=0; i<remoteDeletedContacts.size(); i++) {
+            guidList << UContactsBackend::getRemoteId(remoteDeletedContacts.at(i));
+        }
+
+        QStringList localIdList = d->mContactBackend->localIds(guidList);
+        QMap<int, UContactsStatus> deletedStatusMap =
+                d->mContactBackend->deleteContacts(localIdList);
+
+        syncSuccess = (deletedStatusMap.size() > 0);
+        if (syncSuccess) {
+            // sync report
+            addProcessedItem(Sync::ITEM_DELETED,
+                             Sync::LOCAL_DATABASE,
+                             syncTargetId(),
+                             localIdList.size());
+        }
+    }
+
+    return syncSuccess;
+}
+
+bool
+UContactsClient::cleanUp()
+{
+    FUNCTION_CALL_TRACE;
+    //TODO
+    return true;
+}
+
+void UContactsClient::connectivityStateChanged(Sync::ConnectivityType aType, bool aState)
+{
+    FUNCTION_CALL_TRACE;
+    LOG_DEBUG("Received connectivity change event:" << aType << " changed to " << aState);
+}
+
+void
+UContactsClient::loadLocalContacts(const QDateTime &since)
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    if (!since.isValid()) {
+        d->mAllLocalContactIds = d->mContactBackend->getAllContactIds().toSet();
+
+        LOG_DEBUG ("Number of contacts:" << d->mAllLocalContactIds.size ());
+    } else {
+        d->mAddedContactIds = d->mContactBackend->getAllNewContactIds(since);
+        d->mModifiedContactIds = d->mContactBackend->getAllModifiedContactIds(since);
+        d->mDeletedContactIds = d->mContactBackend->getAllDeletedContactIds(since);
+
+        LOG_DEBUG ("Number of local added contacts:" << d->mAddedContactIds.size());
+        LOG_DEBUG ("Number of local modified contacts:" << d->mModifiedContactIds.size());
+        LOG_DEBUG ("Number of local removed contacts:" << d->mDeletedContactIds.size());
+    }
+}
+
+void
+UContactsClient::onStateChanged(int aState)
+{
+    FUNCTION_CALL_TRACE;
+    emit syncProgressDetail(getProfileName(), aState);
+}
+
+void
+UContactsClient::onSyncFinished(Sync::SyncStatus aState)
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    switch(aState)
+    {
+        case Sync::SYNC_ERROR:
+        case Sync::SYNC_AUTHENTICATION_FAILURE:
+        case Sync::SYNC_DATABASE_FAILURE:
+        case Sync::SYNC_CONNECTION_ERROR:
+        case Sync::SYNC_NOTPOSSIBLE:
+        {
+            generateResults(false);
+            emit error(getProfileName(), "", aState);
+            break;
+        }
+        case Sync::SYNC_DONE:
+            // purge all deleted contacts
+            d->mContactBackend->purgecontacts(lastSyncTime());
+        case Sync::SYNC_ABORTED:
+        {
+            generateResults(true);
+            emit success(getProfileName(), QString::number(aState));
+            break;
+        }
+        case Sync::SYNC_QUEUED:
+        case Sync::SYNC_STARTED:
+        case Sync::SYNC_PROGRESS:
+        default:
+        {
+            generateResults(false);
+            emit error(getProfileName(), "", aState);
+            break;
+        }
+    }
+}
+
+Buteo::SyncResults
+UContactsClient::getSyncResults() const
+{
+    return d_ptr->mResults;
+}
+
+QString
+UContactsClient::authToken() const
+{
+    return d_ptr->mAuth->token();
+}
+
+QString
+UContactsClient::syncTargetId() const
+{
+    return d_ptr->mContactBackend->syncTargetId();
+}
+
+QString UContactsClient::accountName() const
+{
+    if (d_ptr->mAuth) {
+        return d_ptr->mAuth->accountDisplayName();
+    }
+    return QString();
+}
+
+const QDateTime
+UContactsClient::lastSyncTime() const
+{
+    FUNCTION_CALL_TRACE;
+
+    Buteo::ProfileManager pm;
+    Buteo::SyncProfile* sp = pm.syncProfile (iProfile.name ());
+    QDateTime lastTime = sp->lastSuccessfulSyncTime();
+    if (!lastTime.isNull()) {
+        // return UTC time used by google
+        return lastTime.addSecs(3).toUTC();
+    } else {
+        return lastTime;
+    }
+}
+
+
+void
+UContactsClient::filterRemoteAddedModifiedDeletedContacts(const QList<QContact> remoteContacts,
+                                                          QList<QContact> &remoteAddedContacts,
+                                                          QList<QContact> &remoteModifiedContacts,
+                                                          QList<QContact> &remoteDeletedContacts)
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    foreach (const QContact &contact, remoteContacts) {
+        if (UContactsBackend::deleted(contact)) {
+            remoteDeletedContacts.append(contact);
+            continue;
+        }
+
+        QString remoteId = UContactsBackend::getRemoteId(contact);
+        QContactId localId = d->mContactBackend->entryExists(remoteId);
+        if (localId.isNull()) {
+            remoteAddedContacts.append(contact);
+        } else {
+            remoteModifiedContacts.append(contact);
+        }
+    }
+}
+
+void
+UContactsClient::resolveConflicts(QList<QContact> &modifiedRemoteContacts,
+                                  QList<QContact> &deletedRemoteContacts)
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    // TODO: Handle conflicts. The steps:
+    // o Compare the list of local modified/deleted contacts with
+    //   the list of remote modified/deleted contacts
+    // o Create a new list (a map maybe) that has the contacts to
+    //   be modified/deleted using the conflict resolution policy
+    //   (server-wins, client-wins, add-new)
+    // o Return the list
+
+    //QListIterator<GContactEntry*> iter (modifiedRemoteContacts);
+    QList<QContact>::iterator iter;
+    for (iter = modifiedRemoteContacts.begin (); iter != modifiedRemoteContacts.end (); ++iter) {
+        QContact contact = *iter;
+        QString remoteId = UContactsBackend::getRemoteId(contact);
+
+        if (d->mModifiedContactIds.contains(remoteId)) {
+            if (d->mConflictResPolicy == Buteo::SyncProfile::CR_POLICY_PREFER_LOCAL_CHANGES) {
+                modifiedRemoteContacts.erase(iter);
+            } else {
+                d->mModifiedContactIds.remove(remoteId);
+            }
+        }
+
+        if (d->mDeletedContactIds.contains(remoteId)) {
+            if (d->mConflictResPolicy == Buteo::SyncProfile::CR_POLICY_PREFER_LOCAL_CHANGES) {
+                modifiedRemoteContacts.erase(iter);
+            } else {
+                d->mDeletedContactIds.remove(remoteId);
+            }
+        }
+    }
+
+    for (iter = deletedRemoteContacts.begin (); iter != deletedRemoteContacts.end (); ++iter) {
+        QContact contact = *iter;
+        QString remoteId = UContactsBackend::getRemoteId(contact);
+
+        if (d->mModifiedContactIds.contains(remoteId)) {
+            if (d->mConflictResPolicy == Buteo::SyncProfile::CR_POLICY_PREFER_LOCAL_CHANGES) {
+                deletedRemoteContacts.erase(iter);
+            } else {
+                d->mModifiedContactIds.remove(remoteId);
+            }
+        }
+
+        if (d->mDeletedContactIds.contains(remoteId)) {
+            // If the entry is deleted both at the server and
+            // locally, then just remove it from the lists
+            // so that no further action need to be taken
+            deletedRemoteContacts.erase(iter);
+            d->mDeletedContactIds.remove(remoteId);
+        }
+    }
+}
+
+void
+UContactsClient::updateIdsToLocal(const QList<QContact> &contacts)
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+    QList<QContact> newList(contacts);
+    d->mContactBackend->modifyContacts(&newList);
+}
+
+void
+UContactsClient::addProcessedItem(Sync::TransferType modificationType,
+                                  Sync::TransferDatabase database,
+                                  const QString &modifiedDatabase,
+                                  int count)
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    Buteo::DatabaseResults& results = d->mItemResults[modifiedDatabase];
+    if (database == Sync::LOCAL_DATABASE) {
+        if (modificationType == Sync::ITEM_ADDED) {
+            results.iLocalItemsAdded += count;
+        } else if (modificationType == Sync::ITEM_MODIFIED) {
+            results.iLocalItemsModified += count;
+        } else if (modificationType == Sync::ITEM_DELETED) {
+            results.iLocalItemsDeleted += count;
+        }
+    } else if (database == Sync::REMOTE_DATABASE) {
+        if( modificationType == Sync::ITEM_ADDED) {
+            results.iRemoteItemsAdded += count;
+        } else if (modificationType == Sync::ITEM_MODIFIED) {
+            results.iRemoteItemsModified += count;
+        } else if (modificationType == Sync::ITEM_DELETED) {
+            results.iRemoteItemsDeleted += count;
+        }
+    }
+
+    emit transferProgress(getProfileName(), database, modificationType, "text/vcard", count);
+}
+
+void
+UContactsClient::generateResults(bool aSuccessful)
+{
+    FUNCTION_CALL_TRACE;
+    Q_D(UContactsClient);
+
+    d->mResults = Buteo::SyncResults();
+    d->mResults.setMajorCode(aSuccessful ? Buteo::SyncResults::SYNC_RESULT_SUCCESS :
+                                           Buteo::SyncResults::SYNC_RESULT_FAILED );
+    d->mResults.setTargetId(iProfile.name());
+    if (d->mItemResults.isEmpty()) {
+        LOG_INFO("No items transferred");
+    } else {
+        QMapIterator<QString, Buteo::DatabaseResults> i(d->mItemResults);
+        while (i.hasNext())
+        {
+            i.next();
+            const Buteo::DatabaseResults &r = i.value();
+            Buteo::TargetResults targetResults(i.key(), // Target name
+                                               Buteo::ItemCounts(r.iLocalItemsAdded,
+                                                                 r.iLocalItemsDeleted,
+                                                                 r.iLocalItemsModified),
+                                               Buteo::ItemCounts(r.iRemoteItemsAdded,
+                                                                 r.iRemoteItemsDeleted,
+                                                                 r.iRemoteItemsModified));
+            d->mResults.addTargetResults(targetResults);
+            LOG_INFO("Sync finished at:" << d->mResults.syncTime().toUTC().toString(Qt::ISODate));
+            LOG_INFO("Items for" << targetResults.targetName() << ":");
+            LOG_INFO("LA:" << targetResults.localItems().added <<
+                     "LD:" << targetResults.localItems().deleted <<
+                     "LM:" << targetResults.localItems().modified <<
+                     "RA:" << targetResults.remoteItems().added <<
+                     "RD:" << targetResults.remoteItems().deleted <<
+                     "RM:" << targetResults.remoteItems().modified);
+        }
+    }
+}

=== added file 'buteo-contact-client/UContactsClient.h'
--- buteo-contact-client/UContactsClient.h	1970-01-01 00:00:00 +0000
+++ buteo-contact-client/UContactsClient.h	2015-09-24 17:49:24 +0000
@@ -0,0 +1,170 @@
+/*
+ * This file is part of buteo-sync-plugins-contacts package
+ *
+ * Copyright (C) 2013 Jolla Ltd. and/or its subsidiary(-ies).
+ *               2015 Canonical Ltd
+ *
+ * Contributors: Sateesh Kavuri <[e-mail]>
+ *               Mani Chandrasekar <[e-mail]>
+ *               Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef UCONTACSTCLIENT_H
+#define UCONTACSTCLIENT_H
+
+#include <QNetworkReply>
+#include <QContact>
+#include <QList>
+#include <QPair>
+
+#include <ClientPlugin.h>
+
+class UContactsClientPrivate;
+class UAuth;
+class UAbstractRemoteSource;
+class UContactsBackend;
+
+class UContactsClient : public Buteo::ClientPlugin
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(UContactsClient)
+
+public:
+
+    /*! \brief Constructor
+     *
+     * @param aPluginName Name of this client plugin
+     * @param aProfile Sync profile
+     * @param aCbInterface Pointer to the callback interface
+     * @param authenticator a instance of UAuth class to be used during the authentication
+     */
+    UContactsClient(const QString& aPluginName,
+                    const Buteo::SyncProfile &aProfile,
+                    Buteo::PluginCbInterface *aCbInterface,
+                    const QString& serviceName);
+
+    /*! \brief Destructor
+     *
+     * Call uninit before destroying the object.
+     */
+    virtual ~UContactsClient();
+
+    //! @see SyncPluginBase::init
+    virtual bool init();
+
+    //! @see SyncPluginBase::uninit
+    virtual bool uninit();
+
+    //! @see ClientPlugin::startSync
+    virtual bool startSync();
+
+    //! @see SyncPluginBase::abortSync
+    virtual void abortSync(Sync::SyncStatus aStatus = Sync::SYNC_ABORTED);
+
+    //! @see SyncPluginBase::getSyncResults
+    virtual Buteo::SyncResults getSyncResults() const;
+
+    //! @see SyncPluginBase::cleanUp
+    virtual bool cleanUp();
+
+public slots:
+    //! @see SyncPluginBase::connectivityStateChanged
+    virtual void connectivityStateChanged( Sync::ConnectivityType aType,
+                                           bool aState );
+
+protected:
+    QString authToken() const;
+    QString syncTargetId() const;
+    QString accountName() const;
+
+    // Must be implemented by the plugins
+    virtual UAbstractRemoteSource* createRemoteSource(QObject *parent) const = 0;
+    virtual QVariantMap remoteSourceProperties() const = 0;
+
+    virtual UContactsBackend* createContactsBackend(QObject *parent) const;
+    virtual UAuth* crateAuthenticator(QObject *parent) const;
+
+    virtual bool isReadyToSync() const;
+    virtual const QDateTime lastSyncTime() const;
+
+signals:
+    void stateChanged(int progress);
+    void itemProcessed(Sync::TransferType type,
+                       Sync::TransferDatabase db,
+                       int committedItems);
+    void syncFinished(Sync::SyncStatus);
+
+
+private:
+    QScopedPointer<UContactsClientPrivate> d_ptr;
+
+    void loadLocalContacts(const QDateTime &since);
+
+    bool initConfig();
+    void generateResults(bool aSuccessful);
+    void updateIdsToLocal(const QList<QtContacts::QContact> &contacts);
+    void filterRemoteAddedModifiedDeletedContacts(const QList<QTCONTACTS_PREPEND_NAMESPACE(QContact)> remoteContacts,
+                                                  QList<QTCONTACTS_PREPEND_NAMESPACE(QContact)> &remoteAddedContacts,
+                                                  QList<QTCONTACTS_PREPEND_NAMESPACE(QContact)> &remoteModifiedContacts,
+                                                  QList<QTCONTACTS_PREPEND_NAMESPACE(QContact)> &remoteDeletedContacts);
+    void resolveConflicts(QList<QTCONTACTS_PREPEND_NAMESPACE(QContact)> &modifiedRemoteContacts,
+                          QList<QTCONTACTS_PREPEND_NAMESPACE(QContact)> &deletedRemoteContacts);
+    void addProcessedItem(Sync::TransferType modificationType,
+                          Sync::TransferDatabase database,
+                          const QString &modifiedDatabase,
+                          int count = 1);
+    QList<QTCONTACTS_PREPEND_NAMESPACE(QContact)> prepareContactsToUpload(UContactsBackend *backend,
+                                                                          const QSet<QTCONTACTS_PREPEND_NAMESPACE(QContactId)> &ids);
+
+    /* slow sync */
+    bool storeToLocalForSlowSync(const QList<QTCONTACTS_PREPEND_NAMESPACE(QContact)> &remoteContacts);
+
+    /* fast sync */
+    bool storeToLocalForFastSync(const QList<QTCONTACTS_PREPEND_NAMESPACE(QContact)> &remoteContacts);
+
+private slots:
+    bool start();
+    void onAuthenticationError();
+    void onStateChanged(int progress);
+    void onSyncFinished(Sync::SyncStatus status);
+    void fireSyncFinishedSucessfully();
+    void handleError(const QMap<QString, int> &errorMap);
+
+
+    /* slow sync */
+    void onRemoteContactsFetchedForSlowSync(const QList<QtContacts::QContact> contacts,
+                                            Sync::SyncStatus status,
+                                            qreal progress);
+    void onContactsSavedForSlowSync(const QList<QtContacts::QContact> &createdContacts,
+                                    const QList<QtContacts::QContact> &updatedContacts,
+                                    const QStringList &removedContacts,
+                                    const QMap<QString, int> errorList,
+                                    Sync::SyncStatus status);
+    /* fast sync */
+    void onRemoteContactsFetchedForFastSync(const QList<QtContacts::QContact> contacts,
+                                            Sync::SyncStatus status,
+                                            qreal progress);
+    void onContactsSavedForFastSync(const QList<QtContacts::QContact> &createdContacts,
+                                    const QList<QtContacts::QContact> &updatedContacts,
+                                    const QStringList &removedContacts,
+                                    const QMap<QString, int> errorMap,
+                                    Sync::SyncStatus status);
+
+};
+
+#endif // UCONTACTCLIENT_H

=== added file 'buteo-contact-client/UContactsCustomDetail.cpp'
--- buteo-contact-client/UContactsCustomDetail.cpp	1970-01-01 00:00:00 +0000
+++ buteo-contact-client/UContactsCustomDetail.cpp	2015-09-24 17:49:24 +0000
@@ -0,0 +1,56 @@
+/*
+ * This file is part of buteo-sync-plugins-contacts package
+ *
+ * Copyright (C) 2013 Jolla Ltd. and/or its subsidiary(-ies).
+ *               2015 Canonical Ltd
+ *
+ * Contributors: Sateesh Kavuri <[e-mail]>
+ *               Mani Chandrasekar <[e-mail]>
+ *               Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "UContactsCustomDetail.h"
+
+// Ubuntu fields
+const QString UContactsCustomDetail::FieldContactETag = "X-GOOGLE-ETAG";
+const QString UContactsCustomDetail::FieldGroupMembershipInfo = "X-GROUP-ID";
+const QString UContactsCustomDetail::FieldRemoteId = "X-REMOTE-ID";
+const QString UContactsCustomDetail::FieldDeletedAt = "X-DELETED-AT";
+const QString UContactsCustomDetail::FieldCreatedAt = "X-CREATED-AT";
+const QString UContactsCustomDetail::FieldContactAvatarETag = "X-AVATAR-REV";
+
+QContactExtendedDetail
+UContactsCustomDetail::getCustomField(const QContact &contact, const QString &name)
+{
+    foreach (QContactExtendedDetail xd, contact.details<QContactExtendedDetail>()) {
+        if (xd.name() == name) {
+            return xd;
+        }
+    }
+    QContactExtendedDetail xd;
+    xd.setName(name);
+    return xd;
+}
+
+
+void UContactsCustomDetail::setCustomField(QtContacts::QContact &contact, const QString &name, const QVariant &value)
+{
+    QContactExtendedDetail xd = getCustomField(contact, name);
+    xd.setData(value);
+    contact.saveDetail(&xd);
+}

=== added file 'buteo-contact-client/UContactsCustomDetail.h'
--- buteo-contact-client/UContactsCustomDetail.h	1970-01-01 00:00:00 +0000
+++ buteo-contact-client/UContactsCustomDetail.h	2015-09-24 17:49:24 +0000
@@ -0,0 +1,52 @@
+/*
+ * This file is part of buteo-sync-plugins-contacts package
+ *
+ * Copyright (C) 2013 Jolla Ltd. and/or its subsidiary(-ies).
+ *               2015 Canonical Ltd
+ *
+ * Contributors: Sateesh Kavuri <[e-mail]>
+ *               Mani Chandrasekar <[e-mail]>
+ *               Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef UCONTACTSCUSTOMDETAIL_H
+#define UCONTACTSCUSTOMDETAIL_H
+
+#include <QString>
+
+#include <QContact>
+#include <QContactExtendedDetail>
+
+QTCONTACTS_USE_NAMESPACE
+
+class UContactsCustomDetail
+{
+public:
+    // Ubuntu fields
+    static const QString FieldContactETag;
+    static const QString FieldRemoteId;
+    static const QString FieldGroupMembershipInfo;
+    static const QString FieldDeletedAt;
+    static const QString FieldCreatedAt;
+    static const QString FieldContactAvatarETag;
+
+    static QContactExtendedDetail getCustomField(const QContact &contact, const QString &name);
+    static void setCustomField(QContact &contact, const QString &name, const QVariant &value);
+};
+
+#endif // GCONTACTCUSTOMDETAIL_H

=== added directory 'cmake'
=== added file 'cmake/lcov.cmake'
--- cmake/lcov.cmake	1970-01-01 00:00:00 +0000
+++ cmake/lcov.cmake	2015-09-24 17:49:24 +0000
@@ -0,0 +1,72 @@
+# - This module creates a new 'lcov' target which generates
+#   a coverage analysis html output.
+# LCOV is a graphical front-end for GCC's coverage testing tool gcov.  Please see
+# http://ltp.sourceforge.net/coverage/lcov.php
+#
+# Usage: you must add an option to your CMakeLists.txt to build your application
+# with coverage support. Then you need to include this file to the lcov target.
+#
+# Example:
+# IF(BUILD_WITH_COVERAGE)
+#   SET(CMAKE_C_FLAGS "-g -O0 -Wall -fprofile-arcs -ftest-coverage")
+#   SET(CMAKE_CXX_FLAGS "-g -O0 -Wall -fprofile-arcs -ftest-coverage")
+#   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage -lgcov")
+#   include(${CMAKE_SOURCE_DIR}/cmake/lcov.cmake)
+# ENDIF(BUILD_WITH_COVERAGE)
+#=============================================================================
+# Copyright 2010 ascolab GmbH
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+set(REMOVE_PATTERN
+    q*.h
+    *.moc
+    moc_*.cpp
+    locale_facets.h
+    new
+    move.h
+    qcontactmemorybackend.cpp
+    limits
+    /usr/include/c++/4.9/bits/*
+    /usr/include/buteosyncfw5/*
+    )
+
+## lcov target
+ADD_CUSTOM_TARGET(lcov)
+ADD_CUSTOM_COMMAND(TARGET lcov
+    COMMAND mkdir -p coverage
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+ADD_CUSTOM_COMMAND(TARGET lcov
+    COMMAND lcov --directory . --zerocounters
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+ADD_CUSTOM_COMMAND(TARGET lcov
+    COMMAND make test
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+ADD_CUSTOM_COMMAND(TARGET lcov
+    COMMAND lcov --directory . --capture --output-file ./coverage/stap_all.info --no-checksum --compat-libtool
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+ADD_CUSTOM_COMMAND(TARGET lcov
+    COMMAND lcov --directory . -r ./coverage/stap_all.info ${REMOVE_PATTERN} --output-file ./coverage/stap.info
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+ADD_CUSTOM_COMMAND(TARGET lcov
+    COMMAND genhtml -o ./coverage --title "Code Coverage" --legend --show-details --demangle-cpp ./coverage/stap.info
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+ADD_CUSTOM_COMMAND(TARGET lcov
+    COMMAND echo "Open ${CMAKE_BINARY_DIR}/coverage/index.html to view the coverage analysis results."
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+

=== added file 'cmake_uninstall.cmake.in'
--- cmake_uninstall.cmake.in	1970-01-01 00:00:00 +0000
+++ cmake_uninstall.cmake.in	2015-09-24 17:49:24 +0000
@@ -0,0 +1,21 @@
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+  IF(EXISTS "$ENV{DESTDIR}${file}")
+    EXEC_PROGRAM(
+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
+    IF(NOT "${rm_retval}" STREQUAL 0)
+      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+    ENDIF(NOT "${rm_retval}" STREQUAL 0)
+  ELSE(EXISTS "$ENV{DESTDIR}${file}")
+    MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+  ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+ENDFOREACH(file)

=== added file 'config.h.in'
--- config.h.in	1970-01-01 00:00:00 +0000
+++ config.h.in	2015-09-24 17:49:24 +0000
@@ -0,0 +1,9 @@
+#ifndef __CONFIG_H__
+#define __CONFIG_H__
+
+#include <QString>
+
+const QString GOOGLE_ETAG_DETAIL                 ("X-GOOGLE-ETAG");
+const QString QCONTACTS_BACKEND_NAME             ("galera");
+
+#endif

=== added directory 'google'
=== added file 'google/CMakeLists.txt'
--- google/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ google/CMakeLists.txt	2015-09-24 17:49:24 +0000
@@ -0,0 +1,87 @@
+project(buteo-contact-google)
+set(GOOGLE_CONTACTS_CLIENT googlecontacts-client)
+set(GOOGLE_CONTACTS_LIB    googlecontacts-lib)
+
+include_directories(
+    ${CMAKE_BINARY_DIR}
+    ${buteo-contact-client_SOURCE_DIR}
+    ${ACCOUNTS_INCLUDE_DIRS}
+    ${BUTEOSYNCFW_INCLUDE_DIRS}
+    ${LIBSIGNON_INCLUDE_DIRS}
+)
+
+set(GOOGLE_CONTACTS_LIB_SRCS
+    atom_global.h
+    buteo-gcontact-plugin_global.h
+    buteosyncfw_p.h
+    GConfig.h
+    GConfig.cpp
+    GContactAtom.h
+    GContactAtom.cpp
+    GContactImageDownloader.h
+    GContactImageDownloader.cpp
+    GContactStream.h
+    GContactStream.cpp
+    GRemoteSource.h
+    GRemoteSource.cpp
+)
+
+add_library(${GOOGLE_CONTACTS_LIB} STATIC
+    ${GOOGLE_CONTACTS_LIB_SRCS}
+)
+
+target_link_libraries(${GOOGLE_CONTACTS_LIB}
+    ${ACCOUNTS_LIBRARIES}
+    ${BUTEOSYNCFW_LIBRARIES}
+    ${LIBSIGNON_LIBRARIES}
+    ubuntu-contact-client
+)
+
+qt5_use_modules(${GOOGLE_CONTACTS_LIB} Core Network Contacts)
+
+# Buteo oop plugin
+add_definitions(-DCLASSNAME=GContactsClient)
+add_definitions(-DCLASSNAME_H=\"GContactsClient.h\")
+add_definitions(-DCLIENT_PLUGIN)
+set(GOOGLE_CONTACT_BUTEO_SRCS
+    ${BUTEOSYNCFW_INCLUDEDIR}/ButeoPluginIfaceAdaptor.h
+    ${BUTEOSYNCFW_INCLUDEDIR}/PluginCbImpl.h
+    ${BUTEOSYNCFW_INCLUDEDIR}/PluginServiceObj.h
+    ${BUTEOSYNCFW_INCLUDEDIR}/ButeoPluginIfaceAdaptor.cpp
+    ${BUTEOSYNCFW_INCLUDEDIR}/PluginCbImpl.cpp
+    ${BUTEOSYNCFW_INCLUDEDIR}/PluginServiceObj.cpp
+    ${BUTEOSYNCFW_INCLUDEDIR}/plugin_main.cpp
+)
+
+set(GOOGLE_CONTACTS_CLIENT_SRCS
+    GContactsClient.h
+    GContactsClient.cpp
+    # real implementation
+    GTransport.h
+    GTransport.cpp
+    GContactImageUploader.cpp
+    GContactImageUploader.h
+    ${GOOGLE_CONTACT_BUTEO_SRCS}
+)
+
+add_executable(${GOOGLE_CONTACTS_CLIENT}
+    ${GOOGLE_CONTACTS_CLIENT_SRCS}
+)
+
+target_link_libraries(${GOOGLE_CONTACTS_CLIENT}
+    ${ACCOUNTS_LIBRARIES}
+    ${BUTEOSYNCFW_LIBRARIES}
+    ${LIBSIGNON_LIBRARIES}
+    ${GOOGLE_CONTACTS_LIB}
+    ubuntu-contact-client
+)
+
+qt5_use_modules(${GOOGLE_CONTACTS_CLIENT} Core DBus Network Contacts)
+
+install(TARGETS ${GOOGLE_CONTACTS_CLIENT}
+    RUNTIME DESTINATION "${BUTEOSYNCFW_PLUGIN_PATH}/oopp"
+)
+
+add_subdirectory(xmls)
+
+

=== added file 'google/GConfig.cpp'
--- google/GConfig.cpp	1970-01-01 00:00:00 +0000
+++ google/GConfig.cpp	2015-09-24 17:49:24 +0000
@@ -0,0 +1,52 @@
+/*
+ * This file is part of buteo-sync-plugins-contacts package
+ *
+ * Copyright (C) 2013 Jolla Ltd. and/or its subsidiary(-ies).
+ *               2015 Canonical Ltd
+ *
+ * Contributors: Sateesh Kavuri <[e-mail]>
+ *               Mani Chandrasekar <[e-mail]>
+ *               Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "GConfig.h"
+
+const int GConfig::MAX_RESULTS = 30;
+const QString GConfig::SCOPE_URL = "https://www.google.com/m8/feeds/";
+const QString GConfig::GCONTACT_URL = SCOPE_URL + "/contacts/default/";
+
+const QString GConfig::GDATA_VERSION_TAG = "GData-Version";
+const QString GConfig::GDATA_VERSION = "3.0";
+const QString GConfig::G_DELETE_OVERRIDE_HEADER = "X-HTTP-Method-Override: DELETE";
+const QString GConfig::G_ETAG_HEADER = "If-Match";
+const QString GConfig::G_AUTH_HEADER = "Authorization";
+
+/* Query parameters */
+const QString GConfig::QUERY_TAG = "q";
+const QString GConfig::MAX_RESULTS_TAG = "max-results";
+const QString GConfig::START_INDEX_TAG = "start-index";
+const QString GConfig::UPDATED_MIN_TAG = "updated-min";
+const QString GConfig::ORDERBY_TAG = "orderby";
+const QString GConfig::SHOW_DELETED_TAG = "showdeleted";
+const QString GConfig::REQUIRE_ALL_DELETED = "requirealldeleted";
+const QString GConfig::SORTORDER_TAG = "sortorder";
+const QString GConfig::GROUP_MY_CONTACTS_ID = "6";
+
+const QString GConfig::PHOTO_TAG = "photos";
+const QString GConfig::MEDIA_TAG = "media";
+const QString GConfig::BATCH_TAG = "batch";

=== added file 'google/GConfig.h'
--- google/GConfig.h	1970-01-01 00:00:00 +0000
+++ google/GConfig.h	2015-09-24 17:49:24 +0000
@@ -0,0 +1,71 @@
+/*
+ * This file is part of buteo-sync-plugins-contacts package
+ *
+ * Copyright (C) 2013 Jolla Ltd. and/or its subsidiary(-ies).
+ *               2015 Canonical Ltd
+ *
+ * Contributors: Sateesh Kavuri <[e-mail]>
+ *               Mani Chandrasekar <[e-mail]>
+ *               Renato Araujo Oliveira Filho <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef GCONFIG_H
+#define GCONFIG_H
+
+#include <QString>
+
+class GConfig
+{
+public:
+    static const int MAX_RESULTS;
+    static const QString SCOPE_URL;
+    static const QString GCONTACT_URL;
+
+    static const QString GDATA_VERSION_TAG;
+    static const QString GDATA_VERSION;
+    static const QString G_DELETE_OVERRIDE_HEADER;
+    static const QString G_ETAG_HEADER;
+    static const QString G_AUTH_HEADER;
+
+    /* My Contacts Group */
+    static const QString GROUP_MY_CONTACTS_ID;
+
+    /* Query parameters */
+    static const QString QUERY_TAG;
+    static const QString MAX_RESULTS_TAG;
+    static const QString START_INDEX_TAG;
+    static const QString UPDATED_MIN_TAG;
+    static const QString ORDERBY_TAG;
+    static const QString SHOW_DELETED_TAG;
+    static const QString REQUIRE_ALL_DELETED;
+    static const QString SORTORDER_TAG;
+
+    static const QString PHOTO_TAG;
+    static const QString MEDIA_TAG;
+    static const QString BATCH_TAG;
+
+    typedef enum
+    {
+        NONE = 0,
+        ADD,
+        UPDATE,
+        DELETE
+    } TRANSACTION_TYPE;
+};
+#endif // GCONFIG_H
+

=== added file 'google/GContactAtom.cpp'
--- google/GContactAtom.cpp	1970-01-01 00:00:00 +0000
+++ google/GContactAtom.cpp	2015-09-24 17:49:24 +0000
@@ -0,0 +1,209 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2013-2014 Jolla Ltd. and/or its subsidiary(-ies).
+ ** Contact: Chris Adams <[e-mail]>
+ **
+ ** Contributors: Sateesh Kavuri <[e-mail]>
+ **               Mani Chandrasekar <[e-mail]>
+ **               Chris Adams <[e-mail]>
+ **
+ ** This program/library is free software; you can redistribute it and/or
+ ** modify it under the terms of the GNU Lesser General Public License
+ ** version 2.1 as published by the Free Software Foundation.
+ **
+ ** This program/library 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
+ ** Lesser General Public License for more details.
+ **
+ ** You should have received a copy of the GNU Lesser General Public
+ ** License along with this program/library; if not, write to the Free
+ ** Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ** 02110-1301 USA
+ **
+ ****************************************************************************/
+
+#include "GContactAtom.h"
+
+GoogleContactAtom::BatchOperationResponse::BatchOperationResponse()
+    : isError(false)
+{
+}
+
+GoogleContactAtom::GoogleContactAtom()
+{
+}
+
+void GoogleContactAtom::setAuthorEmail(const QString &authorEmail)
+{
+    mAuthorEmail = authorEmail;
+}
+
+QString GoogleContactAtom::authorEmail() const
+{
+    return mAuthorEmail;
+}
+
+void GoogleContactAtom::setAuthorName(const QString &authorName)
+{
+    mAuthorName = authorName;
+}
+
+QString GoogleContactAtom::authorName() const
+{
+    return mAuthorName;
+}
+
+void GoogleContactAtom::setId(const QString &id)
+{
+    mId = id;
+}
+
+QString GoogleContactAtom::id() const
+{
+    return mId;
+}
+
+void GoogleContactAtom::setUpdated(const QString &updated)
+{
+    mUpdated = updated;
+}
+
+QString GoogleContactAtom::updated() const
+{
+    return mUpdated;
+}
+
+void GoogleContactAtom::setCategory(const QString &schema, const QString &term)
+{
+    mCategorySchema = schema;
+    mCategoryTerm = term;
+}
+
+QString GoogleContactAtom::categorySchema() const
+{
+    return mCategorySchema;
+}
+
+QString GoogleContactAtom::categoryTerm() const
+{
+    return mCategoryTerm;
+}
+
+void GoogleContactAtom::setTitle(const QString &title)
+{
+    mTitle = title;
+}
+
+QString GoogleContactAtom::title() const
+{
+    return mTitle;
+}
+
+void GoogleContactAtom::setGenerator(const QString &name, const QString &version, const QString &uri)
+{
+    mGeneratorName = name;
+    mGeneratorVersion = version;
+    mGeneratorUri = uri;
+}
+
+void GoogleContactAtom::setContent(const QString &note, const QString &type)
+{
+    Q_UNUSED(note)
+    Q_UNUSED(type)
+}
+
+QString GoogleContactAtom::generatorName() const
+{
+    return mGeneratorName;
+}
+
+QString GoogleContactAtom::generatorVersion() const
+{
+    return mGeneratorVersion;
+}
+
+QString GoogleContactAtom::generatorUri() const
+{
+    return mGeneratorUri;
+}
+
+void GoogleContactAtom::setTotalResults(int totalResults)
+{
+    mTotalResults = totalResults;
+}
+
+int GoogleContactAtom::totalResults() const
+{
+    return mTotalResults;
+}
+
+void GoogleContactAtom::setStartIndex(int startIndex)
+{
+    mStartIndex = startIndex;
+}
+
+int GoogleContactAtom::startIndex() const
+{
+    return mStartIndex;
+}
+
+void GoogleContactAtom::setItemsPerPage(int itemsPerPage)
+{
+    mItemsPerPage = itemsPerPage;
+}
+
+int GoogleContactAtom::itemsPerPage() const
+{
+    return mItemsPerPage;
+}
+
+void GoogleContactAtom::addBatchOperationResponse(const QString &operationId, GoogleContactAtom::BatchOperationResponse response)
+{
+    mBatchOperationResponses.insert(operationId, response);
+}
+
+QMap<QString, GoogleContactAtom::BatchOperationResponse> GoogleContactAtom::batchOperationResponses() const
+{
+    return mBatchOperationResponses;
+}
+
+void GoogleContactAtom::addEntryContact(const QContact &entryContact, const QStringList &unsupportedElements)
+{
+    mContactList.append(qMakePair(entryContact, unsupportedElements));
+}
+
+QList<QPair<QContact, QStringList> > GoogleContactAtom::entryContacts() const
+{
+    return mContactList;
+}
+
+void GoogleContactAtom::addDeletedEntryContact(const QContact &deletedContact)
+{
+    mDeletedContactList.append(deletedContact);
+}
+
+QList<QContact> GoogleContactAtom::deletedEntryContacts() const
+{
+    return mDeletedContactList;
+}
+
+void GoogleContactAtom::addEntrySystemGroup(const QString &systemGroupId, const QString &systemGroupAtomId)
+{
+    mSystemGroupAtomIds.insert(systemGroupId, systemGroupAtomId);
+}
+
+QMap<QString, QString> GoogleContactAtom::entrySystemGroups() const
+{
+    return mSystemGroupAtomIds;
+}
+
+void GoogleContactAtom::setNextEntriesUrl(const QString &nextUrl)
+{
+    mNextEntriesUrl = nextUrl;
+}
+
+QString GoogleContactAtom::nextEntriesUrl() const
+{
+    return mNextEntriesUrl;
+}

=== added file 'google/GContactAtom.h'
--- google/GContactAtom.h	1970-01-01 00:00:00 +0000
+++ google/GContactAtom.h	2015-09-24 17:49:24 +0000
@@ -0,0 +1,138 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2013-2014 Jolla Ltd. and/or its subsidiary(-ies).
+ ** Contact: Chris Adams <[e-mail]>
+ **
+ ** Contributors: Sateesh Kavuri <[e-mail]>
+ **               Chris Adams <[e-mail]>
+ **
+ ** This program/library is free software; you can redistribute it and/or
+ ** modify it under the terms of the GNU Lesser General Public License
+ ** version 2.1 as published by the Free Software Foundation.
+ **
+ ** This program/library 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
+ ** Lesser General Public License for more details.
+ **
+ ** You should have received a copy of the GNU Lesser General Public
+ ** License along with this program/library; if not, write to the Free
+ ** Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ** 02110-1301 USA
+ **
+ ****************************************************************************/
+
+#ifndef GOOGLECONTACTATOM_H
+#define GOOGLECONTACTATOM_H
+
+#include <QMetaEnum>
+#include <QMap>
+#include <QList>
+#include <QXmlStreamWriter>
+
+#include <QContact>
+
+QTCONTACTS_USE_NAMESPACE
+
+class GoogleContactAtom {
+public:
+    GoogleContactAtom();
+
+    void setAuthorName(const QString &authorName);
+    QString authorName() const;
+
+    void setAuthorEmail(const QString &authorEmail);
+    QString authorEmail() const;
+
+    void setId(const QString &id);
+    QString id() const;
+
+    void setUpdated(const QString &updated);
+    QString updated() const;
+
+    void setCategory(const QString &schema = QStringLiteral("http://schemas.google.com/g/2005#kind"),
+                     const QString &term = QStringLiteral("http://schemas.google.com/contact/2008#contact"));
+    QString categorySchema() const;
+    QString categoryTerm() const;
+
+    void setTitle(const QString &title);
+    QString title() const;
+
+    void setContent(const QString &note, const QString &type = QStringLiteral("text"));
+
+    void setGenerator(const QString &name = QStringLiteral("Contacts"),
+                      const QString &version = QStringLiteral("1.0"),
+                      const QString &uri = QStringLiteral("https://sailfishos.org"));
+    QString generatorName() const;
+    QString generatorVersion() const;
+    QString generatorUri() const;
+
+    void setTotalResults(int totalResults);
+    int totalResults() const;
+
+    void setStartIndex(int startIndex);
+    int startIndex() const;
+
+    void setItemsPerPage(int itemsPerPage);
+    int itemsPerPage() const;
+
+    void addEntryContact(const QContact &contact, const QStringList &unsupportedElements);
+    QList<QPair<QContact, QStringList> > entryContacts() const;
+    void addDeletedEntryContact(const QContact &contact);
+    QList<QContact> deletedEntryContacts() const;
+
+    void addEntrySystemGroup(const QString &systemGroupId, const QString &systemGroupAtomId);
+    QMap<QString, QString> entrySystemGroups() const;
+
+    void setNextEntriesUrl(const QString &nextUrl);
+    QString nextEntriesUrl() const;
+
+    class BatchOperationResponse {
+    public:
+        BatchOperationResponse();
+        QString operationId;
+        QString type;
+        QString code;
+        QString reason;
+        QString reasonDescription;
+        QString contactGuid;
+        QString eTag;
+        bool isError;
+    };
+    void addBatchOperationResponse(const QString &operationId, BatchOperationResponse response);
+    QMap<QString, BatchOperationResponse> batchOperationResponses() const;
+
+private:
+    QString mAuthorEmail;
+    QString mAuthorName;
+    QString mCategory;
+    QString mCategorySchema;
+    QString mCategoryTerm;
+    QString mContributor;
+    QString mGeneratorName;
+    QString mGeneratorVersion;
+    QString mGeneratorUri;
+    QString mIcon;
+    QString mId;
+    QString mLink;
+    QString mLogo;
+    QString mRights;
+    QString mSubtitle;
+    QString mTitle;
+    QString mUpdated;
+
+    int mTotalResults;
+    int mStartIndex;
+    int mItemsPerPage;
+
+    QMap<QString, BatchOperationResponse> mBatchOperationResponses;
+
+    QList<QContact> mDeletedContactList;
+    QList<QPair<QContact, QStringList> > mContactList;
+
+    QMap<QString, QString> mSystemGroupAtomIds;
+
+    QString mNextEntriesUrl;
+};
+
+#endif // GOOGLECONTACTATOM_H

=== added file 'google/GContactGroupsMap.cpp'
--- google/GContactGroupsMap.cpp	1970-01-01 00:00:00 +0000
+++ google/GContactGroupsMap.cpp	2015-09-24 17:49:24 +0000
@@ -0,0 +1,122 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2015 Canonical Ltd.
+ **
+ ** Contact: Renato Araujo Oliveira Filho <[e-mail]>
+ **
+ ** This program/library is free software; you can redistribute it and/or
+ ** modify it under the terms of the GNU Lesser General Public License
+ ** version 2.1 as published by the Free Software Foundation.
+ **
+ ** This program/library 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
+ ** Lesser General Public License for more details.
+ **
+ ** You should have received a copy of the GNU Lesser General Public
+ ** License along with this program/library; if not, write to the Free
+ ** Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ** 02110-1301 USA
+ **
+ ****************************************************************************/
+
+#include "GContactGroupsMap.h"
+#include <LogMacros.h>
+
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QNetworkAccessManager>
+#include <QTemporaryFile>
+
+GContactGroupMap::GContactGroupMap(const QString &authToken, QObject *parent)
+    : QObject(parent),
+      mNetworkAccessManager(new QNetworkAccessManager),
+      mAuthToken(authToken)
+{
+}
+
+GContactGroupMap::~GContactGroupMap()
+{
+}
+
+void GContactGroupMap::reload()
+{
+    connect(networkAccessManager,
+            SIGNAL(finished(QNetworkReply*)),
+            SLOT(onRequestFinished(QNetworkReply*)),
+            Qt::QueuedConnection);
+
+    QNetworkRequest request(mQueue.takeFirst());
+    request.setRawHeader("GData-Version", "3.0");
+    request.setRawHeader(QString(QLatin1String("Authorization")).toUtf8(),
+                         QString(QLatin1String("Bearer ") + mAuthToken).toUtf8());
+    QNetworkReply *reply = networkAccessManager->get(request);
+}
+
+void GContactGroupMap::push(const QUrl &imgUrl)
+{
+    mQueue.push_back(imgUrl);
+}
+
+QMap<QUrl, QUrl> GContactImageDownloader::donwloaded()
+{
+    return mResults;
+}
+
+void GContactImageDownloader::exec()
+{
+    QNetworkAccessManager *networkAccessManager = new QNetworkAccessManager;
+
+
+    QEventLoop eventLoop;
+    mEventLoop = &eventLoop;
+
+    while(!mQueue.isEmpty()) {
+        QNetworkRequest request(mQueue.takeFirst());
+        request.setRawHeader("GData-Version", "3.0");
+        request.setRawHeader(QString(QLatin1String("Authorization")).toUtf8(),
+                             QString(QLatin1String("Bearer ") + mAuthToken).toUtf8());
+        QNetworkReply *reply = networkAccessManager->get(request);
+
+        // wait for the download to finish
+        eventLoop.exec();
+
+        // should we abort?
+        if (mAbort) {
+            break;
+        }
+    }
+    delete networkAccessManager;
+}
+
+void GContactImageDownloader::onRequestFinished(QNetworkReply *reply)
+{
+    if (reply->error() != QNetworkReply::NoError) {
+        LOG_WARNING("Fail to download avatar:" << reply->errorString());
+        emit donwloadError(reply->url(), reply->errorString());
+    } else {
+        QUrl localFile(saveImage(reply->url(), reply->readAll()));
+        mResults.insert(reply->url(), localFile);
+        emit downloadFinished(reply->url(), localFile);
+    }
+
+    if (mEventLoop) {
+        mEventLoop->quit();
+    }
+}
+
+QUrl GContactImageDownloader::saveImage(const QUrl &remoteFile, const QByteArray &imgData)
+{
+    Q_UNUSED(remoteFile);
+
+    QTemporaryFile tmp;
+    if (tmp.open()) {
+        tmp.write(imgData);
+        tmp.setAutoRemove(false);
+        tmp.close();
+        mTempFiles << tmp.fileName();
+        return QUrl::fromLocalFile(tmp.fileName());
+    }
+    return QUrl();
+}
+

=== added file 'google/GContactGroupsMap.h'
--- google/GContactGroupsMap.h	1970-01-01 00:00:00 +0000
+++ google/GContactGroupsMap.h	2015-09-24 17:49:24 +0000
@@ -0,0 +1,60 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2015 Canonical Ltd.
+ **
+ ** Contact: Renato Araujo Oliveira Filho <[e-mail]>
+ **
+ ** This program/library is free software; you can redistribute it and/or
+ ** modify it under the terms of the GNU Lesser General Public License
+ ** version 2.1 as published by the Free Software Foundation.
+ **
+ ** This program/library 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
+ ** Lesser General Public License for more details.
+ **
+ ** You should have received a copy of the GNU Lesser General Public
+ ** License along with this program/library; if not, write to the Free
+ ** Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ** 02110-1301 USA
+ **
+ ****************************************************************************/
+
+#ifndef GOOGLECONTACTGRUOPMAP_H
+#define GOOGLECONTACTGRUOPMAP_H
+
+#include <QObject>
+#include <QString>
+#include <QUrl>
+#include <QQueue>
+#include <QThread>
+#include <QMap>
+#include <QMutex>
+#include <QEventLoop>
+#include <QtNetwork/QNetworkAccessManager>
+
+class GTransport;
+
+class GContactGroupMap: public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit GContactGroupMap(const QString &authToken, QObject *parent = 0);
+    ~GContactGroupMap();
+
+    void reload();
+
+signals:
+    void updated();
+
+private slots:
+    void onRequestFinished(QNetworkReply *reply);
+
+private:
+    QScopedPointer<QNetworkAccessManager> mNetworkAccessManager;
+    QString mAuthToken;
+    QMap<QString, QString> mGroups;
+};
+
+#endif // GOOGLECONTACTGRUOPMAP_H

=== added file 'google/GContactImageDownloader.cpp'
--- google/GContactImageDownloader.cpp	1970-01-01 00:00:00 +0000
+++ google/GContactImageDownloader.cpp	2015-09-24 17:49:24 +0000
@@ -0,0 +1,117 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2015 Canonical Ltd.
+ **
+ ** Contact: Renato Araujo Oliveira Filho <[e-mail]>
+ **
+ ** This program/library is free software; you can redistribute it and/or
+ ** modify it under the terms of the GNU Lesser General Public License
+ ** version 2.1 as published by the Free Software Foundation.
+ **
+ ** This program/library 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
+ ** Lesser General Public License for more details.
+ **
+ ** You should have received a copy of the GNU Lesser General Public
+ ** License along with this program/library; if not, write to the Free
+ ** Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ** 02110-1301 USA
+ **
+ ****************************************************************************/
+
+#include "GContactImageDownloader.h"
+#include "GTransport.h"
+
+#include <LogMacros.h>
+
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QNetworkAccessManager>
+#include <QTemporaryFile>
+
+GContactImageDownloader::GContactImageDownloader(const QString &authToken, QObject *parent)
+    : QObject(parent),
+      mEventLoop(0),
+      mAuthToken(authToken),
+      mAbort(false)
+{
+}
+
+GContactImageDownloader::~GContactImageDownloader()
+{
+    foreach(const QString &file, mTempFiles) {
+        QFile::remove(file);
+    }
+}
+
+void GContactImageDownloader::push(const QUrl &imgUrl)
+{
+    mQueue.push_back(imgUrl);
+}
+
+QMap<QUrl, QUrl> GContactImageDownloader::donwloaded()
+{
+    return mResults;
+}
+
+void GContactImageDownloader::exec()
+{
+    QNetworkAccessManager *networkAccessManager = new QNetworkAccessManager;
+    connect(networkAccessManager,
+            SIGNAL(finished(QNetworkReply*)),
+            SLOT(onRequestFinished(QNetworkReply*)),
+            Qt::QueuedConnection);
+
+    QEventLoop eventLoop;
+    mEventLoop = &eventLoop;
+
+    while(!mQueue.isEmpty()) {
+        QNetworkRequest request(mQueue.takeFirst());
+        request.setRawHeader(QStringLiteral("GData-Version").toUtf8(), QStringLiteral("3.0").toUtf8());
+        request.setRawHeader(QStringLiteral("Authorization").toUtf8(),
+                             QStringLiteral("Bearer %1").arg(mAuthToken).toUtf8());
+        networkAccessManager->get(request);
+
+        // wait for the download to finish
+        eventLoop.exec();
+
+        // should we abort?
+        if (mAbort) {
+            break;
+        }
+    }
+    delete networkAccessManager;
+}
+
+void GContactImageDownloader::onRequestFinished(QNetworkReply *reply)
+{
+    if (reply->error() != QNetworkReply::NoError) {
+        LOG_WARNING("Fail to download avatar:" << reply->errorString());
+        emit donwloadError(reply->url(), reply->errorString());
+    } else {
+        QUrl localFile(saveImage(reply->url(), reply->readAll()));
+        mResults.insert(reply->url(), localFile);
+        emit downloadFinished(reply->url(), localFile);
+    }
+
+    if (mEventLoop) {
+        mEventLoop->quit();
+    }
+}
+
+QUrl GContactImageDownloader::saveImage(const QUrl &remoteFile, const QByteArray &imgData)
+{
+    Q_UNUSED(remoteFile);
+
+    QTemporaryFile tmp;
+    if (tmp.open()) {
+        tmp.write(imgData);
+        tmp.setAutoRemove(false);
+        tmp.close();
+        mTempFiles << tmp.fileName();
+        return QUrl::fromLocalFile(tmp.fileName());
+    }
+    return QUrl();
+}
+

=== added file 'google/GContactImageDownloader.h'
--- google/GContactImageDownloader.h	1970-01-01 00:00:00 +0000
+++ google/GContactImageDownloader.h	2015-09-24 17:49:24 +0000
@@ -0,0 +1,68 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2015 Canonical Ltd.
+ **
+ ** Contact: Renato Araujo Oliveira Filho <[e-mail]>
+ **
+ ** This program/library is free software; you can redistribute it and/or
+ ** modify it under the terms of the GNU Lesser General Public License
+ ** version 2.1 as published by the Free Software Foundation.
+ **
+ ** This program/library 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
+ ** Lesser General Public License for more details.
+ **
+ ** You should have received a copy of the GNU Lesser General Public
+ ** License along with this program/library; if not, write to the Free
+ ** Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ** 02110-1301 USA
+ **
+ ****************************************************************************/
+
+#ifndef GOOGLECONTACTIMAGEDOWNLOADER_H
+#define GOOGLECONTACTIMAGEDOWNLOADER_H
+
+#include <QObject>
+#include <QString>
+#include <QUrl>
+#include <QQueue>
+#include <QThread>
+#include <QMap>
+#include <QMutex>
+#include <QEventLoop>
+#include <QtNetwork/QNetworkAccessManager>
+
+class GTransport;
+
+class GContactImageDownloader: public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit GContactImageDownloader(const QString &authToken, QObject *parent = 0);
+    ~GContactImageDownloader();
+
+    void push(const QUrl &imgUrl);
+    QMap<QUrl, QUrl> donwloaded();
+    void exec();
+
+signals:
+    void downloadFinished(const QUrl &imgUrl, const QUrl &localFile);
+    void donwloadError(const QUrl &imgUrl, const QString &error);
+
+private slots:
+    void onRequestFinished(QNetworkReply *reply);
+
+private:
+    QEventLoop *mEventLoop;
+    QQueue<QUrl> mQueue;
+    QString mAuthToken;
+    QMap<QUrl, QUrl> mResults;
+    bool mAbort;
+    QStringList mTempFiles;
+
+    QUrl saveImage(const QUrl &remoteFile, const QByteArray &imgData);
+};
+
+#endif // GOOGLECONTACTIMAGEDOWNLOADER_H

=== added file 'google/GContactImageUploader.cpp'
--- google/GContactImageUploader.cpp	1970-01-01 00:00:00 +0000
+++ google/GContactImageUploader.cpp	2015-09-24 17:49:24 +0000
@@ -0,0 +1,204 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2015 Canonical Ltd.
+ **
+ ** Contact: Renato Araujo Oliveira Filho <[e-mail]>
+ **
+ ** This program/library is free software; you can redistribute it and/or
+ ** modify it under the terms of the GNU Lesser General Public License
+ ** version 2.1 as published by the Free Software Foundation.
+ **
+ ** This program/library 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
+ ** Lesser General Public License for more details.
+ **
+ ** You should have received a copy of the GNU Lesser General Public
+ ** License along with this program/library; if not, write to the Free
+ ** Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ** 02110-1301 USA
+ **
+ ****************************************************************************/
+
+#include "GContactImageUploader.h"
+#include "GContactStream.h"
+#include "GContactAtom.h"
+#include "UContactsCustomDetail.h"
+
+#include <LogMacros.h>
+
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QNetworkAccessManager>
+#include <QScopedPointer>
+#include <QDomDocument>
+
+#define GOOGLE_URL          "https://www.google.com/m8/feeds/contacts/default/full"
+#define GOOGLE_PHOTO_URL    "https://www.google.com/m8/feeds/photos/media/%1/%2"
+
+GContactImageUploader::GContactImageUploader(const QString &authToken,
+                                             const QString &accountId,
+                                             QObject *parent)
+    : QObject(parent),
+      mEventLoop(0),
+      mAuthToken(authToken),
+      mAccountId(accountId),
+      mAbort(false)
+{
+}
+
+void GContactImageUploader::push(const QString &remoteId, const QUrl &imgUrl)
+{
+    mQueue.push_back(qMakePair(remoteId, imgUrl));
+}
+
+QMap<QString, GContactImageUploader::UploaderReply> GContactImageUploader::result()
+{
+    return mResults;
+}
+
+/*
+ * This is a sync function since the contact sync process happen in a different
+ * thread we do not need this function to be async
+ */
+void GContactImageUploader::exec()
+{
+    if (mQueue.isEmpty()) {
+        return;
+    }
+
+    QDateTime startTime = QDateTime::currentDateTime().toUTC();
+    QScopedPointer<QNetworkAccessManager> networkAccessManager(new QNetworkAccessManager);
+    connect(networkAccessManager.data(),
+            SIGNAL(finished(QNetworkReply*)),
+            SLOT(onRequestFinished(QNetworkReply*)),
+            Qt::QueuedConnection);
+
+    QEventLoop eventLoop;
+    mEventLoop = &eventLoop;
+    mUploadCompleted = false;
+
+    while(!mQueue.isEmpty()) {
+        QPair<QString, QUrl> data = mQueue.takeFirst();
+
+        QByteArray imgData;
+        QFile imgFile(data.second.toLocalFile());
+        if (!imgFile.open(QIODevice::ReadOnly)) {
+            LOG_WARNING("Fail to open file:" << data.second.toLocalFile());
+            continue;
+        }
+        imgData = imgFile.readAll();
+        imgFile.close();;
+        mCurrentRemoteId = data.first;
+
+        // upload photo
+        QString requestUrl = QString(GOOGLE_PHOTO_URL)
+                .arg(mAccountId)
+                .arg(mCurrentRemoteId);
+        QNetworkRequest request(requestUrl);
+        request.setRawHeader(QStringLiteral("GData-Version").toUtf8(), QStringLiteral("3.0").toUtf8());
+        request.setRawHeader(QStringLiteral("Authorization").toUtf8(),
+                             QStringLiteral("Bearer %1").arg(mAuthToken).toUtf8());
+        request.setRawHeader(QStringLiteral("Content-Type").toUtf8(), QStringLiteral("image/*").toUtf8());
+        request.setRawHeader(QStringLiteral("If-Match").toUtf8(), QStringLiteral("*").toUtf8());
+        networkAccessManager->put(request, imgData);
+
+        // wait for the upload to finish
+        eventLoop.exec();
+
+        // should we abort?
+        if (mAbort) {
+            break;
+        }
+    }
+
+    mUploadCompleted = true;
+
+    if (mAbort) {
+        return;
+    }
+
+    // After upload the pictures the contact etag get updated we need to retrieve
+    // the new ones
+    QString requestUrl =
+            QString("%1?updated-min=%2&fields=entry(@gd:etag, id, link(@rel, @gd:etag))")
+            .arg(GOOGLE_URL)
+            .arg(startTime.toString(Qt::ISODate));
+    QNetworkRequest request(requestUrl);
+    request.setRawHeader(QStringLiteral("GData-Version").toUtf8(), QStringLiteral("3.0").toUtf8());
+    request.setRawHeader(QStringLiteral("Authorization").toUtf8(),
+                         QStringLiteral("Bearer %1").arg(mAuthToken).toUtf8());
+    networkAccessManager->get(request);
+
+    // wait for the reply to finish
+    eventLoop.exec();
+}
+
+void GContactImageUploader::onRequestFinished(QNetworkReply *reply)
+{
+    if (mUploadCompleted) {
+        if (reply->error() != QNetworkReply::NoError) {
+            LOG_WARNING("Fail to retrieve new etags:" << reply->errorString());
+        } else {
+            QByteArray data = reply->readAll();
+            LOG_TRACE("After avatar upload query result:" << data);
+            QMap<QString, GContactImageUploader::UploaderReply> entries = parseEntryList(data);
+            foreach(const QString &remoteId, entries.keys()) {
+                if (mResults.contains(remoteId)) {
+                    mResults[remoteId] = entries[remoteId];
+                    emit uploadFinished(remoteId, entries[remoteId]);
+                }
+            }
+        }
+    } else {
+        mResults.insert(mCurrentRemoteId, UploaderReply());
+        if (reply->error() != QNetworkReply::NoError) {
+            LOG_WARNING("Fail to upload avatar:" << reply->errorString());
+            emit uploadError(mCurrentRemoteId, reply->errorString());
+        } else {
+            LOG_TRACE("Avatar upload result" << reply->readAll());
+        }
+        mCurrentRemoteId.clear();
+    }
+
+    if (mEventLoop) {
+        mEventLoop->quit();
+    }
+}
+
+QMap<QString, GContactImageUploader::UploaderReply> GContactImageUploader::parseEntryList(const QByteArray &data) const
+{
+    QMap<QString, UploaderReply> result;
+
+    QDomDocument doc;
+    QString errorMsg;
+    if (!doc.setContent(data, &errorMsg)) {
+        LOG_WARNING("Fail to parse etag list" << errorMsg);
+        return result;
+    }
+
+    QDomNodeList entries = doc.elementsByTagName("entry");
+    for (int i = 0; i < entries.size(); i++) {
+        UploaderReply reply;
+        QDomElement entry = entries.item(i).toElement();
+        QDomElement id = entry.firstChildElement("id");
+
+        reply.newEtag = entry.attribute("gd:etag");
+        if (!id.isNull()) {
+            reply.remoteId = id.text().split('/').last();
+        }
+
+        QDomNodeList links = entry.elementsByTagName("link");
+        for (int l = 0; l < links.size(); l++) {
+            QDomElement link = links.item(l).toElement();
+
+            if (link.attribute("rel") == "http://schemas.google.com/contacts/2008/rel#photo") {
+                reply.newAvatarEtag = link.attribute("gd:etag");
+                break;
+            }
+        }
+        result.insert(reply.remoteId, reply);
+    }
+
+    return result;
+}

=== added file 'google/GContactImageUploader.h'
--- google/GContactImageUploader.h	1970-01-01 00:00:00 +0000
+++ google/GContactImageUploader.h	2015-09-24 17:49:24 +0000
@@ -0,0 +1,78 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2015 Canonical Ltd.
+ **
+ ** Contact: Renato Araujo Oliveira Filho <[e-mail]>
+ **
+ ** This program/library is free software; you can redistribute it and/or
+ ** modify it under the terms of the GNU Lesser General Public License
+ ** version 2.1 as published by the Free Software Foundation.
+ **
+ ** This program/library 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
+ ** Lesser General Public License for more details.
+ **
+ ** You should have received a copy of the GNU Lesser General Public
+ ** License along with this program/library; if not, write to the Free
+ ** Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ** 02110-1301 USA
+ **
+ ****************************************************************************/
+
+#ifndef GOOGLECONTACTIMAGEUPLOADER_H
+#define GOOGLECONTACTIMAGEUPLOADER_H
+
+#include <QObject>
+#include <QString>
+#include <QUrl>
+#include <QQueue>
+#include <QMap>
+#include <QMutex>
+#include <QEventLoop>
+#include <QNetworkReply>
+
+
+
+class GContactImageUploader: public QObject
+{
+    Q_OBJECT
+
+public:
+    class UploaderReply
+    {
+    public:
+        QString remoteId;
+        QString newEtag;
+        QString newAvatarEtag;
+    };
+
+    explicit GContactImageUploader(const QString &authToken,
+                                   const QString &accountId,
+                                   QObject *parent = 0);
+
+    void push(const QString &remoteId, const QUrl &imgUrl);
+    QMap<QString, UploaderReply> result();
+    void exec();
+
+signals:
+    void uploadFinished(const QUrl &remoteId, const GContactImageUploader::UploaderReply &eTag);
+    void uploadError(const QUrl &remoteId, const QString &error);
+
+private slots:
+    void onRequestFinished(QNetworkReply *reply);
+
+private:
+    QEventLoop *mEventLoop;
+    QQueue<QPair<QString, QUrl> > mQueue;
+    QString mAuthToken;
+    QString mAccountId;
+    QString mCurrentRemoteId;
+    QMap<QString, UploaderReply> mResults;
+    bool mAbort;
+    bool mUploadCompleted;
+
+     QMap<QString, UploaderReply> parseEntryList(const QByteArray &data) const;
+};
+
+#endif // GOOGLECONTACTIMAGEUPLOADER_H

=== added file 'google/GContactStream.cpp'
--- google/GContactStream.cpp	1970-01-01 00:00:00 +0000
+++ google/GContactStream.cpp	2015-09-24 17:49:24 +0000
@@ -0,0 +1,1446 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2013-2014 Jolla Ltd. and/or its subsidiary(-ies).
+ **               2015 Canonical Ltd.
+ **
+ ** Contributors: Sateesh Kavuri <[e-mail]>
+ **               Mani Chandrasekar <[e-mail]>
+ **               Chris Adams <[e-mail]>
+ **               Renato Araujo Oliveira Filho <[e-mail]>
+ **
+ ** This program/library is free software; you can redistribute it and/or
+ ** modify it under the terms of the GNU Lesser General Public License
+ ** version 2.1 as published by the Free Software Foundation.
+ **
+ ** This program/library 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
+ ** Lesser General Public License for more details.
+ **
+ ** You should have received a copy of the GNU Lesser General Public
+ ** License along with this program/library; if not, write to the Free
+ ** Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ** 02110-1301 USA
+ **
+ ****************************************************************************/
+
+#include "GConfig.h"
+#include "GContactStream.h"
+#include "GContactAtom.h"
+#include "UContactsCustomDetail.h"
+#include "buteosyncfw_p.h"
+
+#include <QDateTime>
+#include <QtContacts/QContactId>
+
+GoogleContactStream::GoogleContactStream(bool response, const QString &accountEmail, QObject* parent)
+    : QObject(parent)
+    , mXmlReader(0)
+    , mAtom(0)
+    , mXmlWriter(0)
+    , mAccountEmail(accountEmail)
+{
+    if (response == true) {
+        initResponseFunctionMap();
+    } else {
+        initFunctionMap();
+    }
+}
+
+GoogleContactStream::~GoogleContactStream()
+{
+}
+
+GoogleContactAtom *GoogleContactStream::parse(const QByteArray &xmlBuffer)
+{
+    mXmlReader = new QXmlStreamReader(xmlBuffer);
+    mAtom = new GoogleContactAtom;
+
+    Q_CHECK_PTR(mXmlReader);
+    Q_CHECK_PTR(mAtom);
+
+    while (!mXmlReader->atEnd() && !mXmlReader->hasError()) {
+        if (mXmlReader->readNextStartElement()) {
+            Handler handler = mAtomFunctionMap.value(mXmlReader->name().toString());
+            if (handler) {
+                (*this.*handler)();
+            }
+        }
+    }
+
+    delete mXmlReader;
+    return mAtom;
+}
+
+QByteArray GoogleContactStream::encode(const QMultiMap<GoogleContactStream::UpdateType, QPair<QContact, QStringList> > &updates)
+{
+    QByteArray xmlBuffer;
+    mXmlWriter = new QXmlStreamWriter(&xmlBuffer);
+    startBatchFeed();
+
+    QList<QPair<QContact, QStringList> > removedContacts = updates.values(GoogleContactStream::Remove);
+    for (int i = 0; i < removedContacts.size(); ++i) {
+        encodeContactUpdate(removedContacts[i].first, removedContacts[i].second, GoogleContactStream::Remove, true); // batchmode = true
+    }
+
+    QList<QPair<QContact, QStringList> > addedContacts = updates.values(GoogleContactStream::Add);
+    for (int i = 0; i < addedContacts.size(); ++i) {
+        encodeContactUpdate(addedContacts[i].first, addedContacts[i].second, GoogleContactStream::Add, true); // batchmode = true
+    }
+
+    QList<QPair<QContact, QStringList> > modifiedContacts = updates.values(GoogleContactStream::Modify);
+    for (int i = 0; i < modifiedContacts.size(); ++i) {
+        encodeContactUpdate(modifiedContacts[i].first, modifiedContacts[i].second, GoogleContactStream::Modify, true); // batchmode = true
+    }
+
+    endBatchFeed();
+    mXmlWriter->writeEndDocument();
+    delete mXmlWriter;
+    return xmlBuffer;
+}
+
+// ----------------------------------------
+
+void GoogleContactStream::initAtomFunctionMap()
+{
+    mAtomFunctionMap.insert("updated", &GoogleContactStream::handleAtomUpdated);
+    mAtomFunctionMap.insert("category", &GoogleContactStream::handleAtomCategory);
+    mAtomFunctionMap.insert("author", &GoogleContactStream::handleAtomAuthor);
+    mAtomFunctionMap.insert("id", &GoogleContactStream::handleAtomId);
+    mAtomFunctionMap.insert("totalResults", &GoogleContactStream::handleAtomOpenSearch);
+    mAtomFunctionMap.insert("startIndex", &GoogleContactStream::handleAtomOpenSearch);
+    mAtomFunctionMap.insert("itemsPerPage", &GoogleContactStream::handleAtomOpenSearch);
+    mAtomFunctionMap.insert("link", &GoogleContactStream::handleAtomLink);
+    mAtomFunctionMap.insert("entry", &GoogleContactStream::handleAtomEntry);
+    mAtomFunctionMap.insert("generator", &GoogleContactStream::handleAtomGenerator);
+    mAtomFunctionMap.insert("title", &GoogleContactStream::handleAtomTitle);
+}
+
+void GoogleContactStream::initResponseFunctionMap()
+{
+    initAtomFunctionMap();
+    // TODO: move the batch request response handling stuff here.
+}
+
+void GoogleContactStream::initFunctionMap()
+{
+    initAtomFunctionMap();
+    mContactFunctionMap.insert("updated", &GoogleContactStream::handleEntryUpdated);
+    //mContactFunctionMap.insert("app:edited", &GoogleContactStream::handleEntryUpdated);
+    mContactFunctionMap.insert("gContact:birthday", &GoogleContactStream::handleEntryBirthday);
+    mContactFunctionMap.insert("gContact:gender", &GoogleContactStream::handleEntryGender);
+    mContactFunctionMap.insert("gContact:hobby", &GoogleContactStream::handleEntryHobby);
+    mContactFunctionMap.insert("gContact:nickname", &GoogleContactStream::handleEntryNickname);
+    mContactFunctionMap.insert("gContact:occupation", &GoogleContactStream::handleEntryOccupation);
+    mContactFunctionMap.insert("gContact:website", &GoogleContactStream::handleEntryWebsite);
+    mContactFunctionMap.insert("gContact:groupMembershipInfo", &GoogleContactStream::handleEntryGroup);
+    mContactFunctionMap.insert("gContact:event", &GoogleContactStream::handleEntryEvent);
+    mContactFunctionMap.insert("gContact:jot", &GoogleContactStream::handleEntryJot);
+    mContactFunctionMap.insert("gContact:relation", &GoogleContactStream::handleRelation);
+    mContactFunctionMap.insert("gd:email", &GoogleContactStream::handleEntryEmail);
+    mContactFunctionMap.insert("gd:im", &GoogleContactStream::handleEntryIm);
+    mContactFunctionMap.insert("gd:name", &GoogleContactStream::handleEntryName);
+    mContactFunctionMap.insert("gd:organization", &GoogleContactStream::handleEntryOrganization);
+    mContactFunctionMap.insert("gd:phoneNumber", &GoogleContactStream::handleEntryPhoneNumber);
+    mContactFunctionMap.insert("gd:structuredPostalAddress", &GoogleContactStream::handleEntryStructuredPostalAddress);
+    mContactFunctionMap.insert("gd:extendedProperty", &GoogleContactStream::handleEntryExtendedProperty);
+
+}
+
+// ----------------------------------------
+
+void GoogleContactStream::handleAtomUpdated()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->name() == "updated");
+    mAtom->setUpdated(mXmlReader->readElementText());
+}
+
+void GoogleContactStream::handleAtomCategory()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->name() == "category");
+
+    QXmlStreamAttributes attributes = mXmlReader->attributes();
+    QString scheme, term;
+    if (attributes.hasAttribute("scheme")) {
+        scheme = attributes.value("scheme").toString();
+    }
+    if (attributes.hasAttribute("term")) {
+        term = attributes.value("term").toString();
+    }
+
+    mAtom->setCategory(scheme, term);
+}
+
+void GoogleContactStream::handleAtomAuthor()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->name() == "author");
+
+    while (!(mXmlReader->tokenType() == QXmlStreamReader::EndElement && mXmlReader->name() == "author")) {
+        if (mXmlReader->tokenType() == QXmlStreamReader::StartElement) {
+            if (mXmlReader->name() == "name") {
+                mAtom->setAuthorName(mXmlReader->readElementText());
+            } else if (mXmlReader->name() == "email") {
+                mAtom->setAuthorEmail(mXmlReader->readElementText());
+            }
+        }
+        mXmlReader->readNextStartElement();
+    }
+}
+
+void GoogleContactStream::handleAtomOpenSearch()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->prefix() == "openSearch");
+
+    if (mXmlReader->name() == "totalResults") {
+        mAtom->setTotalResults(mXmlReader->readElementText().toInt());
+    } else if (mXmlReader->name() == "startIndex") {
+        mAtom->setStartIndex(mXmlReader->readElementText().toInt());
+    } else if (mXmlReader->name() == "itemsPerPage") {
+        mAtom->setItemsPerPage(mXmlReader->readElementText().toInt());
+    }
+}
+
+void GoogleContactStream::handleAtomLink()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->name() == "link");
+
+    if (mXmlReader->attributes().hasAttribute("rel") && (mXmlReader->attributes().value("rel") == "next")) {
+        mAtom->setNextEntriesUrl(mXmlReader->attributes().value("href").toString());
+    }
+}
+
+void GoogleContactStream::handleAtomId()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->name() == "id");
+    mAtom->setId(mXmlReader->readElementText());
+}
+
+void GoogleContactStream::handleAtomGenerator()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->name() == "generator");
+
+    QXmlStreamAttributes attributes = mXmlReader->attributes();
+    QString name, version, uri;
+    if (attributes.hasAttribute("version")) {
+        version = attributes.value("version").toString();
+    }
+    if (attributes.hasAttribute("uri")) {
+        uri = attributes.value("uri").toString();
+    }
+    name = mXmlReader->readElementText();
+
+    mAtom->setGenerator(name, version, uri);
+}
+
+void GoogleContactStream::handleAtomTitle()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->name() == "title");
+    mAtom->setTitle(mXmlReader->readElementText());
+}
+
+void GoogleContactStream::handleAtomEntry()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->name() == "entry");
+
+    // the entry will either be a contact, a group, or a response to a batch update request.
+    // if it's a group, we need to store some information about it.
+    QString systemGroupId;
+    QString systemGroupAtomId;
+
+    // the entry will be a contact if this is a response to a "read" request
+    QContact entryContact;
+    QStringList unsupportedElements;
+    bool isInGroup = false;
+    bool isDeleted = false;
+
+    // or it will be a series of batch operation success/fail info
+    // if this xml is the response to a batch update/delete request.
+    bool isBatchOperationResponse = false;
+    GoogleContactAtom::BatchOperationResponse response;
+
+    while (!((mXmlReader->tokenType() == QXmlStreamReader::EndElement) && (mXmlReader->name() == "entry"))) {
+        if (mXmlReader->tokenType() == QXmlStreamReader::StartElement) {
+            isInGroup |=  (mXmlReader->qualifiedName().toString() == QStringLiteral("gContact:groupMembershipInfo"));
+            DetailHandler handler = mContactFunctionMap.value(mXmlReader->qualifiedName().toString());
+            if (handler) {
+                QContactDetail convertedDetail = (*this.*handler)();
+                if (convertedDetail != QContactDetail()) {
+                    entryContact.saveDetail(&convertedDetail);
+                } else {
+                    LOG_WARNING("Handle not found for " << mXmlReader->qualifiedName().toString());
+                }
+            } else if (mXmlReader->qualifiedName().toString() == QStringLiteral("gd:deleted")) {
+                isDeleted = true;
+            } else if (mXmlReader->qualifiedName().toString() == QStringLiteral("batch:id")) {
+                isBatchOperationResponse = true;
+                handleEntryBatchId(&response);
+            } else if (mXmlReader->qualifiedName().toString() == QStringLiteral("batch:operation")) {
+                isBatchOperationResponse = true;
+                handleEntryBatchOperation(&response);
+            } else if (mXmlReader->qualifiedName().toString() == QStringLiteral("batch:status")) {
+                isBatchOperationResponse = true;
+                handleEntryBatchStatus(&response);
+            } else if (mXmlReader->qualifiedName().toString() == QStringLiteral("link")) {
+                // There are several possible links:
+                // Avatar Photo link
+                // Self query link
+                // Edit link
+                // Batch link etc.
+
+                // If it's an avatar, we grab it as a QContactAvatar detail
+                bool isAvatar = false;
+                QContactAvatar googleAvatar;
+                QString etag;
+                QString unsupportedElement = handleEntryLink(&googleAvatar, &isAvatar, &etag);
+                if (isAvatar) {
+                    // check if we have already a google avatar
+                    entryContact.saveDetail(&googleAvatar);
+                    UContactsCustomDetail::setCustomField(entryContact,
+                                                          UContactsCustomDetail::FieldContactAvatarETag,
+                                                          etag);
+                }
+
+                // Whether it's an avatar or not, we also store the element text.
+                if (!unsupportedElement.isEmpty()) {
+                    unsupportedElements.append(unsupportedElement);
+                }
+            } else if (mXmlReader->name().toString() == QStringLiteral("entry")) {
+                // read the etag out of the entry.
+                response.eTag = mXmlReader->attributes().value("gd:etag").toString();
+            } else if (mXmlReader->qualifiedName().toString() == QStringLiteral("gContact:systemGroup")) {
+                systemGroupId = mXmlReader->attributes().value("id").toString();
+            } else if (mXmlReader->qualifiedName().toString() == QStringLiteral("id")) {
+                // either a contact id or a group id.
+                QContactDetail guidDetail = handleEntryId(&systemGroupAtomId);
+                entryContact.saveDetail(&guidDetail);
+            } else {
+                // This is some XML element which we don't handle.
+                // We should store it, so that we can send it back when we upload changes.
+                QString unsupportedElement = handleEntryUnknownElement();
+                if (!unsupportedElement.isEmpty()) {
+                    unsupportedElements.append(unsupportedElement);
+                }
+            }
+        }
+        mXmlReader->readNextStartElement();
+    }
+
+    if (!systemGroupId.isEmpty()) {
+        // this entry was a group
+        mAtom->addEntrySystemGroup(systemGroupId, systemGroupAtomId);
+    } else {
+        // this entry was a contact.
+        // the etag is the "version identifier".  Save it into the QCOM detail.
+        if (!response.eTag.isEmpty()) {
+            QtContacts::QContactExtendedDetail etagDetail =
+                    UContactsCustomDetail::getCustomField(entryContact, UContactsCustomDetail::FieldContactETag);
+            etagDetail.setData(response.eTag);
+            entryContact.saveDetail(&etagDetail);
+        }
+
+        if (isInGroup) {
+            // Only sync the contact if it is in a "real" group
+            // as otherwise we get hundreds of "Other Contacts"
+            // (random email addresses etc).
+            if (isDeleted) {
+                // if contact is deleted set the deletedAt value
+                QContactExtendedDetail deletedAt =
+                        UContactsCustomDetail::getCustomField(entryContact, UContactsCustomDetail::FieldDeletedAt);
+                deletedAt.setData(QDateTime::currentDateTime());
+                entryContact.saveDetail(&deletedAt);
+
+                mAtom->addDeletedEntryContact(entryContact);
+            } else {
+                mAtom->addEntryContact(entryContact, unsupportedElements);
+            }
+        }
+    }
+
+    if (isBatchOperationResponse) {
+        if (!entryContact.detail<QContactGuid>().guid().isEmpty()) {
+            response.contactGuid = entryContact.detail<QContactGuid>().guid();
+        }
+        mAtom->addBatchOperationResponse(response.operationId, response);
+    }
+}
+
+QString GoogleContactStream::handleEntryLink(QContactAvatar *avatar,
+                                             bool *isAvatar,
+                                             QString *etag)
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->name() == "link");
+    QXmlStreamAttributes attributes = mXmlReader->attributes();
+
+    // if a contact does not have a photo, then the photo link element has no gd:etag attribute.
+    *isAvatar = ((attributes.value("rel") == "http://schemas.google.com/contacts/2008/rel#photo") &&
+                 attributes.hasAttribute("gd:etag"));
+
+    if (*isAvatar) {
+        // this is an avatar photo for the contact entry
+        avatar->setImageUrl(attributes.value("href").toString());
+        *etag = attributes.value("gd:etag").toString();
+    }
+
+    return handleEntryUnknownElement();
+}
+
+QContactDetail GoogleContactStream::handleEntryExtendedProperty()
+{
+    Q_ASSERT(mXmlReader->isStartElement() &&
+             mXmlReader->name() == "gd:extendedProperty");
+
+    QContactExtendedDetail xd;
+    QXmlStreamAttributes attributes = mXmlReader->attributes();
+    QString propName = attributes.value("name").toString();
+
+    // FIXME:
+    // We use extendedProperty to store favorite property until we implment support
+    // for google groups sync
+    if (propName == "X-FAVORITE") {
+        QContactFavorite fav;
+        fav.setFavorite(attributes.value("value").toString() == "true");
+        return fav;
+    } else if (propName == "SOUND") {
+        QContactRingtone ring;
+        ring.setAudioRingtoneUrl(QUrl(attributes.value("value").toString()));
+        return ring;
+    }
+
+    // handle as generic type
+    xd.setName(attributes.value("name").toString());
+    xd.setData(attributes.value("value").toString());
+    return xd;
+}
+
+QContactDetail GoogleContactStream::handleEntryEvent()
+{
+    Q_ASSERT(mXmlReader->isStartElement() &&
+             mXmlReader->name() == "gContact:event");
+
+//    <gContact:event rel="anniversary" label="memorial">
+//      <gd:when startTime="2005-06-06" endTime="2005-06-08" valueString="This month"/>
+//   </gContact:event>
+    static QMap<QString, QContactAnniversary::SubType> anniversaryTypes;
+    if (anniversaryTypes.isEmpty()) {
+        anniversaryTypes.insert(QString::fromLatin1("engagement"),
+                                QContactAnniversary::SubTypeEngagement);
+        anniversaryTypes.insert(QString::fromLatin1("employment"),
+                                QContactAnniversary::SubTypeEmployment);
+        anniversaryTypes.insert(QString::fromLatin1("memorial"),
+                                QContactAnniversary::SubTypeMemorial);
+        anniversaryTypes.insert(QString::fromLatin1("house"),
+                                QContactAnniversary::SubTypeHouse);
+        anniversaryTypes.insert(QString::fromLatin1("wedding"),
+                                QContactAnniversary::SubTypeWedding);
+    }
+    QXmlStreamAttributes attributes = mXmlReader->attributes();
+    if (attributes.value("rel") == "anniversary") {
+        QContactAnniversary anniversary;
+        anniversary.setSubType(anniversaryTypes.value(attributes.value("label").toString(),
+                                                      QContactAnniversary::SubTypeWedding));
+        mXmlReader->readNextStartElement();
+        if (mXmlReader->qualifiedName() == "gd:when") {
+            attributes = mXmlReader->attributes();
+            anniversary.setOriginalDateTime(QDateTime::fromString(attributes.value("startTime").toString(),
+                                                                  Qt::ISODate));
+            anniversary.setEvent(attributes.value("valueString").toString());
+            // FIXME: missing endTime
+            // QContactAnniversary API does not support endTime
+        }
+        return anniversary;
+    }
+
+    return QContactDetail();
+}
+
+QContactDetail GoogleContactStream::handleRelation()
+{
+    Q_ASSERT(mXmlReader->isStartElement() &&
+             mXmlReader->name() == "gContact:relation");
+
+    QXmlStreamAttributes attributes = mXmlReader->attributes();
+    QString rel = attributes.hasAttribute("rel")
+                ? attributes.value("rel").toString()
+                : QString();
+
+    QContactFamily family;
+    if (rel == "spouse") {
+        family.setSpouse(mXmlReader->readElementText());
+    } else if (rel == "child") {
+        family.setChildren(QStringList() << mXmlReader->readElementText());
+    } else {
+        LOG_WARNING("Family relation type not supported" << rel);
+        return QContactDetail();
+    }
+
+    return family;
+}
+
+QString GoogleContactStream::handleEntryUnknownElement()
+{
+    Q_ASSERT(mXmlReader->isStartElement());
+
+    QXmlStreamAttributes attributes = mXmlReader->attributes();
+    QString attributesString;
+    for (int i = 0; i < attributes.size(); ++i) {
+        QString extra = QStringLiteral(" %1=\"%2\"")
+            .arg(attributes[i].qualifiedName().toString())
+            .arg(attributes[i].value().toString().toHtmlEscaped());
+        attributesString.append(extra);
+    }
+
+    QString unknownElement = QStringLiteral("<%1%2>%3</%1>")
+                                .arg(mXmlReader->qualifiedName().toString())
+                                .arg(attributesString)
+                                .arg(mXmlReader->text().toString());
+
+    return unknownElement;
+}
+
+QList<int> GoogleContactStream::handleContext(const QString &rel) const
+{
+    QList<int> contexts;
+    QString name = rel.split("#").last();
+    if (name == QStringLiteral("home")) {
+        contexts << QContactDetail::ContextHome;
+    } else if (name == QStringLiteral("work")) {
+        contexts << QContactDetail::ContextWork;
+    } else if (!name.isEmpty()) {
+        contexts << QContactDetail::ContextOther;
+    }
+    return contexts;
+}
+
+void GoogleContactStream::handleEntryBatchStatus(GoogleContactAtom::BatchOperationResponse *response)
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->name() == "status");
+
+    response->code = mXmlReader->attributes().value("code").toString();
+    response->reason = mXmlReader->attributes().value("reason").toString();
+    response->reasonDescription = mXmlReader->readElementText();
+    response->isError = true;
+    if (response->code == QStringLiteral("200")           // No error.
+            || response->code == QStringLiteral("201")    // Created without error.
+            || response->code == QStringLiteral("304")) { // Not modified (no change since time specified)
+        // according to Google Data API these response codes signify success cases.
+        response->isError = false;
+    }
+}
+
+void GoogleContactStream::handleEntryBatchOperation(GoogleContactAtom::BatchOperationResponse *response)
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->name() == "operation");
+    response->type = mXmlReader->attributes().value("type").toString();
+}
+
+void GoogleContactStream::handleEntryBatchId(GoogleContactAtom::BatchOperationResponse *response)
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->name() == "id");
+    response->operationId = mXmlReader->readElementText();
+}
+
+QContactDetail GoogleContactStream::handleEntryId(QString *rawId)
+{
+    *rawId = mXmlReader->readElementText();
+    QString idUrl = *rawId;
+    QContactGuid guid;
+    guid.setGuid(idUrl.split('/').last());
+    return guid;
+}
+
+QContactDetail GoogleContactStream::handleEntryBirthday()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->qualifiedName() == "gContact:birthday");
+
+    QContactBirthday birthday;
+    birthday.setDate(QDate::fromString(mXmlReader->attributes().value("when").toString(), Qt::ISODate));
+
+    if (birthday.dateTime().isValid()) {
+        return birthday;
+    } else {
+        LOG_WARNING("Birthday date not supported:" << mXmlReader->attributes().value("when").toString());
+        return QContactDetail();
+    }
+}
+
+QContactDetail GoogleContactStream::handleEntryGender()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->qualifiedName() == "gContact:gender");
+
+    QString genderStr = mXmlReader->attributes().value("value").toString().toLower();
+    QContactGender gender;
+    if (genderStr.startsWith('m')) {
+        gender.setGender(QContactGender::GenderMale);
+    } else if (genderStr.startsWith('f')) {
+        gender.setGender(QContactGender::GenderFemale);
+    } else {
+        gender.setGender(QContactGender::GenderUnspecified);
+    }
+
+    return gender;
+}
+
+QContactDetail GoogleContactStream::handleEntryHobby()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->qualifiedName() == "gContact:hobby");
+
+    QContactHobby hobby;
+    hobby.setHobby(mXmlReader->readElementText());
+    return hobby;
+}
+
+QContactDetail GoogleContactStream::handleEntryNickname()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->qualifiedName() == "gContact:nickname");
+
+    QContactNickname nickname;
+    nickname.setNickname(mXmlReader->readElementText());
+    return nickname;
+}
+
+QContactDetail GoogleContactStream::handleEntryOccupation()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->qualifiedName() == "gContact:occupation");
+
+    QContactOrganization org;
+    org.setRole(mXmlReader->readElementText());
+    return org;
+}
+
+QContactDetail GoogleContactStream::handleEntryWebsite()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->qualifiedName() == "gContact:website");
+
+    QContactUrl url;
+    QXmlStreamAttributes attributes = mXmlReader->attributes();
+    QString rel = attributes.hasAttribute("rel")
+                ? attributes.value("rel").toString()
+                : QString();
+
+    if (rel == "home-page") {
+        url.setSubType(QContactUrl::SubTypeHomePage);
+    } else if (rel == "blog") {
+        url.setSubType(QContactUrl::SubTypeBlog);
+    } else {
+        url.setSubType(QContactUrl::SubTypeFavourite);
+    }
+    url.setContexts(handleContext(rel));
+    url.setUrl(attributes.value("href").toString());
+    return url;
+}
+
+QContactDetail GoogleContactStream::handleEntryJot()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->qualifiedName() == "gContact:jot");
+
+    QString rel = mXmlReader->attributes().hasAttribute("rel")
+                ? mXmlReader->attributes().value("rel").toString()
+                : QString();
+
+    QContactNote note;
+    note.setContexts(handleContext(rel));
+    note.setNote(mXmlReader->readElementText());
+    return note;
+}
+
+QContactDetail GoogleContactStream::handleEntryEmail()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->qualifiedName() == "gd:email");
+
+    QContactEmailAddress email;
+    email.setEmailAddress(mXmlReader->attributes().value("address").toString());
+
+    QString rel = mXmlReader->attributes().hasAttribute("rel")
+                ? mXmlReader->attributes().value("rel").toString()
+                : QString();
+    email.setContexts(handleContext(rel));
+    return email;
+}
+
+QContactDetail GoogleContactStream::handleEntryIm()
+{
+    Q_ASSERT(mXmlReader->isStartElement () && mXmlReader->qualifiedName () == "gd:im");
+
+    static QMap<QString, QContactOnlineAccount::Protocol> protocolMap;
+    if (protocolMap.isEmpty()) {
+        protocolMap.insert("AIM", QContactOnlineAccount::ProtocolAim);
+        protocolMap.insert("MSN", QContactOnlineAccount::ProtocolMsn);
+        protocolMap.insert("YAHOO", QContactOnlineAccount::ProtocolYahoo);
+        protocolMap.insert("SKYPE", QContactOnlineAccount::ProtocolSkype);
+        protocolMap.insert("ICQ", QContactOnlineAccount::ProtocolIcq);
+        protocolMap.insert("JABBER", QContactOnlineAccount::ProtocolJabber);
+        protocolMap.insert("QQ", QContactOnlineAccount::ProtocolQq);
+        protocolMap.insert("IRC", QContactOnlineAccount::ProtocolIrc);
+    }
+    QString rel, protocol;
+    if (mXmlReader->attributes().hasAttribute("rel")) {
+        rel = mXmlReader->attributes().value("rel").toString();
+    }
+
+    if (mXmlReader->attributes().hasAttribute ("protocol")) {
+        QString protocolUrl = mXmlReader->attributes().value("protocol").toString();
+        protocol = protocolUrl.split("#").last();
+    }
+
+    QContactOnlineAccount imAccount;
+    imAccount.setAccountUri(mXmlReader->attributes().value("address").toString());
+    imAccount.setProtocol(protocolMap.value(protocol, QContactOnlineAccount::ProtocolUnknown));
+    if (!protocolMap.contains(protocol)) {
+        imAccount.setServiceProvider(protocol);
+    }
+    imAccount.setContexts(handleContext(rel));
+    return imAccount;
+}
+
+QContactDetail GoogleContactStream::handleEntryName()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->qualifiedName() == "gd:name");
+
+    QContactName name;
+    while (!(mXmlReader->tokenType() == QXmlStreamReader::EndElement && mXmlReader->qualifiedName() == "gd:name")) {
+        if (mXmlReader->tokenType() == QXmlStreamReader::StartElement) {
+            if (mXmlReader->qualifiedName() == "gd:givenName") {
+                name.setFirstName(mXmlReader->readElementText());
+            } else if (mXmlReader->qualifiedName() == "gd:additionalName") {
+                name.setMiddleName(mXmlReader->readElementText());
+            } else if (mXmlReader->qualifiedName() == "gd:familyName") {
+                name.setLastName(mXmlReader->readElementText());
+            } else if (mXmlReader->qualifiedName() == "gd:namePrefix") {
+                name.setPrefix(mXmlReader->readElementText());
+            } else if (mXmlReader->qualifiedName() == "gd:nameSuffix") {
+                name.setSuffix(mXmlReader->readElementText());
+            }
+        }
+        mXmlReader->readNextStartElement();
+    }
+
+    return name;
+}
+
+QContactDetail GoogleContactStream::handleEntryOrganization()
+{
+    Q_ASSERT(mXmlReader->isStartElement() && mXmlReader->qualifiedName() == "gd:organization");
+
+    QContactOrganization org;