am 123ecfb2: bug fix: browser was not replacing whitepsace in url if scheme is not fully lowercased.
Merge commit '123ecfb21e7ca670e3d04efe58780b3bac54a9a1'
* commit '123ecfb21e7ca670e3d04efe58780b3bac54a9a1':
bug fix: browser was not replacing whitepsace in url if scheme is not fully lowercased.
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 790174c..d251f7a 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -4521,14 +4521,14 @@
Matcher matcher = ACCEPTED_URI_SCHEMA.matcher(inUrl);
if (matcher.matches()) {
- if (hasSpace) {
- inUrl = inUrl.replace(" ", "%20");
- }
// force scheme to lowercase
String scheme = matcher.group(1);
String lcScheme = scheme.toLowerCase();
if (!lcScheme.equals(scheme)) {
- return lcScheme + matcher.group(2);
+ inUrl = lcScheme + matcher.group(2);
+ }
+ if (hasSpace) {
+ inUrl = inUrl.replace(" ", "%20");
}
return inUrl;
}