Merge lp:~pete-woods/indicator-network/enterprise-wifi-invokes-system-settings into lp:indicator-network/15.10

[Pete Woods]

Enteprise access points invoke the system settings app with details encoded in a URI

Enteprise access points invoke the system settings app with details encoded in a URI

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Jonas G. Drange (jonas-drange)]

Pete, I went past the University today and tried silo 53. I tapped 'eduroam' in the indicator and it invoked System Settings as advertised. However, System Settings failed to create a connection due to the network being out of range.

Re-tapping 'eduroam', which was now green indicating it was connected, failed to invoke System Settings.

I suspected at the time that this was the fault of System Settings; it probably creates a NM connection object but never deletes it if it fails in this manner.

But then I removed the connection and did the following:
1. Tapped 'eduroam' in the indicator.
2. Pressed Cancel in the System Settings dialog.

This also made 'eduroam' appear green in the indicator, but I know for a fact that System Settings has not created a connection in this case.

Do you make sense of this?

Thanks.

Jonas

[lp:~pete-woods/indicator-network/enterprise-wifi-invokes-system-settings]

501. By Pete Woods on 2015-07-07

Add tests for enterprise WiFi trigger

502. By Pete Woods on 2015-07-07

Pass raw SSID through to URL dispatcher

[Pete Woods (pete-woods)]

Thanks for reporting that. Will have to have a look at the connection code-path. It must assume the connection has succeeded, or something like that...

[lp:~pete-woods/indicator-network/enterprise-wifi-invokes-system-settings]

503. By Pete Woods on 2015-07-07

Stop faking the wifi connection state update

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:503
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/356/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/8/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/8/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~pete-woods/indicator-network/enterprise-wifi-invokes-system-settings]

504. By Pete Woods on 2015-07-08

Fix URI spec to match what jgdx wanted, not what he said :)

=== modified file 'src/indicator/menuitems/access-point-item.cpp'
--- src/indicator/menuitems/access-point-item.cpp	2015-04-14 11:20:17 +0000
+++ src/indicator/menuitems/access-point-item.cpp	2015-07-08 08:49:46 +0000
@@ -60,6 +60,7 @@
         m_item->setAttribute("x-canonical-type", TypedVariant<std::string>("unity.widgets.systemsettings.tablet.accesspoint"));
         m_item->setAttribute("x-canonical-wifi-ap-is-adhoc", TypedVariant<bool>(m_accessPoint->adhoc()));
         m_item->setAttribute("x-canonical-wifi-ap-is-secure", TypedVariant<bool>(m_accessPoint->secured()));
+        m_item->setAttribute("x-canonical-wifi-ap-is-enterprise", TypedVariant<bool>(m_accessPoint->enterprise()));
         m_item->setAttribute("x-canonical-wifi-ap-strength-action", TypedVariant<std::string>("indicator." + strengthActionId));
 
         m_actionStrength = std::make_shared<Action>(strengthActionId,

=== modified file 'src/indicator/menuitems/wifi-link-item.cpp'
--- src/indicator/menuitems/wifi-link-item.cpp	2015-04-16 13:18:24 +0000
+++ src/indicator/menuitems/wifi-link-item.cpp	2015-07-08 08:49:46 +0000
@@ -164,7 +164,6 @@
             bool isActive = (ap == m_activeAccessPoint);
             auto item = std::make_shared<AccessPointItem>(ap, isActive);
             connect(item.get(), &AccessPointItem::activated, [this, ap](){
-                updateActiveAccessPoint(ap);
                 m_link->connect_to(ap);
             });
             m_accessPoints[ap] = item;

=== modified file 'src/indicator/nmofono/wifi/access-point-impl.cpp'
--- src/indicator/nmofono/wifi/access-point-impl.cpp	2015-05-05 16:15:26 +0000
+++ src/indicator/nmofono/wifi/access-point-impl.cpp	2015-07-08 08:49:46 +0000
@@ -60,6 +60,8 @@
 
     m_ssid = ssid;
 
+    m_bssid = m_ap->hwAddress();
+
     m_strength = m_ap->strength();
 
     connect(m_ap.get(), &OrgFreedesktopNetworkManagerAccessPointInterface::PropertiesChanged, this, &AccessPointImpl::ap_properties_changed);
@@ -104,11 +106,21 @@
     return m_ssid;
 }
 
+QString AccessPointImpl::bssid() const
+{
+    return m_bssid;
+}
+
 QByteArray AccessPointImpl::raw_ssid() const
 {
     return m_raw_ssid;
 }
 
