Merge branch 'jb22610-avatars' into 'master'

[buteo-sync-plugins-social] Delay downloading of avatars. JB#22610 See merge request mer-core/buteo-sync-plugins-social!74
sailfishos · Oct 29, 2020 · 8b6c9fa · 8b6c9fa
2 parents 16ac498 + c9be2d2
commit 8b6c9fa
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/google/google-contacts/googletwowaycontactsyncadaptor.cpp b/src/google/google-contacts/googletwowaycontactsyncadaptor.cpp
@@ -41,6 +41,7 @@
 #include <QtCore/QJsonArray>
 #include <QtCore/QSettings>
 #include <QtGui/QImageReader>
+#include <QtCore/QTimer>
 
 #include <QtContacts/QContactCollectionFilter>
 #include <QtContacts/QContactIntersectionFilter>
@@ -610,6 +611,8 @@ void GoogleTwoWayContactSyncAdaptor::contactsFinishedHandler()
 
 void GoogleTwoWayContactSyncAdaptor::continueSync(int accountId, const QString &accessToken, ContactChangeNotifier contactChangeNotifier)
 {
+    Q_UNUSED(accessToken)
+
     // early out in case we lost connectivity
     if (syncAborted()) {
         SOCIALD_LOG_ERROR("aborting sync of account" << accountId);
@@ -618,10 +621,6 @@ void GoogleTwoWayContactSyncAdaptor::continueSync(int accountId, const QString &
         return;
     }
 
-    // download avatars for new and modified contacts
-    transformContactAvatars(m_remoteAdds[accountId], accountId, accessToken);
-    transformContactAvatars(m_remoteMods[accountId], accountId, accessToken);
-
     // now store the changes locally
     SOCIALD_LOG_TRACE("storing remote changes locally for account" << accountId);
 
@@ -634,6 +633,10 @@ void GoogleTwoWayContactSyncAdaptor::continueSync(int accountId, const QString &
     } else {
         sqliteSync->remoteContactsDetermined(sqliteSync->m_collection, m_remoteAdds[accountId] + m_remoteMods[accountId]);
     }
+
+    m_pendingAvatarRequests.append(accountId);
+    QTimer::singleShot(0, this, &GoogleTwoWayContactSyncAdaptor::delayedTransformContactAvatars);
+    incrementSemaphore(accountId);
 }
 
 void GoogleTwoWayContactSyncAdaptor::upsyncLocalChanges(const QDateTime &localSince,
@@ -923,6 +926,18 @@ bool GoogleTwoWayContactSyncAdaptor::queueAvatarForDownload(int accountId, const
     return false;
 }
 
+void GoogleTwoWayContactSyncAdaptor::delayedTransformContactAvatars()
+{
+    // download avatars for new and modified contacts
+    if (m_pendingAvatarRequests.count()) {
+        const int accountId = m_pendingAvatarRequests.takeLast();
+        transformContactAvatars(m_remoteAdds[accountId], accountId, m_accessTokens[accountId]);
+        transformContactAvatars(m_remoteMods[accountId], accountId, m_accessTokens[accountId]);
+
+        decrementSemaphore(accountId);
+    }
+}
+
 void GoogleTwoWayContactSyncAdaptor::transformContactAvatars(QList<QContact> &remoteContacts, int accountId, const QString &accessToken)
 {
     // The avatar detail from the remote contact will be of the form:

diff --git a/src/google/google-contacts/googletwowaycontactsyncadaptor.h b/src/google/google-contacts/googletwowaycontactsyncadaptor.h
@@ -148,6 +148,7 @@ class GoogleTwoWayContactSyncAdaptor : public GoogleDataTypeSyncAdaptor
     void downloadContactAvatarImage(int accountId, const QString &accessToken, const QUrl &imageUrl, const QString &filename);
     void imageDownloaded(const QString &url, const QString &path, const QVariantMap &metadata);
 
+    void delayedTransformContactAvatars();
     void loadCollection(const QContactCollection &collection);
 
     void purgeAccount(int pid);
@@ -183,6 +184,7 @@ class GoogleTwoWayContactSyncAdaptor : public GoogleDataTypeSyncAdaptor
 
     QMap<int, int> m_apiRequestsRemaining;
     QMap<int, QMap<QString, QString> > m_queuedAvatarsForDownload; // contact guid -> remote avatar path
+    QList<int> m_pendingAvatarRequests;
 
     bool m_allowFinalCleanup = false;
 };