Merge branch 'jb44852_deprecate_statefs' into 'master'

Use systemsettings plugin for battery info See merge request mer-core/buteo-mtp!26
sailfishos · Sep 26, 2019 · 558e775 · 558e775
2 parents 3521e47 + d704751
commit 558e775
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/mts/common.pri b/mts/common.pri
@@ -1,2 +1,2 @@
 CONFIG += link_pkgconfig
-PKGCONFIG += contextkit-statefs
+PKGCONFIG += systemsettings
diff --git a/mts/mts.pro b/mts/mts.pro
@@ -1,3 +1,5 @@
+include(common.pri)
+
 QT += xml dbus
 QT -= gui
 

diff --git a/mts/platform/deviceinfo/deviceinfoprovider.cpp b/mts/platform/deviceinfo/deviceinfoprovider.cpp
@@ -33,16 +33,16 @@
 #include <QDeviceInfo>
 #include <QTimer>
 #include <ssudeviceinfo.h>
-#include <contextproperty.h>
+#include <batterystatus.h>
 #include "trace.h"
 
 using namespace meegomtp1dot0;
 
 /**********************************************
  * DeviceInfoProvider::DeviceInfoProvider
  *********************************************/
-DeviceInfoProvider::DeviceInfoProvider():
-  battery(new ContextProperty("Battery.ChargePercentage", this))
+DeviceInfoProvider::DeviceInfoProvider()
+    : m_batteryStatus(new BatteryStatus(this))
 {
     QDeviceInfo di;
 
@@ -56,13 +56,8 @@ DeviceInfoProvider::DeviceInfoProvider():
     m_manufacturer = di.manufacturer().isEmpty() ? m_manufacturer : di.manufacturer();
     m_model = di.model().isEmpty() ? m_model : di.model();
 
-    connect(battery, SIGNAL(valueChanged()), this, SLOT(onBatteryPercentageChanged()));
-
-    // Initialize the battery charge value. Use idle callback because
-    // acting on the battery level information requires that the
-    // transport object setup has been finished and that is done
-    // (if at all) after setting up the device info provider.
-    QTimer::singleShot(0, this, SLOT(onBatteryPercentageChanged()));
+    connect(m_batteryStatus, &BatteryStatus::chargePercentageChanged,
+            this, &DeviceInfoProvider::onBatteryPercentageChanged);
 
     if(m_newConfigFileWasCreated)
     {
@@ -81,7 +76,9 @@ DeviceInfoProvider::~DeviceInfoProvider()
 {
 }
 
-void DeviceInfoProvider::onBatteryPercentageChanged()
+void DeviceInfoProvider::onBatteryPercentageChanged(int percentage)
 {
-    setBatteryLevel(battery->value().toUInt());
+    if (percentage >= 0) {
+        setBatteryLevel(quint8(qMin(percentage, 255)));
+    }
 }
diff --git a/mts/platform/deviceinfo/deviceinfoprovider.h b/mts/platform/deviceinfo/deviceinfoprovider.h
@@ -34,7 +34,7 @@
 
 #include "deviceinfo.h"
 
-class ContextProperty;
+class BatteryStatus;
 
 /// This class implements DeviceInfo for getting and setting device info and properties for an MTP session.
 
@@ -59,10 +59,10 @@ class DeviceInfoProvider : public DeviceInfo
     ~DeviceInfoProvider();
 
 private:
-    ContextProperty *battery;
+    BatteryStatus *m_batteryStatus;
 
 private slots:
-    void onBatteryPercentageChanged();
+    void onBatteryPercentageChanged(int percentage);
 };
 }
 

diff --git a/rpm/buteo-mtp-qt5.spec b/rpm/buteo-mtp-qt5.spec
@@ -21,7 +21,7 @@ BuildRequires: pkgconfig(mlite5)
 # for the thumbnailer unit test
 BuildRequires: pkgconfig(Qt5Gui)
 BuildRequires: ssu-devel >= 0.37.9
-BuildRequires: pkgconfig(contextkit-statefs) >= 0.2.7
+BuildRequires: pkgconfig(systemsettings) >= 0.2.25
 Requires: mtp-vendor-configuration
 Requires: thumbnaild
 Requires: libqt5sparql-tracker-direct