From 04f4b9804f10e4724bac22d40bf01711ff708533 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 26 Sep 2024 17:49:58 +0530 Subject: Revert "refactor: use `Closeable#use` extension where applicable" This reverts commit 69513bf24613d4ba540bcdeaffe04dc9330a65a4. --- .../main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'crypto/pgpainless/src') diff --git a/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt index 4a800129..91826001 100644 --- a/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt +++ b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt @@ -65,7 +65,8 @@ public class PGPainlessCryptoHandler @Inject constructor() : .addDecryptionKeys(keyringCollection, protector) .addDecryptionPassphrase(Passphrase.fromPassword(passphrase)) ) - decryptionStream.use { Streams.pipeAll(it, outputStream) } + Streams.pipeAll(decryptionStream, outputStream) + decryptionStream.close() return@runCatching } .mapError { error -> @@ -120,7 +121,8 @@ public class PGPainlessCryptoHandler @Inject constructor() : .setAsciiArmor(options.isOptionEnabled(PGPEncryptOptions.ASCII_ARMOR)) val encryptionStream = PGPainless.encryptAndOrSign().onOutputStream(outputStream).withOptions(producerOptions) - encryptionStream.use { Streams.pipeAll(plaintextStream, it) } + Streams.pipeAll(plaintextStream, encryptionStream) + encryptionStream.close() val result = encryptionStream.result publicKeyRingCollection.forEach { keyRing -> require(result.isEncryptedFor(keyRing)) { -- cgit v1.2.3