Merge lp:~pete-woods/indicator-network/sim-unlock-label-lp1449925 into lp:indicator-network/15.10

[Pete Woods]

* Fix SIM PIN unlock dialog mis-titled
* Move from libnotify to internal notify-cpp

* Fix SIM PIN unlock dialog mis-titled
* Move from libnotify to internal notify-cpp

[lp:~pete-woods/indicator-network/sim-unlock-label-lp1449925]

502. By Pete Woods on 2015-08-03

Sync GCC5 landing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:505
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/379/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/31/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/379/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:506
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/380/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/32/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/380/rebuild

review: Approve (continuous-integration)

[lp:~pete-woods/indicator-network/sim-unlock-label-lp1449925]

503. By Pete Woods on 2015-08-10

Add hotspot management.
Approved by: PS Jenkins bot

504. By Pete Woods on 2015-08-10

Hold a wakelock when the hotspot is active. Fixes: #1458046
Approved by: PS Jenkins bot

505. By Pete Woods on 2015-08-10

Simplify wifi/flight toggles
Approved by: PS Jenkins bot

506. By Pete Woods on 2015-08-10

Don't show access points when hotspot is enabled Fixes: #1478160
Approved by: PS Jenkins bot

507. By Pete Woods on 2015-08-10

Seed the random number generator Fixes: #1478157

508. By CI Train Bot Account on 2015-08-10

Releasing 0.5.2+15.10.20150810.1-0ubuntu1

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-22 08:25:05 +0000
+++ CMakeLists.txt	2015-08-12 13:44:19 +0000
@@ -60,13 +60,6 @@
 )
 include_directories(${OFONO_INCLUDE_DIRS})
 
-set(NOTIFY_REQUIRED_VERSION 0.7.5)
-pkg_check_modules(
-  NOTIFY REQUIRED
-  libnotify>=${NOTIFY_REQUIRED_VERSION}
-)
-include_directories(${NOTIFY_INCLUDE_DIRS})
-
 find_package(Qt5Core REQUIRED)
 include_directories(${Qt5Core_INCLUDE_DIRS})
 

=== modified file 'debian/control'
--- debian/control	2015-07-20 18:48:44 +0000
+++ debian/control	2015-08-12 13:44:19 +0000
@@ -12,7 +12,6 @@
                graphviz,
                intltool,
                libglib2.0-dev,
-               libnotify-dev,
 #///! TODO: The next line should be removed once all dependancy on qmenumodel is removed
                libqmenumodel-dev,
                libqofono-dev,

=== modified file 'src/indicator/CMakeLists.txt'
--- src/indicator/CMakeLists.txt	2015-07-28 08:27:11 +0000
+++ src/indicator/CMakeLists.txt	2015-08-12 13:44:19 +0000
@@ -101,7 +101,6 @@
     qpowerd
     ${DBUSCPP_LIBRARIES}
     ${GLIB_LIBRARIES}
-    ${NOTIFY_LIBRARIES}
     ${QOFONO_LIBRARIES}
 )
 

=== modified file 'src/indicator/agent/PasswordMenu.cpp'
--- src/indicator/agent/PasswordMenu.cpp	2015-04-15 15:04:51 +0000
+++ src/indicator/agent/PasswordMenu.cpp	2015-08-12 13:44:19 +0000
@@ -19,9 +19,12 @@
 #include <agent/PasswordMenu.h>
 #include <gio/gio.h>
 
+#include <iostream>
 #include <QString>
 #include <QDebug>
 
