Merge lp:~pete-woods/indicator-network/simplify-toggles into lp:indicator-network/15.10

[Pete Woods]

Simplify wifi/flight toggles

Simplify wifi/flight toggles

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'src/indicator/connectivity-service/connectivity-service.cpp'
--- src/indicator/connectivity-service/connectivity-service.cpp	2015-08-05 15:22:19 +0000
+++ src/indicator/connectivity-service/connectivity-service.cpp	2015-08-05 15:22:19 +0000
@@ -197,14 +197,13 @@
     connect(d->m_manager.get(), &Manager::wifiEnabledUpdated, d.get(), &Private::wifiEnabledUpdated);
     connect(d->m_manager.get(), &Manager::unstoppableOperationHappeningUpdated, d.get(), &Private::unstoppableOperationHappeningUpdated);
 
-    auto hotspotManager = d->m_manager->hotspotManager();
-    connect(hotspotManager.get(), &HotspotManager::enabledChanged, d.get(), &Private::hotspotEnabledUpdated);
-    connect(hotspotManager.get(), &HotspotManager::ssidChanged, d.get(), &Private::hotspotSsidUpdated);
-    connect(hotspotManager.get(), &HotspotManager::passwordChanged, d.get(), &Private::hotspotPasswordUpdated);
-    connect(hotspotManager.get(), &HotspotManager::modeChanged, d.get(), &Private::hotspotModeUpdated);
-    connect(hotspotManager.get(), &HotspotManager::storedChanged, d.get(), &Private::hotspotStoredUpdated);
+    connect(d->m_manager.get(), &Manager::hotspotEnabledChanged, d.get(), &Private::hotspotEnabledUpdated);
+    connect(d->m_manager.get(), &Manager::hotspotSsidChanged, d.get(), &Private::hotspotSsidUpdated);
+    connect(d->m_manager.get(), &Manager::hotspotPasswordChanged, d.get(), &Private::hotspotPasswordUpdated);
+    connect(d->m_manager.get(), &Manager::hotspotModeChanged, d.get(), &Private::hotspotModeUpdated);
+    connect(d->m_manager.get(), &Manager::hotspotStoredChanged, d.get(), &Private::hotspotStoredUpdated);
 
-    connect(hotspotManager.get(), &HotspotManager::reportError, d->m_privateService.get(), &PrivateService::ReportError);
+    connect(d->m_manager.get(), &Manager::reportError, d->m_privateService.get(), &PrivateService::ReportError);
 
     d->updateNetworkingStatus();
 
@@ -257,22 +256,22 @@
 
 bool ConnectivityService::hotspotEnabled() const
 {
-    return d->m_manager->hotspotManager()->enabled();
+    return d->m_manager->hotspotEnabled();
 }
 
 QByteArray ConnectivityService::hotspotSsid() const
 {
-    return d->m_manager->hotspotManager()->ssid();
+    return d->m_manager->hotspotSsid();
 }
 
 QString ConnectivityService::hotspotMode() const
 {
-    return d->m_manager->hotspotManager()->mode();
+    return d->m_manager->hotspotMode();
 }
 
 bool ConnectivityService::hotspotStored() const
 {
-    return d->m_manager->hotspotManager()->stored();
+    return d->m_manager->hotspotStored();
 }
 
 PrivateService::PrivateService(ConnectivityService& parent) :
@@ -304,27 +303,27 @@
 
 void PrivateService::SetHotspotEnabled(bool enabled)
 {
-    p.d->m_manager->hotspotManager()->setEnabled(enabled);
+    p.d->m_manager->setHotspotEnabled(enabled);
 }
 
 void PrivateService::SetHotspotSsid(const QByteArray &ssid)
 {
-    p.d->m_manager->hotspotManager()->setSsid(ssid);
+    p.d->m_manager->setHotspotSsid(ssid);
 }
 
 void PrivateService::SetHotspotPassword(const QString &password)
 {
-    p.d->m_manager->hotspotManager()->setPassword(password);
+    p.d->m_manager->setHotspotPassword(password);
 }
 
 void PrivateService::SetHotspotMode(const QString &mode)
 {
-    p.d->m_manager->hotspotManager()->setMode(mode);
+    p.d->m_manager->setHotspotMode(mode);
 }
 
 QString PrivateService::hotspotPassword() const
 {
-    return p.d->m_manager->hotspotManager()->password();
+    return p.d->m_manager->hotspotPassword();
 }
 
 }
 
