Merge #6385

6385: For #6384: Use uri as format argument in error pages description string r=Amejia481 a=mcarare
Co-authored-by: mcarare <mihai.carare.dev@gmail.com>

components/browser/errorpages/src/main/java/mozilla/components/browser/errorpages/ErrorPages.kt

@@ -73,7 +73,7 @@ object ErrorPages {
     ): String {
         val title = context.getString(errorType.titleRes)
         val button = context.getString(errorType.refreshButtonRes)
-        val description = context.getString(errorType.messageRes)
+        val description = context.getString(errorType.messageRes, uri)
         val imageName = if (errorType.imageNameRes != null) context.getString(errorType.imageNameRes) + ".svg" else ""
         val badCertAdvanced = context.getString(R.string.mozac_browser_errorpages_security_bad_cert_advanced)
         val badCertTechInfo = context.getString(R.string.mozac_browser_errorpages_security_bad_cert_techInfo,

components/browser/errorpages/src/test/java/mozilla/components/browser/errorpages/ErrorPagesTest.kt

@@ -112,10 +112,12 @@ class ErrorPagesTest {
 
         val htmlFilename = "htmlResource.html"
 
+        val uri = "sampleUri"
+
         val errorPage = createUrlEncodedErrorPage(
             context,
             errorType,
-            null,
+            uri,
             htmlFilename
         )
 
@@ -127,7 +129,7 @@ class ErrorPagesTest {
 
         assertTrue(errorPage.startsWith("resource://android/assets/$htmlFilename"))
         assertTrue(errorPage.contains("&button=${context.resources.getString(errorType.refreshButtonRes)}"))
-        assertTrue(errorPage.contains("&description=${context.resources.getString(errorType.messageRes)}"))
+        assertTrue(errorPage.contains("&description=${context.resources.getString(errorType.messageRes, uri)}"))
         assertTrue(errorPage.contains("&image=$expectedImageName"))
     }
 }