define new D-Bus interface, use qmake to generate adaptors/interfaces

also slightly clean up the way d-bus is handled both in daemon and UI

7 files changed, 87 insertions, 245 deletions

diff --git a/daemon/daemon.pro b/daemon/daemon.pro
index c59d408..3306541 100644
--- a/daemon/daemon.pro
+++ b/daemon/daemon.pro
@@ -20,7 +20,6 @@ SOURCES += \
     notificationmanager.cpp \
     watchconnector.cpp \
     dbusconnector.cpp \
-    dbusadaptor.cpp \
     appmanager.cpp \
     musicmanager.cpp \
     datalogmanager.cpp \
@@ -38,7 +37,6 @@ HEADERS += \
     notificationmanager.h \
     watchconnector.h \
     dbusconnector.h \
-    dbusadaptor.h \
     settings.h \
     appmanager.h \
     musicmanager.h \
@@ -51,10 +49,11 @@ HEADERS += \
     packer.h
 
 OTHER_FILES += \
-    org.pebbled.xml \
     ../log4qt-debug.conf \
     ../log4qt-release.conf
 
+DBUS_ADAPTORS += ../org.pebbled.Watch.xml
+
 INSTALLS += target pebbled confile
 
 target.path = /usr/bin
diff --git a/daemon/dbusadaptor.cpp b/daemon/dbusadaptor.cpp
deleted file mode 100644
index 25e2508..0000000
--- a/daemon/dbusadaptor.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -a dbusadaptor org.pebbled.xml
- *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "dbusadaptor.h"
-#include <QtCore/QMetaObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-
-/*
- * Implementation of adaptor class PebbledAdaptor
- */
-
-PebbledAdaptor::PebbledAdaptor(QObject *parent)
-    : QDBusAbstractAdaptor(parent)
-{
-    // constructor
-    setAutoRelaySignals(true);
-}
-
-PebbledAdaptor::~PebbledAdaptor()
-{
-    // destructor
-}
-
-QString PebbledAdaptor::address() const
-{
-    // get the value of property address
-    return qvariant_cast< QString >(parent()->property("address"));
-}
-
-bool PebbledAdaptor::connected() const
-{
-    // get the value of property connected
-    return qvariant_cast< bool >(parent()->property("connected"));
-}
-
-QString PebbledAdaptor::name() const
-{
-    // get the value of property name
-    return qvariant_cast< QString >(parent()->property("name"));
-}
-
-QVariantMap PebbledAdaptor::pebble() const
-{
-    // get the value of property pebble
-    return qvariant_cast< QVariantMap >(parent()->property("pebble"));
-}
-
-void PebbledAdaptor::disconnect()
-{
-    // handle method call org.pebbled.disconnect
-    QMetaObject::invokeMethod(parent(), "disconnect");
-}
-
-void PebbledAdaptor::ping(int val)
-{
-    // handle method call org.pebbled.ping
-    QMetaObject::invokeMethod(parent(), "ping", Q_ARG(int, val));
-}
-
-void PebbledAdaptor::time()
-{
-    // handle method call org.pebbled.time
-    QMetaObject::invokeMethod(parent(), "time");
-}
-
-void PebbledAdaptor::reconnect()
-{
-    // handle method call org.pebbled.reconnect
-    QMetaObject::invokeMethod(parent(), "reconnect");
-}
-
-void PebbledAdaptor::test()
-{
-    QMetaObject::invokeMethod(parent(), "test");
-}
-
-void PebbledAdaptor::webviewClosed(const QString &result)
-{
-    QMetaObject::invokeMethod(parent(), "webviewClosed", Q_ARG(QString, result));
-}
diff --git a/daemon/dbusadaptor.h b/daemon/dbusadaptor.h
deleted file mode 100644
index f347f92..0000000
--- a/daemon/dbusadaptor.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -a dbusadaptor org.pebbled.xml
- *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#ifndef DBUSADAPTOR_H_1404986135
-#define DBUSADAPTOR_H_1404986135
-
-#include <QtCore/QObject>
-#include <QtDBus/QtDBus>
-QT_BEGIN_NAMESPACE
-class QByteArray;
-template<class T> class QList;
-template<class Key, class Value> class QMap;
-class QString;
-class QStringList;
-class QVariant;
-QT_END_NAMESPACE
-
-/*
- * Adaptor class for interface org.pebbled
- */
-class PebbledAdaptor: public QDBusAbstractAdaptor
-{
-    Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.pebbled")
-    Q_CLASSINFO("D-Bus Introspection", ""
-"  <interface name=\"org.pebbled\">\n"
-"    <property access=\"read\" type=\"a{sv}\" name=\"pebble\">\n"
-"      <annotation value=\"QVariantMap\" name=\"org.qtproject.QtDBus.QtTypeName\"/>\n"
-"    </property>\n"
-"    <property access=\"read\" type=\"s\" name=\"name\"/>\n"
-"    <property access=\"read\" type=\"s\" name=\"address\"/>\n"
-"    <property access=\"read\" type=\"b\" name=\"connected\"/>\n"
-"    <signal name=\"pebbleChanged\"/>\n"
-"    <signal name=\"connectedChanged\"/>\n"
-"    <method name=\"ping\">\n"
-"      <arg direction=\"in\" type=\"i\" name=\"val\"/>\n"
-"    </method>\n"
-"    <method name=\"time\"/>\n"
-"    <method name=\"disconnect\"/>\n"
-"    <method name=\"reconnect\"/>\n"
-"    <method name=\"test\"/>\n"
-"    <signal name=\"openUrl\">\n"
-"      <arg type=\"s\" name=\"url\"/>\n"
-"    </signal>\n"
-"    <method name=\"webviewClosed\">\n"
-"      <arg direction=\"in\" type=\"s\" name=\"result\"/>\n"
-"    </method>\n"
-"  </interface>\n"
-        "")
-public:
-    PebbledAdaptor(QObject *parent);
-    virtual ~PebbledAdaptor();
-
-public: // PROPERTIES
-    Q_PROPERTY(QString address READ address)
-    QString address() const;
-
-    Q_PROPERTY(bool connected READ connected)
-    bool connected() const;
-
-    Q_PROPERTY(QString name READ name)
-    QString name() const;
-
-    Q_PROPERTY(QVariantMap pebble READ pebble)
-    QVariantMap pebble() const;
-
-public Q_SLOTS: // METHODS
-    void disconnect();
-    void ping(int val);
-    void time();
-    void reconnect();
-    void test();
-    void webviewClosed(const QString &result);
-Q_SIGNALS: // SIGNALS
-    void connectedChanged();
-    void pebbleChanged();
-    void openUrl(const QString &s);
-};
-
-#endif
diff --git a/daemon/dbusconnector.h b/daemon/dbusconnector.h
index e6dd793..d4c1bcb 100644
--- a/daemon/dbusconnector.h
+++ b/daemon/dbusconnector.h
@@ -20,8 +20,8 @@ class DBusConnector : public QObject
 public:
     explicit DBusConnector(QObject *parent = 0);
 
