Encode characters that java.net.URI rejects
Bug: 5952386
Our java.net.URI implementation conforms to an old obsolete RFC and
it is very restrictive. Since in our download path, we use download
manager and so java.net.URI, this causes an odd bug (i.e. URIs that
are fetched fine by chromium http stack fails when download manager is
used). Also there is a second bug that when URI parsing fails and an
exception is thrown, we fail to catch it and crash. This CL fixes both.
Change-Id: I62ac289566efae97dd2161b8041b06a0a87211cb
diff --git a/src/com/android/browser/DownloadHandler.java b/src/com/android/browser/DownloadHandler.java
index 6e2c786..219114e 100644
--- a/src/com/android/browser/DownloadHandler.java
+++ b/src/com/android/browser/DownloadHandler.java
@@ -107,7 +107,7 @@
boolean needed = false;
for (char c : chars) {
- if (c == '[' || c == ']') {
+ if (c == '[' || c == ']' || c == '|') {
needed = true;
break;
}
@@ -118,7 +118,7 @@
StringBuilder sb = new StringBuilder("");
for (char c : chars) {
- if (c == '[' || c == ']') {
+ if (c == '[' || c == ']' || c == '|') {
sb.append('%');
sb.append(Integer.toHexString(c));
} else {