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, 44 insertions, 0 deletions

diff --git a/Plugins/DbAndroid/dbandroidconnection.h b/Plugins/DbAndroid/dbandroidconnection.h
new file mode 100644
index 0000000..11e9be0
--- /dev/null
+++ b/Plugins/DbAndroid/dbandroidconnection.h
@@ -0,0 +1,44 @@
+#ifndef DBANDROIDCONNECTION_H
+#define DBANDROIDCONNECTION_H
+
+#include "dbandroidurl.h"
+#include <QObject>
+#include <QStringList>
+#include <QHash>
+
+class DbAndroidConnection : public QObject
+{
+        Q_OBJECT
+
+    public:
+        struct ExecutionResult
+        {
+            bool wasError = false;
+            int errorCode = 0;
+            QString errorMsg;
+            QStringList resultColumns;
+            QList<QVariantHash> resultDataMap;
+            QList<QVariantList> resultDataList;
+        };
+
+        DbAndroidConnection(QObject* parent = 0) : QObject(parent) {}
+        virtual ~DbAndroidConnection() {}
+
+        virtual bool connectToAndroid(const DbAndroidUrl& url) = 0;
+        virtual void disconnectFromAndroid() = 0;
+        virtual bool isConnected() const = 0;
+        virtual QString getDbName() const = 0;
+        virtual QStringList getDbList() = 0;
+        virtual QStringList getAppList() = 0;
+        virtual bool isAppOkay() const = 0;
+        virtual bool deleteDatabase(const QString& dbName) = 0;
+        virtual ExecutionResult executeQuery(const QString& query) = 0;
+
+    protected:
+        static QByteArray convertBlob(const QString& value);
+
+    signals:
+        void disconnected();
+};
+
+#endif // DBANDROIDCONNECTION_H