+using namespace std;
+
 namespace agent
 {
 namespace
@@ -51,7 +54,7 @@
 	void passwordChanged(GVariant *variant) {
 		m_password = QString::fromUtf8(g_variant_get_string(variant, 0));
 		if (qEnvironmentVariableIsSet("SECRET_AGENT_DEBUG_PASSWORD")) {
-			qDebug() << "Password received";
+			cout << "Password received" << endl;
 		}
 	}
 

=== modified file 'src/indicator/agent/SecretAgent.cpp'
--- src/indicator/agent/SecretAgent.cpp	2015-04-21 10:59:52 +0000
+++ src/indicator/agent/SecretAgent.cpp	2015-08-12 13:44:19 +0000
@@ -19,7 +19,7 @@
 #include <agent/SecretAgent.h>
 #include <agent/SecretRequest.h>
 #include <AgentManagerInterface.h>
-#include <NotificationsInterface.h>
+#include <notify-cpp/notification-manager.h>
 #include <SecretAgentAdaptor.h>
 
 #include <NetworkManager.h>
@@ -34,13 +34,13 @@
 	Q_OBJECT
 
 public:
-	Priv(const QDBusConnection &systemConnection,
+	Priv(notify::NotificationManager::SPtr notificationManager, const QDBusConnection &systemConnection,
 			const QDBusConnection &sessionConnection) :
 			m_systemConnection(systemConnection),
 			m_sessionConnection(sessionConnection),
 			m_managerWatcher(NM_DBUS_SERVICE, m_systemConnection),
 			m_agentManager(NM_DBUS_SERVICE, NM_DBUS_PATH_AGENT_MANAGER, m_systemConnection),
-			m_notifications("org.freedesktop.Notifications", "/org/freedesktop/Notifications", m_sessionConnection),
+			m_notifications(notificationManager),
 			m_request(nullptr) {
 	}
 
@@ -64,14 +64,15 @@
 
 	OrgFreedesktopNetworkManagerAgentManagerInterface m_agentManager;
 
-	OrgFreedesktopNotificationsInterface m_notifications;
+	notify::NotificationManager::SPtr m_notifications;
 
 	std::shared_ptr<SecretRequest> m_request;
 };
 
-SecretAgent::SecretAgent(const QDBusConnection &systemConnection,
+SecretAgent::SecretAgent(notify::NotificationManager::SPtr notificationManager,
+        const QDBusConnection &systemConnection,
 		const QDBusConnection &sessionConnection, QObject *parent) :
-		QObject(parent), d(new Priv(systemConnection, sessionConnection))
+		QObject(parent), d(new Priv(notificationManager, systemConnection, sessionConnection))
 	{
 	// Memory managed by Qt
 	new SecretAgentAdaptor(this);
@@ -182,7 +183,7 @@
 	Q_UNUSED(connectionPath);
 }
 
-OrgFreedesktopNotificationsInterface & SecretAgent::notifications() {
+notify::NotificationManager::SPtr SecretAgent::notifications() {
 	return d->m_notifications;
 }
 

=== modified file 'src/indicator/agent/SecretAgent.h'
--- src/indicator/agent/SecretAgent.h	2015-04-21 10:59:52 +0000
+++ src/indicator/agent/SecretAgent.h	2015-08-12 13:44:19 +0000
@@ -26,9 +26,13 @@
 #include <QDBusContext>
 #include <QMap>
 
-class OrgFreedesktopNotificationsInterface;
 class SecretAgentAdaptor;
 
+namespace notify
+{
+class NotificationManager;
+}
+
 namespace agent
 {
 
@@ -58,8 +62,9 @@
 	static constexpr char const* KEY_MGMT_WPA_PSK = "wpa-psk";
 	static constexpr char const* KEY_MGMT_NONE = "none";
 
-	explicit SecretAgent(const QDBusConnection &systemConnection,
-			const QDBusConnection &sessionConnection, QObject *parent = 0);
+	explicit SecretAgent(std::shared_ptr<notify::NotificationManager> notificationManager,
+            const QDBusConnection &systemConnection,
+            const QDBusConnection &sessionConnection, QObject *parent = 0);
 
 	virtual ~SecretAgent();
 
@@ -79,7 +84,7 @@
 	void SaveSecrets(const QVariantDictMap &connection,
 			const QDBusObjectPath &connectionPath);
 
-	OrgFreedesktopNotificationsInterface & notifications();
+	std::shared_ptr<notify::NotificationManager> notifications();
 
 protected:
 	class Priv;

=== modified file 'src/indicator/agent/SecretRequest.cpp'
--- src/indicator/agent/SecretRequest.cpp	2015-04-21 10:59:52 +0000
+++ src/indicator/agent/SecretRequest.cpp	2015-08-12 13:44:19 +0000
@@ -20,7 +20,7 @@
 #include <agent/SecretAgent.h>
 #include <util/localisation.h>
 
-#include <NotificationsInterface.h>
+#include <notify-cpp/notification-manager.h>
 
 namespace agent
 {
@@ -35,12 +35,6 @@
 				settingName), m_hints(hints), m_flags(flags), m_message(
 				message), m_menu() {
 
-	connect(&m_secretAgent.notifications(),
-	SIGNAL(ActionInvoked(uint, const QString &)), this,
-	SLOT(actionInvoked(uint, const QString &)));
-
-	connect(&m_secretAgent.notifications(), SIGNAL(NotificationClosed(uint, uint)), this, SLOT(notificationClosed(uint, uint)));
-
 	// indicate to the notification-daemon, that we want to use snap-decisions
 	QVariantMap notificationHints;
 	notificationHints["x-canonical-snap-decisions"] = "true";
@@ -74,29 +68,28 @@
 		subject = _("WEP");
 	}
 
-	m_notificationId = m_secretAgent.notifications().Notify("indicator-network",
-			0, "wifi-full-secure",
+	m_notification = m_secretAgent.notifications()->notify(
 			title.arg(conn[SecretAgent::CONNECTION_ID].toString()), subject,
+			"wifi-full-secure",
 			QStringList() << "connect_id" << _("Connect") << "cancel_id"
 					<< _("Cancel"), notificationHints, 0);
+
+    connect(m_notification.get(), &notify::Notification::actionInvoked, this,
+            &SecretRequest::actionInvoked);
+
+    connect(m_notification.get(), &notify::Notification::closed, this,
+            &SecretRequest::notificationClosed);
+
+    m_notification->show();
 }
 
 SecretRequest::~SecretRequest() {
-	/* Close the notification if it's open */
-	if (m_notificationId != 0) {
-		m_secretAgent.notifications().CloseNotification(m_notificationId).waitForFinished();
-		m_notificationId = 0;
-	}
 }
 
 /* Called when the user submits a password */
-void SecretRequest::actionInvoked(uint id, const QString &actionKey) {
-	// Ignore other requests' notifications
-	if (id != m_notificationId) {
-		return;
-	}
+void SecretRequest::actionInvoked(const QString &actionKey) {
 
-	m_notificationId = 0;
+    m_notification.reset();
 
 	if (actionKey != "connect_id") {
 		m_secretAgent.FinishGetSecrets(*this, true);
@@ -121,15 +114,10 @@
 }
 
 /* Called when the user closes the dialog */
-void SecretRequest::notificationClosed(uint id, uint reason) {
+void SecretRequest::notificationClosed(uint reason) {
 	Q_UNUSED(reason);
 
-	// Ignore other requests' notifications
-	if (id != m_notificationId) {
-		return;
-	}
-
-	m_notificationId = 0;
+	m_notification.reset();
 
 	m_secretAgent.FinishGetSecrets(*this, true);
 }

=== modified file 'src/indicator/agent/SecretRequest.h'
--- src/indicator/agent/SecretRequest.h	2015-04-21 10:59:52 +0000
+++ src/indicator/agent/SecretRequest.h	2015-08-12 13:44:19 +0000
@@ -20,6 +20,7 @@
 
 #include <dbus-types.h>
 #include <agent/PasswordMenu.h>
+#include <notify-cpp/notification.h>
 
 #include <QDBusMessage>
 #include <QDBusObjectPath>
@@ -42,8 +43,8 @@
 	virtual ~SecretRequest();
 
 public Q_SLOTS:
-	void actionInvoked(uint id, const QString &actionKey);
-	void notificationClosed(uint id, uint reason);
+	void actionInvoked(const QString &actionKey);
+	void notificationClosed(uint reason);
 
 public:
 	const QVariantDictMap & connection() const;
@@ -51,7 +52,7 @@
 	const QDBusMessage & message() const;
 
 protected:
-	unsigned int m_notificationId;
+	notify::Notification::UPtr m_notification;
 
 	SecretAgent &m_secretAgent;
 

=== modified file 'src/indicator/factory.cpp'
--- src/indicator/factory.cpp	2015-04-15 15:04:51 +0000
+++ src/indicator/factory.cpp	2015-08-12 13:44:19 +0000
@@ -17,9 +17,11 @@
  *     Pete Woods <[e-mail]>
  */
 
+#include <config.h>
 #include <factory.h>
 
 #include <nmofono/manager-impl.h>
+#include <notify-cpp/notification-manager.h>
 
 using namespace std;
 
@@ -29,6 +31,17 @@
 
     SessionBus::Ptr m_sessionBus;
 
+    notify::NotificationManager::SPtr m_notificationManager;
+
+    notify::NotificationManager::SPtr singletonNotificationManager()
+    {
+        if (!m_notificationManager)
+        {
+            m_notificationManager = make_shared<notify::NotificationManager>(GETTEXT_PACKAGE);
+        }
+        return m_notificationManager;
+    }
+
     SessionBus::Ptr singletonSessionBus()
     {
         if (!m_sessionBus)
@@ -42,7 +55,9 @@
     {
         if (!m_nmofono)
         {
-            m_nmofono = make_shared<nmofono::ManagerImpl>(QDBusConnection::systemBus());
+            m_nmofono = make_shared<nmofono::ManagerImpl>(
+                    singletonNotificationManager(),
+                    QDBusConnection::systemBus());
         }
         return m_nmofono;
     }
@@ -117,7 +132,8 @@
 
 agent::SecretAgent::UPtr Factory::newSecretAgent()
 {
-    return make_unique<agent::SecretAgent>(QDBusConnection::systemBus(),
+    return make_unique<agent::SecretAgent>(d->singletonNotificationManager(),
+                                           QDBusConnection::systemBus(),
                                            QDBusConnection::sessionBus());
 }
 

=== modified file 'src/indicator/main.cpp'
--- src/indicator/main.cpp	2015-08-10 09:30:04 +0000
+++ src/indicator/main.cpp	2015-08-12 13:44:19 +0000
@@ -28,7 +28,6 @@
 #include <ctime>
 
 #include <glib.h>
-#include <libnotify/notify.h>
 
 #include <config.h>
 
@@ -53,25 +52,17 @@
     bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
     textdomain(GETTEXT_PACKAGE);
 
-    notify_init(GETTEXT_PACKAGE);
-
     if (argc == 2 && QString("--print-address") == argv[1])
     {
         qDebug() << QDBusConnection::systemBus().baseService();
     }
 
-    int result = 0;
-    {
-        Factory factory;
-        auto menu = factory.newMenuBuilder();
-        auto secretAgent = factory.newSecretAgent();
-        auto connectivityService = factory.newConnectivityService();
-
-        QObject::connect(connectivityService.get(), &ConnectivityService::unlockAllModems, menu.get(), &MenuBuilder::unlockAllModems);
-        QObject::connect(connectivityService.get(), &ConnectivityService::unlockModem, menu.get(), &MenuBuilder::unlockModem);
-        result = app.exec();
-    }
-    notify_uninit();
-
-    return result;
+    Factory factory;
+    auto menu = factory.newMenuBuilder();
+    auto secretAgent = factory.newSecretAgent();
+    auto connectivityService = factory.newConnectivityService();
+
+    QObject::connect(connectivityService.get(), &ConnectivityService::unlockAllModems, menu.get(), &MenuBuilder::unlockAllModems);
+    QObject::connect(connectivityService.get(), &ConnectivityService::unlockModem, menu.get(), &MenuBuilder::unlockModem);
+    return app.exec();
 }

=== modified file 'src/indicator/nmofono/manager-impl.cpp'
--- src/indicator/nmofono/manager-impl.cpp	2015-08-07 08:55:50 +0000
+++ src/indicator/nmofono/manager-impl.cpp	2015-08-12 13:44:19 +0000
@@ -31,6 +31,7 @@
 #include <qofono-qt5/qofonomodem.h>
 #undef slots
 
+#include <notify-cpp/notification-manager.h>
 #include <notify-cpp/snapdecision/sim-unlock.h>
 #include <sim-unlock-dialog.h>
 #include <util/qhash-sharedptr.h>
@@ -224,11 +225,11 @@
     Q_EMIT statusUpdated(d->m_status);
 }
 
-ManagerImpl::ManagerImpl(const QDBusConnection& systemConnection) : d(new ManagerImpl::Private(*this))
+ManagerImpl::ManagerImpl(notify::NotificationManager::SPtr notificationManager, const QDBusConnection& systemConnection) : d(new ManagerImpl::Private(*this))
 {
     d->nm = make_shared<OrgFreedesktopNetworkManagerInterface>(NM_DBUS_SERVICE, NM_DBUS_PATH, systemConnection);
 
-    d->m_unlockDialog = make_shared<SimUnlockDialog>();
+    d->m_unlockDialog = make_shared<SimUnlockDialog>(notificationManager);
     connect(d->m_unlockDialog.get(), &SimUnlockDialog::ready, d.get(), &Private::sim_unlock_ready);
 
     d->m_ofono = make_shared<QOfonoManager>();

=== modified file 'src/indicator/nmofono/manager-impl.h'
--- src/indicator/nmofono/manager-impl.h	2015-08-05 15:14:28 +0000
+++ src/indicator/nmofono/manager-impl.h	2015-08-12 13:44:19 +0000
@@ -25,6 +25,11 @@
 #include <QDBusObjectPath>
 #include <QVariantMap>
 
+namespace notify
+{
+class NotificationManager;
+}
+
 namespace nmofono {
     class Manager;
 
@@ -40,7 +45,7 @@
 public:
     typedef std::shared_ptr<ManagerImpl> Ptr;
 
-    ManagerImpl(const QDBusConnection& systemBus);
+    ManagerImpl(std::shared_ptr<notify::NotificationManager> notificationManager, const QDBusConnection& systemBus);
 
     // Public API
     void setFlightMode(bool) override;

=== modified file 'src/indicator/sim-unlock-dialog.cpp'
--- src/indicator/sim-unlock-dialog.cpp	2015-06-18 12:30:09 +0000
+++ src/indicator/sim-unlock-dialog.cpp	2015-08-12 13:44:19 +0000
@@ -19,7 +19,7 @@
 
 #include "sim-unlock-dialog.h"
 
-#include <notify-cpp/notification.h>
+#include <notify-cpp/notification-manager.h>
 #include <notify-cpp/snapdecision/sim-unlock.h>
 #include <util/localisation.h>
 
@@ -196,7 +196,7 @@
         m_sd->showPopup(output.str(), closed);
     }
 
-    Private(SimUnlockDialog& parent);
+    Private(SimUnlockDialog& parent, notify::NotificationManager::SPtr);
 
 public Q_SLOTS:
     void update();
@@ -205,8 +205,6 @@
 
     void pinEntered(const QString& pin);
 
-    void closed();
-
     void reset();
 
     void pinSuccess()
@@ -244,13 +242,12 @@
     }
 };
 
-SimUnlockDialog::Private::Private(SimUnlockDialog& parent)
+SimUnlockDialog::Private::Private(SimUnlockDialog& parent, notify::NotificationManager::SPtr notificationManager)
     : p(parent), m_doCleanUp{true}
 {
-    m_sd = std::make_shared<notify::snapdecision::SimUnlock>();
+    m_sd = make_shared<notify::snapdecision::SimUnlock>(notificationManager);
     connect(m_sd.get(), &notify::snapdecision::SimUnlock::cancelled, this, &Private::cancelled);
     connect(m_sd.get(), &notify::snapdecision::SimUnlock::pinEntered, this, &Private::pinEntered);
-    connect(m_sd.get(), &notify::snapdecision::SimUnlock::closed, this, &Private::closed);
 
     reset();
 }
@@ -310,6 +307,7 @@
             break;
         }
 
+
         m_sd->setPinMinMax(lengths[type]);
 
         std::string attempts;
@@ -386,12 +384,6 @@
 void
 SimUnlockDialog::Private::cancelled()
 {
-    m_sd->close();
-}
-
-void
-SimUnlockDialog::Private::closed()
-{
     reset();
 }
 
@@ -421,8 +413,8 @@
     m_doCleanUp = true;
 }
 
-SimUnlockDialog::SimUnlockDialog() :
-        d(new Private(*this))
+SimUnlockDialog::SimUnlockDialog(notify::NotificationManager::SPtr notificationManager) :
+        d(new Private(*this, notificationManager))
 {
 }
 
@@ -475,9 +467,6 @@
         pukRetries = retries[wwan::Modem::PinType::puk];
     }
 
-    qDebug() << __PRETTY_FUNCTION__ << modem->name() << "pinRetries ="
-            << pinRetries << "pukRetries =" << pukRetries;
-
     // remind the user
     if (type == wwan::Modem::PinType::pin && pinRetries == 1)
     {

=== modified file 'src/indicator/sim-unlock-dialog.h'
--- src/indicator/sim-unlock-dialog.h	2015-04-24 08:47:08 +0000
+++ src/indicator/sim-unlock-dialog.h	2015-08-12 13:44:19 +0000
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <nmofono/wwan/modem.h>
+#include <notify-cpp/notification-manager.h>
 
 #include <memory>
 #include <QObject>
@@ -42,7 +43,7 @@
     };
 
     typedef std::shared_ptr<SimUnlockDialog> Ptr;
-    SimUnlockDialog();
+    SimUnlockDialog(notify::NotificationManager::SPtr notificationManager);
     ~SimUnlockDialog();
 
     void unlock(nmofono::wwan::Modem::Ptr modem);

=== modified file 'src/notify-cpp/CMakeLists.txt'
--- src/notify-cpp/CMakeLists.txt	2015-05-12 09:07:46 +0000
+++ src/notify-cpp/CMakeLists.txt	2015-08-12 13:44:19 +0000
@@ -1,12 +1,15 @@
 include_directories("${CMAKE_SOURCE_DIR}/src/")
+include_directories("${CMAKE_BINARY_DIR}/src/qdbus-stubs")
+include_directories("${CMAKE_SOURCE_DIR}/src/qdbus-stubs")
 
 set(NOTIFY_CPP_SOURCES
     notification.cpp
+    notification-manager.cpp
     snapdecision/sim-unlock.cpp
 )
 
 add_library(notify_cpp STATIC ${NOTIFY_CPP_SOURCES})
 target_link_libraries(
     notify_cpp
-    ${GLIB_LIBRARIES}
+    qdbus-stubs
 )

=== added file 'src/notify-cpp/notification-manager.cpp'
--- src/notify-cpp/notification-manager.cpp	1970-01-01 00:00:00 +0000
+++ src/notify-cpp/notification-manager.cpp	2015-08-12 13:44:19 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Pete Woods <[e-mail]>
+ */
+
+#include <notification-manager.h>
+#include <NotificationsInterface.h>
+#include <QDebug>
+
+using namespace std;
+
+namespace notify
+{
+
+class NotificationManager::Priv
+{
+public:
+    QString m_appName;
+
+    shared_ptr<OrgFreedesktopNotificationsInterface> m_notificationInterface;
+};
+
+NotificationManager::NotificationManager(const QString &appName,
+                                         const QDBusConnection& sessionConnection) :
+        d(new Priv)
+{
+    d->m_appName = appName;
+    d->m_notificationInterface = make_shared<
+            OrgFreedesktopNotificationsInterface>(DBusTypes::NOTIFY_DBUS_NAME,
+                                                  DBusTypes::NOTIFY_DBUS_PATH,
+                                                  sessionConnection);
+
+    d->m_notificationInterface->GetServerInformation();
+
+    connect(d->m_notificationInterface.get(),
+            &OrgFreedesktopNotificationsInterface::ActionInvoked, this,
+            &NotificationManager::actionInvoked);
+
+    connect(d->m_notificationInterface.get(),
+            &OrgFreedesktopNotificationsInterface::NotificationClosed, this,
+            &NotificationManager::notificationClosed);
+
+    connect(d->m_notificationInterface.get(),
+            &OrgFreedesktopNotificationsInterface::dataChanged, this,
+            &NotificationManager::dataChanged);
+}
+
+NotificationManager::~NotificationManager()
+{
+}
+
+Notification::UPtr
+NotificationManager::notify(const QString &summary, const QString &body,
+                            const QString &icon, const QStringList &actions,
+                            const QVariantMap &hints, int expireTimeout)
+{
+    return make_unique<Notification>(d->m_appName, summary, body, icon, actions,
+                                     hints, expireTimeout,
+                                     d->m_notificationInterface);
+}
+
+}

=== added file 'src/notify-cpp/notification-manager.h'
--- src/notify-cpp/notification-manager.h	1970-01-01 00:00:00 +0000
+++ src/notify-cpp/notification-manager.h	2015-08-12 13:44:19 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <memory>
+#include <QDBusConnection>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QVariantMap>
+
+#include <notify-cpp/notification.h>
+
+namespace notify
+{
+
+class NotificationManager: public QObject
+{
+    Q_OBJECT
+
+public:
+    typedef std::unique_ptr<NotificationManager> UPtr;
+    typedef std::shared_ptr<NotificationManager> SPtr;
+
+    NotificationManager(const QString &appName,
+           const QDBusConnection& sessionConnection = QDBusConnection::sessionBus());
+
+    ~NotificationManager();
+
+    Notification::UPtr notify(
+           const QString &summary,
+           const QString &body,
+           const QString &icon,
+           const QStringList &actions,
+           const QVariantMap &hints,
+           int expireTimeout = -1);
+
+Q_SIGNALS:
+    void actionInvoked(uint id, const QString &action_key);
+
+    void notificationClosed(uint id, uint reason);
+
+    void dataChanged(uint id);
+
+protected:
+    class Priv;
+    std::shared_ptr<Priv> d;
+};
+
+}

=== modified file 'src/notify-cpp/notification.cpp'
--- src/notify-cpp/notification.cpp	2015-05-12 09:03:23 +0000
+++ src/notify-cpp/notification.cpp	2015-08-12 13:44:19 +0000
@@ -18,14 +18,17 @@
  */
 
 #include "notification.h"
+#include <NotificationsInterface.h>
 
-#include <libnotify/notify.h>
 #include <QDebug>
 
 using namespace notify;
+using namespace std;
 
-class notify::Notification::Private
+class notify::Notification::Private: public QObject
 {
+    Q_OBJECT
+
 public:
     Private(Notification& parent) :
         p(parent)
@@ -34,76 +37,135 @@
 
     Notification& p;
 
+    QString m_appName;
     QString m_summary;
     QString m_body;
     QString m_icon;
-
-    std::unique_ptr<NotifyNotification, GObjectDeleter> m_notification;
-
-    static void closed_cb(NotifyNotification *,
-                          gpointer user_data)
-    {
-        Private *that = static_cast<Private *>(user_data);
-        Q_EMIT that->p.closed();
-    }
-
-    gulong disconnectId = 0;
+    QStringList m_actions;
+    QVariantMap m_hints;
+    int m_expireTimeout = 0;
+    uint m_id = 0;
+
+    shared_ptr<OrgFreedesktopNotificationsInterface> m_notificationsInterface;
+
+    bool m_open = false;
+    bool m_dirty = false;
+
+public Q_SLOTS:
+    void notificationClosed(uint id, uint reason)
+    {
+        if (id == m_id)
+        {
+            m_open = false;
+            Q_EMIT p.closed(reason);
+        }
+    }
+
+    void actionInvoked(uint id, const QString& name)
+    {
+        if (id == m_id)
+        {
+            Q_EMIT p.actionInvoked(name);
+        }
+    }
 };
 
-Notification::Notification(const QString &summary,
-                           const QString &body,
-                           const QString &icon)
+Notification::Notification(
+        const QString& appName, const QString &summary, const QString &body,
+        const QString &icon, const QStringList &actions,
+        const QVariantMap &hints, int expireTimeout,
+        shared_ptr<OrgFreedesktopNotificationsInterface> notificationsInterface)
 {
     d.reset(new Private(*this));
+    d->m_appName = appName;
     d->m_summary = summary;
     d->m_body = body;
     d->m_icon = icon;
-
-    d->m_notification.reset(notify_notification_new(summary.toUtf8().constData(), body.toUtf8().constData(), icon.toUtf8().constData()));
-    d->disconnectId = g_signal_connect(d->m_notification.get(), "closed", G_CALLBACK(Private::closed_cb), d.get());
+    d->m_actions = actions;
+    d->m_hints = hints;
+    d->m_expireTimeout = expireTimeout;
+    d->m_notificationsInterface = notificationsInterface;
+
+    connect(d->m_notificationsInterface.get(), &OrgFreedesktopNotificationsInterface::NotificationClosed, d.get(), &Private::notificationClosed);
+
+    connect(d->m_notificationsInterface.get(), &OrgFreedesktopNotificationsInterface::ActionInvoked, d.get(), &Private::actionInvoked);
 }
 
 Notification::~Notification()
 {
-    g_signal_handler_disconnect(d->m_notification.get(), d->disconnectId);
-
-// TODO Uncomment this when the notification service is more robust
-//    GError* error = nullptr;
-//    if (notify_notification_close(d->m_notification.get(), &error) == FALSE)
-//    {
-//        qWarning() << __PRETTY_FUNCTION__ << error->message;
-//        g_error_free(error);
-//    }
+    if (d->m_id > 0 && d->m_open)
+    {
+        auto reply = d->m_notificationsInterface->CloseNotification(d->m_id);
+        reply.waitForFinished();
+        if (reply.isError())
+        {
+            qCritical() << __PRETTY_FUNCTION__ << reply.error().message();
+        }
+    }
 }
 
 QString
-Notification::summary()
+Notification::summary() const
 {
     return d->m_summary;
 }
 
 QString
-Notification::body()
+Notification::body() const
 {
     return d->m_body;
 }
 
 QString
-Notification::icon()
+Notification::icon() const
 {
     return d->m_icon;
 }
 
-void
-Notification::setHint(const QString &key, Variant value)
-{
-    notify_notification_set_hint(d->m_notification.get(), key.toUtf8().constData(), value);
-}
-
-void
-Notification::setHintString(const QString &key, const QString &value)
-{
-    notify_notification_set_hint_string(d->m_notification.get(), key.toUtf8().constData(), value.toUtf8().constData());
+QStringList
+Notification::actions() const
+{
+    return d->m_actions;
+}
+
+QVariantMap
+Notification::hints() const
+{
+    return d->m_hints;
+}
+
+void
+Notification::addHint(const QString &key, const QVariant& value)
+{
+    d->m_hints[key] = value;
+    d->m_dirty = true;
+    Q_EMIT hintsUpdated(d->m_hints);
+}
+
+void
+Notification::setHints(const QVariantMap& hints)
+{
+    if (d->m_hints == hints)
+    {
+        return;
+    }
+
+    d->m_hints = hints;
+    d->m_dirty = true;
+    Q_EMIT hintsUpdated(d->m_hints);
+}
+
+void
+Notification::setActions(const QStringList& actions)
+{
+    if (d->m_actions == actions)
+    {
+        return;
+    }
+
+    d->m_actions = actions;
+    d->m_dirty = true;
+    Q_EMIT actionsUpdated(d->m_actions);
 }
 
 void
@@ -115,7 +177,7 @@
     }
 
     d->m_summary = summary;
-    g_object_set(d->m_notification.get(), "summary", d->m_summary.toUtf8().constData(), nullptr);
+    d->m_dirty = true;
     Q_EMIT summaryUpdated(d->m_summary);
 }
 
@@ -128,7 +190,7 @@
     }
 
     d->m_body = body;
-    g_object_set(d->m_notification.get(), "body", d->m_body.toUtf8().constData(), nullptr);
+    d->m_dirty = true;
     Q_EMIT bodyUpdated(d->m_body);
 }
 
