Merge lp:~pete-woods/ubuntu-system-settings/hotspots-via-indicator into lp:ubuntu-system-settings

[Pete Woods]

Manage hotspots using connectivity service.

Manage hotspots using connectivity service.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1467
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2189/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/312/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/312/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2189/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

Love it, but it uses the old backend which is, like we talked about, deprecated.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1386
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2201/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/418/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/418/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2201/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

Could you merge [1]? Thanks!

[1] https://code.launchpad.net/~jonas-drange/ubuntu-system-settings/lp1477300/+merge/265874

review: Needs Information

=== modified file 'debian/control'
--- debian/control	2015-07-02 08:59:36 +0000
+++ debian/control	2015-07-22 16:28:59 +0000
@@ -23,6 +23,7 @@
                libunity-api-dev,
                libupower-glib-dev,
                pkg-config,
+               qml-module-ubuntu-connectivity (>= 0.5.2),
                qt5-default,
                qtbase5-dev,
                qtdeclarative5-dev,
@@ -70,6 +71,7 @@
          powerd (>= 0.15) | gnome-settings-daemon,
          qmenumodel-qml,
          qtdeclarative5-folderlistmodel-plugin,
+         qml-module-ubuntu-connectivity (>= 0.5.2),
          qml-module-qtmultimedia | qml-module-qtmultimedia-gles,
          qtdeclarative5-gsettings1.0 (>=0.1+14.10.20140801.1),
          qtdeclarative5-ofono0.2 (>=0.70~),

=== modified file 'plugins/cellular/CMakeLists.txt'
--- plugins/cellular/CMakeLists.txt	2015-07-22 16:28:59 +0000
+++ plugins/cellular/CMakeLists.txt	2015-07-22 16:28:59 +0000
@@ -22,8 +22,6 @@
 add_library(UbuntuCellularPanel MODULE
   plugin.cpp
   plugin.h
-  hotspotmanager.cpp
-  hotspotmanager.h
   ofonoactivator.cpp
   ofonoactivator.h
   connectivity.cpp

=== modified file 'plugins/cellular/Hotspot.qml'
--- plugins/cellular/Hotspot.qml	2015-07-22 16:28:59 +0000
+++ plugins/cellular/Hotspot.qml	2015-07-22 16:28:59 +0000
@@ -21,6 +21,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components.Popups 0.1
+import Ubuntu.Connectivity 1.0
 import Ubuntu.Settings.Components 0.1 as USC
 import Ubuntu.SystemSettings.Cellular 1.0
 
@@ -41,10 +42,6 @@
         }
     }
 
-    HotspotManager {
-        id: hotspotManager
-    }
-
     Loader {
         id: setup
         asynchronous: false
@@ -57,7 +54,7 @@
 
         ListItem.Standard {
             text: i18n.tr("Hotspot")
-            enabled: hotspotManager.stored
+            enabled: Connectivity.hotspotStored
             control: Switch {
                 id: hotspotSwitch
                 objectName: "hotspotSwitch"
@@ -67,8 +64,8 @@
                     id: switchSync
                     userTarget: hotspotSwitch
                     userProperty: "checked"
-                    serverTarget: hotspotManager
-                    serverProperty: "enabled"
+                    serverTarget: Connectivity
+                    serverProperty: "hotspotEnabled"
                     useWaitBuffer: true
 
                     // Since this blocks the UI thread, we wait until
@@ -84,7 +81,7 @@
                     id: triggerTimer
                     property bool value
                     interval: 250; repeat: false
-                    onTriggered: hotspotManager.enabled = value
+                    onTriggered: Connectivity.hotspotEnabled = value
                 }
             }
         }
@@ -105,13 +102,12 @@
             objectName: "hotspotSetupEntry"
             anchors.horizontalCenter: parent.horizontalCenter
             width: parent.width - units.gu(4)
-            text: hotspotManager.stored ?
+            text: Connectivity.hotspotStored ?
                 i18n.tr("Change password/setup…") : i18n.tr("Set up hotspot…")
 
             onClicked: {
                 setup.setSource(Qt.resolvedUrl("HotspotSetup.qml"));
                 PopupUtils.open(setup.item, hotspot, {
-                    hotspotManager: hotspotManager
                 });
             }
         }

=== modified file 'plugins/cellular/HotspotSetup.qml'
--- plugins/cellular/HotspotSetup.qml	2015-07-22 16:28:59 +0000
+++ plugins/cellular/HotspotSetup.qml	2015-07-22 16:28:59 +0000
@@ -21,6 +21,7 @@
 import SystemSettings 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Connectivity 1.0
 import Ubuntu.SystemSettings.Cellular 1.0
 import Ubuntu.Components.Popups 0.1
 
