1
=== modified file 'indicator/textchannelobserver.cpp'
2
--- indicator/textchannelobserver.cpp	2016-03-30 13:34:38 +0000
3
+++ indicator/textchannelobserver.cpp	2016-09-27 13:39:41 +0000
4
@@ -42,6 +42,7 @@
5
42
#include <QContactFetchRequest>
42
#include <QContactFetchRequest>
6
43
#include <QContactFilter>
43
#include <QContactFilter>
7
44
#include <QContactPhoneNumber>
44
#include <QContactPhoneNumber>
8
45
#include <QDBusInterface>
9
45
#include <QImage>
46
#include <QImage>
10
46
#include <History/TextEvent>
47
#include <History/TextEvent>
11
47
#include <History/Manager>
48
#include <History/Manager>
12
@@ -158,6 +159,7 @@
13
158
}
159
}
14
159
160
15
160
TextChannelObserver::TextChannelObserver(QObject *parent) :
161
TextChannelObserver::TextChannelObserver(QObject *parent) :
16
162
    mPowerdIface("com.canonical.powerd", "/com/canonical/powerd", "com.canonical.powerd", QDBusConnection::systemBus()),
17
161
    QObject(parent)
163
    QObject(parent)
18
162
{
164
{
19
163
    connect(MessagingMenu::instance(),
165
    connect(MessagingMenu::instance(),
20
@@ -644,12 +646,20 @@
21
644
        QTimer *timer = new QTimer(this);
646
        QTimer *timer = new QTimer(this);
22
645
        timer->setInterval(1500);
647
        timer->setInterval(1500);
23
646
        timer->setSingleShot(true);
648
        timer->setSingleShot(true);
24
649
        QString wakeToken;
25
650
        QDBusReply<QString> reply = mPowerdIface.call("requestSysState", "telephony-service-indicator", 1);
26
651
        if (reply.isValid()) {
27
652
            wakeToken = reply.value();
28
653
        }
29
647
        QByteArray token(message.messageToken().toUtf8());
654
        QByteArray token(message.messageToken().toUtf8());
30
648
        mUnreadMessages.append(token);
655
        mUnreadMessages.append(token);
31
649
        QObject::connect(timer, &QTimer::timeout, [=]() {
656
        QObject::connect(timer, &QTimer::timeout, [=]() {
32
650
            triggerNotificationForMessage(message, account->accountId(), participantIds);
657
            triggerNotificationForMessage(message, account->accountId(), participantIds);
33
651
            Metrics::instance()->increment(Metrics::ReceivedMessages);
658
            Metrics::instance()->increment(Metrics::ReceivedMessages);
34
652
            timer->deleteLater();
659
            timer->deleteLater();
35
660
            if (!wakeToken.isEmpty()) {
36
661
                mPowerdIface.call("clearSysState", wakeToken);
37
662
            }
38
653
        });
663
        });
39
654
        timer->start();
664
        timer->start();
40
655
    }
665
    }
41
656
666
42
=== modified file 'indicator/textchannelobserver.h'
43
--- indicator/textchannelobserver.h	2015-04-30 15:49:52 +0000
44
+++ indicator/textchannelobserver.h	2016-09-27 13:39:41 +0000
45
@@ -64,6 +64,7 @@
46
64
    QList<Tp::TextChannelPtr> mFlashChannels;
64
    QList<Tp::TextChannelPtr> mFlashChannels;
47
65
    QMap<NotifyNotification*, NotificationData*> mNotifications;
65
    QMap<NotifyNotification*, NotificationData*> mNotifications;
48
66
    QList<QByteArray> mUnreadMessages;
66
    QList<QByteArray> mUnreadMessages;
49
67
    QDBusInterface mPowerdIface;
50
67
};
68
};
51
68
69
52
69
#endif // TEXTCHANNELOBSERVER_H
70
#endif // TEXTCHANNELOBSERVER_H
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-09-27
Alexandros Frantzis (community)		2016-09-26	Needs Fixing on 2016-09-27
Review via email: mp+306801@code.launchpad.net