=== modified file 'src/indicator/nmofono/hotspot-manager.h'
--- src/indicator/nmofono/hotspot-manager.h	2015-08-05 15:22:19 +0000
+++ src/indicator/nmofono/hotspot-manager.h	2015-08-05 15:22:19 +0000
@@ -123,8 +123,6 @@
 
     bool enabled() const;
 
-    void setEnabled(bool);
-
     bool stored() const;
 
     QByteArray ssid() const;
@@ -155,6 +153,8 @@
     void reportError(int reason);
 
 public Q_SLOTS:
+    void setEnabled(bool);
+
     void setSsid(const QByteArray&);
 
     void setPassword(const QString&);
 
=== modified file 'src/indicator/nmofono/kill-switch.cpp'
--- src/indicator/nmofono/kill-switch.cpp	2015-04-23 13:22:55 +0000
+++ src/indicator/nmofono/kill-switch.cpp	2015-08-05 15:22:19 +0000
@@ -88,27 +88,34 @@
 }
 
 void
-KillSwitch::block()
-{
-    if (state() == KillSwitch::State::hard_blocked)
-        throw KillSwitch::exception::HardBlocked();
-
-    try {
-        if (!utils::getOrThrow(d->urfkill->Block(static_cast<uint>(Private::DeviceType::wlan), true)))
-            throw KillSwitch::exception::Failed("Failed to block killswitch");
-    } catch (std::exception &e) {
-        throw KillSwitch::exception::Failed(e.what());
-    }
-}
-
-void
-KillSwitch::unblock()
-{
-    try {
-        if (!utils::getOrThrow(d->urfkill->Block(static_cast<uint>(Private::DeviceType::wlan), false)))
-            throw KillSwitch::exception::Failed("Failed to unblock killswitch");
-    } catch (std::exception &e) {
-        throw KillSwitch::exception::Failed(e.what());
+KillSwitch::setBlock(bool block)
+{
+    if (!block && state() == State::hard_blocked)
+    {
+        qCritical() << __PRETTY_FUNCTION__ << "Killswitch is hard blocked.";
+        return;
+    }
+
+    if (!block && state() != State::soft_blocked)
+    {
+        return;
+    }
+
+    if (block && state() != State::unblocked)
+    {
+        return;
+    }
+
+    try
+    {
+        if (!utils::getOrThrow(d->urfkill->Block(static_cast<uint>(Private::DeviceType::wlan), block)))
+        {
+            throw std::runtime_error("Failed to block killswitch");
+        }
+    }
+    catch (std::exception &e)
+    {
+        qCritical() << __PRETTY_FUNCTION__ << e.what();
     }
 }
 
 
=== modified file 'src/indicator/nmofono/kill-switch.h'
--- src/indicator/nmofono/kill-switch.h	2015-04-14 11:20:17 +0000
+++ src/indicator/nmofono/kill-switch.h	2015-08-05 15:22:19 +0000
@@ -37,24 +37,6 @@
 public:
     typedef std::shared_ptr<KillSwitch> Ptr;
 
-    struct exception
-    {
-        struct HardBlocked : public std::runtime_error
-        {
-            HardBlocked()
-                : std::runtime_error("Killswitch is hard blocked.")
-            {}
-        };
-
-        struct Failed : public std::runtime_error
-        {
-            Failed() = delete;
-            Failed(std::string what)
-                : std::runtime_error(what)
-            {}
-        };
-    };
-
     enum class State
     {
         not_available = -1,
@@ -68,12 +50,7 @@
     KillSwitch(const QDBusConnection& systemBus);
     ~KillSwitch();
 
-    /// @throws exception::Failed if the switch fails to block
-    void block();
-
-    /// @throws exception::HardBlocked if trying to unblock when switch is hard blocked
-    /// @throws exception::Failed if the switch fails to unblock
-    void unblock();
+    void setBlock(bool block);
 
     State state() const;
     bool flightMode(bool enable);
 
=== modified file 'src/indicator/nmofono/link.h'
--- src/indicator/nmofono/link.h	2015-04-14 11:20:17 +0000
+++ src/indicator/nmofono/link.h	2015-08-05 15:22:19 +0000
@@ -92,12 +92,6 @@
     };
 
     /// @private
-    virtual void enable()  = 0;
-
-    /// @private
-    virtual void disable() = 0;
-
-    /// @private
     virtual Type type() const = 0;
 
     /// @private
 
=== modified file 'src/indicator/nmofono/manager-impl.cpp'
--- src/indicator/nmofono/manager-impl.cpp	2015-08-05 15:22:19 +0000
+++ src/indicator/nmofono/manager-impl.cpp	2015-08-05 15:22:19 +0000
@@ -244,6 +244,13 @@
     connect(d->m_killSwitch.get(), &KillSwitch::stateChanged, d.get(), &Private::updateHasWifi);
 
     d->m_hotspotManager = make_shared<HotspotManager>(systemConnection);
+    connect(d->m_hotspotManager.get(), &HotspotManager::enabledChanged, this, &Manager::hotspotEnabledChanged);
+    connect(d->m_hotspotManager.get(), &HotspotManager::ssidChanged, this, &Manager::hotspotSsidChanged);
+    connect(d->m_hotspotManager.get(), &HotspotManager::passwordChanged, this, &Manager::hotspotPasswordChanged);
+    connect(d->m_hotspotManager.get(), &HotspotManager::modeChanged, this, &Manager::hotspotModeChanged);
+    connect(d->m_hotspotManager.get(), &HotspotManager::storedChanged, this, &Manager::hotspotStoredChanged);
+
+    connect(d->m_hotspotManager.get(), &HotspotManager::reportError, this, &Manager::reportError);
 
     connect(d->nm.get(), &OrgFreedesktopNetworkManagerInterface::DeviceAdded, this, &ManagerImpl::device_added);
     QList<QDBusObjectPath> devices(d->nm->GetDevices());
@@ -256,16 +263,7 @@
     connect(d->nm.get(), &OrgFreedesktopNetworkManagerInterface::PropertiesChanged, this, &ManagerImpl::nm_properties_changed);
 
     connect(d->m_killSwitch.get(), &KillSwitch::flightModeChanged, d.get(), &Private::setFlightMode);
-    try
-    {
-        d->setFlightMode(d->m_killSwitch->isFlightMode());
-    }
-    catch (exception const& e)
-    {
-        cerr << __PRETTY_FUNCTION__ << ": " << e.what() << endl;
-        cerr << "Failed to retrieve initial flight mode state, assuming state is false." << endl;
-        d->setFlightMode(false);
-    }
+    d->setFlightMode(d->m_killSwitch->isFlightMode());
 
     /// @todo set by the default connections.
     d->m_characteristics = Link::Characteristics::empty;
@@ -418,48 +416,23 @@
 }
 
 
-bool
+void
 ManagerImpl::setWifiEnabled(bool enabled)
 {
     if (!d->m_hasWifi)
     {
-        return false;
+        return;
     }
 
     if (d->m_wifiEnabled == enabled)
     {
-        return false;
+        return;
     }
 
-    bool success = true;
     d->setUnstoppableOperationHappening(true);
-
-    try
-    {
-        if (enabled)
-        {
-            if (d->m_killSwitch->state() == KillSwitch::State::soft_blocked)
-            {
-                // try to unblock. throws if fails.
-                d->m_killSwitch->unblock();
-            }
-        }
-        else
-        {
-            if (d->m_killSwitch->state() == KillSwitch::State::unblocked) {
-                // block the device. that will disable it also
-                d->m_killSwitch->block();
-            }
-        }
-        d->nm->setWirelessEnabled(enabled);
-    }
-    catch (runtime_error &e)
-    {
-        qWarning() << __PRETTY_FUNCTION__ << ": " << e.what();
-        success = false;
-    }
+    d->m_killSwitch->setBlock(!enabled);
+    d->nm->setWirelessEnabled(enabled);
     d->setUnstoppableOperationHappening(false);
-    return success;
 }
 
 bool
@@ -557,9 +530,60 @@
     return d->m_ofonoLinks.values().toSet();
 }
 
