diff --git a/application/src/battery.h b/application/src/battery.h index 82fd6c0..c4eac68 100644 --- a/application/src/battery.h +++ b/application/src/battery.h @@ -76,7 +76,6 @@ private: QString state = "idle"; // dis/charging, idle, unknown bool chargingEnabled = true; // Only ever disabled manually - QString health = "unknown"; // Good, warm, overheat. Might have Cold or Overvoltage depending on driver int temperature = 0x7FFFFFFF; // This value means "unknown" (32-bit INT_MAX) diff --git a/service/src/battery.h b/service/src/battery.h index cb45d2f..22379aa 100644 --- a/service/src/battery.h +++ b/service/src/battery.h @@ -26,7 +26,11 @@ #include #include #include "settings.h" +#if LEGACY_BUILD == 1 +#include "mynotification_sfos2.h" +#else #include "mynotification.h" +#endif #include "logger.h" class Battery : public QObject diff --git a/service/src/mynotification_sfos2.cpp b/service/src/mynotification_sfos2.cpp index f31b14f..3f882cb 100644 --- a/service/src/mynotification_sfos2.cpp +++ b/service/src/mynotification_sfos2.cpp @@ -15,7 +15,7 @@ * * Author: Matti Viljanen */ -#include "mynotification.h" +#include "mynotification_sfos2.h" MyNotification::MyNotification(Logger *newLogger, QObject* parent) : QObject(parent) { @@ -57,7 +57,6 @@ void MyNotification::send(QString title, QString body, QString soundFile) notification.setBody(body); notification.setPreviewSummary(title); notification.setPreviewBody(body); -// notification.setSound(soundFile); notification.setUrgency(Notification::Normal); notification.publish();