Merge lp:~unity-api-team/indicator-network/disconnect-wifi-when-hotspot-active into lp:indicator-network/15.10

[Pete Woods]

Disconnect from access points when starting hotspot

Disconnect from access points when starting hotspot

[Antti Kaijanmäki (kaijanmaki)]

LGTM.

review: Approve

=== modified file 'src/indicator/nmofono/hotspot-manager.cpp'
--- src/indicator/nmofono/hotspot-manager.cpp	2015-08-17 11:05:23 +0000
+++ src/indicator/nmofono/hotspot-manager.cpp	2015-08-17 11:05:23 +0000
@@ -67,7 +67,6 @@
         // Get new settings
         QVariantDictMap new_settings = createConnectionSettings(m_ssid,
                                                                 m_password,
-                                                                m_device_path,
                                                                 m_mode, false);
         auto updating = m_hotspot->Update(new_settings);
         updating.waitForFinished();
@@ -202,18 +201,16 @@
         QStringList arguments;
         arguments << "urfkill.hybris.wlan";
 
-        QProcess *getprop = new QProcess();
-        getprop->start(program, arguments);
+        QProcess getprop;
+        getprop.start(program, arguments);
 
-        if (!getprop->waitForFinished())
+        if (!getprop.waitForFinished())
         {
-            qCritical() << "getprop process failed:" << getprop->errorString();
-            delete getprop;
+            qCritical() << "getprop process failed:" << getprop.errorString();
             return false;
         }
 
-        int index = getprop->readAllStandardOutput().indexOf("1");
-        delete getprop;
+        int index = getprop.readAllStandardOutput().indexOf("1");
 
         // A non-negative integer means getprop returned 1
         return index >= 0;
@@ -231,7 +228,7 @@
             return true;
         }
 
-        if (isHybrisWlan())
+        if (m_isHybrisWlan)
         {
             QDBusInterface wpasIface(wpa_supplicant_service,
                                      wpa_supplicant_path,
@@ -305,9 +302,8 @@
      */
     QVariantDictMap createConnectionSettings(
         const QByteArray &ssid, const QString &password,
-        const QDBusObjectPath &devicePath, QString mode, bool autoConnect = true)
+        QString mode, bool autoConnect = true)
     {
-        Q_UNUSED(devicePath);
         QVariantDictMap connection;
 
         QString s_ssid = QString::fromLatin1(ssid);
@@ -386,7 +382,7 @@
     void addConnection()
     {
         QVariantDictMap connection = createConnectionSettings(m_ssid, m_password,
-                                                              m_device_path, m_mode);
+                                                              m_mode);
 
         auto add_connection_reply = m_settings->AddConnection(connection);
         add_connection_reply.waitForFinished();
@@ -440,39 +436,6 @@
     }
 
     /**
-     * Returns a QDBusObjectPath of a wireless device. For now
-     * it returns the first device.
-     */
-    void getWirelessDevice ()
-    {
-        // find the first wlan adapter for now
-        auto reply1 = m_manager->GetDevices();
-        reply1.waitForFinished();
-
-        if(!reply1.isValid()) {
-            qCritical() << "Could not get network device: "
-                << reply1.error().message();
-            m_device_path = QDBusObjectPath();
-            return;
-        }
-        auto devices = reply1.value();
-
-        QDBusObjectPath dev;
-        for (const auto &d : devices) {
-            OrgFreedesktopNetworkManagerDeviceInterface iface(NM_DBUS_SERVICE, d.path(), m_manager->connection());
-            auto type_v = iface.deviceType();
-
-            if (type_v == NM_DEVICE_TYPE_WIFI)
-            {
-                m_device_path = d;
-                return;
-            }
-        }
-        qCritical() << "Wireless device not found, hotspot functionality is inoperative.";
-        m_device_path = 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].
@@ -530,6 +493,22 @@
         m_password = QString::fromStdString(result);
     }
 