+bool AccessPointImpl::enterprise() const
+{
+    return (m_secflags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) > 0;
+}
+
 bool AccessPointImpl::secured() const
 {
     return m_secured;
@@ -132,7 +144,8 @@
 bool AccessPointImpl::operator==(const AccessPointImpl &other) const {
     if(this == &other)
         return true;
-    return m_ssid == other.m_ssid &&
+    return m_raw_ssid == other.m_raw_ssid &&
+            m_bssid == other.m_bssid &&
             m_secflags == other.m_secflags &&
             m_mode == other.m_mode;
 }

=== modified file 'src/indicator/nmofono/wifi/access-point-impl.h'
--- src/indicator/nmofono/wifi/access-point-impl.h	2015-05-05 16:15:26 +0000
+++ src/indicator/nmofono/wifi/access-point-impl.h	2015-07-08 08:49:46 +0000
@@ -83,13 +83,14 @@
     std::chrono::system_clock::time_point lastConnected() const;
 
     QString ssid() const override;
+    QString bssid() const override;
     QByteArray raw_ssid() const override;
 
     std::uint32_t secflags() const;
     std::uint32_t mode() const;
 
     bool secured() const override;
-
+    bool enterprise() const override;
     bool adhoc() const override;
 
     QDBusObjectPath object_path() const override;
@@ -108,6 +109,7 @@
     std::chrono::system_clock::time_point m_lastConnected;
     std::shared_ptr<OrgFreedesktopNetworkManagerAccessPointInterface> m_ap;
     QString m_ssid;
+    QString m_bssid;
     QByteArray m_raw_ssid;
     bool m_secured;
     bool m_adhoc;

=== modified file 'src/indicator/nmofono/wifi/access-point.h'
--- src/indicator/nmofono/wifi/access-point.h	2015-04-14 11:20:17 +0000
+++ src/indicator/nmofono/wifi/access-point.h	2015-07-08 08:49:46 +0000
@@ -50,9 +50,11 @@
     virtual double strength() const = 0;
 
     virtual QString ssid()            const = 0;
+    virtual QString bssid()           const = 0;
     virtual QByteArray raw_ssid()     const = 0;
     virtual QDBusObjectPath object_path()     const = 0;
     virtual bool secured()            const = 0;
+    virtual bool enterprise()         const = 0;
     virtual bool adhoc()              const = 0;
 
 Q_SIGNALS:

=== modified file 'src/indicator/nmofono/wifi/grouped-access-point.cpp'
--- src/indicator/nmofono/wifi/grouped-access-point.cpp	2015-05-05 16:15:26 +0000
+++ src/indicator/nmofono/wifi/grouped-access-point.cpp	2015-07-08 08:49:46 +0000
@@ -168,6 +168,17 @@
     return p->aplist.at(0)->ssid();
 }
 
+QString GroupedAccessPoint::bssid() const
+{
+    if (p->aplist.empty())
+    {
+        return QString();
+    }
+
+    return p->aplist.at(0)->bssid();
+}
+
+
 QByteArray GroupedAccessPoint::raw_ssid() const
 {
     if (p->aplist.empty())
@@ -188,6 +199,16 @@
     return p->aplist.at(0)->secured();
 }
 
+bool GroupedAccessPoint::enterprise() const
+{
+    if (p->aplist.empty())
+    {
+        return false;
+    }
+
+    return p->aplist.at(0)->enterprise();
+}
+
 bool GroupedAccessPoint::adhoc() const
 {
     if (p->aplist.empty())

=== modified file 'src/indicator/nmofono/wifi/grouped-access-point.h'
--- src/indicator/nmofono/wifi/grouped-access-point.h	2015-04-24 08:47:08 +0000
+++ src/indicator/nmofono/wifi/grouped-access-point.h	2015-07-08 08:49:46 +0000
@@ -50,10 +50,11 @@
     std::chrono::system_clock::time_point lastConnected() const;
 
     QString ssid() const override;
+    QString bssid() const override;
     QByteArray raw_ssid() const override;
 
     bool secured() const override;
-
+    bool enterprise() const override;
     bool adhoc() const override;
 
     QDBusObjectPath object_path() const override;

=== modified file 'src/indicator/nmofono/wifi/wifi-link-impl.cpp'
--- src/indicator/nmofono/wifi/wifi-link-impl.cpp	2015-05-05 16:15:26 +0000
+++ src/indicator/nmofono/wifi/wifi-link-impl.cpp	2015-07-08 08:49:46 +0000
@@ -20,6 +20,7 @@
 #include <nmofono/wifi/wifi-link-impl.h>
 #include <nmofono/wifi/access-point-impl.h>
 #include <nmofono/wifi/grouped-access-point.h>
+#include <url-dispatcher-cpp/url-dispatcher.h>
 #include <cassert>
 
 #include <NetworkManagerActiveConnectionInterface.h>
@@ -28,6 +29,7 @@
 
 #include <NetworkManager.h>
 #include <iostream>
+#include <QUrlQuery>
 
 using namespace std;
 
@@ -453,20 +455,37 @@
                                            QDBusObjectPath(d->m_dev->path()),
                                            accessPoint->object_path());
         } else {
-            QVariantDictMap conf;
-
-            /// @todo getting the ssid multiple times over dbus is stupid.
-
-            QVariantMap wireless_conf;
-            wireless_conf["ssid"] = ssid;
-
-            conf["802-11-wireless"] = wireless_conf;
-            auto ret = d->m_nm->AddAndActivateConnection(
-                    conf, QDBusObjectPath(d->m_dev->path()), accessPoint->object_path());
-            ret.waitForFinished();
-            ac = ret.argumentAt<1>();
-        }
-        d->updateActiveConnection(ac);
+            if (accessPoint->enterprise()) {
+                // activate system settings URI
+                QUrlQuery q;
+                q.addQueryItem("ssid", accessPoint->raw_ssid());
+                q.addQueryItem("bssid", accessPoint->bssid());
+                QString url = "settings:///system/wifi?" + q.query(QUrl::FullyEncoded);
+
+                UrlDispatcher::send(url.toStdString(), [](string url, bool success) {
+                    if (!success) {
+                        cerr << "URL Dispatcher failed on " << url << endl;
+                    }
+                });
+            } else {
+                QVariantDictMap conf;
+
+                /// @todo getting the ssid multiple times over dbus is stupid.
+
+                QVariantMap wireless_conf;
+                wireless_conf["ssid"] = ssid;
+
+                conf["802-11-wireless"] = wireless_conf;
+                auto ret = d->m_nm->AddAndActivateConnection(
+                        conf, QDBusObjectPath(d->m_dev->path()), accessPoint->object_path());
+                ret.waitForFinished();
+                ac = ret.argumentAt<1>();
+            }
+        }
+        // For enterprise access points, the system settings app will perform the connection
+        if (!accessPoint->enterprise()) {
+            d->updateActiveConnection(ac);
+        }
         d->m_connecting = false;
     } catch(const exception &e) {
         // @bug default timeout expired: LP(#1361642)

=== modified file 'tests/integration/indicator-network-test-base.cpp'
--- tests/integration/indicator-network-test-base.cpp	2015-07-08 08:49:46 +0000
+++ tests/integration/indicator-network-test-base.cpp	2015-07-08 08:49:46 +0000
@@ -64,8 +64,31 @@
     dbusMock.registerOfono();
     dbusMock.registerURfkill();
 
+    dbusMock.registerCustomMock(
+                        "com.canonical.URLDispatcher",
+                        "/com/canonical/URLDispatcher",
+                        "com.canonical.URLDispatcher",
+                        QDBusConnection::SessionBus);
+
     dbusTestRunner.startServices();
 
+    // Set up a basic URL dispatcher mock
+    auto& urlDispatcher = dbusMock.mockInterface(
+                        "com.canonical.URLDispatcher",
+                        "/com/canonical/URLDispatcher",
+                        "com.canonical.URLDispatcher",
+                        QDBusConnection::SessionBus);
+    urlDispatcher.AddMethod(
+                        "com.canonical.URLDispatcher",
+                        "DispatchURL", "ss", "",
+                        ""
+                     ).waitForFinished();
+    urlDispatcher.AddMethod(
+                        "com.canonical.URLDispatcher",
+                        "TestURL", "as", "as",
+                        "ret = args[0]"
+                     ).waitForFinished();
+
     // mock service creates ril_0 automatically
     // Initial ConnectionManager properties are insane, fix them here
     setConnectionManagerProperty(firstModem(), "Bearer", "none");
@@ -155,16 +178,29 @@
 }
 
 QString IndicatorNetworkTestBase::createAccessPoint(const QString& id, const QString& ssid, const QString& device, uchar strength,
-                          Secure secure, ApMode apMode)
+                          Secure secure, ApMode apMode, const QString& mac)
 {
+    int secflags;
+    if (secure == Secure::insecure)
+    {
+        secflags = NM_802_11_AP_SEC_NONE;
+    }
+    else if (secure == Secure::wpa)
+    {
+        secflags = NM_802_11_AP_SEC_KEY_MGMT_PSK;
+    }
+    else if (secure == Secure::wpa_enterprise)
+    {
+        secflags = NM_802_11_AP_SEC_KEY_MGMT_802_1X;
+    }
 
     auto& networkManager(dbusMock.networkManagerInterface());
     auto reply = networkManager.AddAccessPoint(
                         device, id, ssid,
-                        randomMac(),
+                        mac,
                         apMode == ApMode::adhoc ? NM_802_11_MODE_ADHOC : NM_802_11_MODE_INFRA,
                         0, 0, strength,
-                        secure == Secure::secure ? NM_802_11_AP_SEC_KEY_MGMT_PSK : NM_802_11_AP_SEC_NONE);
+                        secflags);
     reply.waitForFinished();
     return reply;
 }
