Skip to content

Commit cebb39d

Browse files
committed
Revert "Fix duplicate close of EncryptingWritableByteChannel"
This reverts commit cf470a7.
1 parent e8abefc commit cebb39d

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

buildsystem/dependencies.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ ext {
8585
greenDaoVersion = '3.3.0'
8686

8787
// cloud provider libs
88-
cryptolibVersion = '2.2.1'
88+
// todo updaten
89+
cryptolibVersion = '2.2.0' // 2.2.1 is broken in regards to create files
8990

9091
dropboxVersion = '7.0.0'
9192

data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplDecorator.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ abstract class CryptoImplDecorator(
448448
encrypted += written.toLong()
449449
progressAware.onProgress(Progress.progress(UploadState.encryption(cryptoFile)).between(0).and(ciphertextSize).withValue(encrypted))
450450
}
451+
encryptingWritableByteChannel.close()
451452
data.modifiedDate(context).ifPresent { encryptedTmpFile.setLastModified(it.time) }
452453
progressAware.onProgress(Progress.completed(UploadState.encryption(cryptoFile)))
453454
return writeFromTmpFile(data, cryptoFile, encryptedTmpFile, progressAware, replace)

data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormat7.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ open class CryptoImplVaultFormat7 : CryptoImplDecorator {
485485
encrypted += written.toLong()
486486
progressAware.onProgress(Progress.progress(UploadState.encryption(cloudFile)).between(0).and(ciphertextSize).withValue(encrypted))
487487
}
488+
encryptingWritableByteChannel.close()
488489
data.modifiedDate(context).ifPresent { encryptedTmpFile.setLastModified(it.time) }
489490
progressAware.onProgress(Progress.completed(UploadState.encryption(cloudFile)))
490491
val targetFile = targetFile(cryptoFile, cloudFile, replace)

0 commit comments

Comments
 (0)