-    QVariantMap pebble() { return pebbleProps; }
-    QStringList services() { return dbusServices; }
+    QVariantMap pebble() const { return pebbleProps; }
+    QStringList services() const { return dbusServices; }
 
 signals:
     void pebbleChanged();
diff --git a/daemon/manager.cpp b/daemon/manager.cpp
index e732d38..38b3948 100644
--- a/daemon/manager.cpp
+++ b/daemon/manager.cpp
@@ -3,10 +3,11 @@
 #include <QtContacts/QContactPhoneNumber>
 
 #include "manager.h"
-#include "dbusadaptor.h"
+#include "watch_adaptor.h"
 
 Manager::Manager(Settings *settings, QObject *parent) :
     QObject(parent), settings(settings),
+    proxy(new PebbledProxy(this)),
     watch(new WatchConnector(this)),
     dbus(new DBusConnector(this)),
     apps(new AppManager(this)),
@@ -54,14 +55,16 @@ Manager::Manager(Settings *settings, QObject *parent) :
     connect(notifications, SIGNAL(twitterNotify(const QString &,const QString &)), SLOT(onTwitterNotify(const QString &,const QString &)));
     connect(notifications, SIGNAL(facebookNotify(const QString &,const QString &)), SLOT(onFacebookNotify(const QString &,const QString &)));
 
-    PebbledProxy *proxy = new PebbledProxy(this);
-    PebbledAdaptor *adaptor = new PebbledAdaptor(proxy);
+    connect(appmsg, &AppMsgManager::messageReceived, this, &Manager::onAppMessage);
+
     QDBusConnection session = QDBusConnection::sessionBus();
-    session.registerObject("/org/pebbled", proxy);
+    new WatchAdaptor(proxy);
+    session.registerObject("/org/pebbled/watch", proxy);
     session.registerService("org.pebbled");