-HotspotManager::SPtr ManagerImpl::hotspotManager() const
-{
-    return d->m_hotspotManager;
+bool
+ManagerImpl::hotspotEnabled() const
+{
+    return d->m_hotspotManager->enabled();
+}
+
+bool
+ManagerImpl::hotspotStored() const
+{
+    return d->m_hotspotManager->stored();
+}
+
+QByteArray
+ManagerImpl::hotspotSsid() const
+{
+    return d->m_hotspotManager->ssid();
+}
+
+QString
+ManagerImpl::hotspotPassword() const
+{
+    return d->m_hotspotManager->password();
+}
+
+QString
+ManagerImpl::hotspotMode() const
+{
+    return d->m_hotspotManager->mode();
+}
+
+void
+ManagerImpl::setHotspotEnabled(bool enabled)
+{
+    d->setUnstoppableOperationHappening(true);
+    d->m_hotspotManager->setEnabled(enabled);
+    d->setUnstoppableOperationHappening(false);
+}
+
+void
+ManagerImpl::setHotspotSsid(const QByteArray& ssid)
+{
+    d->m_hotspotManager->setSsid(ssid);
+}
+
+void
+ManagerImpl::setHotspotPassword(const QString& password)
+{
+    d->m_hotspotManager->setPassword(password);
+}
+
+void
+ManagerImpl::setHotspotMode(const QString& mode)
+{
+    d->m_hotspotManager->setMode(mode);
 }
 
 }
 
