Don't give connman user name as a network name

Don't give the network name as all, since it is not required for visible
networks. Also adjust the API to remove the user name parameter that was
never used (correctly).

Task-number: QTBUG-57249
Change-Id: I0eb75db6eebcaa05661a9404b728ab8af831cf1d
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>

9 files changed, 19 insertions, 50 deletions

diff --git a/src/imports/networksettings/plugin.cpp b/src/imports/networksettings/plugin.cpp
index c1dac53..2a67657 100644
--- a/src/imports/networksettings/plugin.cpp
+++ b/src/imports/networksettings/plugin.cpp
@@ -116,9 +116,9 @@
 */
 
 /*!
-    \qmlmethod NetworkSettingsManager::userAgent.setUserCredentials(string username, string passphrase)
+    \qmlmethod NetworkSettingsManager::userAgent.setPassphrase(string passphrase)
 
-    Sets the user credentials \a username and \a passphrase for connecting to a Wifi network.
+    Sets the \a passphrase for connecting to a Wifi network.
 
     This method needs to be called in response to receiving a showUserCredentialsInput() signal.
 
@@ -130,7 +130,7 @@
 
     This signal is emitted when user credentials are required for connecting to a Wifi network.
 
-    \sa userAgent.setUserCredentials()
+    \sa userAgent.setPassphrase()
 */
 
 /*!
diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp
index 4791c6e..4d6e10b 100644
--- a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp
@@ -80,13 +80,10 @@ QVariantMap QNetworkSettingsUserAgentPrivate::RequestInput(const QDBusObjectPath
     return QVariantMap();
 }
 
-void QNetworkSettingsUserAgentPrivate::setUserCredentials(const QString& username,
-                                                          const QString& password)
+void QNetworkSettingsUserAgentPrivate::setPassphrase(const QString& passphrase)
 {
-    m_username = username;
-    m_passphrase = password;
+    m_passphrase = passphrase;
     QVariantMap response;
-    response[PropertyName] = m_username;
     response[PropertyPassphrase] = m_passphrase;
     m_reply << response;
     m_pendingReply = false;
diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.h b/src/networksettings/connman/qnetworksettingsuseragent_p.h
index 8df9b26..fb96645 100644
--- a/src/networksettings/connman/qnetworksettingsuseragent_p.h
+++ b/src/networksettings/connman/qnetworksettingsuseragent_p.h
@@ -62,7 +62,7 @@ class QNetworkSettingsUserAgentPrivate : public QDBusAbstractAdaptor
     Q_DECLARE_PUBLIC(QNetworkSettingsUserAgent)
 public:
     QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent *parent = Q_NULLPTR);
-    void setUserCredentials(const QString& aUsername, const QString& aPassword);
+    void setPassphrase(const QString &passphrase);
     void cancel();
     void release();
 public Q_SLOTS: // Dbus methods
@@ -75,7 +75,6 @@ private:
     QDBusMessage m_reply;
     bool m_pendingReply;
     QString m_passphrase;
-    QString m_username;
 };
 
 #endif // QNETWORKSETTINGSUSERAGENTPRIVATE_H
diff --git a/src/networksettings/qnetworksettingsuseragent.cpp b/src/networksettings/qnetworksettingsuseragent.cpp
index 709b4d2..b29cdf4 100644
--- a/src/networksettings/qnetworksettingsuseragent.cpp
+++ b/src/networksettings/qnetworksettingsuseragent.cpp
@@ -35,10 +35,10 @@ QNetworkSettingsUserAgent::QNetworkSettingsUserAgent(QObject *parent)
 {
 }
 
-void QNetworkSettingsUserAgent::setUserCredentials(const QString& username, const QString& passphrase)
+void QNetworkSettingsUserAgent::setPassphrase(const QString &passphrase)
 {
     Q_D(QNetworkSettingsUserAgent);
-    d->setUserCredentials(username, passphrase);
+    d->setPassphrase(passphrase);
 }
 
 void QNetworkSettingsUserAgent::cancelInput()
@@ -47,14 +47,8 @@ void QNetworkSettingsUserAgent::cancelInput()
     d->cancel();
 }
 
-QString QNetworkSettingsUserAgent::passPhrase() const
+QString QNetworkSettingsUserAgent::passphrase() const
 {
     Q_D(const QNetworkSettingsUserAgent);
     return d->m_passphrase;
 }
-
-QString QNetworkSettingsUserAgent::userName() const
-{
-    Q_D(const QNetworkSettingsUserAgent);
-    return d->m_username;
-}
diff --git a/src/networksettings/qnetworksettingsuseragent.h b/src/networksettings/qnetworksettingsuseragent.h
index 0949661..2f6cf12 100644
--- a/src/networksettings/qnetworksettingsuseragent.h
+++ b/src/networksettings/qnetworksettingsuseragent.h
@@ -40,10 +40,9 @@ class Q_DECL_EXPORT QNetworkSettingsUserAgent : public QObject
     Q_OBJECT
 public:
     explicit QNetworkSettingsUserAgent(QObject *parent = Q_NULLPTR);
-    Q_INVOKABLE void setUserCredentials(const QString& username, const QString& passphrase);
+    Q_INVOKABLE void setPassphrase(const QString &passphrase);
     Q_INVOKABLE void cancelInput();
-    QString passPhrase() const;
-    QString userName() const;
+    QString passphrase() const;
 
 Q_SIGNALS:
     void showUserCredentialsInput();
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp
index 30f3f61..8721257 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp
+++ b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp
@@ -142,7 +142,7 @@ void QNetworkSettingsManagerPrivate::userInteractionReady(bool cancel)
     if (!service) {
         return;
     }
-    QString psk = m_agent->passPhrase();
+    QString psk = m_agent->passphrase();
 
     // --------------------- configure network ------------------------------
     // ref: http://w1.fi/cgit/hostap/plain/wpa_supplicant/wpa_supplicant.conf
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp
index b463606..4d49127 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp
+++ b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp
@@ -35,11 +35,10 @@ QNetworkSettingsUserAgentPrivate::QNetworkSettingsUserAgentPrivate(QNetworkSetti
 
 }
 
-void QNetworkSettingsUserAgentPrivate::setUserCredentials(const QString& aUsername, const QString& aPassword)
+void QNetworkSettingsUserAgentPrivate::setPassphrase(const QString &passphrase)
 {
     Q_Q(QNetworkSettingsUserAgent);
-    m_passphrase = aPassword;
-    m_username = aUsername;
+    m_passphrase = passphrase;
     emit q->ready(false);
 }
 
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h
index 6b9fade..f2051c2 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h
+++ b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h
@@ -50,10 +50,9 @@ class QNetworkSettingsUserAgentPrivate : public QObject
 public:
     explicit QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent* parent);
     virtual ~QNetworkSettingsUserAgentPrivate() {}
-    void setUserCredentials(const QString& aUsername, const QString& aPassword);
+    void setPassphrase(const QString &passphrase);
     void cancel();
     QString m_passphrase;
-    QString m_username;
     QNetworkSettingsUserAgent *q_ptr;
 };
 
diff --git a/src/settingsui/network/WifiSettings.qml b/src/settingsui/network/WifiSettings.qml
index f7cf823..b265746 100644
--- a/src/settingsui/network/WifiSettings.qml
+++ b/src/settingsui/network/WifiSettings.qml
@@ -147,7 +147,7 @@ Item {
 
                 GroupBox {
                     id: connectView
-                    title: qsTr("Enter a password")
+                    title: qsTr("Enter a passphrase")
                     visible: false
                     Layout.fillWidth: true
                     ColumnLayout {
@@ -172,34 +172,16 @@ Item {
                         }
                         RowLayout {
                             spacing: 10
-                            visible: false
                             width: parent.width
 
                             Label {
-                                text: qsTr("User name:")
+                                text: qsTr("Passphrase:")
                                 horizontalAlignment: Text.AlignRight
                                 Layout.preferredWidth: root.width * 0.382
                                 Layout.alignment: Qt.AlignVCenter
                             }
                             TextField {
-                                text: ""
-                                inputMethodHints: Qt.ImhNoPredictiveText
-                                Layout.alignment: Qt.AlignVCenter
-                                Layout.fillWidth: true
-                            }
-                        }
-                        RowLayout {
-                            spacing: 10
-                            width: parent.width
-
-                            Label {
-                                text: qsTr("Password:")
-                                horizontalAlignment: Text.AlignRight
-                                Layout.preferredWidth: root.width * 0.382
-                                Layout.alignment: Qt.AlignVCenter
-                            }
-                            TextField {
-                                id: password
+                                id: passphrase
                                 text: ""
                                 echoMode: TextInput.Password
                                 inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase | Qt.ImhPreferLowercase | Qt.ImhSensitiveData
@@ -214,7 +196,7 @@ Item {
                                 text: qsTr("Connect")
                                 onClicked: {
                                     connectView.visible = false
-                                    NetworkSettingsManager.userAgent.setUserCredentials("", password.text)
+                                    NetworkSettingsManager.userAgent.setPassphrase(passphrase.text)
                                 }
                             }
                             Button {