@@ -333,7 +369,8 @@
         .pass_through_attribute(
             "x-canonical-wifi-ap-strength-action",
             shared_ptr<GVariant>(g_variant_new_byte(strength), &mh::gvariant_deleter))
-        .boolean_attribute("x-canonical-wifi-ap-is-secure", secure == Secure::secure)
+        .boolean_attribute("x-canonical-wifi-ap-is-secure", secure != Secure::insecure)
+        .boolean_attribute("x-canonical-wifi-ap-is-enterprise", secure == Secure::wpa_enterprise)
         .boolean_attribute("x-canonical-wifi-ap-is-adhoc", apMode == ApMode::adhoc);
 }
 

=== modified file 'tests/integration/indicator-network-test-base.h'
--- tests/integration/indicator-network-test-base.h	2015-07-08 08:49:46 +0000
+++ tests/integration/indicator-network-test-base.h	2015-07-08 08:49:46 +0000
@@ -63,8 +63,9 @@
 public:
     enum class Secure
     {
-        secure,
-        insecure
+        insecure,
+        wpa,
+        wpa_enterprise
     };
 
     enum class ApMode
@@ -101,7 +102,7 @@
     void disableWiFi();
 
     QString createAccessPoint(const QString& id, const QString& ssid, const QString& device, uchar strength = 100,
-                              Secure secure = Secure::secure, ApMode apMode = ApMode::infra);
+                              Secure secure = Secure::wpa, ApMode apMode = ApMode::infra, const QString& mac = randomMac());
 
     void removeAccessPoint(const QString& device, const QString& ap);
 

