I don't think we need to revert the other commits.

Great job!

Please adjust the commit message as pino suggested, otherwise it's OK.

• Use the correct agent type

• Fix includes

I think any filtering/deduplication should happen in Akonadi Search here - since we are able to store structured data (e.g. split the name and the address into two different fields), Xapian can perform clever deduplication at query time, rather than client code (libkdepim) having to do expensive address parsing for each result.

• Fix includes

Hmm, should we really listen on the "Any" address? It feels wrong, since we are expecting connection on localhost - so I think listening on QHostAddress::LocalHost might be better...

Hi! Sure :) The underlying data model is Akonadi::ContactsTreeModel which is subclass of Akonadi::EntityTreeModel. Thus, if you have a QModelIndex, you can use the data() function to retrieve data for the Akonadi::EntityTreeModel::ItemRole, which gives you the Akonadi::Item which holds the contact itself: KContacts::Addressee

const auto item = index.data(Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>();
if (!item.hasPayload<KContacts::Addressee>()) {
    // error handling
    return;
}
const auto contact = item.payload<KContacts::Addressee>();

Not a bugfix, just an optimization

Looking good, thanks 👍

+1, If this is the icon that other KDE apps went for Feedback settings, we should stay consistent with the rest of KDE

Goo idea

Thanks!

There seems to be a confusion between remoteId and the vCard UID stored in the contact payload. The ItemModifyJob in changeComitted() only updates the Item's remoteId, it does not update the payload - the contact keeps the default UID generated by KAddressBook. The event returned by Google contains UID generated by Google, so we end up with a conflict.

Please fix the small nitpick before committing. Otherwise good to go. Thanks!

Thanks!

Ping?

Ping? :)

Looks good, thanks. Just a small thing, same as in the other review - move the code to a dedicated function please.

Looks good, thanks for the fix. Just move the code to a separate function, please :)