Merge lp:~tiagosh/telephony-service/fix-1453004 into lp:telephony-service/rtm-15.04

[Gustavo Pichorim Boiko]

- Do not let USSD and incoming call snap decisions timeout.
- Initialize m_notificationId with -1, as 0 is a valid id.
- Do not call CloseNotification() when notificationClosed() is received to avoid loop.

- Do not let USSD and incoming call snap decisions timeout.
- Initialize m_notificationId with -1, as 0 is a valid id.
- Do not call CloseNotification() when notificationClosed() is received to avoid loop.

--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/<package-name>) 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

[Gustavo Pichorim Boiko (boiko)]

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

Did CI run pass? If not, please explain why.
Yes, on a previously submitted MP against trunk.

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

review: Approve

=== modified file 'approver/approver.cpp'
--- approver/approver.cpp	2015-06-10 21:05:50 +0000
+++ approver/approver.cpp	2015-07-02 17:43:59 +0000
@@ -477,6 +477,9 @@
     notify_notification_set_hint_string(notification,
                                         "x-canonical-secondary-icon",
                                         "incoming-call");
+    notify_notification_set_hint_int32(notification,
+                                        "x-canonical-snap-decisions-timeout",
+                                        -1);
 
     QString acceptTitle = hasCalls ? C::gettext("Hold + Answer") :
                                      C::gettext("Accept");

