Merge branch 'jb51541' into 'master'

[qtcontacts-sqlite] Serialize QContactExtendedDetail data. JB#51541 See merge request mer-core/qtcontacts-sqlite!50
sailfishos · Oct 21, 2020 · 239d0d4 · 239d0d4
2 parents 6e7e4da + a1ca27e
commit 239d0d4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/engine/contactreader.cpp b/src/engine/contactreader.cpp
@@ -81,6 +81,8 @@
 
 #include <QSqlError>
 #include <QVector>
+#include <QBuffer>
+#include <QDataStream>
 
 #include <QtDebug>
 #include <QElapsedTimer>
@@ -624,7 +626,15 @@ static const FieldInfo extendedDetailFields[] =
 static void setValues(QContactExtendedDetail *detail, QSqlQuery *query, const int offset)
 {
     setValue(detail, QContactExtendedDetail::FieldName, query->value(offset + 0));
-    setValue(detail, QContactExtendedDetail::FieldData, query->value(offset + 1));
+
+    QByteArray bytes = query->value(offset + 1).toByteArray();
+    QBuffer buffer(&bytes);
+    buffer.open(QIODevice::ReadOnly);
+    QDataStream in(&buffer);
+    in.setVersion(QDataStream::Qt_5_6);
+    QVariant deserialized;
+    in >> deserialized;
+    setValue(detail, QContactExtendedDetail::FieldData, deserialized);
 }
 
 static QMap<QString, int> contextTypes()

diff --git a/src/engine/contactwriter.cpp b/src/engine/contactwriter.cpp
@@ -55,6 +55,8 @@
 
 #include <QSqlError>
 #include <QUuid>
+#include <QBuffer>
+#include <QDataStream>
 
 #include <algorithm>
 #include <cmath>
@@ -3218,7 +3220,15 @@ ContactsDatabase::Query bindDetail(ContactsDatabase &db, quint32 contactId, quin
     query.bindValue(":detailId", detailId);
     query.bindValue(":contactId", contactId);
     query.bindValue(":name", detailValue(detail, T::FieldName));
-    query.bindValue(":data", detailValue(detail, T::FieldData));
+
+    QByteArray serialized;
+    QBuffer buffer(&serialized);
+    buffer.open(QIODevice::WriteOnly);
+    QDataStream out(&buffer);
+    out.setVersion(QDataStream::Qt_5_6);
+    out << detailValue(detail, T::FieldData);
+    query.bindValue(":data", serialized);
+
     return query;
 }