diff options
| author | Selim Gurun <sgurun@google.com> | 2013-04-04 17:14:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-04 17:14:29 +0000 |
| commit | 38915fd4d466cc233189bf5b5c11d7f03a416d35 (patch) | |
| tree | eb39a3edefe98598e35b3dec670f78a6b7e27249 /core/java/android/webkit/BrowserFrame.java | |
| parent | aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8 (diff) | |
Revert "Add a delimiter between scheme and host"
This reverts commit aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8
Change-Id: I19e98182e97b8e81cabe3ff09897b82d50ce968e
Diffstat (limited to 'core/java/android/webkit/BrowserFrame.java')
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index 66c2727a03eb..9e454a7b1934 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -70,7 +70,6 @@ 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; @@ -505,14 +504,10 @@ class BrowserFrame extends Handler { .getCurrentItem(); if (item != null) { WebAddress uri = new WebAddress(item.getUrl()); - 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); - } + String schemePlusHost = uri.getScheme() + uri.getHost(); + String[] up = + WebViewDatabaseClassic.getInstance(mContext) + .getUsernamePassword(schemePlusHost); if (up != null && up[0] != null) { setUsernamePassword(up[0], up[1]); } @@ -825,7 +820,7 @@ class BrowserFrame extends Handler { } WebAddress uri = new WebAddress(mCallbackProxy .getBackForwardList().getCurrentItem().getUrl()); - String schemePlusHost = uri.getScheme() + SCHEME_HOST_DELIMITER + uri.getHost(); + String schemePlusHost = uri.getScheme() + 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. |