Merge lp:~bhdouglass/rockwork/appsettings into lp:rockwork

[Brian Douglass]

App settings hookups

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-12-17 23:33:39 +0000
+++ manifest.json.in	2016-01-03 06:41:00 +0000
@@ -6,7 +6,8 @@
     "hooks": {
         "rockwork": {
             "apparmor": "rockwork/rockwork.apparmor",
-            "desktop": "rockwork/rockwork.desktop"
+            "desktop": "rockwork/rockwork.desktop",
+            "urls": "rockwork/rockwork.url-dispatcher"
         }
     },
     "version": "@VERSION@",

=== modified file 'po/rockwork.mzanetti.pot'
--- po/rockwork.mzanetti.pot	2016-01-03 02:45:11 +0000
+++ po/rockwork.mzanetti.pot	2016-01-03 06:41:00 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-03 01:54+0100\n"
+"POT-Creation-Date: 2016-01-03 05:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,74 +17,78 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:8
+#: /home/vagrant/appsettings/rockwork/AppSettingsPage.qml:13
+msgid "App Settings"
+msgstr ""
+
+#: /home/vagrant/appsettings/rockwork/AppStorePage.qml:8
 msgid "Add new watchapp"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:8
+#: /home/vagrant/appsettings/rockwork/AppStorePage.qml:8
 msgid "Add new watchface"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:76
+#: /home/vagrant/appsettings/rockwork/AppStorePage.qml:76
 msgid "Previous"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:84
+#: /home/vagrant/appsettings/rockwork/AppStorePage.qml:84
 msgid "Next"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:8
+#: /home/vagrant/appsettings/rockwork/InstalledAppsPage.qml:8
 msgid "Apps & Watchfaces"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:8
+#: /home/vagrant/appsettings/rockwork/InstalledAppsPage.qml:8
 msgid "Apps"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:8
+#: /home/vagrant/appsettings/rockwork/InstalledAppsPage.qml:8
 msgid "Watchfaces"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:20
+#: /home/vagrant/appsettings/rockwork/MainMenuPage.qml:20
 msgid "Manage notifications"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:26
+#: /home/vagrant/appsettings/rockwork/MainMenuPage.qml:26
 msgid "Manage Apps"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:33
+#: /home/vagrant/appsettings/rockwork/MainMenuPage.qml:33
 msgid "Manage Watchfaces"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/NotificationsPage.qml:7
+#: /home/vagrant/appsettings/rockwork/NotificationsPage.qml:7
 msgid "Notifications"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/NotificationsPage.qml:26
+#: /home/vagrant/appsettings/rockwork/NotificationsPage.qml:26
 msgid ""
 "Entries here will appear as notifications keep coming. Selected "
 "notifications will be shown on your Pebble smartwatch."
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:6
+#: /home/vagrant/appsettings/rockwork/PebblesPage.qml:6
 msgid "Manage Pebble Watches"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:36
+#: /home/vagrant/appsettings/rockwork/PebblesPage.qml:36
 msgid "Connected"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:36
+#: /home/vagrant/appsettings/rockwork/PebblesPage.qml:36
 msgid "Disconnected"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:55
+#: /home/vagrant/appsettings/rockwork/PebblesPage.qml:55
 msgid ""
 "No Pebble smartwatches configured yet. Please connect your Pebble watch "
 "using the system settings."
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:62
+#: /home/vagrant/appsettings/rockwork/PebblesPage.qml:62
 msgid "Open system settings"
 msgstr ""

