Merge tag 'upstream/3.0.7'

Upstream version 3.0.7

# gpg: Signature made Wed 25 Nov 2015 04:48:48 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 14 insertions, 0 deletions

diff --git a/Plugins/DbAndroid/dbandroidconnection.cpp b/Plugins/DbAndroid/dbandroidconnection.cpp
new file mode 100644
index 0000000..1d5ba05
--- /dev/null
+++ b/Plugins/DbAndroid/dbandroidconnection.cpp
@@ -0,0 +1,14 @@
+#include "dbandroidconnection.h"
+#include <QDebug>
+
+QByteArray DbAndroidConnection::convertBlob(const QString& value)
+{
+    if (!value.startsWith("X'", Qt::CaseInsensitive) || !value.endsWith("'"))
+    {
+        qCritical() << "Invalid BLOB value from Android. Doesn't match BLOB pattern:" << value;
+        return QByteArray();
+    }
+
+    return QByteArray::fromHex(value.mid(2, value.length() - 3).toLatin1());
+}
+