Merge lp:~pete-woods/indicator-network/no-aps-when-hotspot-enabled into lp:indicator-network/15.10

[Pete Woods]

Don't show access points when hotspot is enabled

Don't show access points when hotspot is enabled

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'src/indicator/nmofono/kill-switch.cpp'
--- src/indicator/nmofono/kill-switch.cpp	2015-08-07 09:39:56 +0000
+++ src/indicator/nmofono/kill-switch.cpp	2015-08-07 09:39:56 +0000
@@ -25,11 +25,15 @@
 #include <URfkillInterface.h>
 #include <URfkillKillswitchInterface.h>
 
+using namespace std;
+
 namespace nmofono
 {
 
-class KillSwitch::Private
+class KillSwitch::Private: public QObject
 {
+    Q_OBJECT
+
 public:
     enum class DeviceType
     {
@@ -43,15 +47,48 @@
         nfc = 8
     };
 
+    KillSwitch& p;
+
     std::shared_ptr<OrgFreedesktopURfkillInterface> urfkill;
     std::shared_ptr<OrgFreedesktopURfkillKillswitchInterface> killSwitch;
 
     bool m_flightMode = false;
+    State m_state = State::not_available;
 
-    Private(std::shared_ptr<OrgFreedesktopURfkillInterface> urfkill,
+    Private(KillSwitch& parent,
+            std::shared_ptr<OrgFreedesktopURfkillInterface> urfkill,
             std::shared_ptr<OrgFreedesktopURfkillKillswitchInterface> killSwitch)
-        : urfkill(urfkill),
+        : p(parent),
+          urfkill(urfkill),
           killSwitch(killSwitch) {}
+
+public Q_SLOTS:
+    void setFlightMode(bool flightMode)
+    {
+        if (flightMode == m_flightMode)
+        {
+            return;
+        }
+
+        m_flightMode = flightMode;
+        Q_EMIT p.flightModeChanged(flightMode);
+    }
+
+    void stateChanged()
+    {
+        int stateIndex = killSwitch->state();
+        if (stateIndex >= static_cast<int>(State::first_) &&
+            stateIndex <= static_cast<int>(State::last_))
+        {
+            m_state = static_cast<KillSwitch::State>(stateIndex);
+        }
+        else
+        {
+            m_state = KillSwitch::State::not_available;
+        }
+
+        Q_EMIT p.stateChanged(m_state);
+    }
 };
 
 
@@ -65,28 +102,17 @@
                                                                                  DBusTypes::URFKILL_WIFI_OBJ_PATH,
                                                                                  systemBus);
 
-    connect(urfkill.get(), SIGNAL(FlightModeChanged(bool)), this, SLOT(setFlightMode(bool)));
-    connect(killSwitch.get(), SIGNAL(StateChanged()), this, SIGNAL(stateChanged()));
-
-    d.reset(new Private(urfkill, killSwitch));
-
-    setFlightMode(urfkill->IsFlightMode());
+    d = make_unique<Private>(*this, urfkill, killSwitch);
+    d->setFlightMode(urfkill->IsFlightMode());
+    d->stateChanged();
+
+    connect(urfkill.get(), &OrgFreedesktopURfkillInterface::FlightModeChanged, d.get(), &Private::setFlightMode);
+    connect(killSwitch.get(), &OrgFreedesktopURfkillKillswitchInterface::StateChanged, d.get(), &Private::stateChanged);
 }
 
 KillSwitch::~KillSwitch()
 {}
 
-void KillSwitch::setFlightMode(bool flightMode)
-{
-    if (flightMode == d->m_flightMode)
-    {
-        return;
-    }
-
-    d->m_flightMode = flightMode;
-    Q_EMIT flightModeChanged(flightMode);
-}
-
 void
 KillSwitch::setBlock(bool block)
 {
@@ -121,13 +147,7 @@
 
 KillSwitch::State KillSwitch::state() const
 {
-    int stateIndex = d->killSwitch->state();
-    if (stateIndex >= static_cast<int>(State::first_) &&
-        stateIndex <= static_cast<int>(State::last_))
-    {
-        return static_cast<KillSwitch::State>(stateIndex);
-    }
-    return KillSwitch::State::not_available;
+    return d->m_state;
 }
 
 bool KillSwitch::flightMode(bool enable)
@@ -154,3 +174,5 @@
 }
 
 }
+
+#include "kill-switch.moc"

=== modified file 'src/indicator/nmofono/kill-switch.h'
--- src/indicator/nmofono/kill-switch.h	2015-08-07 09:39:56 +0000
+++ src/indicator/nmofono/kill-switch.h	2015-08-07 09:39:56 +0000
@@ -57,11 +57,9 @@
     bool isFlightMode();
 
 Q_SIGNALS:
-    void stateChanged();
+    void stateChanged(State);
     void flightModeChanged(bool);
 
-private Q_SLOTS:
-    void setFlightMode(bool);
 };
 
 }

