diff --git a/src/main/java/org/cryptomator/common/vaults/Vault.java b/src/main/java/org/cryptomator/common/vaults/Vault.java index e5a997bc3..78a3c7e8c 100644 --- a/src/main/java/org/cryptomator/common/vaults/Vault.java +++ b/src/main/java/org/cryptomator/common/vaults/Vault.java @@ -168,8 +168,8 @@ public class Vault { for (var capability : mountProvider.capabilities()) { switch (capability) { case FILE_SYSTEM_NAME -> builder.setFileSystemName("crypto"); - case LOOPBACK_PORT -> builder.setLoopbackPort(settings.port().get()); //TODO: move port from settings to vaultsettings? - case LOOPBACK_HOST_NAME -> builder.setLoopbackHostName("cryptomator-vault"); //TODO: Read from system property + case LOOPBACK_PORT -> builder.setLoopbackPort(settings.port().get()); //TODO: move port from settings to vaultsettings (see https://github.com/cryptomator/cryptomator/tree/feature/mount-setting-per-vault) + case LOOPBACK_HOST_NAME -> env.getLoopbackAlias().ifPresent(builder::setLoopbackHostName); case READ_ONLY -> builder.setReadOnly(vaultSettings.usesReadOnlyMode().get()); case MOUNT_FLAGS -> builder.setMountFlags(defaultMountFlags.getValue()); // TODO use custom mount flags (pre-populated with default mount flags) case VOLUME_ID -> builder.setVolumeId(vaultSettings.getId()); diff --git a/src/main/resources/fxml/vault_detail_unlocked.fxml b/src/main/resources/fxml/vault_detail_unlocked.fxml index 06408537f..02337162a 100644 --- a/src/main/resources/fxml/vault_detail_unlocked.fxml +++ b/src/main/resources/fxml/vault_detail_unlocked.fxml @@ -27,7 +27,7 @@ - diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties index 6538ade61..9bf7dd8c2 100644 --- a/src/main/resources/i18n/strings.properties +++ b/src/main/resources/i18n/strings.properties @@ -362,6 +362,7 @@ main.vaultDetail.passwordSavedInKeychain=Password saved main.vaultDetail.unlockedStatus=UNLOCKED main.vaultDetail.accessLocation=Your vault's contents are accessible here: main.vaultDetail.revealBtn=Reveal Drive +main.vaultDetail.copyUri=Copy URI main.vaultDetail.lockBtn=Lock main.vaultDetail.bytesPerSecondRead=Read: main.vaultDetail.bytesPerSecondWritten=Write: diff --git a/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java b/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java index 55a568e69..2fcc0cf3b 100644 --- a/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java +++ b/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java @@ -26,41 +26,4 @@ public class VaultModuleTest { System.setProperty("user.home", tmpDir.toString()); } - /* TODO: reactivate! - @Test - @DisplayName("provideDefaultMountFlags on Mac/FUSE") - @EnabledOnOs(OS.MAC) - public void testMacFuseDefaultMountFlags() { - Mockito.when(settings.preferredVolumeImpl()).thenReturn(new SimpleObjectProperty<>(VolumeImpl.FUSE)); - - StringBinding result = module.provideDefaultMountFlags(settings, vaultSettings); - - MatcherAssert.assertThat(result.get(), CoreMatchers.containsString("-ovolname=\"TEST\"")); - MatcherAssert.assertThat(result.get(), CoreMatchers.containsString("-ordonly")); - } - - @Test - @DisplayName("provideDefaultMountFlags on Linux/FUSE") - @EnabledOnOs(OS.LINUX) - public void testLinuxFuseDefaultMountFlags() { - Mockito.when(settings.preferredVolumeImpl()).thenReturn(new SimpleObjectProperty<>(VolumeImpl.FUSE)); - - StringBinding result = module.provideDefaultMountFlags(settings, vaultSettings); - - MatcherAssert.assertThat(result.get(), CoreMatchers.containsString("-oro")); - } - - @Test - @DisplayName("provideDefaultMountFlags on Windows/Dokany") - @EnabledOnOs(OS.WINDOWS) - public void testWinDokanyDefaultMountFlags() { - Mockito.when(settings.preferredVolumeImpl()).thenReturn(new SimpleObjectProperty<>(VolumeImpl.DOKANY)); - - StringBinding result = module.provideDefaultMountFlags(settings, vaultSettings); - - MatcherAssert.assertThat(result.get(), CoreMatchers.containsString("--options CURRENT_SESSION,WRITE_PROTECTION")); - } - - */ - }