Merge lp:~tiagosh/telephony-service/skip_notifications into lp:telephony-service

[Tiago Salem Herrmann]

Avoid displaying on screen notifications for messages if the message thread is open.

Avoid displaying on screen notifications for messages if the message thread is open.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/telephony-service) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:938
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/308/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/124
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/125

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/308/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'indicator/textchannelobserver.cpp'
--- indicator/textchannelobserver.cpp	2014-09-11 20:57:34 +0000
+++ indicator/textchannelobserver.cpp	2014-09-17 20:24:21 +0000
@@ -230,6 +230,14 @@
 
     // add the message to the messaging menu (use hex format to avoid invalid characters)
     QByteArray token(message.messageToken().toUtf8());
+
+    // if the message was already read, just play the ringtone and return
+    // ignore logic if we are in greeter mode
+    if (!mUnreadMessages.contains(token) && !GreeterContacts::isGreeterMode()) {
+        Ringtone::instance()->playIncomingMessageSound();
+        return;
+    }
+
     MessagingMenu::instance()->addMessage(contact->id(), token.toHex(), message.received(), messageText);
 
     QString title = QString::fromUtf8(C::gettext("Message from %1")).arg(contact->alias());
@@ -381,14 +389,24 @@
     }
 
     if (!message.isScrollback() && !message.isDeliveryReport() && !message.isRescued()) {
-        showNotificationForMessage(message);
-        Metrics::instance()->increment(Metrics::ReceivedMessages);
+        QTimer *timer = new QTimer(this);
+        timer->setInterval(1500);
+        timer->setSingleShot(true);
+        QByteArray token(message.messageToken().toUtf8());
+        mUnreadMessages.append(token);
+        QObject::connect(timer, &QTimer::timeout, [=]() {
+            showNotificationForMessage(message);
+            Metrics::instance()->increment(Metrics::ReceivedMessages);
+            timer->deleteLater();
+        });
+        timer->start();
     }
 }
 
 void TextChannelObserver::onPendingMessageRemoved(const Tp::ReceivedMessage &message)
 {
     QByteArray token(message.messageToken().toUtf8());
+    mUnreadMessages.removeAll(token);
     MessagingMenu::instance()->removeMessage(token.toHex());
 }
 
 
=== modified file 'indicator/textchannelobserver.h'
--- indicator/textchannelobserver.h	2014-04-07 19:19:09 +0000
+++ indicator/textchannelobserver.h	2014-09-17 20:24:21 +0000
@@ -57,6 +57,7 @@
     QList<Tp::TextChannelPtr> mChannels;
     QList<Tp::TextChannelPtr> mFlashChannels;
     QMap<NotifyNotification*, NotificationData*> mNotifications;
+    QList<QByteArray> mUnreadMessages;
 };
 
 #endif // TEXTCHANNELOBSERVER_H