commit 5e65609a9f4e1eda54167ec911206365ff7fde6c
author Steve Block <steveblock@google.com> Mon Oct 03 14:56:07 2011 +0100
committer Steve Block <steveblock@google.com> Mon Oct 03 14:56:07 2011 +0100
tree 3b996a0a43575763351282cb2cbbc06fd3dde31d
parent 42a73941cd48a92aa1980afecb5e78be0b00972c

Fix SSL certificate error page

Don't always claim that the certificate is expired and the date is invalid.

Bug: 5403221
Change-Id: I914cfad2d5bba9a7a550c89091201614eef8e60f

src/com/android/browser/PageDialogsHandler.java

diff --git a/src/com/android/browser/PageDialogsHandler.java b/src/com/android/browser/PageDialogsHandler.java
index 14373cb..13e9ceb 100644
--- a/src/com/android/browser/PageDialogsHandler.java
+++ b/src/com/android/browser/PageDialogsHandler.java
@@ -319,13 +319,13 @@
         if (error.hasError(SslError.SSL_IDMISMATCH)) {
             addError(factory, placeholder, R.string.ssl_mismatch);
         }
-        if (error.hasError(SslError.SSL_EXPIRED) || true) {
+        if (error.hasError(SslError.SSL_EXPIRED)) {
             addError(factory, placeholder, R.string.ssl_expired);
         }
         if (error.hasError(SslError.SSL_NOTYETVALID)) {
             addError(factory, placeholder, R.string.ssl_not_yet_valid);
         }
-        if (error.hasError(SslError.SSL_DATE_INVALID) || true) {
+        if (error.hasError(SslError.SSL_DATE_INVALID)) {
             addError(factory, placeholder, R.string.ssl_date_invalid);
         }
         if (error.hasError(SslError.SSL_INVALID)) {