From 8b09ed855cd5b292be66c5e884bf11ad2b0b2a08 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Tue, 4 Jul 2017 21:52:17 +0200 Subject: [PATCH] fix: ensure that the certificate status is always shown correctly Change-Id: I57d283ec720031c4930178f5a7483418ccc03920 --- .../wpia/gigi/output/CertificateIterable.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/club/wpia/gigi/output/CertificateIterable.java b/src/club/wpia/gigi/output/CertificateIterable.java index 6d12a3da..15abbf0a 100644 --- a/src/club/wpia/gigi/output/CertificateIterable.java +++ b/src/club/wpia/gigi/output/CertificateIterable.java @@ -35,11 +35,17 @@ public class CertificateIterable implements IterableDataset { vars.put("serial", c.getSerial()); vars.put("digest", c.getMessageDigest()); vars.put("profile", c.getProfile().getVisibleName()); + CertificateStatus st = c.getStatus(); + vars.put("revokable", st != CertificateStatus.REVOKED && st == CertificateStatus.ISSUED); + String issuedWarning = ""; + String expiredWarning = ""; + vars.put("issued", l.getTranslation("N/A")); + vars.put("expire", l.getTranslation("N/A")); + vars.put("classIssued", ""); + vars.put("classExpired", ""); + vars.put("revoked", l.getTranslation("N/A")); + try { - CertificateStatus st = c.getStatus(); - vars.put("revokable", st != CertificateStatus.REVOKED && st == CertificateStatus.ISSUED); - String issuedWarning = ""; - String expiredWarning = ""; if (st == CertificateStatus.ISSUED || st == CertificateStatus.REVOKED) { X509Certificate cert = c.cert(); vars.put("issued", cert.getNotBefore()); @@ -57,15 +63,10 @@ public class CertificateIterable implements IterableDataset { expiredWarning = "bg-danger"; } vars.put("classExpired", expiredWarning); - } else { - vars.put("issued", l.getTranslation("N/A")); - vars.put("expire", l.getTranslation("N/A")); } if (st == CertificateStatus.REVOKED) { vars.put("revoked", c.getRevocationDate()); - } else { - vars.put("revoked", l.getTranslation("N/A")); } } catch (IOException e) { e.printStackTrace(); -- 2.39.2