From 8ec2b10a4d546b148ec2d6f75b284a636b2b9edf Mon Sep 17 00:00:00 2001 From: Marc Stammerjohann Date: Tue, 30 Jan 2018 20:05:01 +0100 Subject: [PATCH] #627: refactor adding trailing slash to copied WebDAV URL --- .../org/cryptomator/ui/controllers/UnlockedController.java | 6 ++---- main/ui/src/main/java/org/cryptomator/ui/model/Vault.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockedController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockedController.java index c2de0c338..fdafb99c4 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockedController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockedController.java @@ -61,8 +61,6 @@ public class UnlockedController implements ViewController { private static final int IO_SAMPLING_STEPS = 100; private static final double IO_SAMPLING_INTERVAL = 0.25; - private static final String TRAILING_SLASH = "/"; - private final Localization localization; private final AsyncTaskService asyncTaskService; private final ObjectProperty vault = new SimpleObjectProperty<>(); @@ -246,8 +244,8 @@ public class UnlockedController implements ViewController { @FXML private void didClickCopyUrl(ActionEvent event) { ClipboardContent clipboardContent = new ClipboardContent(); - clipboardContent.putUrl(vault.get().getWebDavUrl() + TRAILING_SLASH); - clipboardContent.putString(vault.get().getWebDavUrl() + TRAILING_SLASH); + clipboardContent.putUrl(vault.get().getWebDavUrl()); + clipboardContent.putString(vault.get().getWebDavUrl()); Clipboard.getSystemClipboard().setContent(clipboardContent); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java index 2b57d14ab..f2a833778 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java @@ -251,7 +251,7 @@ public class Vault { } public synchronized String getWebDavUrl() { - return servlet.getServletRootUri().toString(); + return servlet.getServletRootUri().toString() + "/"; } public Path getPath() {