=== modified file 'src/indicator/nmofono/manager-impl.h'
--- src/indicator/nmofono/manager-impl.h	2015-08-05 15:22:19 +0000
+++ src/indicator/nmofono/manager-impl.h	2015-08-05 15:22:19 +0000
@@ -51,7 +51,7 @@
     bool hasWifi() const override;
     bool wifiEnabled() const override;
 
-    bool setWifiEnabled(bool) override;
+    void setWifiEnabled(bool) override;
 
     bool roaming() const override;
 
@@ -66,7 +66,23 @@
     void unlockAllModems() override;
     void unlockModemByName(const QString &name) override;
 
-    HotspotManager::SPtr hotspotManager() const;
+    bool hotspotEnabled() const override;
+
+    bool hotspotStored() const override;
+
+    QByteArray hotspotSsid() const override;
+
+    QString hotspotPassword() const override;
+
+    QString hotspotMode() const override;
+
+    void setHotspotEnabled(bool) override;
+
+    void setHotspotSsid(const QByteArray&) override;
+
+    void setHotspotPassword(const QString&) override;
+
+    void setHotspotMode(const QString&) override;
 
 private Q_SLOTS:
     void device_added(const QDBusObjectPath &path);
 
=== modified file 'src/indicator/nmofono/manager.h'
--- src/indicator/nmofono/manager.h	2015-08-05 15:22:19 +0000
+++ src/indicator/nmofono/manager.h	2015-08-05 15:22:19 +0000
@@ -87,8 +87,6 @@
     Q_PROPERTY(bool unstoppableOperationHappening READ unstoppableOperationHappening NOTIFY unstoppableOperationHappeningUpdated)
     virtual bool unstoppableOperationHappening() const = 0;
 
-    virtual HotspotManager::SPtr hotspotManager() const = 0;
-
     /// @private
     Q_PROPERTY(QSet<Link::Ptr> links READ links NOTIFY linksUpdated)
     virtual QSet<Link::Ptr> links() const = 0;
@@ -130,6 +128,21 @@
 
     virtual void unlockModemByName(const QString &name) = 0;
 
+    Q_PROPERTY(bool hotspotEnabled READ hotspotEnabled WRITE setHotspotEnabled NOTIFY hotspotEnabledChanged)
+    virtual bool hotspotEnabled() const = 0;
+
+    Q_PROPERTY(bool hotspotStored READ hotspotStored NOTIFY hotspotStoredChanged)
+    virtual bool hotspotStored() const = 0;
+
+    Q_PROPERTY(QByteArray hotspotSsid READ hotspotSsid WRITE setHotspotSsid NOTIFY hotspotSsidChanged)
+    virtual QByteArray hotspotSsid() const = 0;
+
+    Q_PROPERTY(QString hotspotPassword READ hotspotPassword WRITE setHotspotPassword NOTIFY hotspotPasswordChanged)
+    virtual QString hotspotPassword() const = 0;
+
+    Q_PROPERTY(QString hotspotMode READ hotspotMode WRITE setHotspotMode NOTIFY hotspotModeChanged)
+    virtual QString hotspotMode() const = 0;
+
 Q_SIGNALS:
     void flightModeUpdated(FlightModeStatus);
 
@@ -143,13 +156,33 @@
 
     void wifiEnabledUpdated(bool);
 
+    void hotspotEnabledChanged(bool enabled);
+
+    void hotspotStoredChanged(bool stored);
+
+    void hotspotSsidChanged(const QByteArray& ssid);
+
+    void hotspotPasswordChanged(const QString& password);
+
+    void hotspotModeChanged(const QString& mode);
+
+    void reportError(int reason);
+
     void unstoppableOperationHappeningUpdated(bool);
 
 public Q_SLOTS:
-    virtual bool setWifiEnabled(bool) = 0;
+    virtual void setWifiEnabled(bool) = 0;
 
     virtual void setFlightMode(bool)  = 0;
 
