Handle multiple paired Pebbles

Moved Pebble discovery to WatchConnector.
Removed empty DBusConnector.
Minor firmware handling fixes.

app/pebblefirmware.cpp

@@ -18,6 +18,7 @@ void PebbleFirmware::updateLatest(QString hw)
     QNetworkRequest req;
     req.setUrl(firmwareURL.arg(hw).arg(hw.startsWith("snowy_") ? "release-v3" : "release-v2"));
     req.setRawHeader("Cache-Control", "no-cache");
+    qDebug() << "Getting latest firmware" << req.url();
     nm->get(req);
 }
 

app/qml/pages/WatchInfo.qml

@@ -28,15 +28,15 @@ Page {
                 text: qsTr("Address")
             }
             Label {
-                text: pebbled.info.address
+                text: pebbled.info.address || ""
             }
 
             Label {
                 color: Theme.highlightColor
                 text: qsTr("Serial Number")
             }
             Label {
-                text: pebbled.info.serial
+                text: pebbled.info.serial || ""
             }
 
             Label {
@@ -69,15 +69,15 @@ Page {
                 text: qsTr("Recovery")
             }
             Label {
-                text: app.recoveryVersion
+                text: app.recoveryVersion || qsTr("unknown")
             }
 
             Label {
                 color: Theme.highlightColor
                 text: qsTr("Running")
             }
             Label {
-                text: app.firmwareVersion
+                text: app.firmwareVersion || qsTr("unknown")
             }
 
             Label {
@@ -89,7 +89,7 @@ Page {
             }
         }
         Button {
-            visible: app.firmwareLatest && app.firmwareVersion && app.firmwareVersion !== app.firmwareLatest
+            visible: app.firmwareLatest && app.firmwareVersion !== app.firmwareLatest
             text: qsTr("Upgrade Firmware")
             anchors {
                 left: parent.left

app/qml/pebble.qml

@@ -22,6 +22,8 @@ ApplicationWindow
                     recoveryVersion = firmware.version
                 } else {
                     firmwareVersion = firmware.version
+                }
+                if (firmware.hardware) {
                     hardwareVersion = firmware.hardware
                 }
             })

app/translations/pebble-es.ts

@@ -425,6 +425,8 @@ Si esto tarda mucho, comprueba que el reloj esté emparejado correctamente.</tra
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="72"/>
+        <location filename="../qml/pages/WatchInfo.qml" line="80"/>
         <location filename="../qml/pages/WatchInfo.qml" line="88"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>

app/translations/pebble-pl.ts

@@ -453,6 +453,8 @@ Jeśli nie zostaje znaleziony sprawdź czy jest w zasięgu i czy jest sparowany
         <translation>Najnowszy</translation>
     </message>
     <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="72"/>
+        <location filename="../qml/pages/WatchInfo.qml" line="80"/>
         <location filename="../qml/pages/WatchInfo.qml" line="88"/>
         <source>unknown</source>
         <translation>nie wiadomo</translation>

app/translations/pebble-zh_CN.ts

@@ -405,6 +405,8 @@ If it can't be found please check it's available and paired in Bluetoo
         <translation>最新</translation>
     </message>
     <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="72"/>
+        <location filename="../qml/pages/WatchInfo.qml" line="80"/>
         <location filename="../qml/pages/WatchInfo.qml" line="88"/>
         <source>unknown</source>
         <translation>未知</translation>

app/translations/pebble.ts

@@ -404,6 +404,8 @@ If it can't be found please check it's available and paired in Bluetoo
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qml/pages/WatchInfo.qml" line="72"/>
+        <location filename="../qml/pages/WatchInfo.qml" line="80"/>
         <location filename="../qml/pages/WatchInfo.qml" line="88"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>

daemon/daemon.pro

@@ -16,7 +16,6 @@ SOURCES += \
     voicecallhandler.cpp \
     notificationmanager.cpp \
     watchconnector.cpp \
-    dbusconnector.cpp \
     appmanager.cpp \
     musicmanager.cpp \
     datalogmanager.cpp \
@@ -36,7 +35,6 @@ HEADERS += \
     voicecallhandler.h \
     notificationmanager.h \
     watchconnector.h \
-    dbusconnector.h \
     settings.h \
     appmanager.h \
     musicmanager.h \

daemon/manager.cpp

@@ -10,7 +10,6 @@ Manager::Manager(Settings *settings, QObject *parent) :
     QObject(parent), l(metaObject()->className()), settings(settings),
     proxy(new PebbledProxy(this)),
     watch(new WatchConnector(this)),
-    dbus(new DBusConnector(this)),
     upload(new UploadManager(watch, this)),
     apps(new AppManager(this)),
     bank(new BankManager(watch, upload, apps, this)),
@@ -67,8 +66,8 @@ Manager::Manager(Settings *settings, QObject *parent) :
     session.registerObject("/org/pebbled/Watch", proxy);
     session.registerService("org.pebbled");
 