=== modified file 'src/indicator/nmofono/manager-impl.cpp'
--- src/indicator/nmofono/manager-impl.cpp	2015-08-07 09:39:56 +0000
+++ src/indicator/nmofono/manager-impl.cpp	2015-08-07 09:39:56 +0000
@@ -271,6 +271,69 @@
     d->updateHasWifi();
 }
 
+bool
+ManagerImpl::wifiEnabled() const
+{
+    return d->m_wifiEnabled;
+}
+
+
+void
+ManagerImpl::setWifiEnabled(bool enabled)
+{
+    if (!d->m_hasWifi)
+    {
+        return;
+    }
+
+    if (d->m_wifiEnabled == enabled)
+    {
+        return;
+    }
+
+    d->setUnstoppableOperationHappening(true);
+    d->m_killSwitch->setBlock(!enabled);
+    d->nm->setWirelessEnabled(enabled);
+    d->setUnstoppableOperationHappening(false);
+}
+
+bool
+ManagerImpl::hotspotEnabled() const
+{
+    return d->m_hotspotManager->enabled();
+}
+
+void
+ManagerImpl::setHotspotEnabled(bool enabled)
+{
+    d->setUnstoppableOperationHappening(true);
+    d->m_hotspotManager->setEnabled(enabled);
+    d->setUnstoppableOperationHappening(false);
+}
+
+void
+ManagerImpl::setFlightMode(bool enabled)
+{
+    if (enabled == d->m_killSwitch->isFlightMode())
+    {
+        return;
+    }
+
+    d->setUnstoppableOperationHappening(true);
+
+    if (!d->m_killSwitch->flightMode(enabled))
+    {
+        qWarning() << "Failed to change flightmode.";
+    }
+    d->setUnstoppableOperationHappening(false);
+}
+
+Manager::FlightModeStatus
+ManagerImpl::flightMode() const
+{
+    return d->m_flightMode;
+}
+
 void
 ManagerImpl::nm_properties_changed(const QVariantMap &properties)
 {
@@ -325,9 +388,16 @@
         auto dev = make_shared<OrgFreedesktopNetworkManagerDeviceInterface>(
             NM_DBUS_SERVICE, path.path(), d->nm->connection());
         if (dev->deviceType() == NM_DEVICE_TYPE_WIFI) {
-            link = make_shared<wifi::WifiLinkImpl>(dev,
+            wifi::WifiLink::Ptr tmp = make_shared<wifi::WifiLinkImpl>(dev,
                                                 d->nm,
                                                 d->m_killSwitch);
+
+            // Wire up enabling / disabling AP visibility to the hotspot enabled state
+            tmp->setHideAccessPoints(d->m_hotspotManager->enabled());
+            QObject::connect(d->m_hotspotManager.get(), &HotspotManager::enabledChanged,
+                    tmp.get(), &wifi::WifiLink::setHideAccessPoints);
+
+            link = tmp;
         }
     } catch (const exception &e) {
         qDebug() << __PRETTY_FUNCTION__ << ": failed to create Device proxy for "<< path.path() << ": ";
@@ -345,35 +415,6 @@
 }
 
 
-void
-ManagerImpl::setFlightMode(bool enabled)
-{
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-    qDebug() << __PRETTY_FUNCTION__ << enabled;
-#endif
-    if (enabled == d->m_killSwitch->isFlightMode())
-    {
-        return;
-    }
-
-    d->setUnstoppableOperationHappening(true);
-
-    if (!d->m_killSwitch->flightMode(enabled))
-    {
-        qWarning() << "Failed to change flightmode.";
-    }
-    d->setUnstoppableOperationHappening(false);
-}
-
-Manager::FlightModeStatus
-ManagerImpl::flightMode() const
-{
-    // - connect to each individual URfkill.Killswitch interface
-    // - make this property to reflect their combined state
-    /// @todo implement flightmode status properly when URfkill gets the flightmode API
-    return d->m_flightMode;
-}
-
 bool
 ManagerImpl::unstoppableOperationHappening() const
 {
@@ -410,32 +451,6 @@
 }
 
 bool
-ManagerImpl::wifiEnabled() const
-{
-    return d->m_wifiEnabled;
-}
-
-
-void
-ManagerImpl::setWifiEnabled(bool enabled)
-{
-    if (!d->m_hasWifi)
-    {
-        return;
-    }
-
-    if (d->m_wifiEnabled == enabled)
-    {
-        return;
-    }
-
-    d->setUnstoppableOperationHappening(true);
-    d->m_killSwitch->setBlock(!enabled);
-    d->nm->setWirelessEnabled(enabled);
-    d->setUnstoppableOperationHappening(false);
-}
-
-bool
 ManagerImpl::roaming() const
 {
     for (auto modem : d->m_ofonoLinks) {
@@ -531,12 +546,6 @@
 }
 
 bool
-ManagerImpl::hotspotEnabled() const
-{
-    return d->m_hotspotManager->enabled();
-}
-
-bool
 ManagerImpl::hotspotStored() const
 {
     return d->m_hotspotManager->stored();
@@ -561,14 +570,6 @@
 }
 
 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);

=== modified file 'src/indicator/nmofono/wifi/wifi-link-impl.cpp'
--- src/indicator/nmofono/wifi/wifi-link-impl.cpp	2015-08-07 09:39:56 +0000
+++ src/indicator/nmofono/wifi/wifi-link-impl.cpp	2015-08-07 09:39:56 +0000
@@ -76,6 +76,7 @@
     QString m_name;
     shared_ptr<OrgFreedesktopNetworkManagerConnectionActiveInterface> m_activeConnection;
     bool m_connecting = false;
+    bool m_hideAccessPoints = false;
 
     void setStatus(Status status)
     {
@@ -234,7 +235,7 @@
             } else {
                 m_grouper[k] = make_shared<GroupedAccessPoint>(shap);
             }
-            update_grouped();
+            update_grouped_access_points();
         } catch(const exception &e) {
             /// @bug dbus-cpp internal logic exploded
             // If this happens, indicator-network is in an unknown state with no clear way of
@@ -271,16 +272,25 @@
                 m_grouper.erase(it);
             }
         }
