From 1dde5ff6e7ea9064c50699674f98860c8763653d Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 25 May 2016 15:17:40 +0200 Subject: [PATCH 01/11] release 1.1.0 --- main/ant-kit/pom.xml | 2 +- main/commons-test/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/filesystem-api/pom.xml | 2 +- main/filesystem-charsets/pom.xml | 2 +- main/filesystem-crypto-integration-tests/pom.xml | 2 +- main/filesystem-crypto/pom.xml | 2 +- main/filesystem-inmemory/pom.xml | 2 +- main/filesystem-invariants-tests/pom.xml | 2 +- main/filesystem-nameshortening/pom.xml | 2 +- main/filesystem-nio/pom.xml | 2 +- main/filesystem-stats/pom.xml | 2 +- main/frontend-api/pom.xml | 2 +- main/frontend-webdav/pom.xml | 2 +- main/jacoco-report/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index 3753d71d9..cae2d7a91 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -8,7 +8,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 ant-kit pom diff --git a/main/commons-test/pom.xml b/main/commons-test/pom.xml index 8ae85edf0..d9af1f82a 100644 --- a/main/commons-test/pom.xml +++ b/main/commons-test/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 commons-test Cryptomator common test dependencies diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 5603f36b5..560de1cbd 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 commons Cryptomator common diff --git a/main/filesystem-api/pom.xml b/main/filesystem-api/pom.xml index c0b4421ce..3d3e0af47 100644 --- a/main/filesystem-api/pom.xml +++ b/main/filesystem-api/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 filesystem-api Cryptomator filesystem: API diff --git a/main/filesystem-charsets/pom.xml b/main/filesystem-charsets/pom.xml index b5eba0555..03051fe11 100644 --- a/main/filesystem-charsets/pom.xml +++ b/main/filesystem-charsets/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 filesystem-charsets Cryptomator filesystem: Filename charset compatibility layer diff --git a/main/filesystem-crypto-integration-tests/pom.xml b/main/filesystem-crypto-integration-tests/pom.xml index a5976979c..1e1674f2e 100644 --- a/main/filesystem-crypto-integration-tests/pom.xml +++ b/main/filesystem-crypto-integration-tests/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 filesystem-crypto-integration-tests Cryptomator filesystem: Encryption layer tests diff --git a/main/filesystem-crypto/pom.xml b/main/filesystem-crypto/pom.xml index 3abd9d8b8..d700112e6 100644 --- a/main/filesystem-crypto/pom.xml +++ b/main/filesystem-crypto/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 filesystem-crypto Cryptomator filesystem: Encryption layer diff --git a/main/filesystem-inmemory/pom.xml b/main/filesystem-inmemory/pom.xml index 6134992dc..18bd2b5bf 100644 --- a/main/filesystem-inmemory/pom.xml +++ b/main/filesystem-inmemory/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 filesystem-inmemory Cryptomator filesystem: In-memory mock diff --git a/main/filesystem-invariants-tests/pom.xml b/main/filesystem-invariants-tests/pom.xml index 054464338..47cb00f10 100644 --- a/main/filesystem-invariants-tests/pom.xml +++ b/main/filesystem-invariants-tests/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 filesystem-invariants-tests Cryptomator filesystem: Invariants tests diff --git a/main/filesystem-nameshortening/pom.xml b/main/filesystem-nameshortening/pom.xml index d5830d78d..a32f84f02 100644 --- a/main/filesystem-nameshortening/pom.xml +++ b/main/filesystem-nameshortening/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 filesystem-nameshortening Cryptomator filesystem: Name shortening layer diff --git a/main/filesystem-nio/pom.xml b/main/filesystem-nio/pom.xml index f091d5fcb..8f8f41f91 100644 --- a/main/filesystem-nio/pom.xml +++ b/main/filesystem-nio/pom.xml @@ -7,7 +7,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 filesystem-nio Cryptomator filesystem: NIO-based physical layer diff --git a/main/filesystem-stats/pom.xml b/main/filesystem-stats/pom.xml index 764daf84f..ecb42113e 100644 --- a/main/filesystem-stats/pom.xml +++ b/main/filesystem-stats/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 filesystem-stats Cryptomator filesystem: Throughput statistics diff --git a/main/frontend-api/pom.xml b/main/frontend-api/pom.xml index 875e85f95..f00a529bf 100644 --- a/main/frontend-api/pom.xml +++ b/main/frontend-api/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 frontend-api Cryptomator frontend: API diff --git a/main/frontend-webdav/pom.xml b/main/frontend-webdav/pom.xml index 64de5fea5..54cc377b1 100644 --- a/main/frontend-webdav/pom.xml +++ b/main/frontend-webdav/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 frontend-webdav Cryptomator frontend: WebDAV frontend diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index 20de8d2bf..616d129dd 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 jacoco-report Cryptomator Code Coverage Report diff --git a/main/pom.xml b/main/pom.xml index 75ba59663..e1db6be2b 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -7,7 +7,7 @@ 4.0.0 org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index 833e1b3ea..41aec32f6 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 uber-jar pom diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 873c1af38..bcd97a3a3 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.0-SNAPSHOT + 1.1.0 ui Cryptomator GUI From 5c959989a26e0c4fd8fccfe5f7440ca732e6f5fe Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 5 Jul 2016 23:18:18 +0200 Subject: [PATCH 02/11] Fixed Coverity defect 131711 --- .../src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java index 6f7f147ce..4f67ca3f2 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java @@ -73,7 +73,7 @@ public abstract class UpgradeStrategy { /** * Thrown when data migration failed. */ - public class UpgradeFailedException extends Exception { + public static class UpgradeFailedException extends Exception { UpgradeFailedException() { } From 3d951a9d7beb8d30bcda54af76937946f7079be3 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 7 Jul 2016 14:48:49 +0200 Subject: [PATCH 03/11] set version to 1.1.1 --- main/ant-kit/pom.xml | 2 +- main/commons-test/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/filesystem-api/pom.xml | 2 +- main/filesystem-charsets/pom.xml | 2 +- main/filesystem-crypto-integration-tests/pom.xml | 2 +- main/filesystem-crypto/pom.xml | 2 +- main/filesystem-inmemory/pom.xml | 2 +- main/filesystem-invariants-tests/pom.xml | 2 +- main/filesystem-nameshortening/pom.xml | 2 +- main/filesystem-nio/pom.xml | 2 +- main/filesystem-stats/pom.xml | 2 +- main/frontend-api/pom.xml | 2 +- main/frontend-webdav/pom.xml | 2 +- main/jacoco-report/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index 9d43788c7..d5bfd3e60 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -8,7 +8,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 ant-kit pom diff --git a/main/commons-test/pom.xml b/main/commons-test/pom.xml index 53f68521f..653c8c7ac 100644 --- a/main/commons-test/pom.xml +++ b/main/commons-test/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 commons-test Cryptomator common test dependencies diff --git a/main/commons/pom.xml b/main/commons/pom.xml index afeb35fa1..aa5c7fb0f 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 commons Cryptomator common diff --git a/main/filesystem-api/pom.xml b/main/filesystem-api/pom.xml index b4b4cfc4d..24d0b0964 100644 --- a/main/filesystem-api/pom.xml +++ b/main/filesystem-api/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 filesystem-api Cryptomator filesystem: API diff --git a/main/filesystem-charsets/pom.xml b/main/filesystem-charsets/pom.xml index e156412e5..5fba8cc14 100644 --- a/main/filesystem-charsets/pom.xml +++ b/main/filesystem-charsets/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 filesystem-charsets Cryptomator filesystem: Charset compatibility layer diff --git a/main/filesystem-crypto-integration-tests/pom.xml b/main/filesystem-crypto-integration-tests/pom.xml index 48b51a55b..54261c2dd 100644 --- a/main/filesystem-crypto-integration-tests/pom.xml +++ b/main/filesystem-crypto-integration-tests/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 filesystem-crypto-integration-tests Cryptomator filesystem: Encryption layer tests diff --git a/main/filesystem-crypto/pom.xml b/main/filesystem-crypto/pom.xml index 403777a29..fa43feba1 100644 --- a/main/filesystem-crypto/pom.xml +++ b/main/filesystem-crypto/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 filesystem-crypto Cryptomator filesystem: Encryption layer diff --git a/main/filesystem-inmemory/pom.xml b/main/filesystem-inmemory/pom.xml index d1db21e24..e0a5f3610 100644 --- a/main/filesystem-inmemory/pom.xml +++ b/main/filesystem-inmemory/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 filesystem-inmemory Cryptomator filesystem: In-memory mock diff --git a/main/filesystem-invariants-tests/pom.xml b/main/filesystem-invariants-tests/pom.xml index 83ec41625..7c394c5b7 100644 --- a/main/filesystem-invariants-tests/pom.xml +++ b/main/filesystem-invariants-tests/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 filesystem-invariants-tests Cryptomator filesystem: Invariants tests diff --git a/main/filesystem-nameshortening/pom.xml b/main/filesystem-nameshortening/pom.xml index f325b84c3..28f991d94 100644 --- a/main/filesystem-nameshortening/pom.xml +++ b/main/filesystem-nameshortening/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 filesystem-nameshortening Cryptomator filesystem: Name shortening layer diff --git a/main/filesystem-nio/pom.xml b/main/filesystem-nio/pom.xml index 4f535b1b0..b8c32607a 100644 --- a/main/filesystem-nio/pom.xml +++ b/main/filesystem-nio/pom.xml @@ -7,7 +7,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 filesystem-nio Cryptomator filesystem: NIO-based physical layer diff --git a/main/filesystem-stats/pom.xml b/main/filesystem-stats/pom.xml index 4912e2a72..ebdabe7cd 100644 --- a/main/filesystem-stats/pom.xml +++ b/main/filesystem-stats/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 filesystem-stats Cryptomator filesystem: Throughput statistics diff --git a/main/frontend-api/pom.xml b/main/frontend-api/pom.xml index 7952ce438..edcf07328 100644 --- a/main/frontend-api/pom.xml +++ b/main/frontend-api/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 frontend-api Cryptomator frontend: API diff --git a/main/frontend-webdav/pom.xml b/main/frontend-webdav/pom.xml index 1e6421508..d1b76702b 100644 --- a/main/frontend-webdav/pom.xml +++ b/main/frontend-webdav/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 frontend-webdav Cryptomator frontend: WebDAV frontend diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index b57576813..b21465f5c 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 jacoco-report Cryptomator Code Coverage Report diff --git a/main/pom.xml b/main/pom.xml index cfb5ace1a..0f70d765e 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -7,7 +7,7 @@ 4.0.0 org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index dc7a961fd..e0ffdb58f 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 uber-jar pom diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 2c261d3ad..c8d7fd8e5 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.1 ui Cryptomator GUI From 9c06e762c356fe97d79ac22513f43e65eb675166 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Sat, 9 Jul 2016 11:28:36 +0200 Subject: [PATCH 04/11] fixes #304 --- main/ant-kit/pom.xml | 2 +- main/commons-test/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/filesystem-api/pom.xml | 2 +- main/filesystem-charsets/pom.xml | 2 +- .../pom.xml | 2 +- main/filesystem-crypto/pom.xml | 2 +- .../filesystem/crypto/ConflictResolver.java | 33 +++++++++++++------ main/filesystem-inmemory/pom.xml | 2 +- main/filesystem-invariants-tests/pom.xml | 2 +- main/filesystem-nameshortening/pom.xml | 2 +- main/filesystem-nio/pom.xml | 2 +- main/filesystem-stats/pom.xml | 2 +- main/frontend-api/pom.xml | 2 +- main/frontend-webdav/pom.xml | 2 +- main/jacoco-report/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- 19 files changed, 41 insertions(+), 28 deletions(-) diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index d5bfd3e60..389fa3f63 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -8,7 +8,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 ant-kit pom diff --git a/main/commons-test/pom.xml b/main/commons-test/pom.xml index 653c8c7ac..9ae5f7b44 100644 --- a/main/commons-test/pom.xml +++ b/main/commons-test/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 commons-test Cryptomator common test dependencies diff --git a/main/commons/pom.xml b/main/commons/pom.xml index aa5c7fb0f..735adf23d 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 commons Cryptomator common diff --git a/main/filesystem-api/pom.xml b/main/filesystem-api/pom.xml index 24d0b0964..3ae610104 100644 --- a/main/filesystem-api/pom.xml +++ b/main/filesystem-api/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 filesystem-api Cryptomator filesystem: API diff --git a/main/filesystem-charsets/pom.xml b/main/filesystem-charsets/pom.xml index 5fba8cc14..11fafb0fb 100644 --- a/main/filesystem-charsets/pom.xml +++ b/main/filesystem-charsets/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 filesystem-charsets Cryptomator filesystem: Charset compatibility layer diff --git a/main/filesystem-crypto-integration-tests/pom.xml b/main/filesystem-crypto-integration-tests/pom.xml index 54261c2dd..41638bf90 100644 --- a/main/filesystem-crypto-integration-tests/pom.xml +++ b/main/filesystem-crypto-integration-tests/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 filesystem-crypto-integration-tests Cryptomator filesystem: Encryption layer tests diff --git a/main/filesystem-crypto/pom.xml b/main/filesystem-crypto/pom.xml index fa43feba1..1111a90cb 100644 --- a/main/filesystem-crypto/pom.xml +++ b/main/filesystem-crypto/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 filesystem-crypto Cryptomator filesystem: Encryption layer diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java index 19dceb326..6b8a1f428 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java @@ -2,6 +2,7 @@ package org.cryptomator.filesystem.crypto; import static org.cryptomator.filesystem.crypto.Constants.DIR_PREFIX; +import java.nio.ByteBuffer; import java.util.Optional; import java.util.UUID; import java.util.function.Function; @@ -12,7 +13,7 @@ import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; import org.cryptomator.filesystem.File; import org.cryptomator.filesystem.Folder; -import org.cryptomator.io.FileContents; +import org.cryptomator.filesystem.ReadableFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,6 +21,7 @@ final class ConflictResolver { private static final Logger LOG = LoggerFactory.getLogger(ConflictResolver.class); private static final int UUID_FIRST_GROUP_STRLEN = 8; + private static final int MAX_DIR_FILE_SIZE = 87; // "normal" file header has 88 bytes private final Pattern encryptedNamePattern; private final Function> nameDecryptor; @@ -52,13 +54,11 @@ final class ConflictResolver { if (cleartext.isPresent()) { Folder folder = conflictingFile.parent().get(); File canonicalFile = folder.file(isDirectory ? DIR_PREFIX + ciphertext : ciphertext); - if (canonicalFile.exists()) { + if (isDirectory && canonicalFile.exists() && isSameFileBasedOnSample(canonicalFile, conflictingFile, MAX_DIR_FILE_SIZE)) { // there must not be two directories pointing to the same directory id. In this case no human interaction is needed to resolve this conflict: - if (isDirectory && FileContents.UTF_8.readContents(canonicalFile).equals(FileContents.UTF_8.readContents(conflictingFile))) { - conflictingFile.delete(); - return canonicalFile; - } - + conflictingFile.delete(); + return canonicalFile; + } else { // conventional conflict detected! look for an alternative name: File alternativeFile; String conflictId; @@ -71,9 +71,6 @@ final class ConflictResolver { LOG.info("Detected conflict {}:\n{}\n{}", conflictId, canonicalFile, conflictingFile); conflictingFile.moveTo(alternativeFile); return alternativeFile; - } else { - conflictingFile.moveTo(canonicalFile); - return canonicalFile; } } else { // not decryptable; false positive @@ -81,6 +78,22 @@ final class ConflictResolver { } } + private boolean isSameFileBasedOnSample(File file1, File file2, int sampleSize) { + try (ReadableFile r1 = file1.openReadable(); ReadableFile r2 = file2.openReadable()) { + if (r1.size() != r2.size()) { + return false; + } else { + ByteBuffer beginOfFile1 = ByteBuffer.allocate(sampleSize); + ByteBuffer beginOfFile2 = ByteBuffer.allocate(sampleSize); + r1.read(beginOfFile1); + r2.read(beginOfFile2); + beginOfFile1.flip(); + beginOfFile2.flip(); + return beginOfFile1.equals(beginOfFile2); + } + } + } + private String createConflictId() { return UUID.randomUUID().toString().substring(0, UUID_FIRST_GROUP_STRLEN); } diff --git a/main/filesystem-inmemory/pom.xml b/main/filesystem-inmemory/pom.xml index e0a5f3610..c86c0abf0 100644 --- a/main/filesystem-inmemory/pom.xml +++ b/main/filesystem-inmemory/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 filesystem-inmemory Cryptomator filesystem: In-memory mock diff --git a/main/filesystem-invariants-tests/pom.xml b/main/filesystem-invariants-tests/pom.xml index 7c394c5b7..1012ae262 100644 --- a/main/filesystem-invariants-tests/pom.xml +++ b/main/filesystem-invariants-tests/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 filesystem-invariants-tests Cryptomator filesystem: Invariants tests diff --git a/main/filesystem-nameshortening/pom.xml b/main/filesystem-nameshortening/pom.xml index 28f991d94..01e49e620 100644 --- a/main/filesystem-nameshortening/pom.xml +++ b/main/filesystem-nameshortening/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 filesystem-nameshortening Cryptomator filesystem: Name shortening layer diff --git a/main/filesystem-nio/pom.xml b/main/filesystem-nio/pom.xml index b8c32607a..be2e94afb 100644 --- a/main/filesystem-nio/pom.xml +++ b/main/filesystem-nio/pom.xml @@ -7,7 +7,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 filesystem-nio Cryptomator filesystem: NIO-based physical layer diff --git a/main/filesystem-stats/pom.xml b/main/filesystem-stats/pom.xml index ebdabe7cd..95191d908 100644 --- a/main/filesystem-stats/pom.xml +++ b/main/filesystem-stats/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 filesystem-stats Cryptomator filesystem: Throughput statistics diff --git a/main/frontend-api/pom.xml b/main/frontend-api/pom.xml index edcf07328..e4ee5ccef 100644 --- a/main/frontend-api/pom.xml +++ b/main/frontend-api/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 frontend-api Cryptomator frontend: API diff --git a/main/frontend-webdav/pom.xml b/main/frontend-webdav/pom.xml index d1b76702b..cbe911efc 100644 --- a/main/frontend-webdav/pom.xml +++ b/main/frontend-webdav/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 frontend-webdav Cryptomator frontend: WebDAV frontend diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index b21465f5c..1ec3a7e0c 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 jacoco-report Cryptomator Code Coverage Report diff --git a/main/pom.xml b/main/pom.xml index 0f70d765e..95df83ce3 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -7,7 +7,7 @@ 4.0.0 org.cryptomator main - 1.1.1 + 1.1.2 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index e0ffdb58f..4ed59da11 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 uber-jar pom diff --git a/main/ui/pom.xml b/main/ui/pom.xml index c8d7fd8e5..cf4bcea5f 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.1.1 + 1.1.2 ui Cryptomator GUI From 4ad7481dc7b3dd0a8b54f57031bf9f7ff10cfa76 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Sat, 9 Jul 2016 11:44:53 +0200 Subject: [PATCH 05/11] fixed unit test --- .../crypto/ConflictResolverTest.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/ConflictResolverTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/ConflictResolverTest.java index bd1cf3b51..0e7d7f75a 100644 --- a/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/ConflictResolverTest.java +++ b/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/ConflictResolverTest.java @@ -80,29 +80,29 @@ public class ConflictResolverTest { @Test public void testCanonicalName() { - File resolved = conflictResolver.resolveIfNecessary(canonicalFile); - Assert.assertSame(canonicalFile, resolved); + File result = conflictResolver.resolveIfNecessary(canonicalFile); + Assert.assertSame(canonicalFile, result); } @Test public void testUnrelatedName() { - File resolved = conflictResolver.resolveIfNecessary(unrelatedFile); - Assert.assertSame(unrelatedFile, resolved); + File result = conflictResolver.resolveIfNecessary(unrelatedFile); + Assert.assertSame(unrelatedFile, result); } @Test public void testConflictingFile() { - File resolved = conflictResolver.resolveIfNecessary(conflictingFile); + File result = conflictResolver.resolveIfNecessary(conflictingFile); Mockito.verify(conflictingFile).moveTo(resolved); - Assert.assertSame(resolved, resolved); + Assert.assertSame(resolved, result); } @Test public void testConflictingFileIfCanonicalDoesntExist() { Mockito.when(canonicalFile.exists()).thenReturn(false); - File resolved = conflictResolver.resolveIfNecessary(conflictingFile); - Mockito.verify(conflictingFile).moveTo(canonicalFile); - Assert.assertSame(canonicalFile, resolved); + File result = conflictResolver.resolveIfNecessary(conflictingFile); + Mockito.verify(conflictingFile).moveTo(resolved); + Assert.assertSame(resolved, result); } @Test @@ -122,9 +122,11 @@ public class ConflictResolverTest { @Test public void testConflictingFolderWithSameId() { ReadableFile directoryId1 = Mockito.mock(ReadableFile.class); + ReadableFile directoryId2 = Mockito.mock(ReadableFile.class); Mockito.when(canonicalFolder.openReadable()).thenReturn(directoryId1); - Mockito.when(conflictingFolder.openReadable()).thenReturn(directoryId1); + Mockito.when(conflictingFolder.openReadable()).thenReturn(directoryId2); Mockito.when(directoryId1.read(Mockito.any())).thenAnswer(new FillBufferAnswer("id1")); + Mockito.when(directoryId2.read(Mockito.any())).thenAnswer(new FillBufferAnswer("id1")); File result = conflictResolver.resolveIfNecessary(conflictingFolder); Mockito.verify(conflictingFolder).delete(); From 1e6ff0d9692109af1770516179e1bc3ed2f7dc95 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Mon, 11 Jul 2016 21:14:35 +0200 Subject: [PATCH 06/11] set version to 1.1.3 --- main/ant-kit/pom.xml | 2 +- main/commons-test/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/filesystem-api/pom.xml | 2 +- main/filesystem-charsets/pom.xml | 2 +- main/filesystem-crypto-integration-tests/pom.xml | 2 +- main/filesystem-crypto/pom.xml | 2 +- main/filesystem-inmemory/pom.xml | 2 +- main/filesystem-invariants-tests/pom.xml | 2 +- main/filesystem-nameshortening/pom.xml | 2 +- main/filesystem-nio/pom.xml | 2 +- main/filesystem-stats/pom.xml | 2 +- main/frontend-api/pom.xml | 2 +- main/frontend-webdav/pom.xml | 2 +- main/jacoco-report/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index 9d43788c7..94a3c9e12 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -8,7 +8,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 ant-kit pom diff --git a/main/commons-test/pom.xml b/main/commons-test/pom.xml index 53f68521f..57d835268 100644 --- a/main/commons-test/pom.xml +++ b/main/commons-test/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 commons-test Cryptomator common test dependencies diff --git a/main/commons/pom.xml b/main/commons/pom.xml index afeb35fa1..227a83c8b 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 commons Cryptomator common diff --git a/main/filesystem-api/pom.xml b/main/filesystem-api/pom.xml index b4b4cfc4d..8cf1de3e7 100644 --- a/main/filesystem-api/pom.xml +++ b/main/filesystem-api/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 filesystem-api Cryptomator filesystem: API diff --git a/main/filesystem-charsets/pom.xml b/main/filesystem-charsets/pom.xml index e156412e5..38bac29b9 100644 --- a/main/filesystem-charsets/pom.xml +++ b/main/filesystem-charsets/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 filesystem-charsets Cryptomator filesystem: Charset compatibility layer diff --git a/main/filesystem-crypto-integration-tests/pom.xml b/main/filesystem-crypto-integration-tests/pom.xml index 48b51a55b..f07655191 100644 --- a/main/filesystem-crypto-integration-tests/pom.xml +++ b/main/filesystem-crypto-integration-tests/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 filesystem-crypto-integration-tests Cryptomator filesystem: Encryption layer tests diff --git a/main/filesystem-crypto/pom.xml b/main/filesystem-crypto/pom.xml index 403777a29..8b55b4b52 100644 --- a/main/filesystem-crypto/pom.xml +++ b/main/filesystem-crypto/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 filesystem-crypto Cryptomator filesystem: Encryption layer diff --git a/main/filesystem-inmemory/pom.xml b/main/filesystem-inmemory/pom.xml index d1db21e24..272df5d6b 100644 --- a/main/filesystem-inmemory/pom.xml +++ b/main/filesystem-inmemory/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 filesystem-inmemory Cryptomator filesystem: In-memory mock diff --git a/main/filesystem-invariants-tests/pom.xml b/main/filesystem-invariants-tests/pom.xml index 83ec41625..e8ebda642 100644 --- a/main/filesystem-invariants-tests/pom.xml +++ b/main/filesystem-invariants-tests/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 filesystem-invariants-tests Cryptomator filesystem: Invariants tests diff --git a/main/filesystem-nameshortening/pom.xml b/main/filesystem-nameshortening/pom.xml index f325b84c3..254611fe4 100644 --- a/main/filesystem-nameshortening/pom.xml +++ b/main/filesystem-nameshortening/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 filesystem-nameshortening Cryptomator filesystem: Name shortening layer diff --git a/main/filesystem-nio/pom.xml b/main/filesystem-nio/pom.xml index 4f535b1b0..d4883537f 100644 --- a/main/filesystem-nio/pom.xml +++ b/main/filesystem-nio/pom.xml @@ -7,7 +7,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 filesystem-nio Cryptomator filesystem: NIO-based physical layer diff --git a/main/filesystem-stats/pom.xml b/main/filesystem-stats/pom.xml index 4912e2a72..3a0ec4b41 100644 --- a/main/filesystem-stats/pom.xml +++ b/main/filesystem-stats/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 filesystem-stats Cryptomator filesystem: Throughput statistics diff --git a/main/frontend-api/pom.xml b/main/frontend-api/pom.xml index 7952ce438..d28511515 100644 --- a/main/frontend-api/pom.xml +++ b/main/frontend-api/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 frontend-api Cryptomator frontend: API diff --git a/main/frontend-webdav/pom.xml b/main/frontend-webdav/pom.xml index 1e6421508..d1178790d 100644 --- a/main/frontend-webdav/pom.xml +++ b/main/frontend-webdav/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 frontend-webdav Cryptomator frontend: WebDAV frontend diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index b57576813..9416d0a41 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 jacoco-report Cryptomator Code Coverage Report diff --git a/main/pom.xml b/main/pom.xml index cfb5ace1a..4bbec2aad 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -7,7 +7,7 @@ 4.0.0 org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index dc7a961fd..e711e3632 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 uber-jar pom diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 2c261d3ad..da568ec75 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.3 ui Cryptomator GUI From 6e93d40e512d67473858da653498f500116972ac Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Sun, 14 Aug 2016 15:06:16 +0200 Subject: [PATCH 07/11] changed version to 1.1.4 --- main/ant-kit/pom.xml | 2 +- main/commons-test/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/filesystem-api/pom.xml | 2 +- main/filesystem-charsets/pom.xml | 2 +- main/filesystem-crypto-integration-tests/pom.xml | 2 +- main/filesystem-crypto/pom.xml | 2 +- main/filesystem-inmemory/pom.xml | 2 +- main/filesystem-invariants-tests/pom.xml | 2 +- main/filesystem-nameshortening/pom.xml | 2 +- main/filesystem-nio/pom.xml | 2 +- main/filesystem-stats/pom.xml | 2 +- main/frontend-api/pom.xml | 2 +- main/frontend-webdav/pom.xml | 2 +- main/jacoco-report/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index 9d43788c7..9745ea3df 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -8,7 +8,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 ant-kit pom diff --git a/main/commons-test/pom.xml b/main/commons-test/pom.xml index 53f68521f..4cfb26495 100644 --- a/main/commons-test/pom.xml +++ b/main/commons-test/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 commons-test Cryptomator common test dependencies diff --git a/main/commons/pom.xml b/main/commons/pom.xml index afeb35fa1..e0d30d868 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 commons Cryptomator common diff --git a/main/filesystem-api/pom.xml b/main/filesystem-api/pom.xml index b4b4cfc4d..1de71aa2b 100644 --- a/main/filesystem-api/pom.xml +++ b/main/filesystem-api/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 filesystem-api Cryptomator filesystem: API diff --git a/main/filesystem-charsets/pom.xml b/main/filesystem-charsets/pom.xml index e156412e5..6775acc44 100644 --- a/main/filesystem-charsets/pom.xml +++ b/main/filesystem-charsets/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 filesystem-charsets Cryptomator filesystem: Charset compatibility layer diff --git a/main/filesystem-crypto-integration-tests/pom.xml b/main/filesystem-crypto-integration-tests/pom.xml index 48b51a55b..fec263561 100644 --- a/main/filesystem-crypto-integration-tests/pom.xml +++ b/main/filesystem-crypto-integration-tests/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 filesystem-crypto-integration-tests Cryptomator filesystem: Encryption layer tests diff --git a/main/filesystem-crypto/pom.xml b/main/filesystem-crypto/pom.xml index 35f308aeb..cff7e46ca 100644 --- a/main/filesystem-crypto/pom.xml +++ b/main/filesystem-crypto/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 filesystem-crypto Cryptomator filesystem: Encryption layer diff --git a/main/filesystem-inmemory/pom.xml b/main/filesystem-inmemory/pom.xml index d1db21e24..f015a33d1 100644 --- a/main/filesystem-inmemory/pom.xml +++ b/main/filesystem-inmemory/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 filesystem-inmemory Cryptomator filesystem: In-memory mock diff --git a/main/filesystem-invariants-tests/pom.xml b/main/filesystem-invariants-tests/pom.xml index 83ec41625..7fa900479 100644 --- a/main/filesystem-invariants-tests/pom.xml +++ b/main/filesystem-invariants-tests/pom.xml @@ -9,7 +9,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 filesystem-invariants-tests Cryptomator filesystem: Invariants tests diff --git a/main/filesystem-nameshortening/pom.xml b/main/filesystem-nameshortening/pom.xml index f325b84c3..e81a2b4b7 100644 --- a/main/filesystem-nameshortening/pom.xml +++ b/main/filesystem-nameshortening/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 filesystem-nameshortening Cryptomator filesystem: Name shortening layer diff --git a/main/filesystem-nio/pom.xml b/main/filesystem-nio/pom.xml index 4f535b1b0..ff97f717a 100644 --- a/main/filesystem-nio/pom.xml +++ b/main/filesystem-nio/pom.xml @@ -7,7 +7,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 filesystem-nio Cryptomator filesystem: NIO-based physical layer diff --git a/main/filesystem-stats/pom.xml b/main/filesystem-stats/pom.xml index 4912e2a72..db78fccd0 100644 --- a/main/filesystem-stats/pom.xml +++ b/main/filesystem-stats/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 filesystem-stats Cryptomator filesystem: Throughput statistics diff --git a/main/frontend-api/pom.xml b/main/frontend-api/pom.xml index 7952ce438..7eedb470e 100644 --- a/main/frontend-api/pom.xml +++ b/main/frontend-api/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 frontend-api Cryptomator frontend: API diff --git a/main/frontend-webdav/pom.xml b/main/frontend-webdav/pom.xml index 1e6421508..77f9d8efa 100644 --- a/main/frontend-webdav/pom.xml +++ b/main/frontend-webdav/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 frontend-webdav Cryptomator frontend: WebDAV frontend diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index b57576813..cd76ed0c3 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 jacoco-report Cryptomator Code Coverage Report diff --git a/main/pom.xml b/main/pom.xml index cfb5ace1a..718936741 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -7,7 +7,7 @@ 4.0.0 org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index dc7a961fd..43c6bb55a 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 uber-jar pom diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 2c261d3ad..c1f1f07f8 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.2.0-SNAPSHOT + 1.1.4 ui Cryptomator GUI From 6fb20dd509f3f25540f9d8c563d2c27d3291c519 Mon Sep 17 00:00:00 2001 From: IAMtheIAM Date: Sat, 5 Nov 2016 13:54:39 -0700 Subject: [PATCH 08/11] Update README.md Added info about obfuscating file size and folder structure (two very important features that should be known!) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b587298b5..0e9eec55b 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,8 @@ Download native binaries of Cryptomator on [cryptomator.org](https://cryptomator - Totally transparent: Just work on the virtual drive as if it were a USB flash drive - AES encryption with 256-bit key length - Filenames get encrypted, too +- Folder structure gets obfuscated +- File size gets obfuscated with random padding. - Use as many vaults in your Dropbox as you want, each having individual passwords ### Privacy From 4d68818ec5133d2b69f1e249b7622fd488f569de Mon Sep 17 00:00:00 2001 From: IAMtheIAM Date: Sat, 5 Nov 2016 14:00:32 -0700 Subject: [PATCH 09/11] Update README.md Update features --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0e9eec55b..3958707f1 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,10 @@ Download native binaries of Cryptomator on [cryptomator.org](https://cryptomator - Client-side: No accounts, no data shared with any online service - Totally transparent: Just work on the virtual drive as if it were a USB flash drive - AES encryption with 256-bit key length -- Filenames get encrypted, too -- Folder structure gets obfuscated +- File names get encrypted +- File metadata gets encrypted - File size gets obfuscated with random padding. +- Folder structure gets obfuscated - Use as many vaults in your Dropbox as you want, each having individual passwords ### Privacy From 50885d5c7c761bb3a81bea3d68dc363314593306 Mon Sep 17 00:00:00 2001 From: IAMtheIAM Date: Sat, 5 Nov 2016 16:51:16 -0700 Subject: [PATCH 10/11] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 3958707f1..5fafb8212 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ Download native binaries of Cryptomator on [cryptomator.org](https://cryptomator - AES encryption with 256-bit key length - File names get encrypted - File metadata gets encrypted -- File size gets obfuscated with random padding. - Folder structure gets obfuscated - Use as many vaults in your Dropbox as you want, each having individual passwords From 63daa0f12136cb59a5c71abb50f0c27d0e4adbf0 Mon Sep 17 00:00:00 2001 From: IAMtheIAM Date: Sun, 6 Nov 2016 03:56:56 -0700 Subject: [PATCH 11/11] Update README.md Update Readme with accurate info regarding v1.2.0 --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 5fafb8212..400222c7d 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ Download native binaries of Cryptomator on [cryptomator.org](https://cryptomator - Totally transparent: Just work on the virtual drive as if it were a USB flash drive - AES encryption with 256-bit key length - File names get encrypted -- File metadata gets encrypted - Folder structure gets obfuscated - Use as many vaults in your Dropbox as you want, each having individual passwords