@@ -141,35 +203,50 @@
     }
 
     d->m_icon = icon;
-    g_object_set(d->m_notification.get(), "icon", d->m_icon.toUtf8().constData(), nullptr);
+    d->m_dirty = true;
     Q_EMIT iconUpdated(d->m_icon);
 }
 
 void
-Notification::update()
-{
-    notify_notification_update(d->m_notification.get(), d->m_summary.toUtf8().constData(),
-                               d->m_body.toUtf8().constData(), d->m_icon.toUtf8().constData());
-}
-
-void
 Notification::show()
 {
-    GError *error = nullptr;
-    notify_notification_show(d->m_notification.get(), &error);
-    if (error) {
-        qCritical() << __PRETTY_FUNCTION__ << error->message;
-        g_error_free(error);
+    if (d->m_dirty || !d->m_open)
+    {
+        auto reply = d->m_notificationsInterface->Notify(d->m_appName, d->m_id,
+                                                     d->m_icon, d->m_summary,
+                                                     d->m_body, d->m_actions,
+                                                     d->m_hints,
+                                                     d->m_expireTimeout);
+        reply.waitForFinished();
+        if (reply.isError())
+        {
+            qCritical() << __PRETTY_FUNCTION__ << reply.error().message();
+        }
+        else
+        {
+            d->m_id = reply;
+            d->m_dirty = false;
+            d->m_open = true;
+        }
     }
 }
 
 void
 Notification::close()
 {
-    GError *error = nullptr;
-    notify_notification_close(d->m_notification.get(), &error);
-    if (error) {
-        qCritical() << __PRETTY_FUNCTION__ << error->message;
-        g_error_free(error);
+    if (d->m_id > 0)
+    {
+        auto reply = d->m_notificationsInterface->CloseNotification(d->m_id);
+        reply.waitForFinished();
+        if (reply.isError())
+        {
+            qCritical() << __PRETTY_FUNCTION__ << reply.error().message();
+        }
+        else
+        {
+            d->m_open = false;
+        }
     }
 }
+
+#include "notification.moc"

=== modified file 'src/notify-cpp/notification.h'
--- src/notify-cpp/notification.h	2015-04-24 08:47:08 +0000
+++ src/notify-cpp/notification.h	2015-08-12 13:44:19 +0000
@@ -25,7 +25,12 @@
 
 #include <QObject>
 
-namespace notify {
+class OrgFreedesktopNotificationsInterface;
+
+namespace notify
+{
+
+class NotificationManager;
 
 class Notification: public QObject
 {
@@ -36,35 +41,38 @@
 
 public:
 
-    typedef std::shared_ptr<Notification> Ptr;
+    typedef std::unique_ptr<Notification> UPtr;
+    typedef std::shared_ptr<Notification> SPtr;
 
-    Notification() = delete;
-    Notification(const QString &summary,
-                 const QString &body,
-                 const QString &icon);
     virtual ~Notification();
 
     /// @todo remember show() after set().
-    Q_PROPERTY(QString summary READ summary NOTIFY summaryUpdated)
-    QString summary();
-
-    /// @todo remember show() after set().
-    Q_PROPERTY(QString body READ body NOTIFY bodyUpdated)
-    QString body();
-
-    /// @todo remember show() after set().
-    Q_PROPERTY(QString icon READ icon NOTIFY iconUpdated)
-    QString icon();
-
-    void update();
+    Q_PROPERTY(QString summary READ summary WRITE setSummary NOTIFY summaryUpdated)
+    QString summary() const;
+
+    /// @todo remember show() after set().
+    Q_PROPERTY(QString body READ body WRITE setBody NOTIFY bodyUpdated)
+    QString body() const;
+
+    /// @todo remember show() after set().
+    Q_PROPERTY(QString icon READ icon WRITE setIcon NOTIFY iconUpdated)
+    QString icon() const;
+
+    Q_PROPERTY(QStringList actions READ actions WRITE setActions NOTIFY actionsUpdated)
+    QStringList actions() const;
+
+    Q_PROPERTY(QVariantMap hints READ hints WRITE setHints NOTIFY hintsUpdated)
+    QVariantMap hints() const;
 
     void show();
     void close();
 
 public Q_SLOTS:
-    void setHint(const QString &key, Variant value);
-
-    void setHintString(const QString &key, const QString &value);
+    void setActions(const QStringList& actions);
+
+    void setHints(const QVariantMap& hints);
+
+    void addHint(const QString &key, const QVariant& value);
 
     void setSummary(const QString& summary);
 
@@ -73,12 +81,25 @@
     void setIcon(const QString& icon);
 
 Q_SIGNALS:
-    void closed();
+    void closed(uint reason);
+
+    void hintsUpdated(const QVariantMap&);
+
+    void actionsUpdated(const QStringList&);
 
     void summaryUpdated(const QString&);
 
     void bodyUpdated(const QString&);
 
     void iconUpdated(const QString&);
+
+    void actionInvoked(const QString& name);
+
+public:
+    Notification(const QString& appName,
+                 const QString &summary, const QString &body,
+                 const QString &icon, const QStringList &actions,
+                 const QVariantMap &hints, int expireTimeout,
+                 std::shared_ptr<OrgFreedesktopNotificationsInterface> notificationsInterface);
 };
 }

=== modified file 'src/notify-cpp/snapdecision/sim-unlock.cpp'
--- src/notify-cpp/snapdecision/sim-unlock.cpp	2015-05-12 09:02:50 +0000
+++ src/notify-cpp/snapdecision/sim-unlock.cpp	2015-08-12 13:44:19 +0000
@@ -18,7 +18,6 @@
  */
 
 #include "sim-unlock.h"
-#include <notify-cpp/notification.h>
 
 #include "menumodel-cpp/menu.h"
 #include "menumodel-cpp/menu-exporter.h"
@@ -31,6 +30,7 @@
 #include <QDebug>
 
 using namespace notify::snapdecision;
+using namespace std;
 
 class SimUnlock::Private: public QObject
 {
@@ -39,8 +39,8 @@
 public:
     SimUnlock& p;
 
-    Notification::Ptr m_notification;
-    Notification::Ptr m_pending;
+    NotificationManager::SPtr m_notificationManager;
+    Notification::UPtr m_notification;
 
     QString m_title;
     QString m_body;
@@ -48,7 +48,7 @@
 
     std::shared_ptr<SessionBus> m_sessionBus;
 
-    std::map<std::string, Variant> m_modelPaths;
+    QVariantMap m_modelPaths;
 
     Action::Ptr m_notifyAction;
     Action::Ptr m_pinMinMaxAction;
@@ -65,11 +65,6 @@
     std::function<void()> m_pendingPopupClosed;
 
 public Q_SLOTS:
-    void notificationClosed()
-    {
-        resetNotification(m_title, m_body);
-        Q_EMIT p.closed();
-    }
 
     void resetActionStates()
     {
@@ -90,16 +85,31 @@
         }
     }
 
-    void resetNotification(const QString &title,
-                           const QString &body)
+    void resetNotification()
     {
-        m_pending = m_notification;
-        m_notification = std::make_shared<notify::Notification>(title, body, "");
-        m_notification->setHintString("x-canonical-snap-decisions", "true");
-        m_notification->setHint("x-canonical-snap-decisions-timeout", TypedVariant<std::int32_t>(std::numeric_limits<std::int32_t>::max()));
-        m_notification->setHint("x-canonical-private-menu-model", TypedVariant<std::map<std::string, Variant>>(m_modelPaths));
+        QVariantMap hints({
+            { "x-canonical-snap-decisions", "true" },
+            { "x-canonical-snap-decisions-timeout", numeric_limits<int32_t>::max() },
+            { "x-canonical-private-menu-model", m_modelPaths }
+        });
+
+        if (m_notification)
+        {
+            m_notification->setSummary(m_title);
+            m_notification->setBody(m_body);
+            m_notification->setIcon("");
+            m_notification->setActions(QStringList());
+            m_notification->setHints(hints);
+        }
+        else
+        {
+            m_notification = m_notificationManager->notify(
+                m_title, m_body, "", QStringList(), hints);
+
+            connect(&p, &SimUnlock::titleUpdated, m_notification.get(), &Notification::setSummary);
+            connect(&p, &SimUnlock::bodyUpdated, m_notification.get(), &Notification::setBody);
+        }
         resetActionStates();
-        connect(m_notification.get(), &Notification::closed, this, &Private::notificationClosed);
     }
 
     void pinEntered(const Variant& state)
@@ -111,6 +121,7 @@
     {
         if (!parameter.as<bool>())
         {
+            p.close();
             Q_EMIT p.cancelled();
         }
     }
@@ -145,11 +156,13 @@
 
 public:
     Private(SimUnlock& parent,
+            NotificationManager::SPtr notificationManager,
             const QString &title,
             const QString &body,
             std::pair<std::uint8_t, std::uint8_t> pinMinMax)
         : p(parent)
     {
+        m_notificationManager = notificationManager;
         m_title = title;
         m_body = body;
         m_pinMinMax = pinMinMax;
@@ -162,12 +175,12 @@
         std::string menuPath = "/com/canonical/indicator/network/unlocksim" + std::to_string(exportId);
         ++exportId;
 
-        std::map<std::string, Variant> modelActions;
-        modelActions["notifications"] = TypedVariant<std::string>(actionPath);
+        QVariantMap modelActions;
+        modelActions["notifications"] = QString::fromStdString(actionPath);
 
-        m_modelPaths["busName"] = TypedVariant<std::string>(m_sessionBus->address());
-        m_modelPaths["menuPath"] = TypedVariant<std::string>(menuPath);
-        m_modelPaths["actions"] = TypedVariant<std::map<std::string, Variant>>(modelActions);
+        m_modelPaths["busName"] = QString::fromStdString(m_sessionBus->address());
+        m_modelPaths["menuPath"] = QString::fromStdString(menuPath);
+        m_modelPaths["actions"] = modelActions;
 
         m_menu = std::make_shared<Menu>();
         m_menuItem = std::make_shared<MenuItem>("", "notifications.simunlock");
@@ -205,19 +218,18 @@
         m_menuExporter = std::make_shared<MenuExporter>(m_sessionBus, menuPath, m_menu);
         m_actionGroupExporter = std::make_shared<ActionGroupExporter>(m_sessionBus, m_actionGroup, actionPath);
 
-        resetNotification(title, body);
+        resetNotification();
 
-        connect(&p, &SimUnlock::titleUpdated, m_notification.get(), &Notification::setSummary);
-        connect(&p, &SimUnlock::bodyUpdated, m_notification.get(), &Notification::setBody);
         connect(&p, &SimUnlock::pinMinMaxUpdated, this, &Private::pinMinMaxChanged);
     }
 };
 
-SimUnlock::SimUnlock(const QString &title,
-                                 const QString &body,
-                                 std::pair<std::uint8_t, std::uint8_t> pinMinMax)
+SimUnlock::SimUnlock(NotificationManager::SPtr notificationManager,
+                     const QString &title,
+                     const QString &body,
+                     std::pair<std::uint8_t, std::uint8_t> pinMinMax)
 {
-    d.reset(new Private(*this, title, body, pinMinMax));
+    d.reset(new Private(*this, notificationManager, title, body, pinMinMax));
 }
 
 SimUnlock::~SimUnlock()

=== modified file 'src/notify-cpp/snapdecision/sim-unlock.h'
--- src/notify-cpp/snapdecision/sim-unlock.h	2015-05-13 15:46:54 +0000
+++ src/notify-cpp/snapdecision/sim-unlock.h	2015-08-12 13:44:19 +0000
@@ -24,6 +24,8 @@
 #include <QObject>
 #include <QString>
 
+#include <notify-cpp/notification-manager.h>
+
 namespace notify {
 namespace snapdecision {
 
@@ -38,7 +40,8 @@
 
     typedef std::shared_ptr<SimUnlock> Ptr;
 
-    explicit SimUnlock(const QString &title = "",
+    explicit SimUnlock(NotificationManager::SPtr notificationManager,
+              const QString &title = "",
               const QString &body = "",
               std::pair<std::uint8_t, std::uint8_t> pinMinMax = {0, 0});
     ~SimUnlock();
@@ -84,8 +87,6 @@
 
     void cancelled();
 
-    void closed();
-
     void titleUpdated(const QString&);
 
     void bodyUpdated(const QString&);

=== modified file 'src/qdbus-stubs/dbus-types.h'
--- src/qdbus-stubs/dbus-types.h	2015-08-10 16:49:01 +0000
+++ src/qdbus-stubs/dbus-types.h	2015-08-12 13:44:19 +0000
@@ -56,4 +56,10 @@
     static constexpr char const* URFKILL_OBJ_PATH = "/org/freedesktop/URfkill";
 
     static constexpr char const* URFKILL_WIFI_OBJ_PATH = "/org/freedesktop/URfkill/WLAN";
+    static constexpr char const* NOTIFY_DBUS_NAME = "org.freedesktop.Notifications";
+
+    static constexpr char const* NOTIFY_DBUS_INTERFACE = "org.freedesktop.Notifications";
+
+    static constexpr char const* NOTIFY_DBUS_PATH = "/org/freedesktop/Notifications";
+
 }

=== modified file 'tests/integration/indicator-network-test-base.h'
--- tests/integration/indicator-network-test-base.h	2015-07-07 08:29:34 +0000
+++ tests/integration/indicator-network-test-base.h	2015-08-12 13:44:19 +0000
@@ -30,7 +30,11 @@
 #include <gtest/gtest.h>
 
 inline void PrintTo(const QVariant& variant, std::ostream* os) {
-        *os << "QVariant(" << variant.toString().toStdString() << ")";
+    QString output;
+    QDebug dbg(&output);
+    dbg << variant;
+
+    *os << "QVariant(" << output.toStdString() << ")";
 }
 
 #define WAIT_FOR_SIGNALS(signalSpy, signalsExpected)\

=== modified file 'tests/integration/test-indicator.cpp'
--- tests/integration/test-indicator.cpp	2015-07-08 08:49:30 +0000
+++ tests/integration/test-indicator.cpp	2015-08-12 13:44:19 +0000
@@ -2077,12 +2077,12 @@
     // set sim locked
     setSimManagerProperty(firstModem(), "PinRequired", "pin");
 
+    QSignalSpy notificationsSpy(&notificationsMockInterface(),
+                               SIGNAL(MethodCalled(const QString &, const QVariantList &)));
+
     // start the indicator
     ASSERT_NO_THROW(startIndicator());
 
-    QSignalSpy notificationsSpy(&notificationsMockInterface(),
-                               SIGNAL(MethodCalled(const QString &, const QVariantList &)));
-
     // check indicator is a locked sim card and a 0-bar wifi icon.
     // check sim status shows “SIM Locked”, with locked sim card icon and a “Unlock SIM” button beneath.
     // check that the “Unlock SIM” button has the correct action name.
@@ -2100,10 +2100,9 @@
         ).match());
 
     // check that the "GetServerInformation" method was called
-    // check that the "Notify" method was called twice
     // check method arguments are correct
-    std::string busName;
-    WAIT_FOR_SIGNALS(notificationsSpy, 3);
+    string busName;
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     {
         QVariantList const& call(notificationsSpy.at(0));
         EXPECT_EQ("GetServerInformation", call.at(0));
@@ -2147,45 +2146,9 @@
         ASSERT_TRUE(actions.contains("notifications"));
         EXPECT_EQ("/com/canonical/indicator/network/unlocksim0", actions["notifications"]);
     }
-    {
-        QVariantList const& call(notificationsSpy.at(2));
-        EXPECT_EQ("Notify", call.at(0));
-        QVariantList const& args(call.at(1).toList());
-        ASSERT_EQ(8, args.size());
-        EXPECT_EQ("indicator-network", args.at(0));
-        EXPECT_EQ(1, args.at(1));
-        EXPECT_EQ("", args.at(2));
-        EXPECT_EQ("Enter SIM PIN", args.at(3));
-        EXPECT_EQ("3 attempts remaining", args.at(4));
-        EXPECT_EQ(QStringList(), args.at(5));
-        EXPECT_EQ(-1, args.at(7));
-
-        QVariantMap hints;
-        ASSERT_TRUE(qDBusArgumentToMap(args.at(6), hints));
-        ASSERT_EQ(3, hints.size());
-        ASSERT_TRUE(hints.contains("x-canonical-private-menu-model"));
-        ASSERT_TRUE(hints.contains("x-canonical-snap-decisions"));
-        ASSERT_TRUE(hints.contains("x-canonical-snap-decisions-timeout"));
-        EXPECT_EQ(true, hints["x-canonical-snap-decisions"]);
-        EXPECT_EQ(numeric_limits<int32_t>::max(), hints["x-canonical-snap-decisions-timeout"]);
-
-        QVariantMap menuInfo;
-        ASSERT_TRUE(qDBusArgumentToMap(hints["x-canonical-private-menu-model"], menuInfo));
-        ASSERT_EQ(3, menuInfo.size());
-        ASSERT_TRUE(menuInfo.contains("actions"));
-        ASSERT_TRUE(menuInfo.contains("busName"));
-        ASSERT_TRUE(menuInfo.contains("menuPath"));
-        EXPECT_EQ(busName, menuInfo["busName"].toString().toStdString());
-        EXPECT_EQ("/com/canonical/indicator/network/unlocksim0", menuInfo["menuPath"]);
-
-        QVariantMap actions;
-        ASSERT_TRUE(qDBusArgumentToMap(menuInfo["actions"], actions));
-        ASSERT_EQ(1, actions.size());
-        ASSERT_TRUE(actions.contains("notifications"));
-        EXPECT_EQ("/com/canonical/indicator/network/unlocksim0", actions["notifications"]);
-    }
     notificationsSpy.clear();
 
+    ASSERT_FALSE(busName.empty());
     // check contents of x-canonical-private-menu-model
     EXPECT_MATCHRESULT(mh::MenuMatcher(unlockSimParameters(busName, 0))
         .item(mh::MenuItemMatcher()
@@ -2205,12 +2168,12 @@
     // set sim locked
     setSimManagerProperty(firstModem(), "PinRequired", "pin");
 
+    QSignalSpy notificationsSpy(&notificationsMockInterface(),
+                               SIGNAL(MethodCalled(const QString &, const QVariantList &)));
+
     // start the indicator
     ASSERT_NO_THROW(startIndicator());
 
-    QSignalSpy notificationsSpy(&notificationsMockInterface(),
-                               SIGNAL(MethodCalled(const QString &, const QVariantList &)));
-
     // check indicator is a locked sim card and a 0-bar wifi icon.
     // check sim status shows “SIM Locked”, with locked sim card icon and a “Unlock SIM” button beneath.
     // check that the “Unlock SIM” button has the correct action name.
@@ -2228,15 +2191,13 @@
         ).match());
 
     // check that the "GetServerInformation" method was called
-    // check that the "Notify" method was called twice
     // check method arguments are correct
     std::string busName;
-    WAIT_FOR_SIGNALS(notificationsSpy, 3);
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     CHECK_METHOD_CALL(notificationsSpy, 0, "GetServerInformation", /* no_args */);
     CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 0}, {3, "Enter SIM PIN"}, {4, "3 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 2, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "3 attempts remaining"});
     {
-        QVariantList const& call(notificationsSpy.at(2));
+        QVariantList const& call(notificationsSpy.at(1));
         QVariantList const& args(call.at(1).toList());
         QVariantMap hints;
         QVariantMap menuInfo;
@@ -2284,11 +2245,10 @@
             )
         ).match());
 
