diff options
| author | Selim Gurun <sgurun@google.com> | 2013-03-08 14:23:00 -0800 |
|---|---|---|
| committer | Selim Gurun <sgurun@google.com> | 2013-03-08 14:29:56 -0800 |
| commit | 2905e18b03c6ce34739bed9c06b865b29087deea (patch) | |
| tree | 07510675a039a719f97f8b0969667ba90a891af0 /core/java/android/webkit/BrowserFrame.java | |
| parent | 01eaa2d545a0b0dc28f8f13e6db7348bb6e098e3 (diff) | |
Add a delimiter between scheme and host
Bug: 6923539
Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6
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 24ac54fd0bfe..33e83649aef0 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; @@ -498,9 +499,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]); } @@ -815,7 +821,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. |