=== added file 'rockwork/AppSettingsPage.qml'
--- rockwork/AppSettingsPage.qml	1970-01-01 00:00:00 +0000
+++ rockwork/AppSettingsPage.qml	2016-01-03 06:41:00 +0000
@@ -0,0 +1,82 @@
+import QtQuick 2.4
+import Ubuntu.Web 0.2
+import Ubuntu.Components 1.3
+import com.canonical.Oxide 1.0 as Oxide
+
+Page {
+    id: settings
+
+    property string uuid;
+    property string url;
+    property var pebble;
+
+    title: i18n.tr("App Settings")
+
+    WebContext {
+        id: webcontext
+        userAgent: "Mozilla/5.0 (Linux; Android 5.0; Nexus 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.102 Mobile Safari/537.36 Ubuntu Touch (RockWork)"
+    }
+
+    WebView {
+        id: webview
+        anchors {
+            fill: parent
+            bottom: parent.bottom
+        }
+        width: parent.width
+        height: parent.height
+
+        context: webcontext
+        url: settings.url
+        preferences.localStorageEnabled: true
+        preferences.appCacheEnabled: true
+        preferences.javascriptCanAccessClipboard: true
+
+        function navigationRequestedDelegate(request) {
+            //The pebblejs:// protocol is handeled by the urihandler, as it appears we can't intercept it
+
+            var url = request.url.toString();
+            console.log(url, url.substring(0, 16));
+            if (url.substring(0, 16) == 'pebblejs://close') {
+                pebble.configurationClosed(settings.uuid, url);
+                request.action = Oxide.NavigationRequest.ActionReject;
+                pageStack.pop();
+            }
+            else {
+                Qt.openUrlExternally(url);
+                request.action = Oxide.NavigationRequest.ActionReject;
+            }
+        }
+
+        Component.onCompleted: {
+            preferences.localStorageEnabled = true;
+        }
+    }
+
+    ProgressBar {
+        height: units.dp(3)
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+        }
+
+        showProgressPercentage: false
+        value: (webview.loadProgress / 100)
+        visible: (webview.loading && !webview.lastLoadStopped)
+    }
+
+    Connections {
+        target: UriHandler
+        onOpened: {
+            if (uris && uris[0] && uris[0].length) {
+                var url = uris[0];
+
+                if (url.substring(0, 16) == 'pebblejs://close') {
+                    pebble.configurationClosed(settings.uuid, url);
+                    pageStack.pop();
+                }
+            }
+        }
+    }
+}

=== modified file 'rockwork/InstalledAppsPage.qml'
--- rockwork/InstalledAppsPage.qml	2015-12-30 19:15:55 +0000
+++ rockwork/InstalledAppsPage.qml	2016-01-03 06:41:00 +0000
@@ -44,6 +44,18 @@
                 ]
             }
 
+            trailingActions: ListItemActions {
+                actions: [
+                    Action {
+                        visible: model.hasSettings
+                        iconName: "settings"
+                        onTriggered: {
+                            pebble.requestConfigurationURL(model.uuid);
+                        }
+                    }
+                ]
+            }
+
             RowLayout {
                 anchors {
                     fill: parent
@@ -73,4 +85,3 @@
         }
     }
 }
-

=== modified file 'rockwork/Main.qml'
--- rockwork/Main.qml	2015-12-21 03:46:24 +0000
+++ rockwork/Main.qml	2016-01-03 06:41:00 +0000
@@ -36,7 +36,5 @@
     PageStack {
         id: pageStack
         Component.onCompleted: push(Qt.resolvedUrl("PebblesPage.qml"));
-
     }
 }
-

=== modified file 'rockwork/MainMenuPage.qml'
--- rockwork/MainMenuPage.qml	2015-12-25 14:08:31 +0000
+++ rockwork/MainMenuPage.qml	2016-01-03 06:41:00 +0000
@@ -71,4 +71,13 @@
             }
         }
     }
+
+    Connections {
+        target: pebble
+        onOpenURL: {
+            if (url) {
+                pageStack.push(Qt.resolvedUrl("AppSettingsPage.qml"), {uuid: uuid, url: url, pebble: pebble})
+            }
+        }
+    }
 }

=== modified file 'rockwork/applicationsmodel.cpp'
--- rockwork/applicationsmodel.cpp	2015-12-21 03:46:24 +0000
+++ rockwork/applicationsmodel.cpp	2016-01-03 06:41:00 +0000
@@ -18,6 +18,8 @@
     switch (role) {
     case RoleId:
         return m_apps.at(index.row())->id();
+    case RoleUuid:
+        return m_apps.at(index.row())->uuid();
     case RoleName:
         return m_apps.at(index.row())->name();
     case RoleIcon:
@@ -26,7 +28,12 @@
         return m_apps.at(index.row())->vendor();
     case RoleVersion:
         return m_apps.at(index.row())->version();
+    case RoleIsWatchFace:
+        return m_apps.at(index.row())->isWatchFace();
+    case RoleHasSettings:
+        return m_apps.at(index.row())->hasSettings();
     }
+
     return QVariant();
 }
 
@@ -34,10 +41,14 @@
 {
     QHash<int, QByteArray> roles;
     roles.insert(RoleId, "id");
+    roles.insert(RoleUuid, "uuid");
     roles.insert(RoleName, "name");
     roles.insert(RoleIcon, "icon");
     roles.insert(RoleVendor, "vendor");
     roles.insert(RoleVersion, "version");
+    roles.insert(RoleIsWatchFace, "isWatchFace");
+    roles.insert(RoleHasSettings, "hasSettings");
+
     return roles;
 }
 
