Fix timing issues in wifi library

There is a timing issue on a device startup if the
default application calls Wifi.Interface.wifiSupported()
before qconnectivity service has finished initialize wifi
firmware/driver. This results in wifiSupported() returing
false on nexus 2013, even if this device supports wifi.

The solution is to move firmware/driver initialization
to Qt Wifi library.

Change-Id: If5b4650181f8b7237bd19f3fc3afbd2c75f759e8
Task-number: QTEE-770
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>

5 files changed, 129 insertions, 65 deletions

diff --git a/src/imports/wifi/pluginmain.cpp b/src/imports/wifi/pluginmain.cpp
index 51a2e7c..a779e44 100644
--- a/src/imports/wifi/pluginmain.cpp
+++ b/src/imports/wifi/pluginmain.cpp
@@ -17,74 +17,14 @@
 **
 ****************************************************************************/
 #include "qwifimanager.h"
+#include "qwifiinterface.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QDebug>
-#include <QtCore/QByteArray>
 #include <QtQml/QQmlExtensionPlugin>
 #include <QtQml/qqml.h>
 
-#ifdef Q_OS_ANDROID
-#include <hardware_legacy/wifi.h>
-#endif
-/*!
-    \qmltype Interface
-    \inqmlmodule Qt.labs.wifi
-    \ingroup wifi-qmltypes
-    \brief The Interface element provides the module API.
-
-    This element cannot be directly created. It can only be accessed via a namespace import.
-
-    \code
-    import Qt.labs.wifi 0.1
-    import Qt.labs.wifi 0.1 as Wifi
-
-    Component.onCompleted: {
-        if (Wifi.Interface.wifiSupported()) {
-            var component = Qt.createComponent("WifiMenu.qml")
-        } else {
-            print("WiFi functionality not available on this device.")
-        }
-    }
-    \endcode
-*/
-
-/*!
-    \qmlmethod bool Interface::wifiSupported()
-
-    Returns true if the device is WiFi capable (provides a WiFi driver), otherwise returns false.
-*/
-
-
-class QWifiGlobal : public QObject
-{
-    Q_OBJECT
-public:
-    explicit QWifiGlobal(QObject *parent = 0)
-        : QObject(parent) {}
-    ~QWifiGlobal() {}
-
-    Q_INVOKABLE bool wifiSupported() const
-    {
-        bool hasInterface = QDir().exists(QStringLiteral("/sys/class/net/wlan0"));
-        if (!hasInterface)
-            qWarning() << "QWifiGlobal: could not find wifi interface in /sys/class/net/";
-#ifdef Q_OS_ANDROID
-        if (hasInterface && wifi_load_driver() == 0 && wifi_start_supplicant(0) == 0) {
-            return true;
-        } else {
-            qWarning() << "QWifiGlobal: wifi driver is not available";
-            return false;
-        }
-#else
-        return hasInterface;
-#endif
-    }
-};
-
 static QObject *global_object_wifi(QQmlEngine *, QJSEngine *)
 {
-    return new QWifiGlobal;
+    return new QWifiInterface;
 }
 
 class QWifiPlugin : public QQmlExtensionPlugin
@@ -99,7 +39,7 @@ public:
 
         qmlRegisterType<QWifiManager>(uri, 0, 1, "WifiManager");
         qmlRegisterType<QWifiNetworkListModel>();
-        qmlRegisterSingletonType<QWifiGlobal>(uri, 0, 1, "Interface", global_object_wifi);
+        qmlRegisterSingletonType<QWifiInterface>(uri, 0, 1, "Interface", global_object_wifi);
     }
 };
 
