MUCertificatePreferencesViewController, MUCertificateCell: prettier expiration date.

3 files changed, 24 insertions, 1 deletions

diff --git a/Source/Classes/MUCertificateCell.h b/Source/Classes/MUCertificateCell.h
index cc32229..269f562 100644
--- a/Source/Classes/MUCertificateCell.h
+++ b/Source/Classes/MUCertificateCell.h
@@ -40,6 +40,9 @@
 - (BOOL) isIntermediate;
 - (void) setIsIntermediate:(BOOL)isIntermediate;
 
+- (BOOL) isExpired;
+- (void) setIsExpired:(BOOL)isExpired;
+
 - (BOOL) isCurrentCertificate;
 - (void) setIsCurrentCertificate:(BOOL)isSelected;
 
diff --git a/Source/Classes/MUCertificateCell.m b/Source/Classes/MUCertificateCell.m
index ccb4e80..a052a73 100644
--- a/Source/Classes/MUCertificateCell.m
+++ b/Source/Classes/MUCertificateCell.m
@@ -38,6 +38,7 @@
     IBOutlet UILabel      *_issuerLabel;
     IBOutlet UILabel      *_expiryLabel;
     BOOL                  _isCurrentCert;
+    BOOL                  _isExpired;
     BOOL                  _isIntermediate;
 }
 @end
@@ -78,6 +79,15 @@
     return _isIntermediate;
 }
 
+- (void) setIsExpired:(BOOL)isExpired {
+    _isExpired = isExpired;
+    _expiryLabel.textColor = [UIColor redColor];
+}
+
+- (BOOL) isExpired {
+    return _isExpired;
+}
+
 - (void) setIsCurrentCertificate:(BOOL)isCurrent {
     _isCurrentCert = isCurrent;
     if (isCurrent) {
diff --git a/Source/Classes/MUCertificatePreferencesViewController.m b/Source/Classes/MUCertificatePreferencesViewController.m
index 28e6266..8d4b680 100644
--- a/Source/Classes/MUCertificatePreferencesViewController.m
+++ b/Source/Classes/MUCertificatePreferencesViewController.m
@@ -104,7 +104,17 @@
     [cell setSubjectName:[cert subjectName]];
     [cell setEmail:[cert emailAddress]];
     [cell setIssuerText:[cert issuerName]];
-    [cell setExpiryText:[[cert notAfter] description]];
+    
+    if ([cert isValidOnDate:[NSDate date]]) {
+        NSDateFormatter *dateFormatter = [[[NSDateFormatter alloc] init] autorelease];
+        [dateFormatter setDateFormat:@"yyyy-MM-dd"];
+        NSString *formattedDate = [dateFormatter stringFromDate:[cert notAfter]];
+        NSString *fmt = NSLocalizedString(@"Expires on %@", @"Certificate expiry explanation");
+        [cell setExpiryText:[NSString stringWithFormat:fmt, formattedDate]];
+    } else {
+        [cell setExpiryText:NSLocalizedString(@"Expired", @"Date is past the certificate's notAfter date")];
+        [cell setIsExpired:YES];
+    }
 
     NSData *persistentRef = [dict objectForKey:@"persistentRef"];
     NSData *curPersistentRef = [[NSUserDefaults standardUserDefaults] objectForKey:@"DefaultCertificate"];