Add aggregateCollectionId() to extension

sailfishos · Sep 16, 2020 · cc6f435 · cc6f435
1 parent 8645dc8
commit cc6f435
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 24 deletions.
diff --git a/src/extensions/qtcontacts-extensions.h b/src/extensions/qtcontacts-extensions.h
@@ -34,6 +34,7 @@
 #define QTCONTACTS_EXTENSIONS_H
 
 #include <QContactDetail>
+#include <QContactCollectionId>
 #include <QContactId>
 #include <QContactManager>
 
@@ -106,6 +107,9 @@ namespace QtContactsSqliteExtensions {
 
 QTCONTACTS_USE_NAMESPACE
 
+QContactCollectionId aggregateCollectionId(const QString &managerUri);
+QContactCollectionId localCollectionId(const QString &managerUri);
+
 QContactId apiContactId(quint32, const QString &managerUri);
 quint32 internalContactId(const QContactId &);
 

diff --git a/src/extensions/qtcontacts-extensions_impl.h b/src/extensions/qtcontacts-extensions_impl.h
@@ -178,6 +178,16 @@ QString normalize(const QString &input, int flags, int maxCharacters)
 
 namespace QtContactsSqliteExtensions {
 
+QContactCollectionId aggregateCollectionId(const QString &managerUri)
+{
+    return QContactCollectionId(managerUri, QByteArrayLiteral("col-") + QByteArray::number(1));
+}
+
+QContactCollectionId localCollectionId(const QString &managerUri)
+{
+    return QContactCollectionId(managerUri, QByteArrayLiteral("col-") + QByteArray::number(2));
+}
+
 QContactId apiContactId(quint32 iid, const QString &managerUri)
 {
     return QContactId(managerUri, QByteArrayLiteral("sql-") + QByteArray::number(iid));

diff --git a/tests/auto/aggregation/tst_aggregation.cpp b/tests/auto/aggregation/tst_aggregation.cpp
@@ -33,6 +33,7 @@
 #define QT_STATICPLUGIN
 
 #include "../../util.h"
+#include "qtcontacts-extensions.h"
 
 #include <QLocale>
 
@@ -59,16 +60,6 @@ QString detailProvenanceContact(const QContactDetail &detail)
     return provenance.left(provenance.indexOf(QChar::fromLatin1(':')));
 }
 
-QByteArray aggregateAddressbookId()
-{
-    return QByteArrayLiteral("col-") + QByteArray::number(1); // AggregateAddressbookCollectionId
-}
-
-QByteArray localAddressbookId()
-{
-    return QByteArrayLiteral("col-") + QByteArray::number(2); // LocalAddressbookCollectionId
-}
-
 }
 
 class tst_Aggregation : public QObject
@@ -152,6 +143,16 @@ private slots:
     QSet<QContactId> m_chgAccumulatedIds;
     QSet<QContactId> m_remAccumulatedIds;
     QSet<QContactId> m_createdIds;
+
+    QByteArray aggregateAddressbookId()
+    {
+        return QtContactsSqliteExtensions::aggregateCollectionId(m_cm->managerUri()).localId();
+    }
+
+    QByteArray localAddressbookId()
+    {
+        return QtContactsSqliteExtensions::localCollectionId(m_cm->managerUri()).localId();
+    }
 };
 
 tst_Aggregation::tst_Aggregation()

diff --git a/tests/auto/synctransactions/tst_synctransactions.cpp b/tests/auto/synctransactions/tst_synctransactions.cpp
@@ -35,6 +35,7 @@
 
 #include "../../util.h"
 #include "testsyncadaptor.h"
+#include "qtcontacts-extensions.h"
 
 #include "qcontactcollectionchangesfetchrequest.h"
 #include "qcontactcollectionchangesfetchrequest_impl.h"
@@ -45,20 +46,6 @@
 #include "qcontactclearchangeflagsrequest.h"
 #include "qcontactclearchangeflagsrequest_impl.h"
 
-namespace {
-
-QByteArray aggregateAddressbookId()
-{
-    return QByteArrayLiteral("col-") + QByteArray::number(1); // AggregateAddressbookCollectionId
-}
-
-QByteArray localAddressbookId()
-{
-    return QByteArrayLiteral("col-") + QByteArray::number(2); // LocalAddressbookCollectionId
-}
-
-}
-
 class tst_synctransactions : public QObject
 {
     Q_OBJECT
@@ -96,6 +83,16 @@ private slots:
     QContactManager *m_cm;
     QSet<QContactCollectionId> m_createdColIds;
     QSet<QContactId> m_createdIds;
+
+    QByteArray aggregateAddressbookId()
+    {
+        return QtContactsSqliteExtensions::aggregateCollectionId(m_cm->managerUri()).localId();
+    }
+
+    QByteArray localAddressbookId()
+    {
+        return QtContactsSqliteExtensions::localCollectionId(m_cm->managerUri()).localId();
+    }
 };
 
 tst_synctransactions::tst_synctransactions()