+    virtual void setHotspotEnabled(bool) = 0;
+
+    virtual void setHotspotSsid(const QByteArray&) = 0;
+
+    virtual void setHotspotPassword(const QString&) = 0;
+
+    virtual void setHotspotMode(const QString&) = 0;
+
 protected:
     /**
      * @brief The default constructor is protected.
 
=== modified file 'src/indicator/nmofono/wifi/wifi-link-impl.cpp'
--- src/indicator/nmofono/wifi/wifi-link-impl.cpp	2015-07-08 08:49:30 +0000
+++ src/indicator/nmofono/wifi/wifi-link-impl.cpp	2015-08-05 15:22:19 +0000
@@ -316,73 +316,6 @@
 WifiLinkImpl::~WifiLinkImpl()
 {}
 
-void
-WifiLinkImpl::enable()
-{
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-    qDebug() << __PRETTY_FUNCTION__;
-#endif
-
-    try {
-        if (d->m_killSwitch->state() != KillSwitch::State::unblocked) {
-            // try to unblock. throws if fails.
-            d->m_killSwitch->unblock();
-        }
-        d->m_nm->setWirelessEnabled(true);
-        d->m_dev->setAutoconnect(true);
-    } catch(runtime_error &e) {
-        /// @todo when toggling enable()/disable() rapidly the default timeout of
-        ///       1 second in dbus::core::Property is not long enough..
-        ///       just ignore for now and get dbus-cpp to have larger timeout.
-        cerr << __PRETTY_FUNCTION__ << ": " << e.what() << endl;
-    }
-
-#if 0
-    /** @todo:
-     * NetworkManager 0.9.9 allows doing this below and letting NM to figure out the best connection:
-     *
-     * m_nm.activate_connection(dbus::types::ObjectPath("/"),
-     *                          m_dev.object->path(),
-     *                          core::dbus::typ es::ObjectPath("/"));
-     *
-     * for now we get somewhat similar result by toggling the Autoconnect property,
-     * but this breaks the possible setting we will have for autoconnecting later.
-     */
-    m_dev.autoconnect->set(true);
-    m_disabled = false;
-#endif
-}
-
-void
-WifiLinkImpl::disable()
-{
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-    cout << __PRETTY_FUNCTION__ << endl;
-#endif
-
-    /// @todo for now just disable wireless completely.
-    ///        this only works properly when there is one wifi adapter on the system
-    try {
-        if (d->m_killSwitch->state() == KillSwitch::State::unblocked) {
-            // block the device. that will disable it also
-            d->m_killSwitch->block();
-            return;
-        }
-        d->m_nm->setWirelessEnabled(false);
-        d->m_dev->setAutoconnect(false);
-    } catch(runtime_error &e) {
-        /// @todo when toggling enable()/disable() rapidly the default timeout of
-        ///       1 second in dbus::core::Property is not long enough..
-        ///       just ignore for now and get dbus-cpp to have larger timeout.
-        qWarning() << __PRETTY_FUNCTION__ << ": " << QString::fromStdString(e.what());
-    }
-
-#if 0
-    /** @todo remove this after NM 0.9.9 is available. check comment in enable() */
-    m_dev.disconnect();
-#endif
-}
-
 Link::Type
 WifiLinkImpl::type() const
 {
 
=== modified file 'src/indicator/nmofono/wifi/wifi-link-impl.h'
--- src/indicator/nmofono/wifi/wifi-link-impl.h	2015-04-14 11:20:17 +0000
+++ src/indicator/nmofono/wifi/wifi-link-impl.h	2015-08-05 15:22:19 +0000
@@ -43,9 +43,6 @@
     ~WifiLinkImpl();
 
     // public API
-    void enable() override;
-    void disable() override;
-
     Type type() const override;
     Id id() const override;
     QString name() const override;
 
=== modified file 'src/indicator/nmofono/wwan/modem.cpp'
--- src/indicator/nmofono/wwan/modem.cpp	2015-06-18 12:28:05 +0000
+++ src/indicator/nmofono/wwan/modem.cpp	2015-08-05 15:22:19 +0000
@@ -671,16 +671,6 @@
     return WwanType::GSM;
 }
 
-void
-Modem::enable()
-{
-}
-
-void
-Modem::disable()
-{
-}
-
 Link::Type
 Modem::type() const
 {
 
=== modified file 'src/indicator/nmofono/wwan/modem.h'
--- src/indicator/nmofono/wwan/modem.h	2015-06-18 12:28:05 +0000
+++ src/indicator/nmofono/wwan/modem.h	2015-08-05 15:22:19 +0000
@@ -132,10 +132,6 @@
 
     WwanType wwanType() const override;
 
-    void enable() override;
-
-    void disable() override;
-
     Type type() const override;
 
     std::uint32_t characteristics() const override;