From ad6c11dc522da70d28a92b74ab521901102e3666 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Thu, 21 Jan 2016 01:06:20 +0100 Subject: Choose notification method based on software rev not hardware. To support pebble classic and steel on 3.0 firmware --- daemon/watchconnector.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/daemon/watchconnector.cpp b/daemon/watchconnector.cpp index 5647bc1..c7eae8a 100644 --- a/daemon/watchconnector.cpp +++ b/daemon/watchconnector.cpp @@ -600,11 +600,7 @@ QString WatchConnector::timeStamp() void WatchConnector::sendNotification(uint lead, QString sender, QString data, QString subject) { - switch (platform) { - case HP_UNKNOWN: - qCWarning(l) << "Tried sending notification to UNKNOWN watch platform" << lead << sender << data << subject; - break; - case APLITE: { + if (_versions.main.version < "v3.0") { QStringList tmp; tmp.append(sender); tmp.append(data); @@ -615,9 +611,7 @@ void WatchConnector::sendNotification(uint lead, QString sender, QString data, Q sendMessage(watchNOTIFICATION, res); } - break; - case BASALT: - case CHALK: { + else { int source; switch (lead) { case leadEMAIL: @@ -703,11 +697,6 @@ void WatchConnector::sendNotification(uint lead, QString sender, QString data, Q blob.append(item); sendMessage(watchBLOB_DB, blob); - } - break; - default: - qCWarning(l) << "Tried sending notification to unsupported watch platform" << platform << ":" << lead << sender << data << subject; - break; } } -- cgit v1.2.3