=== modified file 'tests/integration/test-indicator.cpp'
--- tests/integration/test-indicator.cpp	2015-07-08 08:49:46 +0000
+++ tests/integration/test-indicator.cpp	2015-07-08 08:49:46 +0000
@@ -74,7 +74,7 @@
             .item(mh::MenuItemMatcher()
                 .section()
                 .item(accessPoint("the ssid",
-                      Secure::secure,
+                      Secure::wpa,
                       ApMode::infra,
                       ConnectionStatus::disconnected)
                 )
@@ -103,7 +103,7 @@
             .item(mh::MenuItemMatcher()
                 .section()
                 .item(accessPoint("the ssid",
-                      Secure::secure,
+                      Secure::wpa,
                       ApMode::infra,
                       ConnectionStatus::connected)
                 )
@@ -130,7 +130,7 @@
             .item(mh::MenuItemMatcher()
                 .section()
                 .item(accessPoint("the ssid",
-                      Secure::secure,
+                      Secure::wpa,
                       ApMode::infra,
                       ConnectionStatus::disconnected)
                 )
@@ -160,7 +160,7 @@
             .item(mh::MenuItemMatcher()
                 .section()
                 .item(accessPoint("the ssid",
-                      Secure::secure,
+                      Secure::wpa,
                       ApMode::infra,
                       ConnectionStatus::connected)
                 )
@@ -757,7 +757,7 @@
 
     // add and connect to 1-bar secure AP
     auto device = createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
-    auto ap = createAccessPoint("0", "the ssid", device, 20, Secure::secure);
+    auto ap = createAccessPoint("0", "the ssid", device, 20, Secure::wpa);
     auto connection = createAccessPointConnection("0", "the ssid", device);
     auto activeConnection = createActiveConnection("0", device, connection, ap);
 
@@ -782,7 +782,7 @@
             .item(mh::MenuItemMatcher()
                 .section()
                 .item(accessPoint("the ssid",
-                      Secure::secure,
+                      Secure::wpa,
                       ApMode::infra,
                       ConnectionStatus::connected,
                       20)
@@ -833,7 +833,7 @@
         ).match());
 
     // And we're back
-    ap = createAccessPoint("1", "the ssid", device, 20, Secure::secure);
+    ap = createAccessPoint("1", "the ssid", device, 20, Secure::wpa);
     connection = createAccessPointConnection("1", "the ssid", device);
     activeConnection = createActiveConnection("1", device, connection, ap);
     setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
@@ -861,10 +861,10 @@
 
     // add some APs (secure / unsecure / adhoc / varied strength)
     auto device = createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
-    auto ap1 = createAccessPoint("1", "NSD", device, 0, Secure::secure, ApMode::infra);
-    auto ap2 = createAccessPoint("2", "JDR", device, 20, Secure::secure, ApMode::adhoc);
-    auto ap3 = createAccessPoint("3", "DGN", device, 40, Secure::secure, ApMode::infra);
-    auto ap4 = createAccessPoint("4", "JDY", device, 60, Secure::secure, ApMode::adhoc);
+    auto ap1 = createAccessPoint("1", "NSD", device, 0, Secure::wpa, ApMode::infra);
+    auto ap2 = createAccessPoint("2", "JDR", device, 20, Secure::wpa, ApMode::adhoc);
+    auto ap3 = createAccessPoint("3", "DGN", device, 40, Secure::wpa, ApMode::infra);
+    auto ap4 = createAccessPoint("4", "JDY", device, 60, Secure::wpa, ApMode::adhoc);
     auto ap5 = createAccessPoint("5", "SCE", device, 20, Secure::insecure, ApMode::infra);
     auto ap6 = createAccessPoint("6", "ADS", device, 40, Secure::insecure, ApMode::adhoc);
     auto ap7 = createAccessPoint("7", "CFT", device, 60, Secure::insecure, ApMode::infra);
@@ -896,13 +896,13 @@
             .item(wifiEnableSwitch(true))
             .item(mh::MenuItemMatcher()
                 .section()
-                .item(accessPoint("DGN", Secure::secure, ApMode::infra, ConnectionStatus::connected, 40))
+                .item(accessPoint("DGN", Secure::wpa, ApMode::infra, ConnectionStatus::connected, 40))
                 .item(accessPoint("ADS", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 40))
                 .item(accessPoint("CFT", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 60))
                 .item(accessPoint("GDF", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 80))
-                .item(accessPoint("JDR", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 20))
-                .item(accessPoint("JDY", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("NSD", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 0))
+                .item(accessPoint("JDR", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 20))
+                .item(accessPoint("JDY", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("NSD", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 0))
                 .item(accessPoint("SCE", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 20))
             )
         ).match());
@@ -1021,10 +1021,10 @@
 
     // add some APs (secure / unsecure / adhoc / varied strength)
     auto device = createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
-    auto ap1 = createAccessPoint("1", "NSD", device, 0, Secure::secure, ApMode::infra);
-    auto ap2 = createAccessPoint("2", "JDR", device, 20, Secure::secure, ApMode::adhoc);
-    auto ap3 = createAccessPoint("3", "DGN", device, 40, Secure::secure, ApMode::infra);
-    auto ap4 = createAccessPoint("4", "JDY", device, 60, Secure::secure, ApMode::adhoc);
+    auto ap1 = createAccessPoint("1", "NSD", device, 0, Secure::wpa, ApMode::infra);
+    auto ap2 = createAccessPoint("2", "JDR", device, 20, Secure::wpa, ApMode::adhoc);
+    auto ap3 = createAccessPoint("3", "DGN", device, 40, Secure::wpa, ApMode::infra);
+    auto ap4 = createAccessPoint("4", "JDY", device, 60, Secure::wpa, ApMode::adhoc);
     auto ap5 = createAccessPoint("5", "SCE", device, 20, Secure::insecure, ApMode::infra);
     auto ap6 = createAccessPoint("6", "ADS", device, 40, Secure::insecure, ApMode::adhoc);
     auto ap7 = createAccessPoint("7", "CFT", device, 60, Secure::insecure, ApMode::infra);
@@ -1058,10 +1058,10 @@
                 .item(accessPoint("GDF", Secure::insecure, ApMode::adhoc, ConnectionStatus::connected, 80))
                 .item(accessPoint("ADS", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 40))
                 .item(accessPoint("CFT", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("DGN", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("JDR", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 20))
-                .item(accessPoint("JDY", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("NSD", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 0))
+                .item(accessPoint("DGN", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 40))
+                .item(accessPoint("JDR", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 20))
+                .item(accessPoint("JDY", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("NSD", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 0))
                 .item(accessPoint("SCE", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 20))
             )
         ).match());
@@ -1121,10 +1121,10 @@
 
     // NOTE: every newly created access point increments AP index (see: AccessPointItem::Private::ConstructL())
     //       so here we need to start at index 1+8 as we've had 8 APs previously.
-    ap1 = createAccessPoint("9", "NSD", device, 0, Secure::secure, ApMode::infra);
-    ap2 = createAccessPoint("10", "JDR", device, 20, Secure::secure, ApMode::adhoc);
-    ap3 = createAccessPoint("11", "DGN", device, 40, Secure::secure, ApMode::infra);
-    ap4 = createAccessPoint("12", "JDY", device, 60, Secure::secure, ApMode::adhoc);
+    ap1 = createAccessPoint("9", "NSD", device, 0, Secure::wpa, ApMode::infra);
+    ap2 = createAccessPoint("10", "JDR", device, 20, Secure::wpa, ApMode::adhoc);
+    ap3 = createAccessPoint("11", "DGN", device, 40, Secure::wpa, ApMode::infra);
+    ap4 = createAccessPoint("12", "JDY", device, 60, Secure::wpa, ApMode::adhoc);
     ap5 = createAccessPoint("13", "SCE", device, 20, Secure::insecure, ApMode::infra);
     ap6 = createAccessPoint("14", "ADS", device, 40, Secure::insecure, ApMode::adhoc);
     ap7 = createAccessPoint("15", "CFT", device, 60, Secure::insecure, ApMode::infra);
@@ -1152,10 +1152,10 @@
                 .item(accessPoint("GDF", Secure::insecure, ApMode::adhoc, ConnectionStatus::connected, 80))
                 .item(accessPoint("ADS", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 40))
                 .item(accessPoint("CFT", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("DGN", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("JDR", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 20))
-                .item(accessPoint("JDY", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("NSD", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 0))
+                .item(accessPoint("DGN", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 40))
+                .item(accessPoint("JDR", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 20))
+                .item(accessPoint("JDY", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("NSD", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 0))
                 .item(accessPoint("SCE", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 20))
             )
         ).match());
@@ -1189,10 +1189,10 @@
                 .item(accessPoint("GDF", Secure::insecure, ApMode::adhoc, ConnectionStatus::connected, 80))
                 .item(accessPoint("ADS", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 40))
                 .item(accessPoint("CFT", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("DGN", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("JDR", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 20))
-                .item(accessPoint("JDY", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("NSD", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 0))
+                .item(accessPoint("DGN", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 40))
+                .item(accessPoint("JDR", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 20))
+                .item(accessPoint("JDY", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("NSD", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 0))
                 .item(accessPoint("SCE", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 20))
             )
         ).match());
@@ -1210,7 +1210,7 @@
     ASSERT_NO_THROW(startIndicator());
 
     // add a single AP
-    auto ap1 = createAccessPoint("1", "groupA", device, 40, Secure::secure, ApMode::infra);
+    auto ap1 = createAccessPoint("1", "groupA", device, 40, Secure::wpa, ApMode::infra);
 
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
         .item(mh::MenuItemMatcher()
@@ -1220,12 +1220,12 @@
             .item(wifiEnableSwitch())
             .item(mh::MenuItemMatcher()
                 .section()
-                .item(accessPoint("groupA", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 40))
+                .item(accessPoint("groupA", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 40))
             )
         ).match());
 
     // add a second AP with the same SSID
-    auto ap2 = createAccessPoint("2", "groupA", device, 60, Secure::secure, ApMode::infra);
+    auto ap2 = createAccessPoint("2", "groupA", device, 60, Secure::wpa, ApMode::infra);
 
     // check that we see a single AP with the higher strength
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
@@ -1236,7 +1236,7 @@
             .item(wifiEnableSwitch())
             .item(mh::MenuItemMatcher()
                 .section()
-                .item(accessPoint("groupA", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("groupA", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 60))
             )
         ).match());
 
@@ -1252,12 +1252,12 @@
             .item(wifiEnableSwitch())
             .item(mh::MenuItemMatcher()
                 .section()
-                .item(accessPoint("groupA", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 80))
+                .item(accessPoint("groupA", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 80))
             )
         ).match());
 
     // add another AP with a different SSID
-    auto ap3 = createAccessPoint("3", "groupB", device, 75, Secure::secure, ApMode::infra);
+    auto ap3 = createAccessPoint("3", "groupB", device, 75, Secure::wpa, ApMode::infra);
 
     // check that we see a single AP with the higher strength
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
@@ -1268,8 +1268,8 @@
             .item(wifiEnableSwitch())
             .item(mh::MenuItemMatcher()
                 .section()
-                .item(accessPoint("groupA", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 80))
-                .item(accessPoint("groupB", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 75))
+                .item(accessPoint("groupA", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 80))
+                .item(accessPoint("groupB", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 75))
             )
         ).match());
 
@@ -1285,8 +1285,8 @@
             .item(wifiEnableSwitch())
             .item(mh::MenuItemMatcher()
                 .section()
-                .item(accessPoint("groupA", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("groupB", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 75))
+                .item(accessPoint("groupA", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("groupB", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 75))
             )
         ).match());
 }
