mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-02-12 04:31:23 -05:00
84f5adb24a
Fixes stuck "Download favicon" button on icon download attempts for IP address hosts by skipping attempts to get 2nd level domain resources (which resulted in calls to 0.0.0.<rightmost octet of original IP>). Fixes some cases when DuckDuckGo fallback fails to find icon of >2-level domains, by adding a request to a DDG URL based on entry's 2nd level domain. Repurposes EditWidgetIcons' private fetchCanceled slot (which as of #2439, is unused by any code) into public abortRequests slot, which is connected to the entry edit widget's accepted and rejected signals (in other words, Ok or Cancel was pressed).
108 lines
2.7 KiB
C++
108 lines
2.7 KiB
C++
/*
|
|
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
|
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 or (at your option)
|
|
* version 3 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef KEEPASSX_EDITWIDGETICONS_H
|
|
#define KEEPASSX_EDITWIDGETICONS_H
|
|
|
|
#include <QUrl>
|
|
#include <QUuid>
|
|
#include <QWidget>
|
|
|
|
#include "config-keepassx.h"
|
|
#include "core/Global.h"
|
|
#include "gui/MessageWidget.h"
|
|
|
|
class Database;
|
|
class DefaultIconModel;
|
|
class CustomIconModel;
|
|
#ifdef WITH_XC_NETWORKING
|
|
class QNetworkAccessManager;
|
|
class QNetworkReply;
|
|
#endif
|
|
|
|
namespace Ui
|
|
{
|
|
class EditWidgetIcons;
|
|
}
|
|
|
|
struct IconStruct
|
|
{
|
|
IconStruct();
|
|
|
|
QUuid uuid;
|
|
int number;
|
|
};
|
|
|
|
class EditWidgetIcons : public QWidget
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit EditWidgetIcons(QWidget* parent = nullptr);
|
|
~EditWidgetIcons();
|
|
|
|
IconStruct state();
|
|
void reset();
|
|
void load(const QUuid& currentUuid,
|
|
const QSharedPointer<Database>& database,
|
|
const IconStruct& iconStruct,
|
|
const QString& url = "");
|
|
|
|
public slots:
|
|
void setUrl(const QString& url);
|
|
void abortRequests();
|
|
|
|
signals:
|
|
void messageEditEntry(QString, MessageWidget::MessageType);
|
|
void messageEditEntryDismiss();
|
|
void widgetUpdated();
|
|
|
|
private slots:
|
|
void downloadFavicon();
|
|
void startFetchFavicon(const QUrl& url);
|
|
void fetchFinished();
|
|
void fetchReadyRead();
|
|
void addCustomIconFromFile();
|
|
bool addCustomIcon(const QImage& icon);
|
|
void removeCustomIcon();
|
|
void updateWidgetsDefaultIcons(bool checked);
|
|
void updateWidgetsCustomIcons(bool checked);
|
|
void updateRadioButtonDefaultIcons();
|
|
void updateRadioButtonCustomIcons();
|
|
|
|
private:
|
|
const QScopedPointer<Ui::EditWidgetIcons> m_ui;
|
|
QSharedPointer<Database> m_db;
|
|
QUuid m_currentUuid;
|
|
#ifdef WITH_XC_NETWORKING
|
|
QUrl m_url;
|
|
QUrl m_fetchUrl;
|
|
QList<QUrl> m_urlsToTry;
|
|
QByteArray m_bytesReceived;
|
|
QNetworkAccessManager* m_netMgr;
|
|
QNetworkReply* m_reply;
|
|
int m_redirects;
|
|
#endif
|
|
DefaultIconModel* const m_defaultIconModel;
|
|
CustomIconModel* const m_customIconModel;
|
|
|
|
Q_DISABLE_COPY(EditWidgetIcons)
|
|
};
|
|
|
|
#endif // KEEPASSX_EDITWIDGETICONS_H
|