From edea8121ce373b75645dc19065d97688855669d0 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Wed, 29 Jan 2025 10:54:00 +0100 Subject: [PATCH] Simplify code for setExpirationDate() --- .../kotlin/org/pgpainless/key/generation/KeyRingBuilder.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeyRingBuilder.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeyRingBuilder.kt index d2cc8ecd..e7caa43b 100644 --- a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeyRingBuilder.kt +++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeyRingBuilder.kt @@ -52,12 +52,8 @@ class KeyRingBuilder : KeyRingBuilderInterface { addUserId(Strings.fromUTF8ByteArray(userId)) override fun setExpirationDate(expirationDate: Date?): KeyRingBuilder = apply { - if (expirationDate == null) { - this.expirationDate = null - return@apply - } this.expirationDate = - expirationDate.let { + expirationDate?.let { require(Date() < expirationDate) { "Expiration date must be in the future." } expirationDate }