From 1ca803691bb2969f835f3903f2f099d5d3338083 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 3 Nov 2021 08:57:35 +0100 Subject: [PATCH] Revert "increase robustness of vault creation:" This reverts commit f7fdb87d6d8ae8e9beab9b04e9d41017b7a513dc. --- .../CreateNewVaultPasswordController.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java index b71bf0569..578b90969 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java @@ -44,10 +44,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; import java.security.SecureRandom; -import java.util.Comparator; import java.util.ResourceBundle; import java.util.concurrent.ExecutorService; -import java.util.concurrent.atomic.AtomicBoolean; import static java.nio.charset.StandardCharsets.US_ASCII; import static org.cryptomator.common.Constants.MASTERKEY_FILENAME; @@ -197,28 +195,12 @@ public class CreateNewVaultPasswordController implements FxController { } catch (CryptoException e) { throw new IOException("Failed initialize vault.", e); } - } finally { - AtomicBoolean cleanupFailed = new AtomicBoolean(false); - Files.walk(path) - .sorted(Comparator.reverseOrder()) - .forEach(p -> { - try { - Files.deleteIfExists(p); - } catch (IOException e) { - cleanupFailed.set(false); - } - }); - if(cleanupFailed.get()) { - LOG.warn("Failed to cleanup after failed vault creation at {}. Leftovers need to be deleted manually.", path); - } } // 4. write vault-external readme file: String storagePathReadmeFileName = resourceBundle.getString("addvault.new.readme.storageLocation.fileName"); try (WritableByteChannel ch = Files.newByteChannel(path.resolve(storagePathReadmeFileName), StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE)) { ch.write(US_ASCII.encode(readmeGenerator.createVaultStorageLocationReadmeRtf())); - } catch (IOException e) { - LOG.warn("Unable to create vault storage location readme.", e); } LOG.info("Created vault at {}", path);