=== modified file 'cmake/modules/GenerateTest.cmake'
--- cmake/modules/GenerateTest.cmake	2015-06-02 20:39:25 +0000
+++ cmake/modules/GenerateTest.cmake	2015-07-02 17:43:59 +0000
@@ -110,6 +110,7 @@
     cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
 
     set(TASKS --task gnome-keyring-daemon -p -r -p -d --task-name gnome-keyring --ignore-return
+              --task ${CMAKE_BINARY_DIR}/tests/common/NotificationsMock --task-name notifications --ignore-return
               --task /usr/lib/dconf/dconf-service --task-name dconf-service --ignore-return
               --task dconf -p write -p /org/gnome/empathy/use-conn -p false --task-name dconf-write --wait-for ca.desrt.dconf --ignore-return
               --task /usr/lib/telepathy/mission-control-5 --task-name mission-control --wait-for ca.desrt.dconf --ignore-return

=== modified file 'indicator/ussdindicator.cpp'
--- indicator/ussdindicator.cpp	2015-04-28 19:18:55 +0000
+++ indicator/ussdindicator.cpp	2015-07-02 17:43:59 +0000
@@ -32,6 +32,7 @@
 
 USSDIndicator::USSDIndicator(QObject *parent)
 : QObject(parent),
+  m_notificationId(-1),
   m_menuRequest(true),
   m_menuNotification(false),
   m_notifications("org.freedesktop.Notifications",
@@ -99,7 +100,13 @@
 
 void USSDIndicator::onStateChanged(const QString &state)
 {
-    // TODO: check if we should close notifications when the state is idle
+    if (m_notificationId == -1) {
+        return;
+    }
+
+    if (state == "idle") {
+        m_notifications.CloseNotification(m_notificationId);
+    }
 }
 
 void USSDIndicator::showUSSDNotification(const QString &message, bool replyRequired, USSDManager *ussdManager)
@@ -116,6 +123,7 @@
     QVariantMap notificationHints;
     notificationHints["x-canonical-snap-decisions"] = "true";
     notificationHints["x-canonical-private-button-tint"] = "true";
+    notificationHints["x-canonical-snap-decisions-timeout"] = -1;
 
     QVariantMap menuModelActions;
     menuModelActions["notifications"] = menu->actionPath();
@@ -148,7 +156,7 @@
         return;
     }
 
-    m_notificationId = 0;
+    m_notificationId = -1;
 
     if (actionKey == "reply_id") {
         ussdManager->respond(m_menuRequest.response());
@@ -162,19 +170,18 @@
     if (id != m_notificationId) {
         return;
     }
-    m_notifications.CloseNotification(m_notificationId);
-    m_notificationId = 0;
+    m_notificationId = -1;
 }
 
 void USSDIndicator::clear()
 {
-    if (m_notificationId != 0) {
+    if (m_notificationId != -1) {
         USSDManager *ussdManager = mUSSDRequests.take(m_notificationId);
         if (ussdManager) {
             ussdManager->cancel();
         }
 
         m_notifications.CloseNotification(m_notificationId);
-        m_notificationId = 0;
+        m_notificationId = -1;
     }
 }

=== modified file 'tests/common/CMakeLists.txt'
--- tests/common/CMakeLists.txt	2015-06-05 18:42:14 +0000
+++ tests/common/CMakeLists.txt	2015-07-02 17:43:59 +0000
@@ -5,6 +5,9 @@
 
 configure_file(dbus-session.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-session.conf)
 
+add_executable(NotificationsMock NotificationsMock.cpp)
+qt5_use_modules(NotificationsMock Core DBus)
+
 qt5_add_dbus_interface(mockcontroller_SRCS mock/MockConnection.xml MockConnectionInterface)
 add_library(mockcontroller STATIC mockcontroller.cpp mockcontroller.h ${mockcontroller_SRCS})
 qt5_use_modules(mockcontroller Core DBus)

=== added file 'tests/common/NotificationsMock.cpp'
--- tests/common/NotificationsMock.cpp	1970-01-01 00:00:00 +0000
+++ tests/common/NotificationsMock.cpp	2015-07-02 17:43:59 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This file is part of telephony-service.
+ *
+ * telephony-service is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * telephony-service is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QObject>
+#include <QCoreApplication>
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QDBusObjectPath>
+#include <QDebug>
+
+#define NOTIFICATIONS_DBUS_SERVICE_NAME "org.freedesktop.Notifications"
+#define NOTIFICATIONS_DBUS_OBJ_PATH "/org/freedesktop/Notifications"
+
+class NotificationsMock : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", NOTIFICATIONS_DBUS_SERVICE_NAME)
+
+public:
+    Q_SCRIPTABLE void Notify(QString app_name, uint replaces_id, QString app_icon, QString summary, QString body, QStringList actions, QVariantMap hints, int expire_timeout);
+    Q_SCRIPTABLE void CloseNotification(uint id);
+
+    // Mock specific method
+    Q_SCRIPTABLE void MockInvokeAction(uint id, QString action_key);
+
+Q_SIGNALS:
+    Q_SCRIPTABLE void NotificationClosed(uint id, uint reason);
+    Q_SCRIPTABLE void ActionInvoked(uint id, QString action_key);
+
+    // Mock specific signal
+    Q_SCRIPTABLE void MockNotificationReceived(QString app_name, uint replaces_id, QString app_icon, QString summary, QString body, QStringList actions, QVariantMap hints, int expire_timeout);
+};
+
+void NotificationsMock::Notify(QString app_name, uint replaces_id, QString app_icon, QString summary, QString body, QStringList actions, QVariantMap hints, int expire_timeout)
+{
+    Q_EMIT MockNotificationReceived(app_name, replaces_id, app_icon, summary, body, actions, hints, expire_timeout);
+}
+
+void NotificationsMock::MockInvokeAction(uint id, QString action_key)
+{
+    Q_EMIT ActionInvoked(id, action_key);
+    Q_EMIT NotificationClosed(id, 2); // 2 is dismissed by user
+}
+
+void NotificationsMock::CloseNotification(uint id)
+{
+    Q_EMIT NotificationClosed(id, 3); // 3 is closed by a CloseNotification() call
+}
+
+int main(int argc, char **argv)
+{
+    QCoreApplication a(argc, argv);
+
+    QDBusConnection connection = QDBusConnection::sessionBus();
+
+    NotificationsMock notifications;
+    connection.registerObject(NOTIFICATIONS_DBUS_OBJ_PATH, &notifications, QDBusConnection::ExportScriptableContents);
+    connection.registerService(NOTIFICATIONS_DBUS_SERVICE_NAME);
+
+    return a.exec();
+}
+
+#include "NotificationsMock.moc"