@@ -1300,23 +1300,23 @@
     auto device = createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
 
     // prepend a non-utf8 character to the end of AP 1's SSID
-    auto ap1 = createAccessPoint("1", "NSD", device, 20, Secure::secure, ApMode::infra);
+    auto ap1 = createAccessPoint("1", "NSD", device, 20, Secure::wpa, ApMode::infra);
     setNmProperty(ap1, NM_DBUS_INTERFACE_ACCESS_POINT, "Ssid", QByteArray(1, -1) + QByteArray("NSD"));
 
     // append a non-utf8 character to the end of AP 2's SSID
-    auto ap2 = createAccessPoint("2", "DGN", device, 20, Secure::secure, ApMode::infra);
+    auto ap2 = createAccessPoint("2", "DGN", device, 20, Secure::wpa, ApMode::infra);
     setNmProperty(ap2, NM_DBUS_INTERFACE_ACCESS_POINT, "Ssid", QByteArray("DGN") + QByteArray(1, -1));
 
     // insert a non-utf8 character into AP 3's SSID
-    auto ap3 = createAccessPoint("3", "JDY", device, 20, Secure::secure, ApMode::infra);
+    auto ap3 = createAccessPoint("3", "JDY", device, 20, Secure::wpa, ApMode::infra);
     setNmProperty(ap3, NM_DBUS_INTERFACE_ACCESS_POINT, "Ssid", QByteArray("JD") + QByteArray(1, -1) + QByteArray("Y"));
 
     // use only non-utf8 characters for AP 4's SSID
