diff options
| author | Selim Gurun <sgurun@google.com> | 2013-04-20 00:19:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-20 00:19:41 -0700 |
| commit | 3c4fa654801fcf51a92cefd62e28a020d39e08d0 (patch) | |
| tree | 9f719ef685fb19e3231c5061b7495e13c5fffc3b /core/java/android/webkit/BrowserFrame.java | |
| parent | b7787a317fc8bb163de04641a1423cd08324d4b8 (diff) | |
| parent | 679c8f689f6799d143719bb8eb839e2640bf9d07 (diff) | |
am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
* commit '679c8f689f6799d143719bb8eb839e2640bf9d07':
Revert "Add a delimiter between scheme and host"
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 35aabf71dd40..e45ed34f5cc3 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; @@ -501,14 +500,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]); } @@ -823,7 +818,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. |