Merge lp:~phablet-team/indicator-network/store-hotspot-device into lp:indicator-network

[Pete Woods]

Store information about which device we are using in a member variable

* Explicitly name methods and remove return types to make it clear they are altering the state of the hotspot manager

Store information about which device we are using in a member variable

* Explicitly name methods and remove return types to make it clear they are altering the state of the hotspot manager

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:589
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/428/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/80/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/indicator/nmofono/hotspot-manager.cpp'
--- src/indicator/nmofono/hotspot-manager.cpp	2016-05-10 11:21:08 +0000
+++ src/indicator/nmofono/hotspot-manager.cpp	2016-05-10 11:21:08 +0000
@@ -40,6 +40,17 @@
 namespace nmofono
 {
 
+struct ApDevice
+{
+    ApDevice (const QDBusObjectPath& path, const QString& interface) :
+            m_path (path), m_interface (interface)
+    {
+    }
+
+    QDBusObjectPath m_path;
+    QString m_interface;
+};
+
 class HotspotManager::Priv: public QObject
 {
 
@@ -271,10 +282,9 @@
         return true;
     }
 
-
-    QDBusObjectPath getApDevice()
+    void findApDevice()
     {
-        QDBusObjectPath result("/");
+        m_device.release();
         QString tetherIface = getTetheringInterface();
 
         auto devices = QList<QDBusObjectPath>(m_manager->GetDevices()).toStdList();
@@ -293,35 +303,32 @@
                 }
             }
 
-            if (device.deviceType() == NM_DEVICE_TYPE_WIFI)
+            if (device.deviceType() != NM_DEVICE_TYPE_WIFI)
             {
-                qDebug() << "Using AP interface " << interface;
-                m_interface = interface;
-                result = *path;
-                break;
+                continue;
             }
+
+            qDebug() << __PRETTY_FUNCTION__ << "Using AP interface " << interface;
+            m_device = make_unique<ApDevice>(*path, interface);
+            break;
         }
-
-        return result;
     }
 
-    QDBusObjectPath createApDevice()
+    void createApDevice()
     {
         setInterfaceFirmware("/", m_mode);
 
-        QDBusObjectPath result("/");
+        m_device.release();
 
         int count = 0;
         // Wait for AP device to appear
-        while (count < 20 && result.path() == "/")
+        while (count < 20 && !m_device)
         {
             QThread::msleep(100);
-            result = getApDevice();
-            qDebug() << __PRETTY_FUNCTION__ << "Searching for AP device" << result.path();
+            findApDevice();
+            qDebug() << __PRETTY_FUNCTION__ << "Searching for AP device";
             ++count;
         }
-
-        return result;
     }
 
     // wpa_supplicant interaction
@@ -521,12 +528,12 @@
         }
 
 
-        auto device = getApDevice();
+        findApDevice();
 
-        if (device.path() != "/")
+        if (m_device)
         {
-            qDebug() << __PRETTY_FUNCTION__ << "Reactivating hotspot connection on device" << device.path();
-            activateConnection(device);
+            qDebug() << __PRETTY_FUNCTION__ << "Reactivating hotspot connection on device" << m_device->m_path.path();
+            activateConnection(m_device->m_path);
         }
         else
         {
@@ -543,7 +550,8 @@
     bool m_stored = false;
     QString m_password;
     QByteArray m_ssid = "Ubuntu";
-    QString m_interface;
+
+    unique_ptr<ApDevice> m_device;
 
     QPowerd::UPtr m_powerd;
     QPowerd::RequestSPtr m_wakelock;
@@ -619,9 +627,9 @@
         d->setDisconnectWifi(true);
 
         // We use Hybris to load the new device firmware
-        auto device = d->createApDevice();
+        d->createApDevice();
 
-        if (device.path() == "/")
+        if (!d->m_device)
         {
             qWarning() << __PRETTY_FUNCTION__ << "Failed to create AP device";
             Q_EMIT reportError(1);
@@ -637,7 +645,7 @@
         {
             d->addConnection();
         }
-        d->enable(device);
+        d->enable(d->m_device->m_path);
     }
     else
     {
@@ -691,8 +699,8 @@
 
 QString HotspotManager::interface() const
 {
-    if (enabled())
-        return d->m_interface;
+    if (enabled() && d->m_device)
+        return d->m_device->m_interface;
     else
         return QString();
 }