-    connect(dbus, SIGNAL(pebbleChanged()), adaptor, SIGNAL(pebbleChanged()));
-    connect(watch, SIGNAL(connectedChanged()), adaptor, SIGNAL(connectedChanged()));
-    connect(js, SIGNAL(appOpenUrl(QString)), adaptor, SIGNAL(openUrl(QString)));
+
+    connect(dbus, &DBusConnector::pebbleChanged, proxy, &PebbledProxy::NameChanged);
+    connect(dbus, &DBusConnector::pebbleChanged, proxy, &PebbledProxy::AddressChanged);
+    connect(watch, &WatchConnector::connectedChanged, proxy, &PebbledProxy::ConnectedChanged);
 
     QString currentProfile = getCurrentProfile();
     defaultProfile = currentProfile.isEmpty() ? "ambience" : currentProfile;
@@ -289,7 +292,7 @@ void Manager::onMprisPropertiesChanged(QString interface, QMap<QString,QVariant>
     logger()->debug() << "lastSeenMpris:" << lastSeenMpris;
 }
 
-QString Manager::mpris()
+QString Manager::mpris() const
 {
     const QStringList &services = dbus->services();
     if (not lastSeenMpris.isEmpty() && services.contains(lastSeenMpris))
@@ -316,7 +319,7 @@ void Manager::setMprisMetadata(QVariantMap metadata)
     emit mprisMetadataChanged(mprisMetadata);
 }
 
-QString Manager::getCurrentProfile()
+QString Manager::getCurrentProfile() const
 {
     QDBusReply<QString> profile = QDBusConnection::sessionBus().call(
                 QDBusMessage::createMethodCall("com.nokia.profiled", "/com/nokia/profiled", "com.nokia.profiled", "get_profile"));
@@ -386,12 +389,6 @@ void Manager::transliterateMessage(const QString &text)
     }
 }
 
-bool Manager::uploadApp(const QUuid &uuid, int slot)
-{
-    // TODO
-    return false;
-}
-
 void Manager::test()
 {
     logger()->debug() << "Starting test";
@@ -399,6 +396,11 @@ void Manager::test()
     js->showConfiguration();
 }
 
