Browse Source

resolve TODOs

Armin Schrenk 2 years ago
parent
commit
73d8c4098e

+ 2 - 2
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());

+ 1 - 1
src/main/resources/fxml/vault_detail_unlocked.fxml

@@ -27,7 +27,7 @@
 			<HBox spacing="12" alignment="CENTER">
 				<FontAwesome5IconView glyph="LINK" glyphSize="24"/>
 				<VBox spacing="4" alignment="CENTER_LEFT">
-					<Label text="%generic.button.copy"/> <!-- TODO -->
+					<Label text="%main.vaultDetail.copyUri"/>
 					<Label styleClass="label-extra-small" text="${controller.mountPoint}" textOverrun="CENTER_ELLIPSIS"/>
 				</VBox>
 			</HBox>

+ 1 - 0
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:

+ 0 - 37
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"));
-	}
-
-	 */
-
 }