From 51cb41975b4f75a75ecda2f161b7cdf3945c356a Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 26 Apr 2017 14:30:49 +0200 Subject: [PATCH 1/4] Updated dependencies (fixing broken directory listing). Loading correct default settings now --- .../java/org/cryptomator/common/settings/Settings.java | 4 +++- .../cryptomator/common/settings/SettingsJsonAdapter.java | 5 ++++- .../org/cryptomator/common/settings/VaultSettings.java | 8 ++++++-- main/pom.xml | 3 ++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java b/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java index 67fe4cb53..a43c8cf83 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java @@ -10,6 +10,8 @@ package org.cryptomator.common.settings; import java.util.function.Consumer; +import org.apache.commons.lang3.SystemUtils; + import javafx.beans.property.BooleanProperty; import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleBooleanProperty; @@ -27,7 +29,7 @@ public class Settings { public static final int MAX_PORT = 65535; public static final boolean DEFAULT_CHECK_FOR_UDPATES = true; public static final int DEFAULT_PORT = 42427; - public static final boolean DEFAULT_USE_IPV6 = false; + public static final boolean DEFAULT_USE_IPV6 = SystemUtils.IS_OS_WINDOWS; public static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3; public static final String DEFAULT_GVFS_SCHEME = "dav"; public static final boolean DEFAULT_DEBUG_MODE = false; diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java b/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java index ae3e301eb..1bb4ddbc8 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java @@ -69,7 +69,10 @@ public class SettingsJsonAdapter extends TypeAdapter { settings.port().set(in.nextInt()); break; case "useIpv6": - settings.useIpv6().set(in.nextBoolean()); + // Temporarily we will disable loading this setting, as we want the default value on each app start. + // This setting might be removed completely in the future + // settings.useIpv6().set(in.nextBoolean()); + in.skipValue(); break; case "numTrayNotifications": settings.numTrayNotifications().set(in.nextInt()); diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java index 915a4e487..34e281aac 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java @@ -25,13 +25,16 @@ import javafx.beans.value.ObservableValue; public class VaultSettings { + public static final boolean DEFAULT_MOUNT_AFTER_UNLOCK = true; + public static final boolean DEFAULT_REAVEAL_AFTER_MOUNT = true; + private final Settings settings; private final String id; private final ObjectProperty path = new SimpleObjectProperty<>(); private final StringProperty mountName = new SimpleStringProperty(); private final StringProperty winDriveLetter = new SimpleStringProperty(); - private final BooleanProperty mountAfterUnlock = new SimpleBooleanProperty(); - private final BooleanProperty revealAfterMount = new SimpleBooleanProperty(); + private final BooleanProperty mountAfterUnlock = new SimpleBooleanProperty(DEFAULT_MOUNT_AFTER_UNLOCK); + private final BooleanProperty revealAfterMount = new SimpleBooleanProperty(DEFAULT_REAVEAL_AFTER_MOUNT); public VaultSettings(Settings settings, String id) { this.settings = settings; @@ -42,6 +45,7 @@ public class VaultSettings { mountName.addListener(this::somethingChanged); winDriveLetter.addListener(this::somethingChanged); mountAfterUnlock.addListener(this::somethingChanged); + revealAfterMount.addListener(this::somethingChanged); } private void somethingChanged(ObservableValue observable, Object oldValue, Object newValue) { diff --git a/main/pom.xml b/main/pom.xml index d8471d58e..d3caf9e90 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -28,7 +28,7 @@ 1.1.1 - 1.2.1 + 1.2.2 0.5.0 1.0.0 2.8.1 @@ -239,6 +239,7 @@ org.hamcrest hamcrest-all + test org.mockito From c69fc95126dc41a82de196ef346ef36949ebf792 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 26 Apr 2017 14:35:26 +0200 Subject: [PATCH 2/4] fixed test --- .../cryptomator/common/settings/SettingsJsonAdapterTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java b/main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java index 5ce31767e..6b32a06b3 100644 --- a/main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java +++ b/main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java @@ -32,7 +32,7 @@ public class SettingsJsonAdapterTest { Assert.assertTrue(settings.checkForUpdates().get()); Assert.assertEquals(2, settings.getDirectories().size()); Assert.assertEquals(8080, settings.port().get()); - Assert.assertTrue(settings.useIpv6().get()); + // Assert.assertTrue(settings.useIpv6().get()); temporarily ignored Assert.assertEquals(42, settings.numTrayNotifications().get()); Assert.assertEquals("dav", settings.preferredGvfsScheme().get()); } From d0aef5b6838c55d4c6fa1c408760e01c29c2a736 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 26 Apr 2017 16:24:03 +0200 Subject: [PATCH 3/4] Updated dependencies --- main/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/pom.xml b/main/pom.xml index d3caf9e90..d11d564b0 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -29,8 +29,8 @@ 1.1.1 1.2.2 - 0.5.0 - 1.0.0 + 0.5.1 + 1.0.1 2.8.1 1.7.25 4.12 From f960238b47a2737eee5bcc088670d6b151c7a38d Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 26 Apr 2017 16:25:20 +0200 Subject: [PATCH 4/4] Preparing 1.3.0-rc3 --- main/ant-kit/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/jacoco-report/pom.xml | 2 +- main/keychain/pom.xml | 2 +- main/launcher/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index a2ebbfa6f..571ef1968 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -8,7 +8,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc3 ant-kit pom diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 2ab70cf6e..58cadb135 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -10,7 +10,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc3 commons Cryptomator Commons diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml index 2079aed52..2883d4488 100644 --- a/main/jacoco-report/pom.xml +++ b/main/jacoco-report/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc3 jacoco-report Cryptomator Code Coverage Report diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index d5429fb69..66efa7d10 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc3 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index 25ff891e7..8496ad2a0 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc3 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index d11d564b0..ae88eef09 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc3 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index a16e82cb2..2fc2e118b 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -5,7 +5,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc3 uber-jar Single über jar with all dependencies diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 1e13bbf25..9de070ae8 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 1.3.0-SNAPSHOT + 1.3.0-rc3 ui Cryptomator GUI