mirror of
https://github.com/nextcloud/desktop.git
synced 2025-10-26 11:17:43 +00:00
Add proxy host name property to account
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
parent
73dd000429
commit
a4553f5929
@ -1118,4 +1118,19 @@ void Account::setProxyType(QNetworkProxy::ProxyType proxyType)
|
||||
emit proxyTypeChanged();
|
||||
}
|
||||
|
||||
QString Account::proxyHostName() const
|
||||
{
|
||||
return _proxyHostName;
|
||||
}
|
||||
|
||||
void Account::setProxyHostName(const QString &hostName)
|
||||
{
|
||||
if (_proxyHostName == hostName) {
|
||||
return;
|
||||
}
|
||||
|
||||
_proxyHostName = hostName;
|
||||
emit proxyHostNameChanged();
|
||||
}
|
||||
|
||||
} // namespace OCC
|
||||
|
||||
@ -93,6 +93,7 @@ class OWNCLOUDSYNC_EXPORT Account : public QObject
|
||||
Q_PROPERTY(bool askUserForMnemonic READ askUserForMnemonic WRITE setAskUserForMnemonic NOTIFY askUserForMnemonicChanged)
|
||||
Q_PROPERTY(AccountNetworkProxySetting networkProxySetting READ networkProxySetting WRITE setNetworkProxySetting NOTIFY networkProxySettingChanged)
|
||||
Q_PROPERTY(QNetworkProxy::ProxyType proxyType READ proxyType WRITE setProxyType NOTIFY proxyTypeChanged)
|
||||
Q_PROPERTY(QString proxyHostName READ proxyHostName WRITE setProxyHostName NOTIFY proxyHostNameChanged)
|
||||
|
||||
public:
|
||||
enum class AccountNetworkProxySetting {
|
||||
@ -364,6 +365,9 @@ public:
|
||||
[[nodiscard]] QNetworkProxy::ProxyType proxyType() const;
|
||||
void setProxyType(QNetworkProxy::ProxyType proxyType);
|
||||
|
||||
[[nodiscard]] QString proxyHostName() const;
|
||||
void setProxyHostName(const QString &host);
|
||||
|
||||
public slots:
|
||||
/// Used when forgetting credentials
|
||||
void clearQNAMCache();
|
||||
@ -410,6 +414,7 @@ signals:
|
||||
|
||||
void networkProxySettingChanged();
|
||||
void proxyTypeChanged();
|
||||
void proxyHostNameChanged();
|
||||
|
||||
protected Q_SLOTS:
|
||||
void slotCredentialsFetched();
|
||||
@ -488,6 +493,7 @@ private:
|
||||
|
||||
AccountNetworkProxySetting _networkProxySetting = AccountNetworkProxySetting::GlobalProxy;
|
||||
QNetworkProxy::ProxyType _proxyType = QNetworkProxy::NoProxy;
|
||||
QString _proxyHostName;
|
||||
/* IMPORTANT - remove later - FIXME MS@2019-12-07 -->
|
||||
* TODO: For "Log out" & "Remove account": Remove client CA certs and KEY!
|
||||
*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user