Actualize dynamic icons on unlock

Dynamic icons may become out of date after a long period of device inactivity, so it's better to force update them after unlock.
dseight · Aug 30, 2020 · e2dd24b · e2dd24b
1 parent 6c574a2
commit e2dd24b
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 1 deletion.
diff --git a/dynamic-icons/calendar.cpp b/dynamic-icons/calendar.cpp
@@ -1,3 +1,4 @@
+#include "devicelockstatus.h"
 #include "dynamicicon.h"
 #include "iconpack.h"
 #include "iconpackfactory.h"
@@ -99,6 +100,7 @@ class CalendarIconProvider : public IconProvider
         connect(&m_currentIconPackConf, &MGConfItem::valueChanged,
                 this, &IconProvider::imageUpdated);
         connect(&m_timer, &QTimer::timeout, this, &IconProvider::imageUpdated);
+        connect(&m_devicelockStatus, &DevicelockStatus::unlocked, this, &IconProvider::imageUpdated);
 
         // Update icon each hour
         m_timer.start(60 * 60 * 1000);
@@ -124,6 +126,7 @@ private slots:
 
 private:
     QTimer m_timer;
+    DevicelockStatus m_devicelockStatus;
     MGConfItem m_currentIconPackConf;
     QScopedPointer<CalendarIconRenderer> m_renderer;
 };

diff --git a/dynamic-icons/clock.cpp b/dynamic-icons/clock.cpp
@@ -1,3 +1,4 @@
+#include "devicelockstatus.h"
 #include "dynamicicon.h"
 #include "iconpack.h"
 #include "iconpackfactory.h"
@@ -136,6 +137,7 @@ class ClockIconProvider : public IconProvider
         connect(&m_currentIconPackConf, &MGConfItem::valueChanged,
                 this, &IconProvider::imageUpdated);
         connect(&m_timer, &QTimer::timeout, this, &IconProvider::imageUpdated);
+        connect(&m_devicelockStatus, &DevicelockStatus::unlocked, this, &IconProvider::imageUpdated);
 
         // Update icon each minute
         // TODO: use timed as source of update events, look at
@@ -175,6 +177,7 @@ private slots:
 
 private:
     QTimer m_timer;
+    DevicelockStatus m_devicelockStatus;
     MGConfItem m_currentIconPackConf;
     QScopedPointer<ClockIconRenderer> m_renderer;
 };

diff --git a/dynamic-icons/devicelockstatus.cpp b/dynamic-icons/devicelockstatus.cpp
@@ -0,0 +1,22 @@
+#include "devicelockstatus.h"
+#include <QDebug>
+
+DevicelockStatus::DevicelockStatus(QObject *parent)
+    : QObject(parent)
+    , m_mceInterface("com.nokia.mce",
+                     "/com/nokia/mce/signal",
+                     "com.nokia.mce.signal",
+                     QDBusConnection::systemBus())
+{
+    connect(&m_mceInterface, SIGNAL(tklock_mode_ind(QString)),
+            this, SLOT(tklockModeChanged(QString)));
+}
+
+void DevicelockStatus::tklockModeChanged(const QString &mode)
+{
+    if (mode == QStringLiteral("unlocked")) {
+        emit unlocked();
+    } else if (mode == QStringLiteral("locked")) {
+        emit locked();
+    }
+}
diff --git a/dynamic-icons/devicelockstatus.h b/dynamic-icons/devicelockstatus.h
@@ -0,0 +1,24 @@
+#ifndef DEVICELOCKSTATUS_H
+#define DEVICELOCKSTATUS_H
+
+#include <QDBusInterface>
+
+class DevicelockStatus : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit DevicelockStatus(QObject *parent = nullptr);
+
+signals:
+    void unlocked();
+    void locked();
+
+private slots:
+    void tklockModeChanged(const QString &mode);
+
+private:
+    QDBusInterface m_mceInterface;
+};
+
+#endif // DEVICELOCKSTATUS_H
diff --git a/dynamic-icons/dynamic-icons.pro b/dynamic-icons/dynamic-icons.pro
@@ -1,6 +1,8 @@
 TEMPLATE = lib
 TARGET = default-dynamic-icons
 
+QT += dbus
+
 CONFIG += c++14
 CONFIG += plugin
 CONFIG += no_plugin_name_prefix
@@ -15,7 +17,11 @@ DEFINES += ASSETS_PATH=\\\"$${ASSETS_PATH}\\\"
 
 SOURCES += \
     calendar.cpp \
-    clock.cpp
+    clock.cpp \
+    devicelockstatus.cpp
+
+HEADERS += \
+    devicelockstatus.h
 
 target.path = /usr/share/clockwork/dynamic-icons