summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2016-01-21 01:06:20 +0100
committerAndrew Branson <andrew.branson@cern.ch>2016-02-09 11:14:21 +0100
commit538628b9ee37cf6156abd6f7d86ef1df203fb5f7 (patch)
treed64ab4bfecdc119c66d005d08e7f676cd27c8628
parent43999b41595becd5e0f657bedfc14bd441273032 (diff)
Choose notification method based on software rev not hardware.
To support pebble classic and steel on 3.0 firmware
-rw-r--r--daemon/watchconnector.cpp16
1 files changed, 3 insertions, 13 deletions
diff --git a/daemon/watchconnector.cpp b/daemon/watchconnector.cpp
index 5647bc1..5f15ee6 100644
--- a/daemon/watchconnector.cpp
+++ b/daemon/watchconnector.cpp
@@ -600,11 +600,8 @@ 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: {
+ qCDebug(l) << _versions.main.version;
+ if (_versions.main.version < "v3.0") {
QStringList tmp;
tmp.append(sender);
tmp.append(data);
@@ -615,9 +612,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 +698,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;
}
}