Merge tag '5.58.1' into develop

no message

Author: CDRussell

app/src/androidTest/java/com/duckduckgo/app/global/UriExtensionTest.kt

@@ -17,6 +17,7 @@
 package com.duckduckgo.app.global
 
 import android.net.Uri
+import androidx.core.net.toUri
 import org.junit.Assert.*
 import org.junit.Test
 
@@ -194,4 +195,33 @@ class UriExtensionTest {
         val absoluteString = Uri.parse("https://example.com/test?q=example/#1/anotherrandomcode").absoluteString
         assertEquals("https://example.com/test", absoluteString)
     }
+
+    @Test
+    fun whenNullUrlThenNullFaviconUrl() {
+        assertNull("".toUri().faviconLocation())
+    }
+
+    @Test
+    fun whenHttpRequestThenFaviconLocationAlsoHttp() {
+        val favicon = "http://example.com".toUri().faviconLocation()
+        assertTrue(favicon!!.isHttp)
+    }
+
+    @Test
+    fun whenHttpsRequestThenFaviconLocationAlsoHttps() {
+        val favicon = "https://example.com".toUri().faviconLocation()
+        assertTrue(favicon!!.isHttps)
+    }
+
+    @Test
+    fun whenUrlContainsASubdomainThenSubdomainReturnedInFavicon() {
+        val favicon = "https://sub.example.com".toUri().faviconLocation()
+        assertEquals("https://sub.example.com/favicon.ico", favicon.toString())
+    }
+
+    @Test
+    fun whenUrlIsIpAddressThenIpReturnedInFaviconUrl() {
+        val favicon = "https://192.168.1.0".toUri().faviconLocation()
+        assertEquals("https://192.168.1.0/favicon.ico", favicon.toString())
+    }
 }

app/src/main/java/com/duckduckgo/app/global/UriExtension.kt

@@ -80,10 +80,13 @@ fun Uri.toDesktopUri(): Uri {
     return parse(newUrl)
 }
 
-private const val faviconBaseUrlFormat = "https://proxy.duckduckgo.com/ip3/%s.ico"
+// to obtain a favicon for a website, we go directly to the site and look for /favicon.ico
+private const val faviconBaseUrlFormat = "%s://%s/favicon.ico"
 
 fun Uri?.faviconLocation(): Uri? {
-    val host = this?.host
+    if (this == null) return null
+    val host = this.host
     if (host.isNullOrBlank()) return null
-    return parse(String.format(faviconBaseUrlFormat, host))
+    val isHttps = this.isHttps
+    return parse(String.format(faviconBaseUrlFormat, if (isHttps) "https" else "http", host))
 }

app/version/release-notes

@@ -1,6 +1,7 @@
 ## What's new in this release?
 Now the app can prompt you to Fireproof a site when you sign in. Enable this in Settings > Fireproof Websites.
+Retrieve favicons directly from websites.
 Bug fixes and other improvements.
 
 ## Have feedback?
-We've adjusted the color contrast in both light and dark themes to improve visibility.
+You can always reach us at https://duckduckgo.com/feedback.

app/version/version.properties

@@ -1 +1 @@
-VERSION=5.58.0
+VERSION=5.58.1