-    // check that the "Notify" method was called twice
-    // check method arguments are correct (new notification index should be 2)
-    WAIT_FOR_SIGNALS(notificationsSpy, 2);
-    CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 0});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 2});
+    // check that the "Notify" method was called
+    // check method arguments are correct (we re-use the same notification and reopen it)
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
+    CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1});
     notificationsSpy.clear();
 
     // cancel the notification again
@@ -2302,15 +2262,144 @@
             .activate(shared_ptr<GVariant>(g_variant_new_boolean(false), &mh::gvariant_deleter))
         ).match());
 
-    // check that the "NotificationClosed" signal was emitted (new notification index should be 2)
-    WAIT_FOR_SIGNALS(notificationClosedSpy, 1);
-    EXPECT_EQ(notificationClosedSpy.first(), QVariantList() << QVariant(2) << QVariant(1));
-    notificationClosedSpy.clear();
-
-    // check that the "CloseNotification" method was called
-    // check method arguments are correct (new notification index should be 2)
-    WAIT_FOR_SIGNALS(notificationsSpy, 1);
-    CHECK_METHOD_CALL(notificationsSpy, 0, "CloseNotification", {0, "2"});
+    // check that the "NotificationClosed" signal was emitted (new notification index should be 1)
+    WAIT_FOR_SIGNALS(notificationClosedSpy, 1);
+    EXPECT_EQ(notificationClosedSpy.first(), QVariantList() << QVariant(1) << QVariant(1));
+    notificationClosedSpy.clear();
+
+    // check that the "CloseNotification" method was called
+    // check method arguments are correct (still using the same notification: 1)
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
+    CHECK_METHOD_CALL(notificationsSpy, 0, "CloseNotification", {0, "1"});
+    notificationsSpy.clear();
+}
+
+TEST_F(TestIndicator, UnlockSIM_CancelFirstUnlockSecond)
+{
+    // set flight mode off, wifi off, and cell data off, and sim in
+    setGlobalConnectedState(NM_STATE_DISCONNECTED);
+
+    // set sim locked
+    setSimManagerProperty(firstModem(), "PinRequired", "pin");
+
+    // Create a second locked modem
+    auto secondModem = createModem("ril_1");
+    setSimManagerProperty(secondModem, "PinRequired", "pin");
+
+    QSignalSpy notificationsSpy(&notificationsMockInterface(),
+                               SIGNAL(MethodCalled(const QString &, const QVariantList &)));
+
+    QSignalSpy secondModemMockInterfaceSpy(&modemMockInterface(secondModem),
+                               SIGNAL(MethodCalled(const QString &, const QVariantList &)));
+
+    // start the indicator
+    ASSERT_NO_THROW(startIndicator());
+
+    // check indicator is a locked sim card and a 0-bar wifi icon.
+    // check sim status shows “SIM Locked”, with locked sim card icon and a “Unlock SIM” button beneath.
+    // check that the “Unlock SIM” button has the correct action name.
+    // unlock first SIM
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .mode(mh::MenuItemMatcher::Mode::starts_with)
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()
+                .item(modemInfo("SIM 1", "SIM Locked", "simcard-locked", true)
+                      .pass_through_activate("x-canonical-modem-locked-action")
+                )
+                .item(modemInfo("SIM 2", "SIM Locked", "simcard-locked", true))
+                .item(cellularSettings())
+            )
+        ).match());
+
+    // check that the "GetServerInformation" method was called
+    // check method arguments are correct
+    std::string busName;
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
+    CHECK_METHOD_CALL(notificationsSpy, 0, "GetServerInformation", /* no_args */);
+    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 0}, {3, "Enter SIM 1 PIN"}, {4, "3 attempts remaining"});
+    {
+        QVariantList const& call(notificationsSpy.at(1));
+        QVariantList const& args(call.at(1).toList());
+        QVariantMap hints;
+        QVariantMap menuInfo;
+        ASSERT_TRUE(qDBusArgumentToMap(args.at(6), hints));
+        ASSERT_TRUE(qDBusArgumentToMap(hints["x-canonical-private-menu-model"], menuInfo));
+        busName = menuInfo["busName"].toString().toStdString();
+    }
+    notificationsSpy.clear();
+
+    // cancel the notification
+    QSignalSpy notificationClosedSpy(&dbusMock.notificationDaemonInterface(),
+                                     SIGNAL(NotificationClosed(uint, uint)));
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(unlockSimParameters(busName, 0))
+        .item(mh::MenuItemMatcher()
+            .action("notifications.simunlock")
+            .string_attribute("x-canonical-type", "com.canonical.snapdecision.pinlock")
+            .string_attribute("x-canonical-pin-min-max", "notifications.pinMinMax")
+            .string_attribute("x-canonical-pin-popup", "notifications.popup")
+            .string_attribute("x-canonical-pin-error", "notifications.error")
+            .activate(shared_ptr<GVariant>(g_variant_new_boolean(false), &mh::gvariant_deleter))
+        ).match());
+
+    // check that the "NotificationClosed" signal was emitted
+    WAIT_FOR_SIGNALS(notificationClosedSpy, 1);
+    EXPECT_EQ(notificationClosedSpy.first(), QVariantList() << QVariant(1) << QVariant(1));
+    notificationClosedSpy.clear();
+
+    // check that the "CloseNotification" method was called
+    // check method arguments are correct
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
+    CHECK_METHOD_CALL(notificationsSpy, 0, "CloseNotification", {0, "1"});
+    notificationsSpy.clear();
+
+    // Activate  the second SIM unlock
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .mode(mh::MenuItemMatcher::Mode::starts_with)
+            .item(flightModeSwitch())
+            .item(mh::MenuItemMatcher()
+                .item(modemInfo("SIM 1", "SIM Locked", "simcard-locked", true))
+                .item(modemInfo("SIM 2", "SIM Locked", "simcard-locked", true)
+                      .pass_through_activate("x-canonical-modem-locked-action")
+                )
+                .item(cellularSettings())
+            )
+        ).match());
+
+    // check that the "Notify" method was called
+    // check method arguments are correct (we re-use the same notification and reopen it)
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
+    CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Enter SIM 2 PIN"});
+    notificationsSpy.clear();
+
+    secondModemMockInterfaceSpy.clear();
+
+    // enter the PIN
+    EXPECT_MATCHRESULT(mh::MenuMatcher(unlockSimParameters(busName, 0))
+        .item(mh::MenuItemMatcher()
+            .action("notifications.simunlock")
+            .string_attribute("x-canonical-type", "com.canonical.snapdecision.pinlock")
+            .string_attribute("x-canonical-pin-min-max", "notifications.pinMinMax")
+            .string_attribute("x-canonical-pin-popup", "notifications.popup")
+            .string_attribute("x-canonical-pin-error", "notifications.error")
+            .set_action_state(shared_ptr<GVariant>(g_variant_new_string("1234"), &mh::gvariant_deleter))
+        ).match());
+
+    // Check the PIN was sent to Ofono
+    WAIT_FOR_SIGNALS(secondModemMockInterfaceSpy, 1);
+    CHECK_METHOD_CALL(secondModemMockInterfaceSpy, 0, "EnterPin", {0, "pin"}, {1, "1234"});
+
+    // check that the "NotificationClosed" signal was emitted (new notification index should be 1)
+    WAIT_FOR_SIGNALS(notificationClosedSpy, 1);
+    EXPECT_EQ(notificationClosedSpy.first(), QVariantList() << QVariant(1) << QVariant(1));
+    notificationClosedSpy.clear();
+
+    // check that the "CloseNotification" method was called
+    // check method arguments are correct (still using the same notification: 1)
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
+    CHECK_METHOD_CALL(notificationsSpy, 0, "CloseNotification", {0, "1"});
     notificationsSpy.clear();
 }
 
