Skip to content

Remove the ssl button #9675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2022
Merged

Remove the ssl button #9675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/unreleased/9675
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Change: We removed the TLS certificate button from the account page

https://github.com/owncloud/client/pull/9675
1 change: 0 additions & 1 deletion src/gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ set(client_SRCS
sharemanager.cpp
shareusergroupwidget.cpp
sharee.cpp
sslbutton.cpp
tlserrordialog.cpp
syncrunfilelog.cpp
systray.cpp
Expand Down
1 change: 0 additions & 1 deletion src/gui/accountsettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,6 @@ void AccountSettings::slotAccountStateChanged()
{
const AccountState::State state = _accountState ? _accountState->state() : AccountState::Disconnected;
if (state != AccountState::Disconnected) {
ui->sslButton->updateAccountState(_accountState);
AccountPtr account = _accountState->account();
QUrl safeUrl(account->url());
safeUrl.setPassword(QString()); // Remove the password from the URL to avoid showing it in the UI
Expand Down
20 changes: 0 additions & 20 deletions src/gui/accountsettings.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,6 @@
<item>
<widget class="QWidget" name="accountStatus" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="SslButton" name="sslButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="connectLabel">
<property name="sizePolicy">
Expand Down Expand Up @@ -293,13 +280,6 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>SslButton</class>
<extends>QToolButton</extends>
<header>sslbutton.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
249 changes: 0 additions & 249 deletions src/gui/sslbutton.cpp
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions src/gui/sslbutton.h
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/libsync/account.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,6 @@ class OWNCLOUDSYNC_EXPORT Account : public QObject
QNetworkRequest req = QNetworkRequest(),
QIODevice *data = nullptr);

// Because of bugs in Qt, we use this to store info needed for the SSL Button
QSslCipher _sessionCipher;
QByteArray _sessionTicket;
QSet<QSslCertificate> _peerCertificateChain;


/** The certificates of the account */
QSet<QSslCertificate> approvedCerts() const { return _approvedCerts; }

Expand Down