@@ -74,6 +85,11 @@
     return m_id;
 }
 
+QString AppItem::uuid() const
+{
+    return m_uuid;
+}
+
 QString AppItem::name() const
 {
     return m_name;
@@ -99,11 +115,21 @@
     return m_isWatchFace;
 }
 
+bool AppItem::hasSettings() const
+{
+    return m_hasSettings;
+}
+
 void AppItem::setId(const QString &id)
 {
     m_id = id;
 }
 
+void AppItem::setUuid(const QString &uuid)
+{
+    m_uuid = uuid;
+}
+
 void AppItem::setName(const QString &name)
 {
     m_name = name;
@@ -128,3 +154,8 @@
 {
     m_isWatchFace = isWatchFace;
 }
+
+void AppItem::setHasSettings(bool hasSettings)
+{
+    m_hasSettings = hasSettings;
+}

=== modified file 'rockwork/applicationsmodel.h'
--- rockwork/applicationsmodel.h	2015-12-21 03:46:24 +0000
+++ rockwork/applicationsmodel.h	2016-01-03 06:41:00 +0000
@@ -10,36 +10,44 @@
 {
     Q_OBJECT
     Q_PROPERTY(QString id MEMBER m_id)
+    Q_PROPERTY(QString uuid MEMBER m_uuid)
     Q_PROPERTY(QString name MEMBER m_name)
     Q_PROPERTY(QString icon MEMBER m_icon)
     Q_PROPERTY(QString vendor MEMBER m_vendor)
     Q_PROPERTY(QString version MEMBER m_version)
     Q_PROPERTY(bool isWatchFace MEMBER m_isWatchFace)
+    Q_PROPERTY(bool hasSettings MEMBER m_hasSettings)
 
 public:
     AppItem(QObject *parent = 0);
 
     QString id() const;
+    QString uuid() const;
     QString name() const;
     QString icon() const;
     QString vendor() const;
     QString version() const;
     bool isWatchFace() const;
+    bool hasSettings() const;
 
     void setId(const QString &id);
+    void setUuid(const QString &uuid);
     void setName(const QString &name);
     void setIcon(const QString &icon);
     void setVendor(const QString &vendor);
     void setVersion(const QString &version);
     void setIsWatchFace(bool isWatchFace);
+    void setHasSettings(bool hasSettings);
 
 private:
     QString m_id;
+    QString m_uuid;
     QString m_name;
     QString m_icon;
     QString m_vendor;
     QString m_version;
     bool m_isWatchFace = false;
+    bool m_hasSettings = false;
 };
 
 class ApplicationsModel : public QAbstractListModel
@@ -48,10 +56,13 @@
 public:
     enum Roles {
         RoleId,
+        RoleUuid,
         RoleName,
         RoleIcon,
         RoleVendor,
-        RoleVersion
+        RoleVersion,
+        RoleIsWatchFace,
+        RoleHasSettings
     };
 
     ApplicationsModel(QObject *parent = nullptr);

=== modified file 'rockwork/main.cpp'
--- rockwork/main.cpp	2015-12-30 19:15:55 +0000
+++ rockwork/main.cpp	2016-01-03 06:41:00 +0000
@@ -31,4 +31,3 @@
     view.show();
     return app.exec();
 }
-

=== modified file 'rockwork/pebble.cpp'
--- rockwork/pebble.cpp	2015-12-30 19:15:55 +0000
+++ rockwork/pebble.cpp	2016-01-03 06:41:00 +0000
@@ -14,6 +14,7 @@
     QDBusConnection::sessionBus().connect("org.rockwork", path.path(), "org.rockwork.Pebble", "Connected", this, SLOT(pebbleConnected()));
     QDBusConnection::sessionBus().connect("org.rockwork", path.path(), "org.rockwork.Pebble", "Disconnected", this, SLOT(pebbleDisconnected()));
     QDBusConnection::sessionBus().connect("org.rockwork", path.path(), "org.rockwork.Pebble", "InstalledAppsChanged", this, SLOT(refreshApps()));
+    QDBusConnection::sessionBus().connect("org.rockwork", path.path(), "org.rockwork.Pebble", "OpenURL", this, SIGNAL(openURL(const QString&, const QString&)));
 
     dataChanged();
     refreshApps();
@@ -54,6 +55,16 @@
     return m_installedApps;
 }
 
