[nemo-qml-plugin-contacts] Enable the use of region codes for phone n…

…umber resolution. Contributes to JB#38835
sailfishos · Sep 2, 2019 · 42455b1 · 42455b1
1 parent c4b5474
commit 42455b1
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/src/seasidefilteredmodel.cpp b/src/seasidefilteredmodel.cpp
@@ -825,7 +825,14 @@ SeasidePerson *SeasideFilteredModel::personById(int id) const
 
 SeasidePerson *SeasideFilteredModel::personByPhoneNumber(const QString &number, bool requireComplete) const
 {
-    return personFromItem(SeasideCache::itemByPhoneNumber(number, requireComplete));
+    qWarning() << Q_FUNC_INFO << "calling this function without a region code is deprecated";
+
+    return personByPhoneNumber(number, QString(), requireComplete);
+}
+
+SeasidePerson *SeasideFilteredModel::personByPhoneNumber(const QString &number, const QString &regionCode, bool requireComplete) const
+{
+    return personFromItem(SeasideCache::itemByPhoneNumber(number, regionCode, requireComplete));
 }
 
 SeasidePerson *SeasideFilteredModel::personByEmailAddress(const QString &email, bool requireComplete) const

diff --git a/src/seasidefilteredmodel.h b/src/seasidefilteredmodel.h
@@ -149,6 +149,7 @@ class SeasideFilteredModel : public SeasideCache::ListModel
     Q_INVOKABLE SeasidePerson *personByRow(int row) const;
     Q_INVOKABLE SeasidePerson *personById(int id) const;
     Q_INVOKABLE SeasidePerson *personByPhoneNumber(const QString &number, bool requireComplete = true) const;
+    Q_INVOKABLE SeasidePerson *personByPhoneNumber(const QString &number, const QString &regionCode, bool requireComplete = true) const;
     Q_INVOKABLE SeasidePerson *personByEmailAddress(const QString &email, bool requireComplete = true) const;
     Q_INVOKABLE SeasidePerson *personByOnlineAccount(const QString &localUid, const QString &remoteUid, bool requireComplete = true) const;
     Q_INVOKABLE SeasidePerson *selfPerson() const;

diff --git a/src/seasideperson.cpp b/src/seasideperson.cpp
@@ -2147,11 +2147,18 @@ void SeasidePerson::fetchMergeCandidates()
 }
 
 void SeasidePerson::resolvePhoneNumber(const QString &number, bool requireComplete)
+{
+    qWarning() << Q_FUNC_INFO << "calling this function without a region code is deprecated";
+
+    resolvePhoneNumber(number, QString(), requireComplete);
+}
+
+void SeasidePerson::resolvePhoneNumber(const QString &number, const QString &regionCode, bool requireComplete)
 {
     mResolving = true;
     emit resolvingChanged();
 
-    if (SeasideCache::CacheItem *item = SeasideCache::resolvePhoneNumber(this, number, requireComplete)) {
+    if (SeasideCache::CacheItem *item = SeasideCache::resolvePhoneNumber(this, number, regionCode, requireComplete)) {
         // TODO: should this be invoked async?
         addressResolved(QString(), number, item);
     }

diff --git a/src/seasideperson.h b/src/seasideperson.h
@@ -323,6 +323,7 @@ class SeasidePerson
     Q_INVOKABLE void fetchMergeCandidates();
 
     Q_INVOKABLE void resolvePhoneNumber(const QString &number, bool requireComplete = true);
+    Q_INVOKABLE void resolvePhoneNumber(const QString &number, const QString &regionCode, bool requireComplete = true);
     Q_INVOKABLE void resolveEmailAddress(const QString &address, bool requireComplete = true);
     Q_INVOKABLE void resolveOnlineAccount(const QString &localUid, const QString &remoteUid, bool requireComplete = true);
 

diff --git a/tests/tst_seasidefilteredmodel/seasidecache.cpp b/tests/tst_seasidefilteredmodel/seasidecache.cpp
@@ -325,7 +325,7 @@ void SeasideCache::refreshContact(CacheItem *)
 {
 }
 
-SeasideCache::CacheItem *SeasideCache::itemByPhoneNumber(const QString &, bool)
+SeasideCache::CacheItem *SeasideCache::itemByPhoneNumber(const QString &, const QString &, bool)
 {
     return 0;
 }
@@ -340,7 +340,7 @@ SeasideCache::CacheItem *SeasideCache::itemByOnlineAccount(const QString &, cons
     return 0;
 }
 
-SeasideCache::CacheItem *SeasideCache::resolvePhoneNumber(ResolveListener *, const QString &, bool)
+SeasideCache::CacheItem *SeasideCache::resolvePhoneNumber(ResolveListener *, const QString &, const QString &, bool)
 {
     // TODO: implement and test these functions
     return 0;

diff --git a/tests/tst_seasidefilteredmodel/seasidecache.h b/tests/tst_seasidefilteredmodel/seasidecache.h
@@ -181,11 +181,11 @@ class SeasideCache : public QObject
     static void ensureCompletion(CacheItem *cacheItem);
     static void refreshContact(CacheItem *cacheItem);
 
-    static CacheItem *itemByPhoneNumber(const QString &number, bool requireComplete = true);
+    static CacheItem *itemByPhoneNumber(const QString &number, const QString &regionCode, bool requireComplete = true);
     static CacheItem *itemByEmailAddress(const QString &email, bool requireComplete = true);
     static CacheItem *itemByOnlineAccount(const QString &localUid, const QString &remoteUid, bool requireComplete = true);
 
-    static CacheItem *resolvePhoneNumber(ResolveListener *listener, const QString &msisdn, bool requireComplete = true);
+    static CacheItem *resolvePhoneNumber(ResolveListener *listener, const QString &msisdn, const QString &regionCode, bool requireComplete = true);
     static CacheItem *resolveEmailAddress(ResolveListener *listener, const QString &email, bool requireComplete = true);
     static CacheItem *resolveOnlineAccount(ResolveListener *listener, const QString &localUid, const QString &remoteUid, bool requireComplete = true);