From 38915fd4d466cc233189bf5b5c11d7f03a416d35 Mon Sep 17 00:00:00 2001
From: Selim Gurun <sgurun@google.com>
Date: Thu, 4 Apr 2013 17:14:29 +0000
Subject: Revert "Add a delimiter between scheme and host"

This reverts commit aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8

Change-Id: I19e98182e97b8e81cabe3ff09897b82d50ce968e
---
 core/java/android/webkit/BrowserFrame.java           | 15 +++++----------
 core/java/android/webkit/WebView.java                |  3 +--
 core/java/android/webkit/WebViewDatabaseClassic.java | 15 +--------------
 3 files changed, 7 insertions(+), 26 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.
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 11062a2a4241..e4936532a0b8 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -588,8 +588,7 @@ public class WebView extends AbsoluteLayout
      * Saves the username and password for a particular host in this WebView's
      * internal database.
      *
-     * @param host the host that required the credentials. It is recommended that
-     *             the host is given using scheme://hostname format.
+     * @param host the host that required the credentials
      * @param username the username for the given host
      * @param password the password for the given host
      */
diff --git a/core/java/android/webkit/WebViewDatabaseClassic.java b/core/java/android/webkit/WebViewDatabaseClassic.java
index 1e2c199af839..9b1d4cb92986 100644
--- a/core/java/android/webkit/WebViewDatabaseClassic.java
+++ b/core/java/android/webkit/WebViewDatabaseClassic.java
@@ -37,7 +37,7 @@ final class WebViewDatabaseClassic extends WebViewDatabase {
     private static final String DATABASE_FILE = "webview.db";
     private static final String CACHE_DATABASE_FILE = "webviewCache.db";
 
-    private static final int DATABASE_VERSION = 12;
+    private static final int DATABASE_VERSION = 11;
     // 2 -> 3 Modified Cache table to allow cache of redirects
     // 3 -> 4 Added Oma-Downloads table
     // 4 -> 5 Modified Cache table to support persistent contentLength
@@ -50,7 +50,6 @@ final class WebViewDatabaseClassic extends WebViewDatabase {
     // 10 -> 11 Drop cookies and cache now managed by the chromium stack,
     //          and update the form data table to use the new format
     //          implemented for b/5265606.
-    // 11 -> 12 Add a delimiter between scheme and host when storing passwords
 
     private static WebViewDatabaseClassic sInstance = null;
 
@@ -166,23 +165,11 @@ final class WebViewDatabaseClassic extends WebViewDatabase {
     private static void upgradeDatabase() {
         upgradeDatabaseToV10();
         upgradeDatabaseFromV10ToV11();
-        upgradeDatabaseFromV11ToV12();
         // Add future database upgrade functions here, one version at a
         // time.
         sDatabase.setVersion(DATABASE_VERSION);
     }
 
-    private static void upgradeDatabaseFromV11ToV12() {
-        int oldVersion = sDatabase.getVersion();
-
-        if (oldVersion >= 12) {
-            // Nothing to do.
-            return;
-        }
-        // delete the rows in the database.
-        sDatabase.delete(mTableNames[TABLE_PASSWORD_ID], null, null);
-    }
-
     private static void upgradeDatabaseFromV10ToV11() {
         int oldVersion = sDatabase.getVersion();
 
-- 
cgit v1.2.3-59-g8ed1b