From 16b6806562476950f5c26878ebf1d6075f1a16d8 Mon Sep 17 00:00:00 2001
From: Huahui Wu <hwu@google.com>
Date: Tue, 28 Jun 2011 10:09:07 -0700
Subject: Revert "Shows the right URL that has a cert error."

This reverts commit db6ff8999159f386ea8a99d980ce533b717fca78.
---
 src/com/android/browser/PageDialogsHandler.java | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

(limited to 'src/com/android/browser/PageDialogsHandler.java')

diff --git a/src/com/android/browser/PageDialogsHandler.java b/src/com/android/browser/PageDialogsHandler.java
index b9e08594a..2dbddf32d 100644
--- a/src/com/android/browser/PageDialogsHandler.java
+++ b/src/com/android/browser/PageDialogsHandler.java
@@ -42,7 +42,6 @@ public class PageDialogsHandler {
     private Context mContext;
     private Controller mController;
     private boolean mPageInfoFromShowSSLCertificateOnError;
-    private String mUrlCertificateOnError;
     private Tab mPageInfoView;
     private AlertDialog mPageInfoDialog;
 
@@ -67,9 +66,7 @@ public class PageDialogsHandler {
     public void onConfigurationChanged(Configuration config) {
         if (mPageInfoDialog != null) {
             mPageInfoDialog.dismiss();
-            showPageInfo(mPageInfoView,
-                         mPageInfoFromShowSSLCertificateOnError,
-                         mUrlCertificateOnError);
+            showPageInfo(mPageInfoView, mPageInfoFromShowSSLCertificateOnError);
         }
         if (mSSLCertificateDialog != null) {
             mSSLCertificateDialog.dismiss();
@@ -77,9 +74,8 @@ public class PageDialogsHandler {
         }
         if (mSSLCertificateOnErrorDialog != null) {
             mSSLCertificateOnErrorDialog.dismiss();
-            showSSLCertificateOnError(mSSLCertificateOnErrorView,
-                                      mSSLCertificateOnErrorHandler,
-                                      mSSLCertificateOnErrorError);
+            showSSLCertificateOnError(mSSLCertificateOnErrorView, mSSLCertificateOnErrorHandler,
+                    mSSLCertificateOnErrorError);
         }
         if (mHttpAuthenticationDialog != null) {
             mHttpAuthenticationDialog.reshow();
@@ -133,19 +129,16 @@ public class PageDialogsHandler {
      * this dialog was opened from the SSL-certificate-on-error dialog or
      * not. This is important, since we need to know whether to return to
      * the parent dialog or simply dismiss.
-     * @param urlCertificateOnError The URL that invokes SSLCertificateError.
-     * Null when fromShowSSLCertificateOnError is false.
      */
     void showPageInfo(final Tab tab,
-            final boolean fromShowSSLCertificateOnError,
-            final String urlCertificateOnError) {
+            final boolean fromShowSSLCertificateOnError) {
         final LayoutInflater factory = LayoutInflater.from(mContext);
 
         final View pageInfoView = factory.inflate(R.layout.page_info, null);
 
         final WebView view = tab.getWebView();
 
-        String url = fromShowSSLCertificateOnError ? urlCertificateOnError : tab.getUrl();
+        String url = tab.getUrl();
         String title = tab.getTitle();
 
         if (url == null) {
@@ -160,7 +153,6 @@ public class PageDialogsHandler {
 
         mPageInfoView = tab;
         mPageInfoFromShowSSLCertificateOnError = fromShowSSLCertificateOnError;
-        mUrlCertificateOnError = urlCertificateOnError;
 
         AlertDialog.Builder alertDialogBuilder =
             new AlertDialog.Builder(mContext)
@@ -271,7 +263,7 @@ public class PageDialogsHandler {
                                 mSSLCertificateDialog = null;
                                 mSSLCertificateView = null;
 
-                                showPageInfo(tab, false, null);
+                                showPageInfo(tab, false);
                             }
                         })
                 .setOnCancelListener(
@@ -280,7 +272,7 @@ public class PageDialogsHandler {
                                 mSSLCertificateDialog = null;
                                 mSSLCertificateView = null;
 
-                                showPageInfo(tab, false, null);
+                                showPageInfo(tab, false);
                             }
                         })
                 .show();
@@ -369,8 +361,7 @@ public class PageDialogsHandler {
 
                                 showPageInfo(mController.getTabControl()
                                         .getTabFromView(view),
-                                        true,
-                                        error.getUrl());
+                                        true);
                             }
                         })
                 .setOnCancelListener(
-- 
cgit v1.2.3