1616 */
1717
1818import ch .cyberduck .core .Path ;
19- import ch .cyberduck .core .RandomStringService ;
2019import ch .cyberduck .core .Session ;
21- import ch .cyberduck .core .UUIDRandomStringService ;
2220import ch .cyberduck .core .cryptomator .AbstractVault ;
2321import ch .cyberduck .core .cryptomator .ContentWriter ;
2422import ch .cyberduck .core .cryptomator .random .RandomNonceGenerator ;
@@ -41,7 +39,6 @@ public class CryptoDirectoryV7Feature<Reply> implements Directory<Reply> {
4139 private final Write <Reply > writer ;
4240 private final Directory <Reply > delegate ;
4341 private final AbstractVault vault ;
44- private final RandomStringService random = new UUIDRandomStringService ();
4542
4643 public CryptoDirectoryV7Feature (final Session <?> session , final Directory <Reply > delegate ,
4744 final Write <Reply > writer , final AbstractVault vault ) {
@@ -54,7 +51,6 @@ public CryptoDirectoryV7Feature(final Session<?> session, final Directory<Reply>
5451 @ Override
5552 public Path mkdir (final Path folder , final TransferStatus status ) throws BackgroundException {
5653 final byte [] directoryId = vault .getDirectoryProvider ().createDirectoryId (folder );
57- final Path encrypt = vault .encrypt (session , folder , false );
5854 // Create metadata file for directory
5955 final Path directoryMetadataFolder = session ._getFeature (Directory .class ).mkdir (vault .encrypt (session , folder , true ),
6056 new TransferStatus ().setRegion (status .getRegion ()));
@@ -63,6 +59,7 @@ public Path mkdir(final Path folder, final TransferStatus status) throws Backgro
6359 EnumSet .of (Path .Type .file ));
6460 log .debug ("Write metadata {} for folder {}" , directoryMetadataFile , folder );
6561 new ContentWriter (session ).write (directoryMetadataFile , directoryId );
62+ final Path encrypt = vault .encrypt (session , folder , false );
6663 final Path intermediate = encrypt .getParent ();
6764 if (!session ._getFeature (Find .class ).find (intermediate )) {
6865 session ._getFeature (Directory .class ).mkdir (intermediate , new TransferStatus ().setRegion (status .getRegion ()));
@@ -94,7 +91,7 @@ public void preflight(final Path workdir, final String filename) throws Backgrou
9491
9592 @ Override
9693 public String toString () {
97- final StringBuilder sb = new StringBuilder ("CryptoDirectoryFeature {" );
94+ final StringBuilder sb = new StringBuilder ("CryptoDirectoryV7Feature {" );
9895 sb .append ("proxy=" ).append (delegate );
9996 sb .append ('}' );
10097 return sb .toString ();
0 commit comments