-        update_grouped();
+        update_grouped_access_points();
     }
 
-    void update_grouped() {
-        QSet<AccessPoint::Ptr> new_grouped;
-        for(auto &i : m_grouper) {
-            new_grouped.insert(i.second);
-        }
-        m_groupedAccessPoints = new_grouped;
-        Q_EMIT p.accessPointsUpdated(new_grouped);
+    void update_grouped_access_points()
+    {
+        m_groupedAccessPoints.clear();
+        for (auto &i : m_grouper)
+        {
+            m_groupedAccessPoints.insert(i.second);
+        }
+
+        if (m_hideAccessPoints)
+        {
+            Q_EMIT p.accessPointsUpdated(QSet<AccessPoint::Ptr>());
+        }
+        else
+        {
+            Q_EMIT p.accessPointsUpdated(m_groupedAccessPoints);
+        }
     }
 
     void state_changed(uint new_state, uint, uint)
@@ -288,7 +298,7 @@
         updateDeviceState(new_state);
     }
 
-    void kill_switch_updated()
+    void kill_switch_updated(KillSwitch::State)
     {
         updateDeviceState(m_lastState);
     }
@@ -346,8 +356,13 @@
     return d->m_name;
 }
 
-const QSet<AccessPoint::Ptr>&
+QSet<AccessPoint::Ptr>
 WifiLinkImpl::accessPoints() const {
+    if (d->m_hideAccessPoints)
+    {
+        return QSet<AccessPoint::Ptr>();
+    }
+
     return d->m_groupedAccessPoints;
 }
 
@@ -438,6 +453,18 @@
     return QDBusObjectPath(d->m_dev->path());
 }
 
+void
+WifiLinkImpl::setHideAccessPoints(bool hide)
+{
+    if (hide == d->m_hideAccessPoints)
+    {
+        return;
+    }
+
+    d->m_hideAccessPoints = hide;
+    d->update_grouped_access_points();
+}
+
 }
 }
 

=== modified file 'src/indicator/nmofono/wifi/wifi-link-impl.h'
--- src/indicator/nmofono/wifi/wifi-link-impl.h	2015-08-07 09:39:56 +0000
+++ src/indicator/nmofono/wifi/wifi-link-impl.h	2015-08-07 09:39:56 +0000
@@ -50,12 +50,14 @@
     std::uint32_t characteristics() const override;
     Status status() const override;
 
-    const QSet<AccessPoint::Ptr>& accessPoints() const override;
+    QSet<AccessPoint::Ptr> accessPoints() const override;
     void connect_to(AccessPoint::Ptr accessPoint) override;
     AccessPoint::Ptr activeAccessPoint() override;
 
     QDBusObjectPath device_path() const;
 
+    void setHideAccessPoints(bool) override;
+
 private:
     struct Private;
     std::unique_ptr<Private> d;

=== modified file 'src/indicator/nmofono/wifi/wifi-link.h'
--- src/indicator/nmofono/wifi/wifi-link.h	2015-04-14 11:20:17 +0000
+++ src/indicator/nmofono/wifi/wifi-link.h	2015-08-07 09:39:56 +0000
@@ -46,13 +46,16 @@
     virtual ~WifiLink() = default;
 
     Q_PROPERTY(QSet<nmofono::wifi::AccessPoint::Ptr> accessPoints READ accessPoints NOTIFY accessPointsUpdated)
-    virtual const QSet<AccessPoint::Ptr>& accessPoints() const = 0;
+    virtual QSet<AccessPoint::Ptr> accessPoints() const = 0;
 
     virtual void connect_to(AccessPoint::Ptr accessPoint) = 0;
 
     Q_PROPERTY(nmofono::wifi::AccessPoint::Ptr activeAccessPoint READ activeAccessPoint NOTIFY activeAccessPointUpdated)
     virtual AccessPoint::Ptr activeAccessPoint() = 0;
 
+public Q_SLOTS:
+    virtual void setHideAccessPoints(bool) = 0;
+
 Q_SIGNALS:
     void accessPointsUpdated(const QSet<AccessPoint::Ptr>&);