@@ -2322,12 +2411,12 @@
     // set sim locked
     setSimManagerProperty(firstModem(), "PinRequired", "pin");
 
+    QSignalSpy notificationsSpy(&notificationsMockInterface(),
+                               SIGNAL(MethodCalled(const QString &, const QVariantList &)));
+
     // start the indicator
     ASSERT_NO_THROW(startIndicator());
 
-    QSignalSpy notificationsSpy(&notificationsMockInterface(),
-                               SIGNAL(MethodCalled(const QString &, const QVariantList &)));
-
     // check indicator is a locked sim card and a 0-bar wifi icon.
     // check sim status shows “SIM Locked”, with locked sim card icon and a “Unlock SIM” button beneath.
     // check that the “Unlock SIM” button has the correct action name.
@@ -2348,12 +2437,11 @@
     // check that the "Notify" method was called twice
     // check method arguments are correct
     std::string busName;
-    WAIT_FOR_SIGNALS(notificationsSpy, 3);
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     CHECK_METHOD_CALL(notificationsSpy, 0, "GetServerInformation", /* no_args */);
     CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 0}, {3, "Enter SIM PIN"}, {4, "3 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 2, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "3 attempts remaining"});
     {
-        QVariantList const& call(notificationsSpy.at(2));
+        QVariantList const& call(notificationsSpy.at(1));
         QVariantList const& args(call.at(1).toList());
         QVariantMap hints;
         QVariantMap menuInfo;
@@ -2406,12 +2494,12 @@
     // set sim locked
     setSimManagerProperty(firstModem(), "PinRequired", "pin");
 
+    QSignalSpy notificationsSpy(&notificationsMockInterface(),
+                                SIGNAL(MethodCalled(const QString &, const QVariantList &)));
+
     // start the indicator
     ASSERT_NO_THROW(startIndicator());
 
-    QSignalSpy notificationsSpy(&notificationsMockInterface(),
-                                SIGNAL(MethodCalled(const QString &, const QVariantList &)));
-
     // check indicator is a locked sim card and a 0-bar wifi icon.
     // check sim status shows “SIM Locked”, with locked sim card icon and a “Unlock SIM” button beneath.
     // check that the “Unlock SIM” button has the correct action name.
@@ -2432,12 +2520,11 @@
     // check that the "Notify" method was called twice
     // check method arguments are correct
     std::string busName;
-    WAIT_FOR_SIGNALS(notificationsSpy, 3);
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     CHECK_METHOD_CALL(notificationsSpy, 0, "GetServerInformation", /* no_args */);
     CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 0}, {3, "Enter SIM PIN"}, {4, "3 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 2, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "3 attempts remaining"});
     {
-        QVariantList const& call(notificationsSpy.at(2));
+        QVariantList const& call(notificationsSpy.at(1));
         QVariantList const& args(call.at(1).toList());
         QVariantMap hints;
         QVariantMap menuInfo;
@@ -2464,13 +2551,11 @@
     CHECK_METHOD_CALL(modemSpy, 0, "EnterPin", {0, "pin"}, {1, "4321"});
     modemSpy.clear();
 
-    // check that the "Notify" method was called twice when retries changes, then twice again for incorrect pin
+    // check that the "Notify" method was called when retries changes, then again for incorrect pin
     // check method arguments are correct (notification index should still be 1)
-    WAIT_FOR_SIGNALS(notificationsSpy, 4);
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "2 attempts remaining"});
     CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "2 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 2, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "2 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 3, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "2 attempts remaining"});
     notificationsSpy.clear();
 
     // check that the notification is displaying the appropriate error message
