diff --git a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java index be3f3fc7f4b1..fe40e5c54f7a 100644 --- a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java +++ b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java @@ -1134,6 +1134,8 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) { Log_OC.d(TAG, "file size set to " + formattedFileSize); final long serverMaxChunkSize = getCapabilities().getChunkedUploadMaxSize(); + Log_OC.d("CHUNK_SIZE","server max chunk size: " + serverMaxChunkSize); + Log_OC.d("CHUNK_SIZE", "calc chunk size: " + ChunkedFileUploadRemoteOperation.chunkSize(mOnWifiOnly, serverMaxChunkSize)); if (size > ChunkedFileUploadRemoteOperation.chunkSize(mOnWifiOnly, serverMaxChunkSize)) { Log_OC.d(TAG, "chunked upload operation will be used"); diff --git a/app/src/main/java/com/owncloud/android/utils/EncryptionUtilsV2.kt b/app/src/main/java/com/owncloud/android/utils/EncryptionUtilsV2.kt index b92d5cba134f..d2f18d0f6a46 100644 --- a/app/src/main/java/com/owncloud/android/utils/EncryptionUtilsV2.kt +++ b/app/src/main/java/com/owncloud/android/utils/EncryptionUtilsV2.kt @@ -870,7 +870,13 @@ class EncryptionUtilsV2 { return false } + Log_OC.e("TEST_HASH", "decryptedFolderMetadataFile: $decryptedFolderMetadataFile") + Log_OC.e("TEST_HASH", "decryptedFolderMetadataFile2: ${decryptedFolderMetadataFile.metadata.metadataKey}") + val hashedMetadataKey = hashMetadataKey(decryptedFolderMetadataFile.metadata.metadataKey) + Log_OC.e("TEST_HASH", "decryptedFolderMetadataFile3: $hashedMetadataKey") + Log_OC.e("TEST_HASH", "decryptedFolderMetadataFile4: ${decryptedFolderMetadataFile.metadata.keyChecksums}") + if (!decryptedFolderMetadataFile.metadata.keyChecksums.contains(hashedMetadataKey)) { MainApp.showMessage(R.string.e2e_hash_not_found) return false