Minor UI changes

Author: rfc2822

lib/src/main/java/at/bitfire/cert4android/CertificateDetails.kt

@@ -6,17 +6,19 @@ import java.security.spec.MGF1ParameterSpec.SHA256
 import java.text.DateFormat
 
 /**
- * Certificate details.
- * Create with [CertificateDetails.create] and use with [TrustCertificateDialog]
+ * Human-readable certificate details.
+ *
+ * Usually created with [CertificateDetails.fromX509] and used by [TrustCertificateDialog].
  */
 data class CertificateDetails(
     val issuedFor: String? = null,
     val issuedBy: String? = null,
     val validFrom: String? = null,
     val validTo: String? = null,
     val sha1: String? = null,
-    val sha256: String? = null,
+    val sha256: String? = null
 ) {
+
     companion object {
 
         /**
@@ -25,7 +27,7 @@ data class CertificateDetails(
          * @param cert X509Certificate
          * @return CertificateDetails
          */
-        fun create(cert: X509Certificate): CertificateDetails? {
+        fun fromX509(cert: X509Certificate): CertificateDetails {
             val subject = cert.subjectAlternativeNames?.let { altNames ->
                 val sb = StringBuilder()
                 for (altName in altNames) {
@@ -42,9 +44,10 @@ data class CertificateDetails(
                 issuedBy = cert.issuerDN.toString(),
                 validFrom = timeFormatter.format(cert.notBefore),
                 validTo = timeFormatter.format(cert.notAfter),
-                sha1 = "SHA1: " + CertUtils.fingerprint(cert, SHA1.digestAlgorithm),
-                sha256 = "SHA256: " + CertUtils.fingerprint(cert, SHA256.digestAlgorithm)
+                sha1 = CertUtils.fingerprint(cert, SHA1.digestAlgorithm),
+                sha256 = CertUtils.fingerprint(cert, SHA256.digestAlgorithm)
             )
         }
     }
+
 }

lib/src/main/java/at/bitfire/cert4android/TrustCertificateDialog.kt

@@ -79,7 +79,7 @@ fun TrustCertificateDialog(
 
                 if (sha1 != null)
                     Text(
-                        text = sha1,
+                        text = stringResource(R.string.trust_certificate_fingerprint_sha1, sha1),
                         style = MaterialTheme.typography.bodyMedium,
                         modifier = modifier
                             .fillMaxWidth()
@@ -88,7 +88,7 @@ fun TrustCertificateDialog(
 
                 if (sha256 != null)
                     Text(
-                        text = sha256,
+                        text = stringResource(R.string.trust_certificate_fingerprint_sha256, sha256),
                         style = MaterialTheme.typography.bodyMedium,
                         modifier = modifier
                             .fillMaxWidth()

lib/src/main/res/values/strings.xml

@@ -8,6 +8,8 @@
     <string name="trust_certificate_validity_period">Validity period</string>
     <string name="trust_certificate_validity_period_value">%1$s – %2$s (will not be enforced)</string>
     <string name="trust_certificate_fingerprints">Fingerprints</string>
+    <string name="trust_certificate_fingerprint_sha1">SHA-1: %s</string>
+    <string name="trust_certificate_fingerprint_sha256">SHA-256: %s</string>
     <string name="trust_certificate_fingerprint_verified">I have manually verified the whole fingerprint.</string>
     <string name="trust_certificate_accept">Accept</string>
     <string name="trust_certificate_reject">Reject</string>

sample-app/src/main/java/at/bitfire/cert4android/demo/MainActivity.kt

@@ -170,7 +170,7 @@ class MainActivity : ComponentActivity() {
                             userDecision = CompletableDeferred()
 
                             // Show TrustDecisionDialog with certificate details to user
-                            _certificateDetailsFlow.value = CertificateDetails.create(cert)
+                            _certificateDetailsFlow.value = CertificateDetails.fromX509(cert)
 
                             // Wait for user decision and return it
                             userDecision.await()