@@ -2498,13 +2583,11 @@
     CHECK_METHOD_CALL(modemSpy, 0, "EnterPin", {0, "pin"}, {1, "4321"});
     modemSpy.clear();
 
-    // check that the "Notify" method was called twice when retries changes, then twice again for incorrect pin
+    // check that the "Notify" method was called when retries changes, then again for incorrect pin
     // check method arguments are correct (notification index should still be 1)
-    WAIT_FOR_SIGNALS(notificationsSpy, 4);
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "1 attempt remaining"});
     CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "1 attempt remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 2, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "1 attempt remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 3, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "1 attempt remaining"});
     notificationsSpy.clear();
 
     // check that the error message and last attempt popup are displayed
@@ -2537,13 +2620,11 @@
     CHECK_METHOD_CALL(modemSpy, 0, "EnterPin", {0, "pin"}, {1, "4321"});
     modemSpy.clear();
 
-    // check that the "Notify" method was called twice when retries changes, then twice again for incorrect pin
+    // check that the "Notify" method was called when retries changes, then again for incorrect pin
     // check method arguments are correct (notification index should still be 1)
-    WAIT_FOR_SIGNALS(notificationsSpy, 4);
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "0 attempts remaining"});
     CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "0 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 2, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "0 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 3, "Notify", {1, 1}, {3, "Enter SIM PIN"}, {4, "0 attempts remaining"});
     notificationsSpy.clear();
 
     // set sim blocked
