Chromium Code Reviews| Index: chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerDelegate.java |
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerDelegate.java |
| index ee41a0f07fc472471867e0eda20777efb58da4b4..959c60b6a5460f94dedb3e4a0e2d3b6bc7071de1 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerDelegate.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerDelegate.java |
| @@ -101,9 +101,12 @@ public class DownloadManagerDelegate { |
| Method method = c.getMethod("addCompletedDownload", args); |
| // OriginalUri has to be null or non-empty, and cannot be file scheme. |
|
David Trainor- moved to gerrit
2017/05/14 05:55:14
Update the comment too
qinmin
2017/05/15 17:59:18
Done.
|
| Uri originalUri = TextUtils.isEmpty(originalUrl) ? null : Uri.parse(originalUrl); |
| - if (originalUri != null && UrlConstants.FILE_SCHEME.equals( |
| - originalUri.normalizeScheme().getScheme())) { |
| - originalUri = null; |
| + if (originalUri != null) { |
| + String scheme = originalUri.normalizeScheme().getScheme(); |
| + if (scheme == null || (!scheme.equals(UrlConstants.HTTPS_SCHEME) |
| + && !scheme.equals(UrlConstants.HTTP_SCHEME))) { |
| + originalUri = null; |
| + } |
| } |
| Uri refererUri = TextUtils.isEmpty(referer) ? null : Uri.parse(referer); |
| downloadId = (Long) method.invoke(manager, fileName, description, true, mimeType, |