diff --git a/src/imports/wifi/qwifiinterface.cpp b/src/imports/wifi/qwifiinterface.cpp
new file mode 100644
index 0000000..2922866
--- /dev/null
+++ b/src/imports/wifi/qwifiinterface.cpp
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use the contact form at
+** http://qt.digia.com/
+**
+** This file is part of Qt Enterprise Embedded.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** the contact form at http://qt.digia.com/
+**
+****************************************************************************/
+#include "qwifiinterface.h"
+
+/*!
+    \qmltype Interface
+    \inqmlmodule Qt.labs.wifi
+    \ingroup wifi-qmltypes
+    \brief The Interface element provides the module API.
+
+    This element cannot be directly created. It can only be accessed via a namespace import.
+
+    \code
+    import Qt.labs.wifi 0.1
+    import Qt.labs.wifi 0.1 as Wifi
+
+    Component.onCompleted: {
+        if (Wifi.Interface.wifiSupported()) {
+            var component = Qt.createComponent("WifiMenu.qml")
+        } else {
+            print("WiFi functionality not available on this device.")
+        }
+    }
+    \endcode
+*/
+
+/*!
+    \qmlmethod bool Interface::wifiSupported()
+
+    Returns true if the device is WiFi capable (provides a WiFi driver), otherwise returns false.
+*/
+
+bool QWifiInterface::wifiSupported() const
+{
+#ifdef Q_OS_ANDROID
+    const char *fwpath = 0;
+    // reload wifi firmware
+    fwpath = (char *)wifi_get_fw_path(WIFI_GET_FW_PATH_STA);
+    if (!fwpath) {
+        qWarning() << "QWifiInterface: failed to get firmware path";
+        return false;
+    }
+    if (wifi_change_fw_path((const char *)fwpath)) {
+        qWarning() << "QWifiInterface: failed to change firmware path";
+        return false;
+    }
+#endif
+    const bool hasInterface = QDir().exists(QStringLiteral("/sys/class/net/wlan0"));
+    if (!hasInterface)
+        qWarning() << "QWifiInterface: could not find wifi interface in /sys/class/net/";
+#ifdef Q_OS_ANDROID
+    if (hasInterface && wifi_load_driver() == 0 && wifi_start_supplicant(0) == 0) {
+        return true;
+    } else {
+        qWarning() << "QWifiInterface: wifi driver is not available";
+        return false;
+    }
+#else
+    return hasInterface;
+#endif
+}
diff --git a/src/imports/wifi/qwifiinterface.h b/src/imports/wifi/qwifiinterface.h
new file mode 100644
index 0000000..da7750e
--- /dev/null
+++ b/src/imports/wifi/qwifiinterface.h
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use the contact form at
+** http://qt.digia.com/
+**
+** This file is part of Qt Enterprise Embedded.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** the contact form at http://qt.digia.com/
+**
+****************************************************************************/
+#ifndef QWIFIINTERFACE_H
+#define QWIFIINTERFACE_H
+
+#include <QtCore/QDir>
+#include <QtCore/QDebug>
+#ifdef Q_OS_ANDROID
+#include <hardware_legacy/wifi.h>
+#include <cutils/properties.h>
+#endif
+
+class QWifiInterface : public QObject
+{
+    Q_OBJECT
+public:
+    explicit QWifiInterface(QObject *parent = 0)
+        : QObject(parent) {}
+    ~QWifiInterface() {}
+
+    Q_INVOKABLE bool wifiSupported() const;
+};
+
+#endif // QWIFIHELPERS_H
diff --git a/src/imports/wifi/qwifimanager.cpp b/src/imports/wifi/qwifimanager.cpp
index 8eec3e0..165abfd 100644
--- a/src/imports/wifi/qwifimanager.cpp
+++ b/src/imports/wifi/qwifimanager.cpp
@@ -17,6 +17,7 @@
 **
 ****************************************************************************/
 #include "qwifimanager.h"
+#include "qwifiinterface.h"
 
 #include <QtCore>
 #ifdef Q_OS_ANDROID
@@ -422,6 +423,10 @@ QWifiManager::QWifiManager()
     , m_startingUp(true)
     , m_network(0)
 {
+    if (!QWifiInterface().wifiSupported())
+        // give a warning about API misuse
+        qWarning() << "WifiManager may not work as expected on this device. Use the API provided by QtWifi "
+                      "library to verify if device has support for Wi-Fi before creating an instance of WifiManager!";
 #ifdef Q_OS_ANDROID
     char interface[PROPERTY_VALUE_MAX];
     property_get(WIFI_INTERFACE, interface, NULL);
diff --git a/src/imports/wifi/wifi.pro b/src/imports/wifi/wifi.pro
index fcb6cdd..dabf8cb 100644
--- a/src/imports/wifi/wifi.pro
+++ b/src/imports/wifi/wifi.pro
@@ -7,13 +7,15 @@ IMPORT_VERSION = 0.1
 HEADERS += \
     qwifimanager.h \
     qwifinetwork.h \
-    qwifinetworklistmodel.h
+    qwifinetworklistmodel.h \
+    qwifiinterface.h
 
 SOURCES += \
     pluginmain.cpp \
     qwifimanager.cpp \
     qwifinetwork.cpp \
-    qwifinetworklistmodel.cpp
+    qwifinetworklistmodel.cpp \
+    qwifiinterface.cpp
 
 android: {
     LIBS += -lhardware_legacy -lcutils