@@ -2553,11 +2634,10 @@
     WAIT_FOR_SIGNALS(modemSpy, 1);
     modemSpy.clear();
 
-    // check that the "Notify" method was called twice
+    // check that the "Notify" method was called
     // check method arguments are correct (notification index should still be 1)
-    WAIT_FOR_SIGNALS(notificationsSpy, 2);
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Enter PUK code"}, {4, "10 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Enter PUK code"}, {4, "10 attempts remaining"});
     notificationsSpy.clear();
 
     // check that the error message and last attempt popup are displayed
@@ -2585,11 +2665,10 @@
             .set_action_state(shared_ptr<GVariant>(g_variant_new_string("87654321"), &mh::gvariant_deleter))
         ).match());
 
-    // check that the "Notify" method was called twice
+    // check that the "Notify" method was called
     // check method arguments are correct (notification index should still be 1)
-    WAIT_FOR_SIGNALS(notificationsSpy, 2);
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Enter new SIM PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Enter new SIM PIN"}, {4, "Create new PIN"});
     notificationsSpy.clear();
 
     // enter new pin
@@ -2598,11 +2677,10 @@
             .set_action_state(shared_ptr<GVariant>(g_variant_new_string("4321"), &mh::gvariant_deleter))
         ).match());
 
-    // check that the "Notify" method was called twice
+    // check that the "Notify" method was called
     // check method arguments are correct (notification index should still be 1)
-    WAIT_FOR_SIGNALS(notificationsSpy, 2);
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Confirm new SIM PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Confirm new SIM PIN"}, {4, "Create new PIN"});
     notificationsSpy.clear();
 
     // enter new pin again
@@ -2617,13 +2695,11 @@
     CHECK_METHOD_CALL(modemSpy, 0, "ResetPin", {0, "puk"}, {1, "87654321"}, {2, "4321"});
     modemSpy.clear();
 
-    // check that the "Notify" method was called twice when retries changes, then twice again for incorrect pin
+    // check that the "Notify" method was called when retries changes, then again for incorrect pin
     // check method arguments are correct (notification index should still be 1)
-    WAIT_FOR_SIGNALS(notificationsSpy, 4);
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Confirm new SIM PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Confirm new SIM PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 2, "Notify", {1, 1}, {3, "Enter PUK code"}, {4, "9 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 3, "Notify", {1, 1}, {3, "Enter PUK code"}, {4, "9 attempts remaining"});
+    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Enter PUK code"}, {4, "9 attempts remaining"});
     notificationsSpy.clear();
 
     // check that the notification is displaying the appropriate error message
@@ -2649,10 +2725,9 @@
             .set_action_state(shared_ptr<GVariant>(g_variant_new_string("12345678"), &mh::gvariant_deleter))
         ).match());
 
-    // check that the "Notify" method was called twice
-    WAIT_FOR_SIGNALS(notificationsSpy, 2);
+    // check that the "Notify" method was called
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Enter new SIM PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Enter new SIM PIN"}, {4, "Create new PIN"});
     notificationsSpy.clear();
 
     // enter new pin
@@ -2661,10 +2736,9 @@
             .set_action_state(shared_ptr<GVariant>(g_variant_new_string("4321"), &mh::gvariant_deleter))
         ).match());
 
-    // check that the "Notify" method was called twice
-    WAIT_FOR_SIGNALS(notificationsSpy, 2);
+    // check that the "Notify" method was called
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Confirm new SIM PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Confirm new SIM PIN"}, {4, "Create new PIN"});
     notificationsSpy.clear();
 
     // enter new pin again
@@ -2687,10 +2761,9 @@
     // check that the "Notify" method was called twice when retries changes
     // check that the "CloseNotification" method was called
     // check method arguments are correct
-    WAIT_FOR_SIGNALS(notificationsSpy, 3);
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Confirm new SIM PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Confirm new SIM PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 2, "CloseNotification", {0, "1"});
+    CHECK_METHOD_CALL(notificationsSpy, 1, "CloseNotification", {0, "1"});
     notificationsSpy.clear();
 }
 
@@ -2703,12 +2776,12 @@
     auto secondModem = createModem("ril_1");
     setSimManagerProperty(secondModem, "PinRequired", "pin");
 
+    QSignalSpy notificationsSpy(&notificationsMockInterface(),
+                                SIGNAL(MethodCalled(const QString &, const QVariantList &)));
+
     // start the indicator
     ASSERT_NO_THROW(startIndicator());
 
-    QSignalSpy notificationsSpy(&notificationsMockInterface(),
-                                SIGNAL(MethodCalled(const QString &, const QVariantList &)));
-
     // check indicator is a locked sim card and a 0-bar wifi icon.
     // check sim status shows “SIM Locked”, with locked sim card icon and a “Unlock SIM” button beneath.
     // check that the “Unlock SIM” button has the correct action name.
