From 42d34a1999b159d54677bdc727b6df9e8716a22b Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Tue, 16 Apr 2019 20:14:10 -0400
Subject: [PATCH] Made changes to streamline icon downloading process

---
 src/core/Metadata.cpp                        |  2 +-
 src/gui/ApplicationSettingsWidgetSecurity.ui |  2 +-
 src/gui/EditWidgetIcons.cpp                  | 41 ++++++++++----------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/core/Metadata.cpp b/src/core/Metadata.cpp
index 6448c391a..ff1ee71e7 100644
--- a/src/core/Metadata.cpp
+++ b/src/core/Metadata.cpp
@@ -195,7 +195,7 @@ QPixmap Metadata::customIconScaledPixmap(const QUuid& uuid) const
     QPixmapCache::Key& cacheKey = m_customIconScaledCacheKeys[uuid];
 
     if (!QPixmapCache::find(cacheKey, &pixmap)) {
-        QImage image = m_customIcons.value(uuid).scaled(16, 16, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        QImage image = m_customIcons.value(uuid).scaled(16, 16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
         pixmap = QPixmap::fromImage(image);
         cacheKey = QPixmapCache::insert(pixmap);
     }
diff --git a/src/gui/ApplicationSettingsWidgetSecurity.ui b/src/gui/ApplicationSettingsWidgetSecurity.ui
index 527110e64..bf5cce2d3 100644
--- a/src/gui/ApplicationSettingsWidgetSecurity.ui
+++ b/src/gui/ApplicationSettingsWidgetSecurity.ui
@@ -212,7 +212,7 @@
       <item>
        <widget class="QCheckBox" name="fallbackToSearch">
         <property name="text">
-         <string>Use DuckDuckGo to download website icons</string>
+         <string>Use DuckDuckGo service to download website icons</string>
         </property>
        </widget>
       </item>
diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp
index 36c88e730..dcc5160a3 100644
--- a/src/gui/EditWidgetIcons.cpp
+++ b/src/gui/EditWidgetIcons.cpp
@@ -197,8 +197,6 @@ void EditWidgetIcons::downloadFavicon()
 
     QString fullyQualifiedDomain = m_url.host();
 
-    m_urlsToTry.append(QUrl(m_url.scheme() + "://" + fullyQualifiedDomain + "/favicon.ico"));
-
     // Determine if host portion of URL is an IP address by resolving it and
     // searching for a match with the returned address(es).
     bool hostIsIp = false;
@@ -209,32 +207,35 @@ void EditWidgetIcons::downloadFavicon()
         }
     }
 
+    // Determine the second-level domain, if available
+    QString secondLevelDomain;
     if (!hostIsIp) {
-        QString secondLevelDomain = getSecondLevelDomain(m_url);
-
-        // Attempt to simply load the favicon.ico file
-        if (fullyQualifiedDomain != secondLevelDomain) {
-            m_urlsToTry.append(QUrl(m_url.scheme() + "://" + secondLevelDomain + "/favicon.ico"));
-        }
+        secondLevelDomain = getSecondLevelDomain(m_url);
     }
 
-    // Try to use alternative fallback URL, if enabled
+    // Start with the "fallback" url (if enabled) to try to get the best favicon
     if (config()->get("security/IconDownloadFallback", false).toBool()) {
         QUrl fallbackUrl = QUrl("https://icons.duckduckgo.com");
         fallbackUrl.setPath("/ip3/" + QUrl::toPercentEncoding(fullyQualifiedDomain) + ".ico");
+        m_urlsToTry.append(fallbackUrl);
 
-        if (!hostIsIp) {
-            QString secondLevelDomain = getSecondLevelDomain(m_url);
-
-            if (fullyQualifiedDomain != secondLevelDomain) {
-                fallbackUrl.setPath("/ip3/" + QUrl::toPercentEncoding(secondLevelDomain) + ".ico");
-                m_urlsToTry.prepend(fallbackUrl);
-            }
+        // Also try a direct pull of the second-level domain (if possible)
+        if (!hostIsIp && fullyQualifiedDomain != secondLevelDomain) {
+            fallbackUrl.setPath("/ip3/" + QUrl::toPercentEncoding(secondLevelDomain) + ".ico");
+            m_urlsToTry.append(fallbackUrl);
         }
-
-        m_urlsToTry.prepend(fallbackUrl);
     }
 
+    // Add a direct pull of the website's own favicon.ico file
+    m_urlsToTry.append(QUrl(m_url.scheme() + "://" + fullyQualifiedDomain + "/favicon.ico"));
+
+    // Also try a direct pull of the second-level domain (if possible)
+    if (!hostIsIp && fullyQualifiedDomain != secondLevelDomain) {
+        m_urlsToTry.append(QUrl(m_url.scheme() + "://" + secondLevelDomain + "/favicon.ico"));
+    }
+
+    // Use the first URL to start the download process
+    // If a favicon is not found, the next URL will be tried
     startFetchFavicon(m_urlsToTry.takeFirst());
 #endif
 }
@@ -277,7 +278,7 @@ void EditWidgetIcons::fetchFinished()
     if (!image.isNull()) {
         if (!addCustomIcon(image)) {
             emit messageEditEntry(tr("Custom icon already exists"), MessageWidget::Information);
-        } else if (!this->isVisible()) {
+        } else if (!isVisible()) {
             // Show confirmation message if triggered from Entry tab download button
             emit messageEditEntry(tr("Custom icon successfully downloaded"), MessageWidget::Positive);
         }
@@ -289,7 +290,7 @@ void EditWidgetIcons::fetchFinished()
         if (!fallbackEnabled) {
             emit messageEditEntry(
                 tr("Unable to fetch favicon.") + "\n"
-                    + tr("Hint: You can enable DuckDuckGo as a fallback under Tools>Settings>Security"),
+                    + tr("You can enable the DuckDuckGo website icon service under Tools -> Settings -> Security"),
                 MessageWidget::Error);
         } else {
             emit messageEditEntry(tr("Unable to fetch favicon."), MessageWidget::Error);