From 2ae9c94841ba203fb8e8a8af8c9d7bebc4a0b5c1 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Thu, 20 Mar 2025 19:33:46 +0100 Subject: [PATCH] Port SelectUserId.validUserIds() --- .../org/pgpainless/util/selection/userid/SelectUserId.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/util/selection/userid/SelectUserId.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/util/selection/userid/SelectUserId.kt index 6613abde..00bc3984 100644 --- a/pgpainless-core/src/main/kotlin/org/pgpainless/util/selection/userid/SelectUserId.kt +++ b/pgpainless-core/src/main/kotlin/org/pgpainless/util/selection/userid/SelectUserId.kt @@ -83,11 +83,7 @@ abstract class SelectUserId : Predicate, (String) -> Boolean { @JvmStatic fun validUserId(keyRing: PGPKeyRing) = - object : SelectUserId() { - private val info = PGPainless.inspectKeyRing(keyRing) - - override fun invoke(userId: String): Boolean = info.isUserIdValid(userId) - } + validUserId(PGPainless.getInstance().toCertificate(keyRing)) @JvmStatic fun and(vararg filters: SelectUserId) =