From 314de829065a3fa411b8fed90ff1289b000e229b Mon Sep 17 00:00:00 2001
From: Kari Oikarinen <kari.oikarinen@qt.io>
Date: Fri, 7 Apr 2017 16:23:35 +0300
Subject: 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>
---
 src/settingsui/network/WifiSettings.qml | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

(limited to 'src/settingsui/network/WifiSettings.qml')

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 {
-- 
cgit v1.2.3