From c2ee0200c70f107a7201680388edcfd7ee0c7b2b Mon Sep 17 00:00:00 2001 From: Mikkel Krautz Date: Sun, 3 Sep 2017 19:09:03 +0200 Subject: MUCertificateViewController: avoid fancy newline formatting of cert digests. This only looks good on devices that use the traditional iPhone screen width. Now that we support multiple widths, avoid any fancy formatting. --- Source/Classes/MUCertificateViewController.m | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Source/Classes/MUCertificateViewController.m b/Source/Classes/MUCertificateViewController.m index 354bdaf..89cd7e3 100644 --- a/Source/Classes/MUCertificateViewController.m +++ b/Source/Classes/MUCertificateViewController.m @@ -285,9 +285,7 @@ static const NSUInteger CertificateViewSectionTotal = 4; MKCertificate *cert = [_certificates objectAtIndex:_curIdx]; NSString *hexDigest = [cert hexDigestOfKind:@"sha1"]; if ([indexPath row] == 0 && hexDigest.length == 40) { - cell.textLabel.text = [NSString stringWithFormat:@"%@\n%@", - [MUCertificateController fingerprintFromHexString:[hexDigest substringToIndex:20]], - [MUCertificateController fingerprintFromHexString:[hexDigest substringFromIndex:20]]]; + cell.textLabel.text = hexDigest; cell.textLabel.textColor = [MUColor selectedTextColor]; cell.textLabel.font = [UIFont fontWithName:@"Courier" size:16]; cell.textLabel.numberOfLines = 0; @@ -298,11 +296,7 @@ static const NSUInteger CertificateViewSectionTotal = 4; MKCertificate *cert = [_certificates objectAtIndex:_curIdx]; NSString *hexDigest = [cert hexDigestOfKind:@"sha256"]; if ([indexPath row] == 0 && hexDigest.length == 64) { - cell.textLabel.text = [NSString stringWithFormat:@"%@\n%@\n%@\n%@", - [MUCertificateController fingerprintFromHexString:[hexDigest substringWithRange:NSMakeRange(0, 20)]], - [MUCertificateController fingerprintFromHexString:[hexDigest substringWithRange:NSMakeRange(20, 20)]], - [MUCertificateController fingerprintFromHexString:[hexDigest substringWithRange:NSMakeRange(40, 20)]], - [MUCertificateController fingerprintFromHexString:[hexDigest substringWithRange:NSMakeRange(60, 4)]]]; + cell.textLabel.text = hexDigest; cell.textLabel.textColor = [MUColor selectedTextColor]; cell.textLabel.font = [UIFont fontWithName:@"Courier" size:16]; cell.textLabel.numberOfLines = 0; -- cgit v1.2.3 From 01ac79d7a368bcc46656380f7f5fc8e1853a49e0 Mon Sep 17 00:00:00 2001 From: Mikkel Krautz Date: Sun, 3 Sep 2017 19:27:35 +0200 Subject: MUCertificateViewController: auto-size table view cells. --- Source/Classes/MUCertificateViewController.m | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Source/Classes/MUCertificateViewController.m b/Source/Classes/MUCertificateViewController.m index 89cd7e3..3809b6d 100644 --- a/Source/Classes/MUCertificateViewController.m +++ b/Source/Classes/MUCertificateViewController.m @@ -88,6 +88,9 @@ static const NSUInteger CertificateViewSectionTotal = 4; - (void) viewDidLoad { [self setTitle:_certTitle]; + + [[self tableView] setRowHeight:UITableViewAutomaticDimension]; + [[self tableView] setEstimatedRowHeight:44.0f]; } - (void) viewWillAppear:(BOOL)animated { @@ -321,15 +324,6 @@ static const NSUInteger CertificateViewSectionTotal = 4; return cell; } -- (CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if ([indexPath section] == CertificateViewSectionSHA1Fingerprint) { - return 55.0f; - } else if ([indexPath section] == CertificateViewSectionSHA256Fingerprint) { - return 88.0f; - } - return 44.0f; -} - #pragma mark - #pragma mark Table view delegate -- cgit v1.2.3