diff options
| author | Geremy Condra <gcondra@google.com> | 2013-04-18 11:40:09 -0700 |
|---|---|---|
| committer | Geremy Condra <gcondra@google.com> | 2013-04-18 11:40:09 -0700 |
| commit | b7787a317fc8bb163de04641a1423cd08324d4b8 (patch) | |
| tree | 32d03d4622b85d57ef7077c6c3ea18afe5f0f353 /core/java/android/webkit/BrowserFrame.java | |
| parent | c6af49efc467e379e7ac56246e9c7f0e6ebddc00 (diff) | |
| parent | 8225df007e44966335115939e374f676aa8e6e4b (diff) | |
DO NOT MERGE Merge commit '8225df00' into bp
Add a delimiter between scheme and host
Bug: 6923539
Change-Id: Ic5e19f96c64367c9dc0e3168850309cdd5047e47
Diffstat (limited to 'core/java/android/webkit/BrowserFrame.java')
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index 4dbca23c9277..35aabf71dd40 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -70,6 +70,7 @@ class BrowserFrame extends Handler { * request's LoadListener */ private final static int MAX_OUTSTANDING_REQUESTS = 300; + private final static String SCHEME_HOST_DELIMITER = "://"; private final CallbackProxy mCallbackProxy; private final WebSettingsClassic mSettings; @@ -500,9 +501,14 @@ class BrowserFrame extends Handler { .getCurrentItem(); if (item != null) { WebAddress uri = new WebAddress(item.getUrl()); - String schemePlusHost = uri.getScheme() + uri.getHost(); + String schemePlusHost = uri.getScheme() + SCHEME_HOST_DELIMITER + + uri.getHost(); String[] up = mDatabase.getUsernamePassword( schemePlusHost); + if (up == null) { // no row found, try again using the legacy method + schemePlusHost = uri.getScheme() + uri.getHost(); + up = mDatabase.getUsernamePassword(schemePlusHost); + } if (up != null && up[0] != null) { setUsernamePassword(up[0], up[1]); } @@ -817,7 +823,7 @@ class BrowserFrame extends Handler { } WebAddress uri = new WebAddress(mCallbackProxy .getBackForwardList().getCurrentItem().getUrl()); - String schemePlusHost = uri.getScheme() + uri.getHost(); + String schemePlusHost = uri.getScheme() + SCHEME_HOST_DELIMITER + uri.getHost(); // Check to see if the username & password appear in // the post data (there could be another form on the // page and that was posted instead. |