+void Pebble::configurationClosed(const QString &uuid, const QString &url)
+{
+    m_iface->call("ConfigurationClosed", uuid, url.mid(17));
+}
+
+void Pebble::requestConfigurationURL(const QString &id)
+{
+    m_iface->call("ConfigurationURL", id);
+}
+
 void Pebble::removeApp(const QString &id)
 {
     qDebug() << "should remove app" << id;
@@ -138,12 +149,14 @@
     foreach (const QVariant &v, appList) {
         AppItem *app = new AppItem(this);
         app->setId(v.toMap().value("uuid").toString());
+        app->setUuid(v.toMap().value("uuid").toString());
         app->setName(v.toMap().value("name").toString());
         app->setIcon(v.toMap().value("icon").toString());
         app->setVendor(v.toMap().value("vendor").toString());
         app->setVersion(v.toMap().value("version").toString());
         app->setIsWatchFace(v.toMap().value("watchface").toBool());
-        qDebug() << "inserting app" << app->name();
+        app->setHasSettings(v.toMap().value("hasSettings").toBool());
+
         m_installedApps->insert(app);
     }
 }

=== modified file 'rockwork/pebble.h'
--- rockwork/pebble.h	2015-12-30 19:15:55 +0000
+++ rockwork/pebble.h	2016-01-03 06:41:00 +0000
@@ -29,9 +29,12 @@
 public slots:
     void removeApp(const QString &id);
     void installApp(const QString &id);
+    void requestConfigurationURL(const QString &id);
+    void configurationClosed(const QString &uuid, const QString &url);
 
 signals:
     void connectedChanged();
+    void openURL(const QString &uuid, const QString &url);
 
 private:
     QVariant fetchProperty(const QString &propertyName);

=== modified file 'rockwork/rockwork.pro'
--- rockwork/rockwork.pro	2015-12-30 19:15:55 +0000
+++ rockwork/rockwork.pro	2016-01-03 06:41:00 +0000
@@ -33,7 +33,8 @@
 
 CONF_FILES +=  rockwork.apparmor \
                rockwork.svg \
