[libcommhistory] Add a contact avatar URL property to recipients. Con…

…tributes to JB#50910
sailfishos · Sep 11, 2020 · ac9e410 · ac9e410
1 parent d3653dc
commit ac9e410
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/rpm/libcommhistory-qt5.spec b/rpm/libcommhistory-qt5.spec
@@ -12,7 +12,7 @@ BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(qtcontacts-sqlite-qt5-extensions) >= 0.1.41
-BuildRequires:  pkgconfig(contactcache-qt5) >= 0.0.17
+BuildRequires:  pkgconfig(contactcache-qt5) >= 0.2.12
 BuildRequires:  libphonenumber-devel
 
 %{!?qtc_qmake5:%define qtc_qmake5 %qmake5}

diff --git a/src/contactfetcher.cpp b/src/contactfetcher.cpp
@@ -67,7 +67,7 @@ ContactFetcherPrivate::ContactFetcherPrivate(ContactFetcher *parent)
     , m_resolver(0)
     , m_fetching(false)
 {
-    SeasideCache::registerChangeListener(this);
+    SeasideCache::registerChangeListener(this, SeasideCache::FetchAvatar);
 }
 
 ContactFetcherPrivate::~ContactFetcherPrivate()

diff --git a/src/contactlistener.cpp b/src/contactlistener.cpp
@@ -101,7 +101,7 @@ ContactListenerPrivate::ContactListenerPrivate(ContactListener *q)
     , retryResolver(0)
     , q_ptr(q)
 {
-    SeasideCache::registerChangeListener(this);
+    SeasideCache::registerChangeListener(this, SeasideCache::FetchAvatar);
 }
 
 ContactListenerPrivate::~ContactListenerPrivate()

diff --git a/src/recipient.cpp b/src/recipient.cpp
@@ -281,6 +281,11 @@ QString Recipient::contactName() const
     return d->item ? d->item->displayLabel : QString();
 }
 
+QUrl Recipient::contactAvatarUrl() const
+{
+    return d->item ? SeasideCache::filteredAvatarUrl(d->item->contact) : QUrl();
+}
+
 bool Recipient::isContactResolved() const
 {
     return d->isResolved;

diff --git a/src/recipient.h b/src/recipient.h
@@ -97,6 +97,7 @@ class LIBCOMMHISTORY_EXPORT Recipient
 
     int contactId() const;
     QString contactName() const;
+    QUrl contactAvatarUrl() const;
     bool isContactResolved() const;
 
     /* Update the resolved contact for this recipient