[libcontacts] Prioritize address resolution requests over updates

Fetching changed contact details is typically less urgent than resolving addresses.
sailfishos · Jan 9, 2014 · f08f29e · f08f29e
1 parent 396cef1
commit f08f29e
Showing 1 changed file with 43 additions and 43 deletions.
diff --git a/src/seasidecache.cpp b/src/seasidecache.cpp
@@ -1574,6 +1574,49 @@ bool SeasideCache::event(QEvent *event)
         }
     }
 
+    if (!m_resolveAddresses.isEmpty()) {
+        if (m_fetchRequest.isActive()) {
+            requestPending = true;
+        } else {
+            const ResolveData &resolve = m_resolveAddresses.first();
+
+            if (resolve.first.isEmpty()) {
+                // Search for phone number
+                m_fetchRequest.setFilter(QContactPhoneNumber::match(resolve.second));
+            } else if (resolve.second.isEmpty()) {
+                // Search for email address
+                QContactDetailFilter detailFilter;
+                setDetailType<QContactEmailAddress>(detailFilter, QContactEmailAddress::FieldEmailAddress);
+                detailFilter.setMatchFlags(QContactFilter::MatchExactly | QContactFilter::MatchFixedString); // allow case insensitive
+                detailFilter.setValue(resolve.first);
+
+                m_fetchRequest.setFilter(detailFilter);
+            } else {
+                // Search for online account
+                QContactDetailFilter localFilter;
+                setDetailType<QContactOnlineAccount>(localFilter, QContactOnlineAccount__FieldAccountPath);
+                localFilter.setValue(resolve.first);
+
+                QContactDetailFilter remoteFilter;
+                setDetailType<QContactOnlineAccount>(remoteFilter, QContactOnlineAccount::FieldAccountUri);
+                remoteFilter.setMatchFlags(QContactFilter::MatchExactly | QContactFilter::MatchFixedString); // allow case insensitive
+                remoteFilter.setValue(resolve.second);
+
+                m_fetchRequest.setFilter(localFilter & remoteFilter);
+            }
+
+            // If completion is not required, we need to at least retrieve as much detail
+            // as the favorites store, so we don't update any favorite with a smaller data subset
+            m_activeResolve = &resolve;
+            m_fetchRequest.setFetchHint(resolve.requireComplete ? basicFetchHint() : favoriteFetchHint(m_fetchTypes));
+            m_fetchRequest.start();
+
+            m_fetchProcessedCount = 0;
+
+            return true;
+        }
+    }
+
     if (!m_changedContacts.isEmpty()) {
         if (m_fetchRequest.isActive()) {
             requestPending = true;
@@ -1644,49 +1687,6 @@ bool SeasideCache::event(QEvent *event)
         return true;
     }
 
-    if (!m_resolveAddresses.isEmpty()) {
-        if (m_fetchRequest.isActive()) {
-            requestPending = true;
-        } else {
-            const ResolveData &resolve = m_resolveAddresses.first();
-
-            if (resolve.first.isEmpty()) {
-                // Search for phone number
-                m_fetchRequest.setFilter(QContactPhoneNumber::match(resolve.second));
-            } else if (resolve.second.isEmpty()) {
-                // Search for email address
-                QContactDetailFilter detailFilter;
-                setDetailType<QContactEmailAddress>(detailFilter, QContactEmailAddress::FieldEmailAddress);
-                detailFilter.setMatchFlags(QContactFilter::MatchExactly | QContactFilter::MatchFixedString); // allow case insensitive
-                detailFilter.setValue(resolve.first);
-
-                m_fetchRequest.setFilter(detailFilter);
-            } else {
-                // Search for online account
-                QContactDetailFilter localFilter;
-                setDetailType<QContactOnlineAccount>(localFilter, QContactOnlineAccount__FieldAccountPath);
-                localFilter.setValue(resolve.first);
-
-                QContactDetailFilter remoteFilter;
-                setDetailType<QContactOnlineAccount>(remoteFilter, QContactOnlineAccount::FieldAccountUri);
-                remoteFilter.setMatchFlags(QContactFilter::MatchExactly | QContactFilter::MatchFixedString); // allow case insensitive
-                remoteFilter.setValue(resolve.second);
-
-                m_fetchRequest.setFilter(localFilter & remoteFilter);
-            }
-
-            // If completion is not required, we need to at least retrieve as much detail
-            // as the favorites store, so we don't update any favorite with a smaller data subset
-            m_activeResolve = &resolve;
-            m_fetchRequest.setFetchHint(resolve.requireComplete ? basicFetchHint() : favoriteFetchHint(m_fetchTypes));
-            m_fetchRequest.start();
-
-            m_fetchProcessedCount = 0;
-
-            return true;
-        }
-    }
-
     if (m_refreshRequired) {
         if (m_contactIdRequest.isActive()) {
             requestPending = true;