kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reapply "refactor: use Closeable#use extension where applicable"

Browse source 
This reverts commit 04f4b9804f.
This commit is contained in:
Harsh Shandilya 2024-09-28 23:35:54 +05:30
parent 7e1ed55ab7
commit 5803f0244a
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/app/passwordstore/util/services/PasswordExportService.kt
View file

@ -89,10 +89,7 @@ class PasswordExportService : Service() {
val destOutputStream = contentResolver.openOutputStream(targetPasswordFile.uri) val destOutputStream = contentResolver.openOutputStream(targetPasswordFile.uri)
if (destOutputStream != null && sourceInputStream != null) { if (destOutputStream != null && sourceInputStream != null) {
sourceInputStream.copyTo(destOutputStream, 1024) sourceInputStream.use { source -> destOutputStream.use { dest -> source.copyTo(dest) } }
sourceInputStream.close()
destOutputStream.close()
} }
} }
} }

6
crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt
View file

@ -65,8 +65,7 @@ public class PGPainlessCryptoHandler @Inject constructor() :
.addDecryptionKeys(keyringCollection, protector) .addDecryptionKeys(keyringCollection, protector)
.addDecryptionPassphrase(Passphrase.fromPassword(passphrase)) .addDecryptionPassphrase(Passphrase.fromPassword(passphrase))
) )
Streams.pipeAll(decryptionStream, outputStream) decryptionStream.use { Streams.pipeAll(it, outputStream) }
decryptionStream.close()
return@runCatching return@runCatching
} }
.mapError { error -> .mapError { error ->
@ -121,8 +120,7 @@ public class PGPainlessCryptoHandler @Inject constructor() :
.setAsciiArmor(options.isOptionEnabled(PGPEncryptOptions.ASCII_ARMOR)) .setAsciiArmor(options.isOptionEnabled(PGPEncryptOptions.ASCII_ARMOR))
val encryptionStream = val encryptionStream =
PGPainless.encryptAndOrSign().onOutputStream(outputStream).withOptions(producerOptions) PGPainless.encryptAndOrSign().onOutputStream(outputStream).withOptions(producerOptions)
Streams.pipeAll(plaintextStream, encryptionStream) encryptionStream.use { Streams.pipeAll(plaintextStream, it) }
encryptionStream.close()
val result = encryptionStream.result val result = encryptionStream.result
publicKeyRingCollection.forEach { keyRing -> publicKeyRingCollection.forEach { keyRing ->
require(result.isEncryptedFor(keyRing)) { require(result.isEncryptedFor(keyRing)) {