From 81de6a2b6cee7bce14a1586def1d782d9c16e618 Mon Sep 17 00:00:00 2001
From: Lily Chen <[email protected]>
Date: Mon, 07 Jul 2025 13:16:21 -0700
Subject: [PATCH] Android downloads UI: Only parse URL for eTLD+1 if it has a host

This CL fixes a helper function used in downloads UI on Android, which
formats a URL for display in the Download Home list, download completion
message, and download notification. Previously, the function would fall
back to an eTLD+1 from getDomainAndRegistry() if the formatted URL was
too long for the display surface. This is subtly incorrect for URLs
without a host (e.g. certain URL schemes), and can result in misleading
UI strings displayed to the user.

In this CL, we add a check that the origin has a host, and we omit the
URL/domain from the UI display if we cannot get a suitable formatted
URL/eTLD+1.

Screenshots:
https://drive.google.com/drive/folders/1M7lElUPRMstiM_zfgzsYVU8x0PQQMdD-

Bug: 421511847
Change-Id: Id4e48441d30427a6d73ab74f69caf6a778c49a99
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6701188
Reviewed-by: Theresa Sullivan <[email protected]>
Commit-Queue: Lily Chen <[email protected]>
Reviewed-by: Xinghui Lu <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1483331}
---

diff --git a/chrome/browser/download/internal/android/java/src/org/chromium/chrome/browser/download/DownloadMessageUiControllerImpl.java b/chrome/browser/download/internal/android/java/src/org/chromium/chrome/browser/download/DownloadMessageUiControllerImpl.java
index a25366f..d76ac4b2 100644
--- a/chrome/browser/download/internal/android/java/src/org/chromium/chrome/browser/download/DownloadMessageUiControllerImpl.java
+++ b/chrome/browser/download/internal/android/java/src/org/chromium/chrome/browser/download/DownloadMessageUiControllerImpl.java
@@ -797,6 +797,7 @@
                 String bytesString =
                         org.chromium.components.browser_ui.util.DownloadUtils.getStringForBytes(
                                 getContext(), itemToShow.totalSizeBytes);
+                // Try to display the download domain/origin if possible. Otherwise, omit it.
                 String displayUrl =
                         DownloadUtils.formatUrlForDisplayInNotification(
                                 itemToShow.url, DownloadUtils.MAX_ORIGIN_LENGTH_FOR_NOTIFICATION);
@@ -805,7 +806,7 @@
                                 .getString(
                                         R.string.download_message_download_complete_description,
                                         bytesString,
-                                        displayUrl);
+                                        displayUrl != null ? displayUrl : "");
                 info.id = itemToShow.id;
                 info.link = getContext().getString(R.string.open_downloaded_label);
                 info.icon = R.drawable.infobar_download_complete_animation;
diff --git a/chrome/browser/download/internal/android/java/src/org/chromium/chrome/browser/download/home/list/UiUtils.java b/chrome/browser/download/internal/android/java/src/org/chromium/chrome/browser/download/home/list/UiUtils.java
index ab1513d9..76c3a605 100644
--- a/chrome/browser/download/internal/android/java/src/org/chromium/chrome/browser/download/home/list/UiUtils.java
+++ b/chrome/browser/download/internal/android/java/src/org/chromium/chrome/browser/download/home/list/UiUtils.java
@@ -8,6 +8,7 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
 
@@ -147,15 +148,20 @@
         String displayUrl =
                 DownloadUtils.formatUrlForDisplayInNotification(
                         item.url, DownloadUtils.MAX_ORIGIN_LENGTH_FOR_DOWNLOAD_HOME_CAPTION);
+        boolean hasDisplayUrl = !TextUtils.isEmpty(displayUrl);
 
         if (item.totalSizeBytes == 0) {
-            return context.getString(
-                    R.string.download_manager_list_item_description_no_size, displayUrl);
+            return hasDisplayUrl
+                    ? context.getString(
+                            R.string.download_manager_list_item_description_no_size, displayUrl)
+                    : "";
         }
 
         String displaySize = Formatter.formatFileSize(context, item.totalSizeBytes);
-        return context.getString(
-                R.string.download_manager_list_item_description, displaySize, displayUrl);
+        return hasDisplayUrl
+                ? context.getString(
+                        R.string.download_manager_list_item_description, displaySize, displayUrl)
+                : displaySize;
     }
 
     /**
diff --git a/components/browser_ui/util/android/java/src/org/chromium/components/browser_ui/util/DownloadUtils.java b/components/browser_ui/util/android/java/src/org/chromium/components/browser_ui/util/DownloadUtils.java
index adce708..5224900 100644
--- a/components/browser_ui/util/android/java/src/org/chromium/components/browser_ui/util/DownloadUtils.java
+++ b/components/browser_ui/util/android/java/src/org/chromium/components/browser_ui/util/DownloadUtils.java
@@ -137,7 +137,7 @@
      *
      * @param url The full URL.
      * @param limit Character limit.
-     * @return The text to display, or null if the input was invalid.
+     * @return The text to display, or null if the input was invalid or cannot be shortened enough.
      */
     public static @Nullable String formatUrlForDisplayInNotification(
             @Nullable GURL url, int limit) {
@@ -145,11 +145,23 @@
 
         String formattedUrl =
                 UrlFormatter.formatUrlForSecurityDisplay(url, SchemeDisplay.OMIT_HTTP_AND_HTTPS);
-        if (formattedUrl.length() <= limit) return formattedUrl;
+        if (!TextUtils.isEmpty(formattedUrl) && formattedUrl.length() <= limit) {
+            return formattedUrl;
+        }
 
-        // The origin is too long. Strip down to eTLD+1.
-        return UrlUtilities.getDomainAndRegistry(
-                url.getSpec(), /* includePrivateRegistries= */ false);
+        // The formatted URL is unsuitable. One possible fallback is eTLD+1, but we should be
+        // careful to only parse for eTLD+1 if the origin has a host portion (some URL schemes
+        // don't).
+        GURL origin = url.getOrigin();
+        String fallback =
+                !GURL.isEmptyOrInvalid(origin) && !origin.getHost().isEmpty()
+                        ? UrlUtilities.getDomainAndRegistry(
+                                origin.getSpec(), /* includePrivateRegistries= */ true)
+                        : origin.getPossiblyInvalidSpec();
+        if (!TextUtils.isEmpty(fallback) && fallback.length() <= limit) {
+            return fallback;
+        }
+        return null;
     }
 
     /**