@@ -29,15 +30,14 @@
 
     Dialog {
         id: hotspotSetupDialog
-        property var hotspotManager: null
 
-        /* hotspotManager.stored changes as soon as the user has added a
+        /* Connectivity.hotspotStored changes as soon as the user has added a
         hotspot, and we use this value when we choose between e.g. "Change" and
         "Setup". We'd like the narrative to be consistent, so we stick with
         what the stored value was at component completion.
         */
         property bool stored: false
-        Component.onCompleted: stored = hotspotManager.stored;
+        Component.onCompleted: stored = Connectivity.hotspotStored;
 
         objectName: "hotspotSetup"
         anchorToKeyboard: true
@@ -163,7 +163,7 @@
             TextField {
                 id: ssidField
                 objectName: "ssidField"
-                text: hotspotManager.ssid
+                text: Connectivity.hotspotSsid
                 inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
                 Component.onCompleted: forceActiveFocus()
                 width: parent.width
@@ -182,7 +182,7 @@
             TextField {
                 id: passwordField
                 objectName: "passwordField"
-                text: hotspotManager.password
+                text: Connectivity.hotspotPassword
                 echoMode: passwordVisibleSwitch.checked ?
                     TextInput.Normal : TextInput.Password
                 inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
@@ -262,15 +262,15 @@
                 function hotspotEnabledHandler (enabled) {
                     if (enabled) {
                         hotspotSetupDialog.state = "SUCCEEDED";
-                        hotspotManager.enabledChanged.disconnect(
+                        Connectivity.hotspotEnabledUpdated.disconnect(
                             hotspotEnabledHandler);
                     }
                 }
 
-                hotspotManager.ssid = ssidField.text;
-                hotspotManager.password = passwordField.text;
-                hotspotManager.enabledChanged.connect(hotspotEnabledHandler);
-                hotspotManager.enabled = true;
+                Connectivity.hotspotSsid = ssidField.text;
+                Connectivity.hotspotPassword = passwordField.text;
+                Connectivity.hotspotEnabledUpdated.connect(hotspotEnabledHandler);
+                Connectivity.hotspotEnabled = true;
             }
         }
 
@@ -282,28 +282,28 @@
                 function hotspotEnabledHandler (enabled) {
                     if (enabled) {
                         hotspotSetupDialog.state = "SUCCEEDED";
-                        hotspotManager.enabledChanged.disconnect(
+                        Connectivity.hotspotEnabledUpdated.disconnect(
                             hotspotEnabledHandler);
                     }
                 }
 
                 function hotspotDisabledHandler (enabled) {
                     if (!enabled) {
-                        hotspotManager.enabledChanged.connect(hotspotEnabledHandler);
-                        hotspotManager.enabled = true;
-                        hotspotManager.enabledChanged.disconnect(
+                        Connectivity.hotspotEnabledUpdated.connect(hotspotEnabledHandler);
+                        Connectivity.hotspotEnabled = true;
+                        Connectivity.hotspotEnabledUpdated.disconnect(
                             hotspotDisabledHandler);
                     }
                 }
 
-                hotspotManager.ssid = ssidField.text;
-                hotspotManager.password = passwordField.text;
+                Connectivity.hotspotSsid = ssidField.text;
+                Connectivity.hotspotPassword = passwordField.text;
 
-                if (hotspotManager.enabled) {
+                if (Connectivity.hotspotEnabled) {
                     hotspotSetupDialog.state = "STARTING";
-                    hotspotManager.enabledChanged.connect(
+                    Connectivity.hotspotEnabledUpdated.connect(
                         hotspotDisabledHandler);
-                    hotspotManager.enabled = false;
+                    Connectivity.hotspotEnabled = false;
                 } else {
                     PopupUtils.close(hotspotSetupDialog);
                 }
@@ -321,7 +321,7 @@
         }
 
         Connections {
-            target: hotspotManager
+            target: Connectivity
 
             onReportError: {
                 if (hotspotSetupDialog.state === "STARTING") {

=== removed file 'plugins/cellular/hotspotmanager.cpp'
--- plugins/cellular/hotspotmanager.cpp	2015-07-22 16:28:59 +0000
+++ plugins/cellular/hotspotmanager.cpp	1970-01-01 00:00:00 +0000
@@ -1,707 +0,0 @@
-/*
- * Copyright (C) 2014, 2015 Canonical, Ltd.
- *
- * Authors:
- *    Jussi Pakkanen <[e-mail]>
- *    Jonas G. Drange <[e-mail]>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This library 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "hotspotmanager.h"
-#include <QStringList>
-#include <QDBusReply>
-#include <QtDebug>
-#include <QDBusInterface>
-#include <QDBusMetaType>
-
-typedef QMap<QString, QVariantMap> nmConnectionArg;
-Q_DECLARE_METATYPE(nmConnectionArg)
-
-namespace  { // wpa_supplicant interaction
-
-const QString wpa_supplicant_service("fi.w1.wpa_supplicant1");
-const QString wpa_supplicant_interface("fi.w1.wpa_supplicant1");
-const QString wpa_supplicant_path("/fi/w1/wpa_supplicant1");
-
-bool isHybrisWlan() {
-    QString program("getprop");
-    QStringList arguments;
-    arguments << "urfkill.hybris.wlan";
-
-    QProcess *getprop = new QProcess();
-    getprop->start(program, arguments);
-
-    if (!getprop->waitForFinished()) {
-        qCritical() << "getprop process failed:" << getprop->errorString();
-        delete getprop;
-        return false;
-    }
-
-    int index = getprop->readAllStandardOutput().indexOf("1");
-    delete getprop;
-
-    // A non-negative integer means getprop returned 1
-    return index >= 0;
-}
-
-// True if changed successfully, or there was no need. Otherwise false.
-// Supported modes are 'p2p', 'sta' and 'ap'.
-bool changeInterfaceFirmware(const QString interface, const QString mode) {
-    // Not supported.
-    if (mode == "adhoc") {
-        return true;
-    }
-
-    if (isHybrisWlan()) {
-        QDBusInterface wpasIface (
-            wpa_supplicant_service, wpa_supplicant_path, wpa_supplicant_interface,
-            QDBusConnection::systemBus());
-
-        const QDBusObjectPath interface_path(interface);
-
-        // TODO(jgdx): We need to guard against calling this
-        // when the interface is not soft blocked.
-        auto set_interface = wpasIface.call("SetInterfaceFirmware",
-            QVariant::fromValue(interface_path), QVariant(mode));
-
-        if (set_interface.type() == QDBusMessage::ErrorMessage) {
-            qCritical() << "Failed to change interface firmware:"
-                << set_interface.errorMessage();
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    // We had no need to change the firmware.
-    return true;
-}
-} // wpa_supplicant interaction
-
-namespace  { // UrfKill interaction
-
-const QString urfkill_service("org.freedesktop.URfkill");
-const QString urfkill_interface("org.freedesktop.URfkill");
-const QString urfkill_path("/org/freedesktop/URfkill");
-
-// True if call went through and returned true.
-bool setWifiBlock(bool block) {
-    QDBusInterface urfkill_dbus_interface(urfkill_service, urfkill_path,
-        urfkill_interface, QDBusConnection::systemBus());
-
-    const unsigned int device_type = 1; /* wifi type */
-    auto reply = urfkill_dbus_interface.call("Block", device_type, block);
-
-    if (reply.type() == QDBusMessage::ErrorMessage) {
-        qCritical() << "Failed to block wifi" << reply.errorMessage();
-        return false;
-    }
-
-    // We got exactly one argument back, and it's not an error.
-    if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 1) {
-        // returned false from call
-        if (!qdbus_cast<bool>(reply.arguments().at(0))) {
-            qCritical() << "URfkill Block call did not succeed";
-            return false;
-        } else {
-            return true;
-        }
-    }
-    // We did not get what we wanted from dbus, so we treat that as failure.
-    return false;
-}
-} // UrfKill interaction
-
-namespace { // NetworkManager interaction
-
-const QString nm_service("org.freedesktop.NetworkManager");
-const QString nm_object("/org/freedesktop/NetworkManager");
-const QString nm_settings_object("/org/freedesktop/NetworkManager/Settings");
-const QString nm_settings_interface("org.freedesktop.NetworkManager.Settings");
-const QString nm_connection_interface("org.freedesktop.NetworkManager.Settings.Connection");
-const QString nm_connection_active_interface("org.freedesktop.NetworkManager.Connection.Active");
-const QString nm_device_interface("org.freedesktop.NetworkManager.Device");
-const QString dbus_properties_interface("org.freedesktop.DBus.Properties");
-const QString connection_property("Connection");
-
-// NetworkManager dbus interface proxy we will use to query
-// against NetworkManager. See
-// https://developer.gnome.org/NetworkManager/0.9/spec.html
-//     #org.freedesktop.NetworkManager
-OrgFreedesktopNetworkManagerInterface nm_manager(
-    nm_service, nm_object, QDBusConnection::systemBus());
-
-// NetworkManager Settings interface proxy we use to get
-// the list of connections, as well as adding connections.
-// See https://developer.gnome.org/NetworkManager/0.9/spec.html
-//     #org.freedesktop.NetworkManager.Settings
-OrgFreedesktopNetworkManagerSettingsInterface nm_settings(
-    nm_service, nm_settings_object, QDBusConnection::systemBus());
-
-// Helper that maps QStrings to other QVariantMaps, i.e.
-// QMap<QString, QVariantMap>. QVariantMap is an alias for
-// QMap<QString, QVariant>.
-// See http://doc.qt.io/qt-5/qvariant.html#QVariantMap-typedef and
-// https://developer.gnome.org/NetworkManager/0.9/spec.html
-//     #type-String_String_Variant_Map_Map
-nmConnectionArg createConnectionSettings(
-    const QByteArray &ssid, const QString &password,
-    const QDBusObjectPath &devicePath, QString mode, bool autoConnect = true) {
-    Q_UNUSED(devicePath);
-    nmConnectionArg connection;
-
-    QString s_ssid = QString::fromLatin1(ssid);
-    QString s_uuid = QUuid().createUuid().toString();
-    // Remove {} from the generated uuid.
-    s_uuid.remove(0, 1);
-    s_uuid.remove(s_uuid.size() - 1, 1);
-
-    QVariantMap wireless;
-    wireless[QStringLiteral("security")] = QVariant(QStringLiteral("802-11-wireless-security"));
-    wireless[QStringLiteral("ssid")] = QVariant(ssid);
-    wireless[QStringLiteral("mode")] = QVariant(mode);
-
-    connection["802-11-wireless"] = wireless;
-
-    QVariantMap connsettings;
-    connsettings[QStringLiteral("autoconnect")] = QVariant(autoConnect);
-    connsettings[QStringLiteral("id")] = QVariant(s_ssid);
-    connsettings[QStringLiteral("uuid")] = QVariant(s_uuid);
-    connsettings[QStringLiteral("type")] = QVariant(QStringLiteral("802-11-wireless"));
-    connection["connection"] = connsettings;
-
-    QVariantMap ipv4;
-    ipv4[QStringLiteral("addressess")] = QVariant(QStringList());
-    ipv4[QStringLiteral("dns")] = QVariant(QStringList());
-    ipv4[QStringLiteral("method")] = QVariant(QStringLiteral("shared"));
-    ipv4[QStringLiteral("routes")] = QVariant(QStringList());
-    connection["ipv4"] = ipv4;
-
-    QVariantMap ipv6;
-    ipv6[QStringLiteral("method")] = QVariant(QStringLiteral("ignore"));
-    connection["ipv6"] = ipv6;
-
-    QVariantMap security;
-    security[QStringLiteral("proto")] = QVariant(QStringList{"rsn"});
-    security[QStringLiteral("pairwise")] = QVariant(QStringList{"ccmp"});
-    security[QStringLiteral("group")] = QVariant(QStringList{"ccmp"});
-    security[QStringLiteral("key-mgmt")] = QVariant(QStringLiteral("wpa-psk"));
-    security[QStringLiteral("psk")] = QVariant(password);
-    connection["802-11-wireless-security"] = security;
-
-    return connection;
-}
-
-// Helper that returns a QMap<QString, QVariantMap> given a QDBusObjectPath.
-// See https://developer.gnome.org/NetworkManager/0.9/spec.html
-//     #org.freedesktop.NetworkManager.Settings.Connection.GetSettings
-nmConnectionArg getConnectionSettings (QDBusObjectPath connection) {
-    OrgFreedesktopNetworkManagerSettingsConnectionInterface conn(
-        nm_service, connection.path(), QDBusConnection::systemBus());
-
-    auto connection_settings = conn.GetSettings();
-    connection_settings.waitForFinished();
-    return connection_settings.value();
-}
-
-
-// Helper that returns a QMap<QString, QVariantMap> given a QDBusObjectPath.
-// See https://developer.gnome.org/NetworkManager/0.9/spec.html
-//     #org.freedesktop.NetworkManager.Settings.Connection.GetSettings
-nmConnectionArg getConnectionSecrets (QDBusObjectPath connection,
-    const QString key) {
-    OrgFreedesktopNetworkManagerSettingsConnectionInterface conn(
-        nm_service, connection.path(), QDBusConnection::systemBus());
-    auto connection_secrets = conn.GetSecrets(key);
-    connection_secrets.waitForFinished();
-    return connection_secrets.value();
-}
-
-// Helper that adds a connection and returns the QDBusObjectPath
-// of the newly created connection.
-// See https://developer.gnome.org/NetworkManager/0.9/spec.html
-//     #org.freedesktop.NetworkManager.Settings.AddConnection
-QDBusObjectPath addConnection(
-    const QByteArray &ssid, const QString &password,
-    const QDBusObjectPath &devicePath, QString mode) {
-
-    nmConnectionArg connection = createConnectionSettings(ssid, password,
-        devicePath, mode);
-
-    auto add_connection_reply = nm_settings.AddConnection(connection);
-    add_connection_reply.waitForFinished();
-
-    if(!add_connection_reply.isValid()) {
-        qCritical() << "Failed to add connection: "
-            << add_connection_reply.error().message();
-        return QDBusObjectPath();
-    }
-    return add_connection_reply.argumentAt<0>();
-}
-
-// Returns a QDBusObjectPath of a hotspot given a mode.
-// Valid modes are 'p2p', 'ap' and 'adhoc'.
-QDBusObjectPath getHotspot(QString mode) {
-    const char wifi_key[] = "802-11-wireless";
-
-    auto listed_connections = nm_settings.ListConnections();
-    listed_connections.waitForFinished();
-
-    for(const auto &connection : listed_connections.value()) {
-        OrgFreedesktopNetworkManagerSettingsConnectionInterface conn(
-        nm_service, connection.path(), QDBusConnection::systemBus());
-
-        auto connection_settings = getConnectionSettings(connection);
-
-        if(connection_settings.find(wifi_key) != connection_settings.end()) {
-            auto wifi_setup = connection_settings[wifi_key];
-            QString wifi_mode = wifi_setup["mode"].toString();
-
-            if(wifi_mode == mode) {
-                return connection;
-            }
-        }
-    }
-    return QDBusObjectPath();
-}
-
-// Returns a QDBusObjectPath of a wireless device. For now
-// it returns the first device.
-QDBusObjectPath getWirelessDevice () {
-    // find the first wlan adapter for now
-    auto reply1 = nm_manager.GetDevices();
-    reply1.waitForFinished();
-
-    if(!reply1.isValid()) {
-        qCritical() << "Could not get network device: "
-            << reply1.error().message();
-        return QDBusObjectPath();
-    }
-    auto devices = reply1.value();
-
-    QDBusObjectPath dev;
-    for (const auto &d : devices) {
-        QDBusInterface iface(nm_service, d.path(), nm_device_interface,
-            QDBusConnection::systemBus());
-        auto type_v = iface.property("DeviceType");
-
-        if (type_v.toUInt() == 2 /* NM_DEVICE_TYPE_WIFI */) {
-            return d;
-        }
-    }
-    qCritical() << "Wireless device not found, hotspot functionality is inoperative.";
-    return dev;
-}
-
-// Helper to check if the hotspot on a given QDBusObjectPath is active
-// or not. It checks if the Connection.Active [1] for the given
-// path is in NetworkManager's ActiveConnections property [2].
-// [1] https://developer.gnome.org/NetworkManager/0.9/spec.html
-//     #org.freedesktop.NetworkManager.Connection.Active
-// [2] https://developer.gnome.org/NetworkManager/0.9/spec.html
-//     #org.freedesktop.NetworkManager
-bool isHotspotActive (QDBusObjectPath path) {
-    QSet<QDBusObjectPath> active_relevant_connections;
-    auto active_connections = nm_manager.activeConnections();
-    for(const auto &active_connection : active_connections) {
-
-        // Active connection interface proxy. It might have a connection
-        // property we can use to deduce if this active connection represents
-        // our active hotspot.
-        QDBusInterface active_connection_dbus_interface(
-        nm_service, active_connection.path(), dbus_properties_interface,
-        QDBusConnection::systemBus());
-
-        // Get the Connection property, if any.
-        QDBusReply<QVariant> connection_property =
-            active_connection_dbus_interface.call("Get",
-                nm_connection_active_interface, "Connection");
-
-        // The Connection property did not exist, so ignore this
-        // active connection.
-        if(!connection_property.isValid()) {
-            continue;
-        }
-
-        // It does exist, cast it to a object path.
-        QDBusObjectPath connection_path = qvariant_cast<QDBusObjectPath>(
-            connection_property.value());
-
-        // The object path is the same as the given hotspot path.
-        if (path == connection_path) {
-            return true;
-        }
-    }
-
-    // No active connection had a Connection property equal to the
-    // given path, so return false.
-    return false;
-}
-
-std::string generate_password() {
-    static const std::string items("abcdefghijklmnopqrstuvwxyz01234567890");
-    const int password_length = 8;
-    std::string result;
-
-    for(int i=0; i<password_length; i++) {
-        result.push_back(items[std::rand() % items.length()]);
-    }
-    return result;
-}
-} // NetworkManager interaction
-
-HotspotManager::HotspotManager(QObject *parent) :
-    QObject(parent), m_mode("ap"), m_enabled(false), m_stored(false),
-    m_password(generate_password().c_str()), m_ssid(QByteArray("Ubuntu")),
-    m_device_path(getWirelessDevice()) {
-    static bool isRegistered = false;
-
-    if(!isRegistered) {
-        qDBusRegisterMetaType<nmConnectionArg>();
-        isRegistered = true;
-    }
-
-    // Stored is false if hotspot path is empty.
-    m_hotspot_path = getHotspot(m_mode);
-    setStored(!m_hotspot_path.path().isEmpty());
-
-    if (m_stored) {
-        updateSettingsFromDbus(m_hotspot_path);
-    }
-
-    // Watches for new connections added to NetworkManager's Settings
-    // interface.
-    nm_settings.connection().connect(
-        nm_settings.service(), nm_settings_object, nm_settings_interface,
-        "NewConnection", this, SLOT(onNewConnection(QDBusObjectPath)));
-
-    // Watches changes in NetworkManager.
-    nm_manager.connection().connect(
-        nm_manager.service(), nm_object, nm_service, "PropertiesChanged", this,
-        SLOT(onPropertiesChanged(QMap<QString, QVariant>)));
-}
-
-void HotspotManager::setEnabled(bool value) {
-    bool blocked = setWifiBlock(true);
-
-    // Failed to soft block, here we revert the enabled setting.
-    if (!blocked) {
-        // "The device could not be readied for configuration"
-        Q_EMIT reportError(5);
-        setEnable(false);
-        return;
-    }
-
-    // We are enabling a hotspot
-    if (value) {
-        // If the SSID is empty, we report an error.
-        if (m_ssid.isEmpty()) {
-            Q_EMIT reportError(1);
-            setEnable(false);
-            return;
-        }
-
-        bool changed = changeInterfaceFirmware("/", m_mode);
-        if (!changed) {
-            // Necessary firmware for the device may be missing
-            Q_EMIT reportError(35);
-            setEnable(false);
-            setWifiBlock(false);
-            return;
-        }
-
-        if (m_stored) {
-            // we defer enabling until old hotspot is deleted
-            // if we can delete the old one
-            // If not, unset stored flag and call this method.
-            if (!destroy(m_hotspot_path)) {
-                setStored(false);
-                setEnabled(true);
-                setEnable(true);
-            }
-        } else {
-            // we defer enabling until new hotspot is created
-            m_hotspot_path = addConnection(m_ssid, m_password, m_device_path, m_mode);
-            if (m_hotspot_path.path().isEmpty()) {
-                // Emit "Unknown Error".
-                Q_EMIT reportError(0);
-                setEnable(false);
-                setWifiBlock(false);
-            }
-        }
-
-    } else {
-        // Disabling the hotspot.
-        disable();
-        setEnable(false);
-
-        bool unblocked = setWifiBlock(false);
-        if (!unblocked) {
-            // "The device could not be readied for configuration"
-            Q_EMIT reportError(5);
-        }
-    }
-}
-
-// Disables a hotspot.
-void HotspotManager::disable() {
-    QDBusObjectPath hotspot = getHotspot(m_mode);
-    if (hotspot.path().isEmpty()) {
-        qWarning() << "Could not find a hotspot setup to disable.\n";
-        return;
-    }
-
-    // Create Connection.Settings proxy for hotspot
-    OrgFreedesktopNetworkManagerSettingsConnectionInterface conn(
-        nm_service, hotspot.path(), QDBusConnection::systemBus());
-
-    // Get new settings
-    nmConnectionArg new_settings = createConnectionSettings(m_ssid, m_password,
-        m_device_path, m_mode, false);
-    auto updating = conn.Update(new_settings);
-    updating.waitForFinished();
-    if(!updating.isValid()) {
-        qCritical() << "Could not update connection with autoconnect=false: "
-        << updating.error().message();
-    }
-
-    auto active_connections = nm_manager.activeConnections();
-    for(const auto &active_connection : active_connections) {
-        // DBus Properties interface proxy of the active connection. We use
-        // this proxy to get to the Connection property.
-        QDBusInterface iface(
-            nm_service, active_connection.path(),
-            "org.freedesktop.DBus.Properties", QDBusConnection::systemBus());
-
-        // Call to get the Connection property.
-        QDBusReply<QVariant> conname = iface.call(
-            "Get", nm_connection_active_interface, "Connection");
-
-        // Cast the property to a object path.
-        QDBusObjectPath backingConnection = qvariant_cast<QDBusObjectPath>(
-            conname.value());
-
-        // This active connection's Connection property was our hotspot,
-        // so we will deactivate it. Note that we do not remove the hotspot,
-        // as we are storing the ssid, password and mode on the connection.
-        if(backingConnection == m_hotspot_path) {
-            // Deactivate the connection.
-            auto deactivation = nm_manager.DeactivateConnection(active_connection);
-            deactivation.waitForFinished();
-            if(!deactivation.isValid()) {
-                qCritical() << "Could not get deactivate connection: "
-                    << deactivation.error().message();
-            }
-            return;
-        }
-    }
-    return;
-}
-
-bool HotspotManager::enabled() const {
-    return m_enabled;
-}
-
-void HotspotManager::setEnable(bool value) {
-    if (m_enabled != value) {
-        m_enabled = value;
-        Q_EMIT enabledChanged(value);
-    }
-}
-
-bool HotspotManager::stored() const {
-    return m_stored;
-}
-
-void HotspotManager::setStored(bool value) {
-    if (m_stored != value) {
-        m_stored = value;
-        Q_EMIT storedChanged(value);
-    }
-}
-
-QByteArray HotspotManager::ssid() const {
-    return m_ssid;
-}
-
-void HotspotManager::setSsid(QByteArray value) {
-    if (m_ssid != value) {
-        m_ssid = value;
-        Q_EMIT ssidChanged(value);
-    }
-}
-
-QString HotspotManager::password() const {
-    return m_password;
-}
-
-void HotspotManager::setPassword(QString value) {
-    if (m_password != value) {
-        m_password = value;
-        Q_EMIT passwordChanged(value);
-    }
-}
-
-QString HotspotManager::mode() const {
-    return m_mode;
-}
-
-void HotspotManager::setMode(QString value) {
-    if (m_mode != value) {
-        m_mode = value;
-        Q_EMIT modeChanged(value);
-    }
-}
-
-void HotspotManager::onNewConnection(QDBusObjectPath path) {
-    // The new connection is the same as the stored hotspot path.
-    if (path == m_hotspot_path) {
-        // If a new hotspot was added, it is also given that
-        // Wi-Fi has been soft blocked. We can now unblock Wi-Fi
-        // and let NetworkManager pick up the newly created
-        // connection.
-        bool unblocked = setWifiBlock(false);
-        if (!unblocked) {
-            // "The device could not be readied for configuration"
-            Q_EMIT reportError(5);
-        } else {
-            // We successfully unblocked the Wi-Fi, so set m_enable to true.
-            setEnable(true);
-        }
-
-        // This also mean we have successfully created a hotspot connection
-        // object in NetworkManager, so m_stored should now be true.
-        setStored(true);
-    }
-}
-
-
-bool HotspotManager::destroy(QDBusObjectPath path) {
-    if(path.path().isEmpty()) {
-        return false;
-    }
-
-    // Connection Settings interface proxy for the connection
-    // we are about to delete.
-    OrgFreedesktopNetworkManagerSettingsConnectionInterface conn(
-        nm_service, path.path(), QDBusConnection::systemBus());
-
-    // Subscribe to the connection proxy's Removed signal.
-    conn.connection().connect(conn.service(), path.path(), conn.interface(),
-        "Removed", this, SLOT(onRemoved()));
-
-    auto del = conn.Delete();
-    del.waitForFinished();
-    return del.isValid();
-}
-
-void HotspotManager::onRemoved() {
-    // The UI does not support direct deletion of a hotspot, and given how
-    // hotspots currently work, every time we want to re-use a hotspot, we
-    // delete it an add a new one.
-    // Thus, if a hotspot was deleted, we now create a new one.
-    m_hotspot_path = addConnection(m_ssid, m_password, m_device_path, m_mode);
-
-    // We could not add a connection, so report, disable and unblock.
-    if (m_hotspot_path.path().isEmpty()) {
-        // Emit "Unknown Error".
-        Q_EMIT reportError(0);
-        setEnable(false);
-        setWifiBlock(false);
-    }
-}
-
-void HotspotManager::onPropertiesChanged(QVariantMap properties) {
-    // If we have no hotspot path, ignore changes in NetworkManager.
-    if (m_hotspot_path.path().isEmpty()) {
-        return;
-    }
-
-    // Set flag so we know that ActiveConnections changed.
-    bool active_connection_changed = false;
-
-    for(QVariantMap::const_iterator iter = properties.begin(); iter != properties.end(); ++iter) {
-        if (iter.key() == "ActiveConnections") {
-            active_connection_changed = true;
-
-            const QDBusArgument args = qvariant_cast<QDBusArgument>(iter.value());
-            if (args.currentType() == QDBusArgument::ArrayType) {
-                args.beginArray();
-
-                while (!args.atEnd()) {
-                    QDBusObjectPath path = qdbus_cast<QDBusObjectPath>(args);
-
-                    QDBusInterface active_connection_dbus_interface(
-                        nm_service, path.path(), dbus_properties_interface,
-                        QDBusConnection::systemBus());
-
-                    QDBusReply<QVariant> connection_property = active_connection_dbus_interface.call(
-                        "Get", nm_connection_active_interface, "Connection");
-
-                    // Active connection did not have a connection property,
-                    // so ignore it.
-                    if(!connection_property.isValid()) {
-                        continue;
-                    }
-
-                    QDBusObjectPath connection_path = qvariant_cast<QDBusObjectPath>(
-                        connection_property.value());
-
-                    // We see our connection as being active, so we emit that is
-                    // enabled and return.
-                    if (connection_path == m_hotspot_path) {
-                        setEnable(true);
-                        return;
-                    }
-                }
-                args.endArray();
-            }
-        }
-    }
-
-    // At this point ActiveConnections changed, but
-    // our hotspot was not in that list.
-    if (active_connection_changed) {
-        setEnable(false);
-    }
-}
-
-void HotspotManager::updateSettingsFromDbus(QDBusObjectPath path) {
-    setEnable(isHotspotActive(m_hotspot_path));
-
-    nmConnectionArg settings = getConnectionSettings(path);
-    const char wifi_key[] = "802-11-wireless";
-    const char security_key[] = "802-11-wireless-security";
-
-    if (settings.find(wifi_key) != settings.end()) {
-        QByteArray ssid = settings[wifi_key]["ssid"].toByteArray();
-        if (!ssid.isEmpty()) {
-            setSsid(ssid);
-        }
-
-        QString mode = settings[wifi_key]["mode"].toString();
-        if (!mode.isEmpty()) {
-            setMode(mode);
-        }
-    }
-
-    nmConnectionArg secrets = getConnectionSecrets(path, security_key);
-
-    if (secrets.find(security_key) != secrets.end()) {
-        QString pwd = secrets[security_key]["psk"].toString();
-        if (!pwd.isEmpty()) {
-            setPassword(pwd);
-        }
-    }
-}

=== removed file 'plugins/cellular/hotspotmanager.h'
--- plugins/cellular/hotspotmanager.h	2015-07-22 16:28:59 +0000
+++ plugins/cellular/hotspotmanager.h	1970-01-01 00:00:00 +0000
@@ -1,181 +0,0 @@
-/*
- * Copyright (C) 2014, 2015 Canonical, Ltd.
- *
- * Authors:
- *    Jussi Pakkanen <[e-mail]>
- *    Jonas G. Drange <[e-mail]>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This library 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * HotspotManager API
- * ==============================
- *
- * Methods
- *
- * Signals
- *   enabledChanged(bool enabled)
- *     Signal that gets emitted when the hotspot is disabled or enabled.
- *
- *   storedChanged(bool stored)
- *     Signal that gets emitted when a hotspot was stored.
- *
- *   ssidChanged(QByteArray ssid)
- *     Signal that gets emitted when the ssid of the hotspot was changed.
- *
- *   passwordChanged(QString password)
- *     Signal that gets emitted when the password of the hotspot was changed.
- *
- *   modeChanged(QString mode)
- *     Signal that gets emitted when the mode was changed.
- *
- *   authChanged(QString auth)
- *
- *   Note that none of these signal will be emitted if a change to the hotspot
- *   was made by anyone else than the HotspotManager. Right now, the canonical
- *   way to edit a hotspot, is through the hotspot manager.
- *
- *
- *   reportError(int reason)
- *     The reasons correspond to https://developer.gnome.org/
- *         NetworkManager/0.9/spec.html#type-NM_DEVICE_STATE_REASON
- *
- * Properties
- *   bool enabled [readwrite]
- *     Whether or not the hotspot is enabled.
- *
- *   bool stored [readonly]
- *     Whether or not a hotspot is known to the hotspotmanager.
- *
- *   QByteArray ssid [readwrite]
- *     The current SSID of the hotspot.
- *
- *   QString auth [readwrite]
- *     The current authentication of the hotspot. The default for this property
- *     is "wpa-psk" and is currently the only supported scheme. WEP is unsupported
- *     by design, as is no scheme at all.
- *
- *     TODO: Check/add support for wpa-eap
- *
- *   QString password [readwrite]
- *     The current Pre-Shared-Key for the hotspot. If the key is 64-characters
- *     long, it must contain only hexadecimal characters and is interpreted as a
- *     hexadecimal WPA key. Otherwise, the key must be between 8 and 63 ASCII
- *     characters and is interpreted as a WPA passphrase.
- *
- *   QString mode [readwrite, optional]
- *     The current hotspot mode. The default of this value is "ap", but can be
- *     set to "p2p" or "adhoc". "p2p" and "adhoc" is currently not fully supported.
- *
- *     TODO: Complete support for adhoc and p2p modes.
-*/
-
-#ifndef HOTSPOTMANAGER_H
-#define HOTSPOTMANAGER_H
-
-#include <QObject>
-#include <QDBusObjectPath>
-#include <QUuid>
-
-#include "nm_manager_proxy.h"
-#include "nm_settings_proxy.h"
-#include "nm_settings_connection_proxy.h"
-
-class HotspotManager : public QObject {
-    Q_OBJECT
-    Q_PROPERTY( bool enabled
-        READ enabled
-        WRITE setEnabled
-        NOTIFY enabledChanged)
-    Q_PROPERTY( QByteArray ssid
-        READ ssid
-        WRITE setSsid
-        NOTIFY ssidChanged)
-    Q_PROPERTY( QString auth
-        READ auth
-        WRITE setAuth
-        NOTIFY authChanged)
-    Q_PROPERTY( QString password
-        READ password
-        WRITE setPassword
-        NOTIFY passwordChanged)
-    Q_PROPERTY( QString mode
-        READ mode
-        WRITE setMode
-        NOTIFY modeChanged)
-    Q_PROPERTY( bool stored
-        READ stored
-        NOTIFY storedChanged)
-
-public:
-    explicit HotspotManager(QObject *parent = nullptr);
-    ~HotspotManager() {};
-
-    bool enabled() const;
-    void setEnabled(bool);
-    bool stored() const;
-
-    QByteArray ssid() const;
-    void setSsid(QByteArray);
-
-    QString password() const;
-    void setPassword(QString);
-
-    QString mode() const;
-    void setMode(QString);
-
-    QString auth() const;
-    void setAuth(QString);
-
-Q_SIGNALS:
-    void enabledChanged(bool enabled);
-    void storedChanged(bool stored);
-    void ssidChanged(const QByteArray ssid);
-    void passwordChanged(const QString password);
-    void modeChanged(const QString mode);
-    void authChanged(const QString auth);
-
-    /*
-    The mapping of code to string is taken from
-    http://bazaar.launchpad.net/~vcs-imports/
-      network-manager/trunk/view/head:/cli/src/common.c
-
-    NetworkManager documentation: https://developer.gnome.org/
-      NetworkManager/0.9/spec.html#type-NM_DEVICE_STATE_REASON
-    */
-    void reportError(const int &reason);
-
-public Q_SLOTS:
-    void onNewConnection(const QDBusObjectPath);
-    void onRemoved();
-    void onPropertiesChanged(const QVariantMap);
-
-private:
-    QString m_mode;
-    bool m_enabled;
-    bool m_stored;
-    QString m_password;
-    QByteArray m_ssid;
-    QDBusObjectPath m_device_path;
-    QDBusObjectPath m_hotspot_path;
-
-    void disable();
-
-    bool destroy(QDBusObjectPath);
-
-    void setStored(bool);
-    void setEnable(bool);
-    void updateSettingsFromDbus(QDBusObjectPath);
-};
-
-#endif

=== modified file 'plugins/cellular/plugin.cpp'
--- plugins/cellular/plugin.cpp	2015-01-21 20:44:20 +0000
+++ plugins/cellular/plugin.cpp	2015-07-22 16:28:59 +0000
@@ -20,7 +20,6 @@
 #include <QtQml>
 #include <QtQml/QQmlContext>
 #include "connectivity.h"
-#include "hotspotmanager.h"
 #include "ofonoactivator.h"
 
 static QObject *connectivitySingeltonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
@@ -36,7 +35,6 @@
 {
     Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Cellular"));
     qmlRegisterSingletonType<Connectivity>(uri, 1, 0, "Connectivity", connectivitySingeltonProvider);
-    qmlRegisterType<HotspotManager>(uri, 1, 0, "HotspotManager");
     qmlRegisterType<OfonoActivator>(uri, 1, 0, "OfonoActivator");
 }