commit 08a6f0ce422a7cc35a9a27a0823b1ad604d70f48
author Steve Block <steveblock@google.com> Thu Oct 06 12:12:53 2011 +0100
committer Steve Block <steveblock@google.com> Mon Oct 10 10:21:50 2011 +0100
tree 0ab26fd296dfe8bf08f01a9ce495e168483b47b5
parent 90ff868cf3b30fed8ba8e84f7a37fc44de07aec4

When a page's main resource uses an invalid SSL certificate, reflect this in 'Page Info'

This requires us to keep track of the SslError, if present, for the main
resource.

Also remove some superfluous initializations.

Bug: 5248376
Change-Id: I09b09990c58c8ef10220638ab2b10640692ae801

src/com/android/browser/PageDialogsHandler.java

diff --git a/src/com/android/browser/PageDialogsHandler.java b/src/com/android/browser/PageDialogsHandler.java
index 89c2745..013eaf1 100644
--- a/src/com/android/browser/PageDialogsHandler.java
+++ b/src/com/android/browser/PageDialogsHandler.java
@@ -244,9 +244,7 @@
         }
 
         mSSLCertificateView = tab;
-        // TODO: We should pass the certificate error for the page's main
-        // resource, if present. See http://b/5248376.
-        mSSLCertificateDialog = createSslCertificateDialog(cert, null)
+        mSSLCertificateDialog = createSslCertificateDialog(cert, tab.getSslCertificateError())
                 .setPositiveButton(R.string.ok,
                         new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog,