Merge Boot2Qt Wifi module into Network Settings Plugin.

Added wpasupplicant as alternative backend for the network settings.

Change-Id: Ic05b3e87def2c9a143c30e4045a36db294ce8719
Reviewed-by: Risto Avila <risto.avila@theqtcompany.com>

5 files changed, 13 insertions, 6 deletions

diff --git a/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsmanager_p.cpp
index 2d4a0d3..8df7276 100644
--- a/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsmanager_p.cpp
+++ b/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsmanager_p.cpp
@@ -161,3 +161,8 @@ void QNetworkSettingsManagerPrivate::servicesChanged(ConnmanMapList changed, con
         m_serviceModel.append(service);
     }
 }
+
+void QNetworkSettingsManagerPrivate::setUserAgent(QNetworkSettingsUserAgent *agent)
+{
+
+}
diff --git a/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsmanager_p.h b/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsmanager_p.h
index 6883d74..cadf63f 100644
--- a/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsmanager_p.h
+++ b/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsmanager_p.h
@@ -52,6 +52,7 @@ class QNetworkSettingsManagerPrivate : public QObject
 public:
     explicit QNetworkSettingsManagerPrivate(QNetworkSettingsManager *parent);
     QNetworkSettingsManager *q_ptr;
+    void setUserAgent(QNetworkSettingsUserAgent *agent);
 
 public slots:
     void getServicesFinished(QDBusPendingCallWatcher *watcher);
diff --git a/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsservice_p.cpp b/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsservice_p.cpp
index 95181ed..9e2e83c 100644
--- a/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsservice_p.cpp
+++ b/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsservice_p.cpp
@@ -376,7 +376,7 @@ void QNetworkSettingsServicePrivate::updateProperty(const QString& key, const QV
     else if (key == PropertySecurity) {
         QStringList value = qdbus_cast<QStringList>(val);
         foreach (const QString str, value) {
-            if (str ==  AttributeNone) {
+            if (str ==  AttributeNone || str == AttributeWps) {
                 m_wifiConfig.setSecurity(QNetworkSettingsWireless::None);
             }
             else if (str == AttributeWep) {
@@ -388,9 +388,6 @@ void QNetworkSettingsServicePrivate::updateProperty(const QString& key, const QV
             else if (str == AttributeIeee) {
                 m_wifiConfig.setSecurity(QNetworkSettingsWireless::WPA2);
             }
-            else if (str == AttributeWps) {
-                m_wifiConfig.setSecurity(QNetworkSettingsWireless::WPS);
-            }
         }
     }
 }
diff --git a/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsuseragent_p.cpp b/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsuseragent_p.cpp
index 918c8b8..3b10bed 100644
--- a/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsuseragent_p.cpp
+++ b/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsuseragent_p.cpp
@@ -90,9 +90,11 @@ QVariantMap QNetworkSettingsUserAgentPrivate::RequestInput(const QDBusObjectPath
 void QNetworkSettingsUserAgentPrivate::setUserCredentials(const QString& username,
                                                           const QString& password)
 {
+    m_username = username;
+    m_passphrase = password;
     QVariantMap response;
-    response[PropertyName] = username;
-    response[PropertyPassphrase] = password;
+    response[PropertyName] = m_username;
+    response[PropertyPassphrase] = m_passphrase;
     m_reply << response;
     m_pendingReply = false;
     QDBusConnection::systemBus().send(m_reply);
diff --git a/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsuseragent_p.h b/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsuseragent_p.h
index 8c480a5..92e1516 100644
--- a/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsuseragent_p.h
+++ b/src/qtdevicesettings/networksettingsplugin/networksettings/connman/qnetworksettingsuseragent_p.h
@@ -70,6 +70,8 @@ private:
     QNetworkSettingsUserAgent *q_ptr;
     QDBusMessage m_reply;
     bool m_pendingReply;
+    QString m_passphrase;
+    QString m_username;
 };
 
 #endif // QNETWORKSETTINGSUSERAGENTPRIVATE_H