-    auto ap4 = createAccessPoint("4", "---", device, 20, Secure::secure, ApMode::infra);
+    auto ap4 = createAccessPoint("4", "---", device, 20, Secure::wpa, ApMode::infra);
     setNmProperty(ap4, NM_DBUS_INTERFACE_ACCESS_POINT, "Ssid", QByteArray(4, -1));
 
     // leave AP 5's SSID blank
-    auto ap5 = createAccessPoint("5", "", device, 20, Secure::secure, ApMode::infra);
+    auto ap5 = createAccessPoint("5", "", device, 20, Secure::wpa, ApMode::infra);
 
     // start the indicator
     ASSERT_NO_THROW(startIndicator());
@@ -1334,10 +1334,10 @@
             )
           .item(wifiEnableSwitch(true))
             .item(mh::MenuItemMatcher()
-                .item(accessPoint("DGN�", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 20))
-                .item(accessPoint("JD�Y", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 20))
-                .item(accessPoint("�NSD", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 20))
-                .item(accessPoint("����", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 20))
+                .item(accessPoint("DGN�", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 20))
+                .item(accessPoint("JD�Y", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 20))
+                .item(accessPoint("�NSD", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 20))
+                .item(accessPoint("����", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 20))
             )
         ).match());
 }
@@ -1394,10 +1394,10 @@
               )
         ).match());
 
-    auto ap1 = createAccessPoint("1", "NSD", device, 20, Secure::secure, ApMode::infra);
-    auto ap2 = createAccessPoint("2", "JDR", device, 40, Secure::secure, ApMode::adhoc);
-    auto ap3 = createAccessPoint("3", "DGN", device, 60, Secure::secure, ApMode::infra);
-    auto ap4 = createAccessPoint("4", "JDY", device, 80, Secure::secure, ApMode::adhoc);
+    auto ap1 = createAccessPoint("1", "NSD", device, 20, Secure::wpa, ApMode::infra);
+    auto ap2 = createAccessPoint("2", "JDR", device, 40, Secure::wpa, ApMode::adhoc);
+    auto ap3 = createAccessPoint("3", "DGN", device, 60, Secure::wpa, ApMode::infra);
+    auto ap4 = createAccessPoint("4", "JDY", device, 80, Secure::wpa, ApMode::adhoc);
     auto ap5 = createAccessPoint("5", "SCE", device, 0, Secure::insecure, ApMode::infra);
     auto ap6 = createAccessPoint("6", "ADS", device, 20, Secure::insecure, ApMode::adhoc);
     auto ap7 = createAccessPoint("7", "CFT", device, 40, Secure::insecure, ApMode::infra);
