From 314de829065a3fa411b8fed90ff1289b000e229b Mon Sep 17 00:00:00 2001 From: Kari Oikarinen 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 --- src/networksettings/connman/qnetworksettingsuseragent_p.cpp | 7 ++----- src/networksettings/connman/qnetworksettingsuseragent_p.h | 3 +-- src/networksettings/qnetworksettingsuseragent.cpp | 12 +++--------- src/networksettings/qnetworksettingsuseragent.h | 5 ++--- .../wpasupplicant/qnetworksettingsmanager_p.cpp | 2 +- .../wpasupplicant/qnetworksettingsuseragent_p.cpp | 5 ++--- .../wpasupplicant/qnetworksettingsuseragent_p.h | 3 +-- 7 files changed, 12 insertions(+), 25 deletions(-) (limited to 'src/networksettings') 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; }; -- cgit v1.2.3