mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-10-01 01:26:01 -04:00
fix google favicon download over https
This commit is contained in:
parent
bb50db40d2
commit
9ceadac299
@ -802,13 +802,13 @@ QString Entry::resolveUrl(const QString& url) const
|
||||
}
|
||||
QUrl uurl = QUrl(newurl);
|
||||
|
||||
if(uurl.scheme() == "cmd") {
|
||||
// URL is a cmd, hopefully the second argument it's an URL
|
||||
if (uurl.scheme() == "cmd") {
|
||||
// URL is a cmd, hopefully the second argument is an URL
|
||||
QStringList cmd = newurl.split(" ");
|
||||
if (cmd.size() > 1) {
|
||||
return resolveUrl(cmd[1].remove("'").remove("\""));
|
||||
}
|
||||
} else if(uurl.scheme() == "http" || uurl.scheme() == "https") {
|
||||
} else if (uurl.scheme() == "http" || uurl.scheme() == "https") {
|
||||
// URL is nice
|
||||
return uurl.url();
|
||||
}
|
||||
|
@ -242,7 +242,7 @@ void EditWidgetIcons::fetchFaviconFromGoogle(const QString& domain)
|
||||
if (config()->get("security/IconDownloadFallbackToGoogle", false).toBool() && m_fallbackToGoogle) {
|
||||
resetFaviconDownload();
|
||||
m_fallbackToGoogle = false;
|
||||
fetchFavicon(QUrl("http://www.google.com/s2/favicons?domain=" + domain));
|
||||
fetchFavicon(QUrl("https://www.google.com/s2/favicons?domain=" + domain));
|
||||
} else {
|
||||
resetFaviconDownload();
|
||||
MessageBox::warning(this, tr("Error"), tr("Unable to fetch favicon."));
|
||||
|
Loading…
Reference in New Issue
Block a user