@@ -2730,12 +2803,11 @@
     // check that the "Notify" method was called twice
     // check method arguments are correct
     std::string busName;
-    WAIT_FOR_SIGNALS(notificationsSpy, 3);
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     CHECK_METHOD_CALL(notificationsSpy, 0, "GetServerInformation", /* no_args */);
     CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 0}, {3, "Enter SIM 2 PIN"}, {4, "3 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 2, "Notify", {1, 1}, {3, "Enter SIM 2 PIN"}, {4, "3 attempts remaining"});
     {
-        QVariantList const& call(notificationsSpy.at(2));
+        QVariantList const& call(notificationsSpy.at(1));
         QVariantList const& args(call.at(1).toList());
         QVariantMap hints;
         QVariantMap menuInfo;
@@ -2762,13 +2834,11 @@
     CHECK_METHOD_CALL(modemSpy, 0, "EnterPin", {0, "pin"}, {1, "4321"});
     modemSpy.clear();
 
-    // check that the "Notify" method was called twice when retries changes, then twice again for incorrect pin
+    // check that the "Notify" method was called when retries changes, then again for incorrect pin
     // check method arguments are correct (notification index should still be 1)
-    WAIT_FOR_SIGNALS(notificationsSpy, 4);
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Enter SIM 2 PIN"}, {4, "2 attempts remaining"});
     CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Enter SIM 2 PIN"}, {4, "2 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 2, "Notify", {1, 1}, {3, "Enter SIM 2 PIN"}, {4, "2 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 3, "Notify", {1, 1}, {3, "Enter SIM 2 PIN"}, {4, "2 attempts remaining"});
     notificationsSpy.clear();
 
     // check that the notification is displaying the appropriate error message
@@ -2796,13 +2866,11 @@
     CHECK_METHOD_CALL(modemSpy, 0, "EnterPin", {0, "pin"}, {1, "4321"});
     modemSpy.clear();
 
-    // check that the "Notify" method was called twice when retries changes, then twice again for incorrect pin
+    // check that the "Notify" method was called when retries changes, then again for incorrect pin
     // check method arguments are correct (notification index should still be 1)
-    WAIT_FOR_SIGNALS(notificationsSpy, 4);
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Enter SIM 2 PIN"}, {4, "1 attempt remaining"});
     CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Enter SIM 2 PIN"}, {4, "1 attempt remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 2, "Notify", {1, 1}, {3, "Enter SIM 2 PIN"}, {4, "1 attempt remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 3, "Notify", {1, 1}, {3, "Enter SIM 2 PIN"}, {4, "1 attempt remaining"});
     notificationsSpy.clear();
 
     // check that the error message and last attempt popup are displayed
@@ -2835,13 +2903,11 @@
     CHECK_METHOD_CALL(modemSpy, 0, "EnterPin", {0, "pin"}, {1, "4321"});
     modemSpy.clear();
 
-    // check that the "Notify" method was called twice when retries changes, then twice again for incorrect pin
+    // check that the "Notify" method was called when retries changes, then again for incorrect pin
     // check method arguments are correct (notification index should still be 1)
-    WAIT_FOR_SIGNALS(notificationsSpy, 4);
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Enter SIM 2 PIN"}, {4, "0 attempts remaining"});
     CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Enter SIM 2 PIN"}, {4, "0 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 2, "Notify", {1, 1}, {3, "Enter SIM 2 PIN"}, {4, "0 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 3, "Notify", {1, 1}, {3, "Enter SIM 2 PIN"}, {4, "0 attempts remaining"});
     notificationsSpy.clear();
 
     // set sim blocked
@@ -2851,11 +2917,10 @@
     WAIT_FOR_SIGNALS(modemSpy, 1);
     modemSpy.clear();
 
-    // check that the "Notify" method was called twice
+    // check that the "Notify" method was called
     // check method arguments are correct (notification index should still be 1)
-    WAIT_FOR_SIGNALS(notificationsSpy, 2);
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Enter PUK code for SIM 2"}, {4, "10 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Enter PUK code for SIM 2"}, {4, "10 attempts remaining"});
     notificationsSpy.clear();
 
     // check that the error message and last attempt popup are displayed
@@ -2883,11 +2948,10 @@
             .set_action_state(shared_ptr<GVariant>(g_variant_new_string("87654321"), &mh::gvariant_deleter))
         ).match());
 
-    // check that the "Notify" method was called twice
+    // check that the "Notify" method was called
     // check method arguments are correct (notification index should still be 1)
-    WAIT_FOR_SIGNALS(notificationsSpy, 2);
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Enter new SIM 2 PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Enter new SIM 2 PIN"}, {4, "Create new PIN"});
     notificationsSpy.clear();
 
     // enter new pin
@@ -2896,11 +2960,10 @@
             .set_action_state(shared_ptr<GVariant>(g_variant_new_string("4321"), &mh::gvariant_deleter))
         ).match());
 
-    // check that the "Notify" method was called twice
+    // check that the "Notify" method was called
     // check method arguments are correct (notification index should still be 1)
-    WAIT_FOR_SIGNALS(notificationsSpy, 2);
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Confirm new SIM 2 PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Confirm new SIM 2 PIN"}, {4, "Create new PIN"});
     notificationsSpy.clear();
 
     // enter new pin again
@@ -2915,13 +2978,11 @@
     CHECK_METHOD_CALL(modemSpy, 0, "ResetPin", {0, "puk"}, {1, "87654321"}, {2, "4321"});
     modemSpy.clear();
 
-    // check that the "Notify" method was called twice when retries changes, then twice again for incorrect pin
+    // check that the "Notify" method was called when retries changes, then again for incorrect pin
     // check method arguments are correct (notification index should still be 1)
-    WAIT_FOR_SIGNALS(notificationsSpy, 4);
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Confirm new SIM 2 PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Confirm new SIM 2 PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 2, "Notify", {1, 1}, {3, "Enter PUK code for SIM 2"}, {4, "9 attempts remaining"});
-    CHECK_METHOD_CALL(notificationsSpy, 3, "Notify", {1, 1}, {3, "Enter PUK code for SIM 2"}, {4, "9 attempts remaining"});
+    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Enter PUK code for SIM 2"}, {4, "9 attempts remaining"});
     notificationsSpy.clear();
 
     // check that the notification is displaying the appropriate error message
@@ -2947,10 +3008,9 @@
             .set_action_state(shared_ptr<GVariant>(g_variant_new_string("12345678"), &mh::gvariant_deleter))
         ).match());
 
-    // check that the "Notify" method was called twice
-    WAIT_FOR_SIGNALS(notificationsSpy, 2);
+    // check that the "Notify" method was called
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Enter new SIM 2 PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Enter new SIM 2 PIN"}, {4, "Create new PIN"});
     notificationsSpy.clear();
 
     // enter new pin
@@ -2959,10 +3019,9 @@
             .set_action_state(shared_ptr<GVariant>(g_variant_new_string("4321"), &mh::gvariant_deleter))
         ).match());
 
-    // check that the "Notify" method was called twice
-    WAIT_FOR_SIGNALS(notificationsSpy, 2);
+    // check that the "Notify" method was called
+    WAIT_FOR_SIGNALS(notificationsSpy, 1);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Confirm new SIM 2 PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Confirm new SIM 2 PIN"}, {4, "Create new PIN"});
     notificationsSpy.clear();
 
     // enter new pin again
@@ -2985,10 +3044,9 @@
     // check that the "Notify" method was called twice when retries changes
     // check that the "CloseNotification" method was called
     // check method arguments are correct
-    WAIT_FOR_SIGNALS(notificationsSpy, 3);
+    WAIT_FOR_SIGNALS(notificationsSpy, 2);
     CHECK_METHOD_CALL(notificationsSpy, 0, "Notify", {1, 1}, {3, "Confirm new SIM 2 PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 1, "Notify", {1, 1}, {3, "Confirm new SIM 2 PIN"}, {4, "Create new PIN"});
-    CHECK_METHOD_CALL(notificationsSpy, 2, "CloseNotification", {0, "1"});
+    CHECK_METHOD_CALL(notificationsSpy, 1, "CloseNotification", {0, "1"});
     notificationsSpy.clear();
 }
 

=== modified file 'tests/unit/secret-agent/test-secret-agent.cpp'
--- tests/unit/secret-agent/test-secret-agent.cpp	2015-04-23 12:04:27 +0000
+++ tests/unit/secret-agent/test-secret-agent.cpp	2015-08-12 13:44:19 +0000
@@ -50,7 +50,8 @@
 		QProcessEnvironment env(QProcessEnvironment::systemEnvironment());
 		env.insert("SECRET_AGENT_DEBUG_PASSWORD", "1");
 		secretAgent.setProcessEnvironment(env);
-		secretAgent.setProcessChannelMode(QProcess::MergedChannels);
+		secretAgent.setReadChannel(QProcess::StandardOutput);
+		secretAgent.setProcessChannelMode(QProcess::ForwardedErrorChannel);
 		secretAgent.start(SECRET_AGENT_BIN, QStringList() << "--print-address");
 		secretAgent.waitForStarted();
 		secretAgent.waitForReadyRead();
@@ -260,13 +261,14 @@
 /* Tests that if we request secrets and then cancel the request
    that we close the notification */
 TEST_F(TestSecretAgent, CancelGetSecrets) {
+	QSignalSpy notificationSpy(notificationsInterface.data(), SIGNAL(MethodCalled(const QString &, const QVariantList &)));
+
 	agentInterface->GetSecrets(
 			connection(SecretAgent::KEY_MGMT_WPA_PSK),
 			QDBusObjectPath("/connection/foo"),
 			SecretAgent::WIRELESS_SECURITY_SETTING_NAME, QStringList(),
 			5);
 
-	QSignalSpy notificationSpy(notificationsInterface.data(), SIGNAL(MethodCalled(const QString &, const QVariantList &)));
 	notificationSpy.wait();
 
 	ASSERT_EQ(1, notificationSpy.size());