-    connect(dbus, &DBusConnector::pebbleChanged, proxy, &PebbledProxy::NameChanged);
-    connect(dbus, &DBusConnector::pebbleChanged, proxy, &PebbledProxy::AddressChanged);
+    connect(watch, &WatchConnector::pebbleChanged, proxy, &PebbledProxy::NameChanged);
+    connect(watch, &WatchConnector::pebbleChanged, proxy, &PebbledProxy::AddressChanged);
     connect(watch, &WatchConnector::connectedChanged, proxy, &PebbledProxy::ConnectedChanged);
     connect(watch, &WatchConnector::versionsChanged, proxy, &PebbledProxy::InfoChanged);
     connect(bank, &BankManager::slotsChanged, proxy, &PebbledProxy::AppSlotsChanged);
@@ -79,11 +78,7 @@ Manager::Manager(Settings *settings, QObject *parent) :
     // Set BT icon for notification
     notification.setImage("icon-system-bluetooth-device");
 
-    if (btDevice.isValid()) {
-        qCDebug(l) << "BT local name:" << btDevice.name();
-        connect(dbus, SIGNAL(pebbleChanged()), SLOT(onPebbleChanged()));
-        dbus->findPebble();
-    }
+    watch->findPebbles();
 }
 
 Manager::~Manager()
@@ -100,17 +95,6 @@ void Manager::onSettingsChanged()
     qCWarning(l) << __FUNCTION__ << "Not implemented!";
 }
 
-void Manager::onPebbleChanged()
-{
-    const QVariantMap & pebble = dbus->pebble();
-    QString name = pebble["Name"].toString();
-    if (name.isEmpty()) {
-        qCDebug(l) << "Pebble gone";
-    } else {
-        watch->deviceConnect(name, pebble["Address"].toString());
-    }
-}
-
 void Manager::onConnectedChanged()
 {
     QString message = QString("%1 %2")

daemon/manager.h

@@ -2,7 +2,6 @@
 #define MANAGER_H
 
 #include "watchconnector.h"
-#include "dbusconnector.h"
 #include "uploadmanager.h"
 #include "voicecallmanager.h"
 #include "notificationmanager.h"
@@ -15,7 +14,6 @@
 #include "settings.h"
 
 #include <QObject>
-#include <QBluetoothLocalDevice>
 #include <QDBusContext>
 #include <QtContacts/QContactManager>
 #include <QtContacts/QContactDetailFilter>
@@ -35,14 +33,11 @@ class Manager : public QObject, protected QDBusContext
 
     friend class PebbledProxy;
 
-    QBluetoothLocalDevice btDevice;
-
     Settings *settings;
 
     PebbledProxy *proxy;
 
     WatchConnector *watch;
-    DBusConnector *dbus;
     UploadManager *upload;
     AppManager *apps;
     BankManager *bank;
@@ -79,7 +74,6 @@ public slots:
 private slots:
     void onSettingChanged(const QString &key);
     void onSettingsChanged();
-    void onPebbleChanged();
     void onConnectedChanged();
     void onActiveVoiceCallChanged();
     void onVoiceError(const QString &message);
@@ -113,16 +107,15 @@ class PebbledProxy : public QObject, protected QDBusContext
     Q_PROPERTY(QVariantList AllApps READ AllApps NOTIFY AllAppsChanged)
 
     inline Manager* manager() const { return static_cast<Manager*>(parent()); }
-    inline QVariantMap pebble() const { return manager()->dbus->pebble(); }
 
 public:
     inline explicit PebbledProxy(QObject *parent)
         : QObject(parent), l(metaObject()->className()) {}
 
-    inline QString Name() const { return pebble()["Name"].toString(); }
-    inline QString Address() const { return pebble()["Address"].toString(); }
-    inline QVariantMap Info() const { return manager()->watch->versions().toMap(); }
-    inline bool Connected() const { return manager()->watch->isConnected(); }
+    inline QString Name() const { qCDebug(l) << manager()->watch->name(); return manager()->watch->name(); }
+    inline QString Address() const { qCDebug(l) << manager()->watch->address().toString(); return manager()->watch->address().toString(); }
+    inline QVariantMap Info() const { qCDebug(l) << manager()->watch->versions().toMap(); return manager()->watch->versions().toMap(); }
+    inline bool Connected() const { qCDebug(l) << manager()->watch->isConnected(); return manager()->watch->isConnected(); }
     inline QString AppUuid() const { return manager()->currentAppUuid.toString(); }
 
     QStringList AppSlots() const;
@@ -131,7 +124,7 @@ class PebbledProxy : public QObject, protected QDBusContext
 
 public slots:
     inline void Disconnect() { manager()->watch->disconnect(); }
-    inline void Reconnect() { manager()->watch->reconnect(); }
+    inline void Reconnect() { manager()->watch->connect(); }
     inline void Ping(uint val) { manager()->watch->ping(val); }
     inline void SyncTime() { manager()->watch->time(); }