From a25ba5943ee382f379bb785d689451c71bf3bde4 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Sat, 8 Mar 2025 11:06:02 +0100 Subject: [PATCH] Avoid deprecated API and remove unnecessary code --- .../org/pgpainless/encryption_signing/EncryptionBuilder.kt | 6 +----- .../org/pgpainless/key/certification/CertifyCertificate.kt | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/encryption_signing/EncryptionBuilder.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/encryption_signing/EncryptionBuilder.kt index 6b4713d6..43263a28 100644 --- a/pgpainless-core/src/main/kotlin/org/pgpainless/encryption_signing/EncryptionBuilder.kt +++ b/pgpainless-core/src/main/kotlin/org/pgpainless/encryption_signing/EncryptionBuilder.kt @@ -63,11 +63,7 @@ class EncryptionBuilder : EncryptionBuilderInterface { @JvmStatic fun negotiateCompressionAlgorithm(producerOptions: ProducerOptions): CompressionAlgorithm { - val compressionAlgorithmOverride = producerOptions.compressionAlgorithmOverride - return compressionAlgorithmOverride - ?: getPolicy().compressionAlgorithmPolicy.defaultCompressionAlgorithm() - - // TODO: Negotiation + return producerOptions.compressionAlgorithmOverride } } } diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/certification/CertifyCertificate.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/certification/CertifyCertificate.kt index 90865d67..8febadbb 100644 --- a/pgpainless-core/src/main/kotlin/org/pgpainless/key/certification/CertifyCertificate.kt +++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/certification/CertifyCertificate.kt @@ -323,8 +323,7 @@ class CertifyCertificate { } return certificationKey.getSecretKey(certificationPubKey.keyIdentifier) - ?: throw MissingSecretKeyException( - fingerprint, certificationPubKey.keyIdentifier.keyId) + ?: throw MissingSecretKeyException(fingerprint, certificationPubKey.keyIdentifier) } } }