-               rockwork.desktop
+               rockwork.desktop \
+               rockwork.url-dispatcher
 
 AP_TEST_FILES += tests/autopilot/run \
                  $$files(tests/*.py,true)
@@ -49,7 +50,7 @@
 config_files.files += $${CONF_FILES}
 INSTALLS+=config_files
 
-#install the desktop file, a translated version is 
+#install the desktop file, a translated version is
 #automatically created in the build directory
 desktop_file.path = /rockwork
 desktop_file.files = $$OUT_PWD/rockwork.desktop

=== modified file 'rockwork/rockwork.qrc'
--- rockwork/rockwork.qrc	2015-12-30 19:15:55 +0000
+++ rockwork/rockwork.qrc	2016-01-03 06:41:00 +0000
@@ -5,6 +5,7 @@
         <file>PebblesPage.qml</file>
         <file>InstalledAppsPage.qml</file>
         <file>MainMenuPage.qml</file>
+        <file>AppSettingsPage.qml</file>
         <file>AppStorePage.qml</file>
     </qresource>
 </RCC>

=== added file 'rockwork/rockwork.url-dispatcher'
--- rockwork/rockwork.url-dispatcher	1970-01-01 00:00:00 +0000
+++ rockwork/rockwork.url-dispatcher	2016-01-03 06:41:00 +0000
@@ -0,0 +1,5 @@
+[
+    {
+        "protocol": "pebblejs"
+    }
+]

=== modified file 'rockworkd/dbusinterface.cpp'
--- rockworkd/dbusinterface.cpp	2015-12-30 19:15:55 +0000
+++ rockworkd/dbusinterface.cpp	2016-01-03 06:41:00 +0000
@@ -9,6 +9,7 @@
     connect(pebble, &Pebble::pebbleConnected, this, &DBusPebble::Connected);
     connect(pebble, &Pebble::pebbleDisconnected, this, &DBusPebble::Disconnected);
     connect(pebble, &Pebble::installedAppsChanged, this, &DBusPebble::InstalledAppsChanged);
+    connect(pebble, SIGNAL(openURL(const QString&, const QString&)), this, SIGNAL(OpenURL(const QString&, const QString&)));
 }
 
 QString DBusPebble::Address() const
@@ -52,6 +53,7 @@
         app.insert("watchface", info.isWatchface());
         app.insert("version", info.versionLabel());
         app.insert("uuid", info.uuid().toString());
+        app.insert("hasSettings", info.hasSettings());
 
         list.append(app);
     }
@@ -63,6 +65,16 @@
     m_pebble->removeApp(id);
 }
 
+void DBusPebble::ConfigurationURL(const QString &uuid)
+{
+    m_pebble->requestConfigurationURL(QUuid(uuid));
+}
+
+void DBusPebble::ConfigurationClosed(const QString &uuid, const QString &result)
+{
+    m_pebble->configurationClosed(QUuid(uuid), result);
+}
+
 QString DBusPebble::SerialNumber() const
 {
     return m_pebble->serialNumber();
@@ -121,6 +133,3 @@
     m_dbusPebbles.insert(address, dbusPebble);
     QDBusConnection::sessionBus().registerObject("/org/rockwork/" + address, dbusPebble, QDBusConnection::ExportAllContents);
 }
-
-
-

=== modified file 'rockworkd/dbusinterface.h'
--- rockworkd/dbusinterface.h	2015-12-30 19:15:55 +0000
+++ rockworkd/dbusinterface.h	2016-01-03 06:41:00 +0000
@@ -18,6 +18,7 @@
     void Connected();
     void Disconnected();
     void InstalledAppsChanged();
+    void OpenURL(const QString &uuid, const QString &url);
 
 public slots:
     QString Address() const;
@@ -30,6 +31,8 @@
     QStringList InstalledAppIds() const;
     QVariantList InstalledApps() const;
     void RemoveApp(const QString &id);
+    void ConfigurationURL(const QString &uuid);
+    void ConfigurationClosed(const QString &uuid, const QString &result);
 
 private:
     Pebble *m_pebble;

=== modified file 'rockworkd/libpebble/appinfo.cpp'
--- rockworkd/libpebble/appinfo.cpp	2015-12-30 19:15:55 +0000
+++ rockworkd/libpebble/appinfo.cpp	2016-01-03 06:41:00 +0000
@@ -44,6 +44,7 @@
     m_companyName = map.value("companyName").toString();
     m_versionCode = map.value("versionCode").toInt();
     m_versionLabel = map.value("versionLabel").toString();
+    m_capabilities = 0;
 
     m_isWatchface = map.value("watchapp").toMap().value("watchface").toBool();
 
@@ -54,6 +55,20 @@
         }
     }
 
+    if (map.contains("capabilities")) {
+        QList<QVariant> capabilities = map.value("capabilities").toList();
+
+        foreach (const QVariant &value, capabilities) {
+            QString capability = value.toString();
+            if (capability == "location") {
+                m_capabilities |= Location;
+            }
+            else if (capability == "configurable") {
+                m_capabilities |= Configurable;
+            }
+        }
+    }
+
     QFile jsApp(path + "/pebble-js-app.js");
     m_isJsKit = jsApp.exists();
 }
@@ -117,6 +132,11 @@
     return m_appKeys;
 }
 
+bool AppInfo::hasSettings() const
+{
+    return (m_capabilities & Configurable);
+}
+
 AppInfo::Capabilities AppInfo::capabilities() const
 {
     return m_capabilities;
@@ -249,4 +269,3 @@
     }
     return 0;
 }
-

=== modified file 'rockworkd/libpebble/appinfo.h'
--- rockworkd/libpebble/appinfo.h	2015-12-30 19:15:55 +0000
+++ rockworkd/libpebble/appinfo.h	2016-01-03 06:41:00 +0000
@@ -41,6 +41,7 @@
     bool isJSKit() const;
     QHash<QString, int> appKeys() const;
     Capabilities capabilities() const;
+    bool hasSettings() const;
 
     bool hasMenuIcon() const;
     QImage getMenuIconImage(HardwarePlatform hardwarePlatform) const;

=== modified file 'rockworkd/libpebble/appmsgmanager.cpp'
--- rockworkd/libpebble/appmsgmanager.cpp	2015-12-30 19:22:54 +0000
+++ rockworkd/libpebble/appmsgmanager.cpp	2016-01-03 06:41:00 +0000
@@ -1,13 +1,16 @@
 #include <QTimer>
 
+#include "pebble.h"
 #include "appmsgmanager.h"
 #include "watchdatareader.h"
 #include "watchdatawriter.h"
 
 // TODO D-Bus server for non JS kit apps!!!!
 
-AppMsgManager::AppMsgManager(AppManager *apps, WatchConnection *connection, QObject *parent)
-    : QObject(parent), apps(apps),
+AppMsgManager::AppMsgManager(Pebble *pebble, AppManager *apps, WatchConnection *connection)
+    : QObject(pebble),
+      m_pebble(pebble),
+      apps(apps),
       m_connection(connection), _lastTransactionId(0), _timeout(new QTimer(this))
 {
     connect(m_connection, &WatchConnection::watchConnected,
@@ -113,24 +116,36 @@
 
 void AppMsgManager::launchApp(const QUuid &uuid)
 {
-    WatchConnection::Dict dict;
-    dict.insert(1, LauncherActionStart);
-
-    qDebug() << "Sending message to launcher" << uuid << dict;
-
-    QByteArray msg = buildPushMessage(++_lastTransactionId, uuid, dict);
-    m_connection->writeToPebble(WatchConnection::EndpointLauncher, msg);
+    if (m_pebble->softwareVersion() < "v3.0") {
+        WatchConnection::Dict dict;
+        dict.insert(1, LauncherActionStart);
+
+        qDebug() << "Sending start message to launcher" << uuid << dict;
+        QByteArray msg = buildPushMessage(++_lastTransactionId, uuid, dict);
+        m_connection->writeToPebble(WatchConnection::EndpointLauncher, msg);
+    }
+    else {
+        QByteArray msg = buildLaunchMessage(LauncherActionStart, uuid);
+        qDebug() << "Sending start message to launcher" << uuid;
+        m_connection->writeToPebble(WatchConnection::EndpointAppLaunch, msg);
+    }
 }
 
 void AppMsgManager::closeApp(const QUuid &uuid)
 {
-    WatchConnection::Dict dict;
-    dict.insert(1, LauncherActionStop);
-
-    qDebug() << "Sending message to launcher" << uuid << dict;
-
-    QByteArray msg = buildPushMessage(++_lastTransactionId, uuid, dict);
-    m_connection->writeToPebble(WatchConnection::EndpointLauncher, msg);
+    if (m_pebble->softwareVersion() < "v3.0") {
+        WatchConnection::Dict dict;
+        dict.insert(1, LauncherActionStop);
+
+        qDebug() << "Sending stop message to launcher" << uuid << dict;
+        QByteArray msg = buildPushMessage(++_lastTransactionId, uuid, dict);
+        m_connection->writeToPebble(WatchConnection::EndpointLauncher, msg);
+    }
+    else {
+        QByteArray msg = buildLaunchMessage(LauncherActionStop, uuid);
+        qDebug() << "Sending stop message to launcher" << uuid;
+        m_connection->writeToPebble(WatchConnection::EndpointAppLaunch, msg);
+    }
 }
 
 WatchConnection::Dict AppMsgManager::mapAppKeys(const QUuid &uuid, const QVariantMap &data)
@@ -227,6 +242,16 @@
     return ba;
 }
 
+QByteArray AppMsgManager::buildLaunchMessage(quint8 messageType, const QUuid &uuid)
+{
+    QByteArray ba;
+    WatchDataWriter writer(&ba);
+    writer.write<quint8>(messageType);
+    writer.writeUuid(uuid);
+
+    return ba;
+}
+
 QByteArray AppMsgManager::buildAckMessage(quint8 transaction)
 {
     QByteArray ba(2, Qt::Uninitialized);

=== modified file 'rockworkd/libpebble/appmsgmanager.h'
--- rockworkd/libpebble/appmsgmanager.h	2015-12-17 05:02:00 +0000
+++ rockworkd/libpebble/appmsgmanager.h	2016-01-03 06:41:00 +0000
@@ -24,7 +24,7 @@
         LauncherActionStop = 0
     };
 
-    explicit AppMsgManager(AppManager *apps, WatchConnection *connection, QObject *parent);
+    explicit AppMsgManager(Pebble *pebble, AppManager *apps, WatchConnection *connection);
 
     void send(const QUuid &uuid, const QVariantMap &data,
               const std::function<void()> &ackCallback,
@@ -54,6 +54,7 @@
     static bool unpackPushMessage(const QByteArray &msg, quint8 *transaction, QUuid *uuid, WatchConnection::Dict *dict);
 
     static QByteArray buildPushMessage(quint8 transaction, const QUuid &uuid, const WatchConnection::Dict &dict);
+    static QByteArray buildLaunchMessage(quint8 messageType, const QUuid &uuid);
     static QByteArray buildAckMessage(quint8 transaction);
     static QByteArray buildNackMessage(quint8 transaction);
 
@@ -73,6 +74,7 @@
     void handleApplicationMessage(const QByteArray &data);
 
 private:
+    Pebble *m_pebble;
     AppManager *apps;
     WatchConnection *m_connection;
     QHash<QUuid, MessageHandlerFunc> _handlers;

=== modified file 'rockworkd/libpebble/jskitmanager.cpp'
--- rockworkd/libpebble/jskitmanager.cpp	2015-12-30 19:15:55 +0000
+++ rockworkd/libpebble/jskitmanager.cpp	2016-01-03 06:41:00 +0000
@@ -9,6 +9,7 @@
     m_pebble(pebble),
     m_connection(connection), _apps(apps), _appmsg(appmsg), _engine(0)
 {
+    m_configurationUuid = QUuid();
     connect(_appmsg, &AppMsgManager::appStarted, this, &JSKitManager::handleAppStarted);
     connect(_appmsg, &AppMsgManager::appStopped, this, &JSKitManager::handleAppStopped);
 }
@@ -62,6 +63,16 @@
     }
 }
 
+void JSKitManager::setConfigurationId(const QUuid &uuid)
+{
+    m_configurationUuid = uuid;
+}
+
+AppInfo JSKitManager::currentApp()
+{
+    return _curApp;
+}
+
 void JSKitManager::handleAppStarted(const QUuid &uuid)
 {
     qDebug() << "handleAppStarted!!!" << uuid;
@@ -197,6 +208,13 @@
 
     // We try to invoke the callbacks even if script parsing resulted in error...
     _jspebble->invokeCallbacks("ready");
+
+    if (m_configurationUuid == _curApp.uuid()) {
+        qDebug() << "going to launch config for" << m_configurationUuid;
+        showConfiguration();
+    }
+
+    m_configurationUuid = QUuid();
 }
 
 void JSKitManager::stopJsApp()

=== modified file 'rockworkd/libpebble/jskitmanager.h'
--- rockworkd/libpebble/jskitmanager.h	2015-11-29 14:19:26 +0000
+++ rockworkd/libpebble/jskitmanager.h	2016-01-03 06:41:00 +0000
@@ -29,10 +29,12 @@
 
     void showConfiguration();
     void handleWebviewClosed(const QString &result);
+    void setConfigurationId(const QUuid &uuid);
+    AppInfo currentApp();
 
 signals:
     void appNotification(const QUuid &uuid, const QString &title, const QString &body);
-    void appOpenUrl(const QUrl &url);
+    void openURL(const QString &uuid, const QString &url);
 
 private slots:
     void handleAppStarted(const QUuid &uuid);
@@ -57,6 +59,7 @@
     QPointer<JSKitConsole> _jsconsole;
     QPointer<JSKitLocalStorage> _jsstorage;
     QPointer<JSKitGeolocation> _jsgeo;
+    QUuid m_configurationUuid;
 };
 
 #endif // JSKITMANAGER_H

=== modified file 'rockworkd/libpebble/jskitobjects.cpp'
--- rockworkd/libpebble/jskitobjects.cpp	2015-12-17 05:03:19 +0000
+++ rockworkd/libpebble/jskitobjects.cpp	2016-01-03 06:41:00 +0000
@@ -152,7 +152,7 @@
 void JSKitPebble::openURL(const QUrl &url)
 {
     qDebug() << "opening url" << url.toString();
-    emit _mgr->appOpenUrl(url);
+    emit _mgr->openURL(_appInfo.uuid().toString(), url.toString());
 }
 
 QString JSKitPebble::getAccountToken() const
@@ -244,6 +244,21 @@
     qCDebug(l) << msg;
 }
 
+void JSKitConsole::warn(const QString &msg)
+{
+    qCWarning(l) << msg;
+}
+
+void JSKitConsole::error(const QString &msg)
+{
+    qCCritical(l) << msg;
+}
+
+void JSKitConsole::info(const QString &msg)
+{
+    qCDebug(l) << msg;
+}
+
 JSKitLocalStorage::JSKitLocalStorage(const QUuid &uuid, QObject *parent)
     : QObject(parent), _storage(new QSettings(getStorageFileFor(uuid), QSettings::IniFormat, this))
 {

=== modified file 'rockworkd/libpebble/jskitobjects.h'
--- rockworkd/libpebble/jskitobjects.h	2015-11-29 14:19:26 +0000
+++ rockworkd/libpebble/jskitobjects.h	2016-01-03 06:41:00 +0000
@@ -61,6 +61,9 @@
     explicit JSKitConsole(QObject *parent=0);
 
     Q_INVOKABLE void log(const QString &msg);
+    Q_INVOKABLE void warn(const QString &msg);
+    Q_INVOKABLE void error(const QString &msg);
+    Q_INVOKABLE void info(const QString &msg);
 };
 
 class JSKitLocalStorage : public QObject

=== modified file 'rockworkd/libpebble/pebble.cpp'
--- rockworkd/libpebble/pebble.cpp	2016-01-03 02:45:11 +0000
+++ rockworkd/libpebble/pebble.cpp	2016-01-03 06:41:00 +0000
@@ -26,17 +26,24 @@
     m_connection->registerEndpointHandler(WatchConnection::EndpointVersion, this, "pebbleVersionReceived");
     m_connection->registerEndpointHandler(WatchConnection::EndpointPhoneVersion, this, "phoneVersionAsked");
     m_connection->registerEndpointHandler(WatchConnection::EndpointDataLogging, this, "logData");
+
     m_notificationEndpoint = new NotificationEndpoint(this, m_connection);
     m_musicEndpoint = new MusicEndpoint(this, m_connection);
     m_phoneCallEndpoint = new PhoneCallEndpoint(this, m_connection);
     QObject::connect(m_phoneCallEndpoint, &PhoneCallEndpoint::hangupCall, this, &Pebble::hangupCall);
+
     m_appManager = new AppManager(this, m_connection);
     QObject::connect(m_appManager, &AppManager::appsChanged, this, &Pebble::installedAppsChanged);
-    m_appMsgManager = new AppMsgManager(m_appManager, m_connection, this);
+
+    m_appMsgManager = new AppMsgManager(this, m_appManager, m_connection);
+
     m_jskitManager = new JSKitManager(this, m_connection, m_appManager, m_appMsgManager, this);
+    QObject::connect(m_jskitManager, SIGNAL(openURL(const QString&, const QString&)), this, SIGNAL(openURL(const QString&, const QString&)));
+
     m_blobDB = new BlobDB(this, m_connection);
     QObject::connect(m_blobDB, &BlobDB::muteSource, this, &Pebble::muteNotificationSource);
     QObject::connect(m_blobDB, &BlobDB::actionTriggered, this, &Pebble::actionTriggered);
+
     m_appDownloader = new AppDownloader(m_storagePath, this);
     QObject::connect(m_appDownloader, &AppDownloader::downloadFinished, this, &Pebble::appDownloadFinished);
 
@@ -220,6 +227,23 @@
     m_appManager->removeApp(uuid);
 }
 
+void Pebble::requestConfigurationURL(const QUuid &uuid) {
+    if (m_jskitManager->currentApp().uuid() == uuid) {
+        m_jskitManager->showConfiguration();
+    }
+    else {
+        m_jskitManager->setConfigurationId(uuid);
+        m_appMsgManager->launchApp(uuid);
+    }
+}
+
+void Pebble::configurationClosed(const QUuid &uuid, const QString &result)
+{
+    if (m_jskitManager->currentApp().uuid() == uuid) {
+        m_jskitManager->handleWebviewClosed(result);
+    }
+}
+
 void Pebble::onPebbleConnected()
 {
     qDebug() << "Pebble connected:" << m_name;

=== modified file 'rockworkd/libpebble/pebble.h'
--- rockworkd/libpebble/pebble.h	2015-12-30 19:15:55 +0000
+++ rockworkd/libpebble/pebble.h	2016-01-03 06:41:00 +0000
@@ -73,6 +73,8 @@
     QList<QUuid> installedAppIds();
     AppInfo appInfo(const QUuid &uuid);
     void removeApp(const QUuid &uuid);
+    void requestConfigurationURL(const QUuid &uuid);
+    void configurationClosed(const QUuid &uuid, const QString &result);
 
 private slots:
     void onPebbleConnected();
@@ -90,6 +92,7 @@
     void muteNotificationSource(const QString &source);
     void actionTriggered(const QString &actToken);
     void installedAppsChanged();
+    void openURL(const QString &uuid, const QString &url);
 
 private:
     void setHardwareRevision(HardwareRevision hardwareRevision);

=== modified file 'rockworkd/libpebble/watchconnection.cpp'
--- rockworkd/libpebble/watchconnection.cpp	2015-12-19 01:48:22 +0000
+++ rockworkd/libpebble/watchconnection.cpp	2016-01-03 06:41:00 +0000
@@ -95,7 +95,8 @@
         qWarning() << "Socket not open. Cannot send data to Pebble. (Endpoint:" << endpoint << ")";
         return;
     }
-//    qCDebug(l) << "sending message to endpoint" << decodeEndpoint(endpoint);
+
+    //qDebug() << "sending message to endpoint" << endpoint;
     QByteArray msg;
 
     msg.append((data.length() & 0xFF00) >> 8);
@@ -106,7 +107,7 @@
 
     msg.append(data);
 
-//    qDebug() << "Writing:" << msg.toHex();
+    //qDebug() << "Writing:" << msg.toHex();
     m_socket->write(msg);
 }
 
@@ -232,4 +233,3 @@
     res.append(buildData(data));
     return res;
 }
-