BitsOfBinaryData: Add fromByteArray() utility function

It automatically hashes the data and creates a content ID.

2 files changed, 25 insertions, 0 deletions

diff --git a/src/base/QXmppBitsOfBinaryData.cpp b/src/base/QXmppBitsOfBinaryData.cpp
index 1592a2e5..6f9226de 100644
--- a/src/base/QXmppBitsOfBinaryData.cpp
+++ b/src/base/QXmppBitsOfBinaryData.cpp
@@ -41,6 +41,29 @@ QXmppBitsOfBinaryDataPrivate::QXmppBitsOfBinaryDataPrivate()
 ///
 
 ///
+/// Creates bits of binary data from a QByteArray.
+///
+/// This hashes the data to generate a content ID. The MIME type is not set.
+///
+/// \note This blocks while hashing the data. You may want to run this via QtConcurrent or a
+/// QThreadPool to run this on for large amounts of data.
+///
+/// \since QXmpp 1.5
+///
+QXmppBitsOfBinaryData QXmppBitsOfBinaryData::fromByteArray(QByteArray data)
+{
+    QXmppBitsOfBinaryContentId cid;
+    cid.setHash(QCryptographicHash::hash(data, QCryptographicHash::Sha1));
+    cid.setAlgorithm(QCryptographicHash::Sha1);
+
+    QXmppBitsOfBinaryData bobData;
+    bobData.d->cid = std::move(cid);
+    bobData.d->data = std::move(data);
+
+    return bobData;
+}
+
+///
 /// Default constructor
 ///
 QXmppBitsOfBinaryData::QXmppBitsOfBinaryData()
diff --git a/src/base/QXmppBitsOfBinaryData.h b/src/base/QXmppBitsOfBinaryData.h
index 3e5ad20b..e0a0226c 100644
--- a/src/base/QXmppBitsOfBinaryData.h
+++ b/src/base/QXmppBitsOfBinaryData.h
@@ -18,6 +18,8 @@ class QXmppBitsOfBinaryContentId;
 class QXMPP_EXPORT QXmppBitsOfBinaryData
 {
 public:
+    static QXmppBitsOfBinaryData fromByteArray(QByteArray data);
+
     QXmppBitsOfBinaryData();
     QXmppBitsOfBinaryData(const QXmppBitsOfBinaryData &);
     QXmppBitsOfBinaryData(QXmppBitsOfBinaryData &&);