+    void setDisconnectWifi(bool disconnect)
+    {
+        if (!m_isHybrisWlan)
+        {
+            return;
+        }
+
+        if (m_disconnectWifi == disconnect)
+        {
+            return;
+        }
+
+        m_disconnectWifi = disconnect;
+        Q_EMIT p.disconnectWifiChanged(m_disconnectWifi);
+    }
+
 public Q_SLOTS:
     void onNewConnection(const QDBusObjectPath& path)
     {
@@ -653,11 +632,12 @@
     QString m_password;
     QByteArray m_ssid = "Ubuntu";
 
-    QDBusObjectPath m_device_path;
-
     QPowerd::UPtr m_powerd;
     QPowerd::RequestSPtr m_wakelock;
 
+    bool m_isHybrisWlan = false;
+    bool m_disconnectWifi = false;
+
     /**
      * NetworkManager dbus interface proxy we will use to query
      * against NetworkManager. See
@@ -680,6 +660,8 @@
 HotspotManager::HotspotManager(const QDBusConnection& connection, QObject *parent) :
         QObject(parent), d(new Priv(*this))
 {
+    d->m_isHybrisWlan = d->isHybrisWlan();
+
     d->m_manager = make_unique<OrgFreedesktopNetworkManagerInterface>(
             NM_DBUS_SERVICE, NM_DBUS_PATH, connection);
     d->m_settings = make_unique<OrgFreedesktopNetworkManagerSettingsInterface>(
@@ -688,7 +670,6 @@
     d->m_powerd = make_unique<QPowerd>(connection);
 
     d->generatePassword();
-    d->getWirelessDevice();
 
     // Stored is false if hotspot path is empty.
     d->getHotspot();
@@ -729,6 +710,8 @@
         return;
     }
 
+    d->setDisconnectWifi(value);
+
     // We are enabling a hotspot
     if (value)
     {
@@ -840,3 +823,8 @@
         Q_EMIT modeChanged(value);
     }
 }
+
+bool HotspotManager::disconnectWifi() const
+{
+    return d->m_disconnectWifi;
+}

=== modified file 'src/indicator/nmofono/hotspot-manager.h'
--- src/indicator/nmofono/hotspot-manager.h	2015-08-05 09:18:11 +0000
+++ src/indicator/nmofono/hotspot-manager.h	2015-08-17 11:05:23 +0000
@@ -114,6 +114,10 @@
         READ stored
         NOTIFY storedChanged)
 
+    Q_PROPERTY( bool disconnectWifi
+        READ disconnectWifi
+        NOTIFY disconnectWifiChanged)
+
 public:
     typedef std::shared_ptr<HotspotManager> SPtr;
 
@@ -131,6 +135,8 @@
 
     QString mode() const;
 
+    bool disconnectWifi() const;
+
 Q_SIGNALS:
     void enabledChanged(bool enabled);
 
@@ -142,6 +148,8 @@
 
     void modeChanged(const QString& mode);
 
+    void disconnectWifiChanged(bool disconnect);
+
     /*
      * The mapping of code to string is taken from
      *  http://bazaar.launchpad.net/~vcs-imports/

=== modified file 'src/indicator/nmofono/manager-impl.cpp'
--- src/indicator/nmofono/manager-impl.cpp	2015-08-17 11:05:23 +0000
+++ src/indicator/nmofono/manager-impl.cpp	2015-08-17 11:05:23 +0000
@@ -38,6 +38,7 @@
 
 #include <QMap>
 #include <QList>
+#include <QRegularExpression>
 #include <NetworkManager.h>
 #include <QDebug>
 #include <algorithm>
@@ -47,6 +48,8 @@
 
 namespace nmofono {
 
+static const QRegularExpression ACCESS_POINT_EXPRESSION("^ap\\d+$");
+
 class ManagerImpl::Private : public QObject
 {
     Q_OBJECT
@@ -417,13 +420,18 @@
                                                 d->m_killSwitch);
 
             // We're not interested in showing access points
-            if (tmp->mode() != wifi::WifiLink::Mode::ap)
+            if (!ACCESS_POINT_EXPRESSION.match(tmp->name()).hasMatch())
             {
                 // 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);
 
+                // Disconnect wifi if we're on hybris
+                tmp->setDisconnectWifi(d->m_hotspotManager->disconnectWifi());
+                QObject::connect(d->m_hotspotManager.get(), &HotspotManager::disconnectWifiChanged,
+                        tmp.get(), &wifi::WifiLink::setDisconnectWifi);
+
                 link = tmp;
             }
         }

=== modified file 'src/indicator/nmofono/wifi/wifi-link-impl.cpp'
--- src/indicator/nmofono/wifi/wifi-link-impl.cpp	2015-08-17 11:05:23 +0000
+++ src/indicator/nmofono/wifi/wifi-link-impl.cpp	2015-08-17 11:05:23 +0000
@@ -79,6 +79,7 @@
     unique_ptr<QMetaObject::Connection> m_signalStrengthConnection;
     bool m_connecting = false;
     bool m_hideAccessPoints = false;
+    bool m_disconnectWifi = false;
 
     void setStatus(Status status)
     {
@@ -546,6 +547,23 @@
     d->strengthUpdated();
 }
 
+void
+WifiLinkImpl::setDisconnectWifi(bool disconnect)
+{
+    if (disconnect == d->m_disconnectWifi)
+    {
+        return;
+    }
+
+    d->m_dev->setAutoconnect(!disconnect);
+    if (disconnect && d->m_activeConnection)
+    {
+        // Disconnect from the current network
+        d->m_nm->DeactivateConnection(
+                QDBusObjectPath(d->m_activeConnection->path()));
+    }
+}
+
 }
 }
 

=== modified file 'src/indicator/nmofono/wifi/wifi-link-impl.h'
--- src/indicator/nmofono/wifi/wifi-link-impl.h	2015-08-17 11:05:23 +0000
+++ src/indicator/nmofono/wifi/wifi-link-impl.h	2015-08-17 11:05:23 +0000
@@ -58,6 +58,8 @@
 
     void setHideAccessPoints(bool) override;
 
+    void setDisconnectWifi(bool) override;
+
     Mode mode() const override;
 
     Signal signal() const override;

=== modified file 'src/indicator/nmofono/wifi/wifi-link.h'
--- src/indicator/nmofono/wifi/wifi-link.h	2015-08-17 11:05:23 +0000
+++ src/indicator/nmofono/wifi/wifi-link.h	2015-08-17 11:05:23 +0000
@@ -83,6 +83,8 @@
 public Q_SLOTS:
     virtual void setHideAccessPoints(bool) = 0;
 
+    virtual void setDisconnectWifi(bool) = 0;
+
 Q_SIGNALS:
     void accessPointsUpdated(const QSet<AccessPoint::Ptr>&);