+void Manager::onAppMessage(const QUuid &uuid, const QVariantMap &data)
+{
+    emit proxy->AppMessage(uuid.toString(), data);
+}
+
 void Manager::onWebviewClosed(const QString &result)
 {
     js->handleWebviewClosed(result);
diff --git a/daemon/manager.h b/daemon/manager.h
index b0e15fb..c12d3dc 100644
--- a/daemon/manager.h
+++ b/daemon/manager.h
@@ -24,9 +24,9 @@
 
 using namespace QtContacts;
 
-class Manager :
-        public QObject,
-        protected QDBusContext
+class PebbledProxy;
+
+class Manager : public QObject, protected QDBusContext
 {
     Q_OBJECT
     LOG4QT_DECLARE_QCLASS_LOGGER
@@ -40,6 +40,8 @@ class Manager :
 
     Settings *settings;
 
+    PebbledProxy *proxy;
+
     WatchConnector *watch;
     DBusConnector *dbus;
     AppManager *apps;
@@ -58,6 +60,7 @@ class Manager :
     QString defaultProfile;
 
     QString lastSeenMpris;
+    QVariantMap mprisMetadata;
 
     QScopedPointer<icu::Transliterator> transliterator;
 
@@ -65,13 +68,11 @@ public:
     explicit Manager(Settings *settings, QObject *parent = 0);
     ~Manager();
 
-    Q_INVOKABLE QString findPersonByNumber(QString number);
-    Q_INVOKABLE QString getCurrentProfile();
-    Q_INVOKABLE QString mpris();
-    QVariantMap mprisMetadata;
-    QVariantMap getMprisMetadata() { return mprisMetadata; }
+    QString findPersonByNumber(QString number);
+    QString getCurrentProfile() const;
+    QString mpris() const;
 
-    Q_INVOKABLE bool uploadApp(const QUuid &uuid, int slot = -1);
+    inline QVariantMap getMprisMetadata() const { return mprisMetadata; }
 
 protected:
     void transliterateMessage(const QString &text);
@@ -100,31 +101,71 @@ private slots:
     void onMprisPropertiesChanged(QString,QMap<QString,QVariant>,QStringList);
     void setMprisMetadata(QDBusArgument metadata);
     void setMprisMetadata(QVariantMap metadata);
+
+    void onAppMessage(const QUuid &uuid, const QVariantMap &data);
 };
 
-class PebbledProxy : public QObject
+/** This class is what's actually exported over D-Bus,
+ *  so the names of the slots and properties must match with org.pebbled.Watch D-Bus interface.
+ *  Case sensitive. Otherwise, _runtime_ failures will occur. */
+// The methods are marked inline so that they may be inlined inside qt_metacall
+class PebbledProxy : public QObject, protected QDBusContext
 {
     Q_OBJECT
-    Q_PROPERTY(QVariantMap pebble READ pebble)
-    Q_PROPERTY(QString name READ pebbleName)
-    Q_PROPERTY(QString address READ pebbleAddress)
-    Q_PROPERTY(bool connected READ pebbleConnected)
+    Q_PROPERTY(QString Name READ Name NOTIFY NameChanged)
+    Q_PROPERTY(QString Address READ Address NOTIFY AddressChanged)
+    Q_PROPERTY(bool Connected READ Connected NOTIFY ConnectedChanged)
 
-    QVariantMap pebble() { return static_cast<Manager*>(parent())->dbus->pebble(); }
-    QString pebbleName() { return static_cast<Manager*>(parent())->dbus->pebble()["Name"].toString(); }
-    QString pebbleAddress() { return static_cast<Manager*>(parent())->dbus->pebble()["Address"].toString(); }
-    bool pebbleConnected() { return static_cast<Manager*>(parent())->watch->isConnected(); }
+    inline Manager* manager() const { return static_cast<Manager*>(parent()); }
+    inline QVariantMap pebble() const { return manager()->dbus->pebble(); }
 
 public:
-    explicit PebbledProxy(QObject *parent) : QObject(parent) {}
+    inline explicit PebbledProxy(QObject *parent) : QObject(parent) {}
+
+    inline QString Name() const { return pebble()["Name"].toString(); }
+    inline QString Address() const { return pebble()["Address"].toString(); }
+    inline bool Connected() const { return manager()->watch->isConnected(); }
 
 public slots:
-    void ping(int val) { static_cast<Manager*>(parent())->watch->ping((unsigned int)val); }
-    void time() { static_cast<Manager*>(parent())->watch->time(); }
-    void disconnect() { static_cast<Manager*>(parent())->watch->disconnect(); }
-    void reconnect() { static_cast<Manager*>(parent())->watch->reconnect(); }
-    void test() { static_cast<Manager*>(parent())->test(); }
-    void webviewClosed(const QString &result) { static_cast<Manager*>(parent())->onWebviewClosed(result); }
+    inline void Disconnected() { manager()->watch->disconnect(); }
+    inline void Reconnect() { manager()->watch->reconnect(); }
+    inline void Ping(uint val) { manager()->watch->ping(val); }
+    inline void SyncTime() { manager()->watch->time(); }
+
+    inline void LaunchApp(const QString &uuid) { /* TODO */ }
+    inline void CloseApp(const QString &uuid) { /* TODO */ }
+
+    bool SendAppMessage(const QString &uuid, const QVariantMap &data) {
+        Q_ASSERT(calledFromDBus());
+        const QDBusMessage msg = message();
+        setDelayedReply(true);
+        manager()->appmsg->send(uuid, data, [this, msg]() {
+            QDBusMessage reply = msg.createReply(QVariant::fromValue(true));
+            this->connection().send(reply);
+        }, [this, msg]() {
+            QDBusMessage reply = msg.createReply(QVariant::fromValue(false));
+            this->connection().send(reply);
+        });
+        return false; // D-Bus clients should never see this reply.
+    }
+
+    QString StartAppConfiguration(const QString &uuid) {
+        Q_ASSERT(calledFromDBus());
+        const QDBusMessage msg = message();
+        setDelayedReply(true);
+
+        // TODO
+    }
+
+    inline void SendAppConfiguration(const QString &uuid, const QString &data) {
+        // TODO
+    }
+
+signals:
+    void NameChanged();
+    void AddressChanged();
+    void ConnectedChanged();
+    void AppMessage(const QString &uuid, const QVariantMap &data);
 };
 
 #endif // MANAGER_H
diff --git a/daemon/org.pebbled.xml b/daemon/org.pebbled.xml
deleted file mode 100644
index e255782..0000000
--- a/daemon/org.pebbled.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.pebbled">
-    <property name="pebble" type="a{sv}" access="read">
-      <annotation name="org.qtproject.QtDBus.QtTypeName" value="QVariantMap"/>
-    </property>
-    <property name="name" type="s" access="read"/>
-    <property name="address" type="s" access="read"/>
-    <property name="connected" type="b" access="read"/>
-    <signal name="pebbleChanged"/>
-    <signal name="connectedChanged"/>
-    <method name="ping">
-      <arg name="val" type="i" direction="in"/>
-    </method>
-    <method name="time"/>
-    <method name="disconnect"/>
-    <method name="reconnect"/>
-  </interface>
-</node>