@@ -1420,11 +1420,11 @@
             .item(mh::MenuItemMatcher()
                 .item(accessPoint("ADS", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 20))
                 .item(accessPoint("CFT", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("DGN", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("DGN", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 60))
                 .item(accessPoint("GDF", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("JDR", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("JDY", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 80))
-                .item(accessPoint("NSD", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 20))
+                .item(accessPoint("JDR", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 40))
+                .item(accessPoint("JDY", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 80))
+                .item(accessPoint("NSD", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 20))
                 .item(accessPoint("SCE", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 0))
             )
         ).match());
@@ -1445,11 +1445,11 @@
             .item(mh::MenuItemMatcher()
                 .item(accessPoint("ADS", Secure::insecure, ApMode::adhoc, ConnectionStatus::connected, 20))
                 .item(accessPoint("CFT", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("DGN", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("DGN", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 60))
                 .item(accessPoint("GDF", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("JDR", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("JDY", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 80))
-                .item(accessPoint("NSD", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 20))
+                .item(accessPoint("JDR", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 40))
+                .item(accessPoint("JDY", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 80))
+                .item(accessPoint("NSD", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 20))
                 .item(accessPoint("SCE", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 0))
             )
         ).match());
@@ -1565,10 +1565,10 @@
 
     // add some APs (secure / unsecure / adhoc / varied strength)
     auto device = createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
-    auto ap1 = createAccessPoint("1", "NSD", device, 20, Secure::secure, ApMode::infra);
-    auto ap2 = createAccessPoint("2", "JDR", device, 40, Secure::secure, ApMode::adhoc);
-    auto ap3 = createAccessPoint("3", "DGN", device, 60, Secure::secure, ApMode::infra);
-    auto ap4 = createAccessPoint("4", "JDY", device, 80, Secure::secure, ApMode::adhoc);
+    auto ap1 = createAccessPoint("1", "NSD", device, 20, Secure::wpa, ApMode::infra);
+    auto ap2 = createAccessPoint("2", "JDR", device, 40, Secure::wpa, ApMode::adhoc);
+    auto ap3 = createAccessPoint("3", "DGN", device, 60, Secure::wpa, ApMode::infra);
+    auto ap4 = createAccessPoint("4", "JDY", device, 80, Secure::wpa, ApMode::adhoc);
     auto ap5 = createAccessPoint("5", "SCE", device, 0, Secure::insecure, ApMode::infra);
     auto ap6 = createAccessPoint("6", "ADS", device, 20, Secure::insecure, ApMode::adhoc);
     auto ap7 = createAccessPoint("7", "CFT", device, 40, Secure::insecure, ApMode::infra);
@@ -1594,13 +1594,13 @@
             )
           .item(wifiEnableSwitch(true))
             .item(mh::MenuItemMatcher()
-                .item(accessPoint("JDY", Secure::secure, ApMode::adhoc, ConnectionStatus::connected, 80))
+                .item(accessPoint("JDY", Secure::wpa, ApMode::adhoc, ConnectionStatus::connected, 80))
                 .item(accessPoint("ADS", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 20))
                 .item(accessPoint("CFT", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("DGN", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("DGN", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 60))
                 .item(accessPoint("GDF", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("JDR", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("NSD", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 20))
+                .item(accessPoint("JDR", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 40))
+                .item(accessPoint("NSD", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 20))
                 .item(accessPoint("SCE", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 0))
             )
         ).match());
@@ -1624,11 +1624,11 @@
             .item(mh::MenuItemMatcher()
                 .item(accessPoint("CFT", Secure::insecure, ApMode::infra, ConnectionStatus::connected, 40))
                 .item(accessPoint("ADS", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 20))
-                .item(accessPoint("DGN", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("DGN", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 60))
                 .item(accessPoint("GDF", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("JDR", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("JDY", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 80))
-                .item(accessPoint("NSD", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 20))
+                .item(accessPoint("JDR", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 40))
+                .item(accessPoint("JDY", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 80))
+                .item(accessPoint("NSD", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 20))
                 .item(accessPoint("SCE", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 0))
             )
         ).match());
@@ -1681,10 +1681,10 @@
 
     // NOTE: every newly created access point increments AP index (see: AccessPointItem::Private::ConstructL())
     //       so here we need to start at index 1+8 as we've had 8 APs previously.
-    ap1 = createAccessPoint("9", "NSD", device, 20, Secure::secure, ApMode::infra);
-    ap2 = createAccessPoint("10", "JDR", device, 40, Secure::secure, ApMode::adhoc);
-    ap3 = createAccessPoint("11", "DGN", device, 60, Secure::secure, ApMode::infra);
-    ap4 = createAccessPoint("12", "JDY", device, 80, Secure::secure, ApMode::adhoc);
+    ap1 = createAccessPoint("9", "NSD", device, 20, Secure::wpa, ApMode::infra);
+    ap2 = createAccessPoint("10", "JDR", device, 40, Secure::wpa, ApMode::adhoc);
+    ap3 = createAccessPoint("11", "DGN", device, 60, Secure::wpa, ApMode::infra);
+    ap4 = createAccessPoint("12", "JDY", device, 80, Secure::wpa, ApMode::adhoc);
     ap5 = createAccessPoint("13", "SCE", device, 0, Secure::insecure, ApMode::infra);
     ap6 = createAccessPoint("14", "ADS", device, 20, Secure::insecure, ApMode::adhoc);
     ap7 = createAccessPoint("15", "CFT", device, 40, Secure::insecure, ApMode::infra);
@@ -1703,13 +1703,13 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false)).item(mh::MenuItemMatcher()).item(wifiEnableSwitch(true))
             .item(mh::MenuItemMatcher()
-                .item(accessPoint("JDY", Secure::secure, ApMode::adhoc, ConnectionStatus::connected, 80))
+                .item(accessPoint("JDY", Secure::wpa, ApMode::adhoc, ConnectionStatus::connected, 80))
                 .item(accessPoint("ADS", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 20))
                 .item(accessPoint("CFT", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("DGN", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("DGN", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 60))
                 .item(accessPoint("GDF", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("JDR", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("NSD", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 20))
+                .item(accessPoint("JDR", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 40))
+                .item(accessPoint("NSD", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 20))
                 .item(accessPoint("SCE", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 0))
             )
         ).match());
@@ -1725,10 +1725,10 @@
 
     // add some APs (secure / unsecure / adhoc / varied strength)
     auto device = createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
-    auto ap1 = createAccessPoint("1", "NSD", device, 40, Secure::secure, ApMode::infra);
-    auto ap2 = createAccessPoint("2", "JDR", device, 40, Secure::secure, ApMode::adhoc);
-    auto ap3 = createAccessPoint("3", "DGN", device, 60, Secure::secure, ApMode::infra);
-    auto ap4 = createAccessPoint("4", "JDY", device, 80, Secure::secure, ApMode::adhoc);
+    auto ap1 = createAccessPoint("1", "NSD", device, 40, Secure::wpa, ApMode::infra);
+    auto ap2 = createAccessPoint("2", "JDR", device, 40, Secure::wpa, ApMode::adhoc);
+    auto ap3 = createAccessPoint("3", "DGN", device, 60, Secure::wpa, ApMode::infra);
+    auto ap4 = createAccessPoint("4", "JDY", device, 80, Secure::wpa, ApMode::adhoc);
     auto ap5 = createAccessPoint("5", "SCE", device, 20, Secure::insecure, ApMode::infra);
     auto ap6 = createAccessPoint("6", "ADS", device, 20, Secure::insecure, ApMode::adhoc);
     auto ap7 = createAccessPoint("7", "CFT", device, 40, Secure::insecure, ApMode::infra);
@@ -1753,11 +1753,11 @@
             .item(mh::MenuItemMatcher()
                 .item(accessPoint("ADS", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 20))
                 .item(accessPoint("CFT", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("DGN", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("DGN", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 60))
                 .item(accessPoint("GDF", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("JDR", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("JDY", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 80))
-                .item(accessPoint("NSD", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 40))
+                .item(accessPoint("JDR", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 40))
+                .item(accessPoint("JDY", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 80))
+                .item(accessPoint("NSD", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 40))
                 .item(accessPoint("SCE", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 20)
                       .activate())
             )
@@ -1782,11 +1782,11 @@
                 .item(accessPoint("SCE", Secure::insecure, ApMode::infra, ConnectionStatus::connected, 20))
                 .item(accessPoint("ADS", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 20))
                 .item(accessPoint("CFT", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("DGN", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("DGN", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 60))
                 .item(accessPoint("GDF", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("JDR", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("JDY", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 80))
-                .item(accessPoint("NSD", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 40)
+                .item(accessPoint("JDR", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 40))
+                .item(accessPoint("JDY", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 80))
+                .item(accessPoint("NSD", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 40)
                       .activate())
             )
         ).match());
@@ -1808,13 +1808,13 @@
             )
           .item(wifiEnableSwitch(true))
             .item(mh::MenuItemMatcher()
-                .item(accessPoint("NSD", Secure::secure, ApMode::infra, ConnectionStatus::connected, 40))
+                .item(accessPoint("NSD", Secure::wpa, ApMode::infra, ConnectionStatus::connected, 40))
                 .item(accessPoint("ADS", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 20))
                 .item(accessPoint("CFT", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("DGN", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("DGN", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 60))
                 .item(accessPoint("GDF", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("JDR", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("JDY", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 80))
+                .item(accessPoint("JDR", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 40))
+                .item(accessPoint("JDY", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 80))
                 .item(accessPoint("SCE", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 20)
                       .activate())
             )
@@ -1839,13 +1839,70 @@
                 .item(accessPoint("SCE", Secure::insecure, ApMode::infra, ConnectionStatus::connected, 20))
                 .item(accessPoint("ADS", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 20))
                 .item(accessPoint("CFT", Secure::insecure, ApMode::infra, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("DGN", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 60))
+                .item(accessPoint("DGN", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 60))
                 .item(accessPoint("GDF", Secure::insecure, ApMode::adhoc, ConnectionStatus::disconnected, 60))
-                .item(accessPoint("JDR", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 40))
-                .item(accessPoint("JDY", Secure::secure, ApMode::adhoc, ConnectionStatus::disconnected, 80))
-                .item(accessPoint("NSD", Secure::secure, ApMode::infra, ConnectionStatus::disconnected, 40))
-            )
-        ).match());
+                .item(accessPoint("JDR", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 40))
+                .item(accessPoint("JDY", Secure::wpa, ApMode::adhoc, ConnectionStatus::disconnected, 80))
+                .item(accessPoint("NSD", Secure::wpa, ApMode::infra, ConnectionStatus::disconnected, 40))
+            )
+        ).match());
+}
+
+TEST_F(TestIndicator, EnterpriseWifiConnect)
+{
+    // set wifi on, flight mode off
+    setGlobalConnectedState(NM_STATE_DISCONNECTED);
+
+    // set no sim
+    setSimManagerProperty(firstModem(), "Present", false);
+
+    // add some APs (secure / unsecure / adhoc / varied strength)
+    auto device = createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
+    auto ap1 = createAccessPoint("1", "ABC", device, 80, Secure::wpa_enterprise, ApMode::infra, "11:22:33:44:55:66");
+
+    // start the indicator
+    ASSERT_NO_THROW(startIndicator());
+
+    // interface to the URL dispatcher
+    auto& urlDispatcher = dbusMock.mockInterface(
+                        "com.canonical.URLDispatcher",
+                        "/com/canonical/URLDispatcher",
+                        "com.canonical.URLDispatcher",
+                        QDBusConnection::SessionBus);
+
+   // Wait for method calls on the URL dispatcher
+   QSignalSpy urlDispatcherSpy(&urlDispatcher, SIGNAL(MethodCalled(const QString &, const QVariantList &)));
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .state_icons({"nm-no-connection"})
+            .mode(mh::MenuItemMatcher::Mode::starts_with)
+            .item(flightModeSwitch(false))
+            .item(mh::MenuItemMatcher()
+                .item(modemInfo("", "No SIM", "no-simcard"))
+                .item(cellularSettings())
+            )
+          .item(wifiEnableSwitch(true))
+          .item(mh::MenuItemMatcher()
+               .item(accessPoint("ABC", Secure::wpa_enterprise, ApMode::infra, ConnectionStatus::disconnected, 80).activate())
+           )
+        ).match());
+
+    if (urlDispatcherSpy.isEmpty())
+    {
+        ASSERT_TRUE(urlDispatcherSpy.wait());
+    }
+
+    ASSERT_FALSE(urlDispatcherSpy.isEmpty());
+    EXPECT_EQ(urlDispatcherSpy.first(),
+        QVariantList()
+            << QVariant("DispatchURL")
+            << QVariant(
+                QVariantList()
+                    << QVariant("settings:///system/wifi?ssid=ABC&bssid=11:22:33:44:55:66")
+                    << QVariant("")
+               )
+    );
 }
 
 TEST_F(TestIndicator, CellDataEnabled)
@@ -1982,7 +2039,7 @@
 
     // Enable WiFi and connect to it
     enableWiFi();
-    auto ap1 = createAccessPoint("1", "ABC", device, 20, Secure::secure, ApMode::infra);
+    auto ap1 = createAccessPoint("1", "ABC", device, 20, Secure::wpa, ApMode::infra);
     auto connection = createAccessPointConnection("1", "ABC", device);
     setNmProperty(device, NM_DBUS_INTERFACE_DEVICE, "State", QVariant::fromValue(uint(NM_DEVICE_STATE_ACTIVATED)));
     auto active_connection = createActiveConnection("1", device, connection, ap1);
@@ -2003,7 +2060,7 @@
             .item(wifiEnableSwitch(true))
             .item(mh::MenuItemMatcher()
                 .item(accessPoint("ABC",
-                    Secure::secure,
+                    Secure::wpa,
                     ApMode::infra,
                     ConnectionStatus::connected,
                     20)

=== modified file 'tests/unit/indicator/menuitems/test-access-point-item.cpp'
--- tests/unit/indicator/menuitems/test-access-point-item.cpp	2015-04-14 11:20:17 +0000
+++ tests/unit/indicator/menuitems/test-access-point-item.cpp	2015-07-08 08:49:46 +0000
@@ -40,12 +40,16 @@
 public:
     MOCK_CONST_METHOD0(ssid, QString());
 
+    MOCK_CONST_METHOD0(bssid, QString());
+
     MOCK_CONST_METHOD0(raw_ssid, QByteArray());
 
     MOCK_CONST_METHOD0(object_path, QDBusObjectPath());
 
     MOCK_CONST_METHOD0(secured, bool());
 
+    MOCK_CONST_METHOD0(enterprise, bool());
+
     MOCK_CONST_METHOD0(adhoc, bool());
 
     MOCK_CONST_METHOD0(strength, double());