From 84bf7f03328693835235d8874cf3b887fa3e9764 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 12 Mar 2020 15:26:10 +0100 Subject: [PATCH 01/14] Preparing 1.5.0 --- main/buildkit/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/keychain/pom.xml | 2 +- main/launcher/pom.xml | 2 +- main/pom.xml | 2 +- main/ui/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml index b4dddb8b0..b763fdd2c 100644 --- a/main/buildkit/pom.xml +++ b/main/buildkit/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.5.0 buildkit pom diff --git a/main/commons/pom.xml b/main/commons/pom.xml index f16aaccfc..2e7e88a2a 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.5.0 commons Cryptomator Commons diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 4b454f8be..ee87d5163 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.5.0 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index aef980622..962160c6f 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.5.0 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index 348e5af96..6dd95a8d6 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator main - 1.5.0-SNAPSHOT + 1.5.0 pom Cryptomator diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 5867f2ade..2ced5b191 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.5.0 ui Cryptomator GUI From 0732a55d0e7c21dedebf97f4f803d4121942db19 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 13 Mar 2020 14:27:09 +0100 Subject: [PATCH 02/14] updated link to documentation [ci skip] --- .../java/org/cryptomator/ui/mainwindow/WelcomeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java index 6d780032f..829c14436 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java @@ -16,7 +16,7 @@ import javax.inject.Inject; public class WelcomeController implements FxController { private static final Logger LOG = LoggerFactory.getLogger(WelcomeController.class); - private static final String GETTING_STARTED_URI = "https://docs.cryptomator.org/en/latest/desktop/basic-concepts/"; + private static final String GETTING_STARTED_URI = "https://docs.cryptomator.org/en/1.5/desktop/basic-concepts/"; private final Application application; private final BooleanBinding noVaultPresent; From 2e6246528ea602639552294701a43c57b309d1c8 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 13 Mar 2020 16:08:06 +0100 Subject: [PATCH 03/14] updated link to documentation [ci skip] --- .../java/org/cryptomator/ui/mainwindow/WelcomeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java index 829c14436..2646c1a36 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java @@ -16,7 +16,7 @@ import javax.inject.Inject; public class WelcomeController implements FxController { private static final Logger LOG = LoggerFactory.getLogger(WelcomeController.class); - private static final String GETTING_STARTED_URI = "https://docs.cryptomator.org/en/1.5/desktop/basic-concepts/"; + private static final String GETTING_STARTED_URI = "https://docs.cryptomator.org/en/1.5/desktop/getting-started/"; private final Application application; private final BooleanBinding noVaultPresent; From fc818b37fdfbfd34632f06f83f82d32669651320 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 25 Mar 2020 10:10:03 +0100 Subject: [PATCH 04/14] fixes #1077 --- .../org/cryptomator/ui/mainwindow/MainWindowController.java | 4 ++++ main/ui/src/main/resources/css/dark_theme.css | 6 ++++++ main/ui/src/main/resources/css/light_theme.css | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java index b83acb0a3..d7cd2023a 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java @@ -6,6 +6,7 @@ import javafx.fxml.FXML; import javafx.scene.input.DragEvent; import javafx.scene.input.TransferMode; import javafx.scene.layout.StackPane; +import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.vaults.VaultListManager; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.wrongfilealert.WrongFileAlertComponent; @@ -46,6 +47,9 @@ public class MainWindowController implements FxController { root.setOnDragOver(this::handleDragEvent); root.setOnDragDropped(this::handleDragEvent); root.setOnDragExited(this::handleDragEvent); + if (SystemUtils.IS_OS_WINDOWS) { + root.getStyleClass().add("os-windows"); + } } private void handleDragEvent(DragEvent event) { diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css index 3c309a9da..d86141d32 100644 --- a/main/ui/src/main/resources/css/dark_theme.css +++ b/main/ui/src/main/resources/css/dark_theme.css @@ -148,6 +148,12 @@ * * ******************************************************************************/ +/* windows needs an explicit border: */ +.main-window.os-windows { + -fx-border-color: TITLE_BG; + -fx-border-width: 1px; +} + .main-window .title { -fx-background-color: CONTROL_BORDER_NORMAL, TITLE_BG; -fx-background-insets: 0, 0 0 1px 0; diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css index 3b3594ffd..767c119ab 100644 --- a/main/ui/src/main/resources/css/light_theme.css +++ b/main/ui/src/main/resources/css/light_theme.css @@ -148,6 +148,12 @@ * * ******************************************************************************/ +/* windows needs an explicit border: */ +.main-window.os-windows { + -fx-border-color: TITLE_BG; + -fx-border-width: 1px; +} + .main-window .title { -fx-background-color: TITLE_BG; } From 85eb459182db9a6773d7c1c0277b7960a0b55dd0 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 25 Mar 2020 10:28:29 +0100 Subject: [PATCH 05/14] Replaced bullet points in license list, because windows -.- [ci skip] --- main/ui/src/license/template.ftl | 2 +- .../main/resources/license/THIRD-PARTY.txt | 124 +++++++++--------- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/main/ui/src/license/template.ftl b/main/ui/src/license/template.ftl index 12f788d90..f405277bf 100644 --- a/main/ui/src/license/template.ftl +++ b/main/ui/src/license/template.ftl @@ -25,7 +25,7 @@ Cryptomator uses ${dependencyMap?size} third-party dependencies under the follow <#if projects?size > 0> ${license}: <#list projects as project> - • ${artifactFormat(project)} + - ${artifactFormat(project)} diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt index 050703384..d327e63da 100644 --- a/main/ui/src/main/resources/license/THIRD-PARTY.txt +++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt @@ -13,76 +13,76 @@ along with this program. If not, see http://www.gnu.org/licenses/. Cryptomator uses 50 third-party dependencies under the following licenses: Apache License v2.0: - • HKDF-RFC5869 (at.favre.lib:hkdf:1.0.2 - https://github.com/patrickfav/hkdf) - • jffi (com.github.jnr:jffi:1.2.23 - http://github.com/jnr/jffi) - • jnr-a64asm (com.github.jnr:jnr-a64asm:1.0.0 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm) - • jnr-constants (com.github.jnr:jnr-constants:0.9.15 - http://github.com/jnr/jnr-constants) - • jnr-ffi (com.github.jnr:jnr-ffi:2.1.12 - http://github.com/jnr/jnr-ffi) - • FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/) - • Gson (com.google.code.gson:gson:2.8.6 - https://github.com/google/gson/gson) - • Dagger (com.google.dagger:dagger:2.26 - https://github.com/google/dagger) - • error-prone annotations (com.google.errorprone:error_prone_annotations:2.3.2 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) - • Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess) - • Guava: Google Core Libraries for Java (com.google.guava:guava:28.1-jre - https://github.com/google/guava/guava) - • Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture) - • J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/) - • Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/) - • Apache Commons IO (commons-io:commons-io:2.6 - http://commons.apache.org/proper/commons-io/) - • javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/) - • Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna) - • Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna) - • Apache Commons Lang (org.apache.commons:commons-lang3:3.9 - http://commons.apache.org/proper/commons-lang/) - • Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.19.0 - http://jackrabbit.apache.org/jackrabbit-webdav/) - • Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.17.v20190418 - http://www.eclipse.org/jetty) - • Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.17.v20190418 - http://www.eclipse.org/jetty) - • Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.17.v20190418 - http://www.eclipse.org/jetty) - • Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.17.v20190418 - http://www.eclipse.org/jetty) - • Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.17.v20190418 - http://www.eclipse.org/jetty) - • Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.17.v20190418 - http://www.eclipse.org/jetty) - • Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.17.v20190418 - http://www.eclipse.org/jetty) - • Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - HKDF-RFC5869 (at.favre.lib:hkdf:1.0.2 - https://github.com/patrickfav/hkdf) + - jffi (com.github.jnr:jffi:1.2.23 - http://github.com/jnr/jffi) + - jnr-a64asm (com.github.jnr:jnr-a64asm:1.0.0 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm) + - jnr-constants (com.github.jnr:jnr-constants:0.9.15 - http://github.com/jnr/jnr-constants) + - jnr-ffi (com.github.jnr:jnr-ffi:2.1.12 - http://github.com/jnr/jnr-ffi) + - FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/) + - Gson (com.google.code.gson:gson:2.8.6 - https://github.com/google/gson/gson) + - Dagger (com.google.dagger:dagger:2.26 - https://github.com/google/dagger) + - error-prone annotations (com.google.errorprone:error_prone_annotations:2.3.2 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) + - Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess) + - Guava: Google Core Libraries for Java (com.google.guava:guava:28.1-jre - https://github.com/google/guava/guava) + - Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture) + - J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/) + - Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/) + - Apache Commons IO (commons-io:commons-io:2.6 - http://commons.apache.org/proper/commons-io/) + - javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/) + - Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna) + - Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna) + - Apache Commons Lang (org.apache.commons:commons-lang3:3.9 - http://commons.apache.org/proper/commons-lang/) + - Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.19.0 - http://jackrabbit.apache.org/jackrabbit-webdav/) + - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.17.v20190418 - http://www.eclipse.org/jetty) BSD: - • asm (org.ow2.asm:asm:7.1 - http://asm.ow2.org/) - • asm-analysis (org.ow2.asm:asm-analysis:7.1 - http://asm.ow2.org/) - • asm-commons (org.ow2.asm:asm-commons:7.1 - http://asm.ow2.org/) - • asm-tree (org.ow2.asm:asm-tree:7.1 - http://asm.ow2.org/) - • asm-util (org.ow2.asm:asm-util:7.1 - http://asm.ow2.org/) + - asm (org.ow2.asm:asm:7.1 - http://asm.ow2.org/) + - asm-analysis (org.ow2.asm:asm-analysis:7.1 - http://asm.ow2.org/) + - asm-commons (org.ow2.asm:asm-commons:7.1 - http://asm.ow2.org/) + - asm-tree (org.ow2.asm:asm-tree:7.1 - http://asm.ow2.org/) + - asm-util (org.ow2.asm:asm-util:7.1 - http://asm.ow2.org/) Eclipse Public License - Version 1.0: - • Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.17.v20190418 - http://www.eclipse.org/jetty) - • Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.17.v20190418 - http://www.eclipse.org/jetty) - • Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.17.v20190418 - http://www.eclipse.org/jetty) - • Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.17.v20190418 - http://www.eclipse.org/jetty) - • Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.17.v20190418 - http://www.eclipse.org/jetty) - • Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.17.v20190418 - http://www.eclipse.org/jetty) - • Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.17.v20190418 - http://www.eclipse.org/jetty) - • Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.17.v20190418 - http://www.eclipse.org/jetty) + - Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.17.v20190418 - http://www.eclipse.org/jetty) Eclipse Public License - v 2.0: - • jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix) + - jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix) GPLv2: - • jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix) + - jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix) GPLv2+CE: - • Java Servlet API (javax.servlet:javax.servlet-api:3.1.0 - http://servlet-spec.java.net) - • javafx-base (org.openjfx:javafx-base:14 - https://openjdk.java.net/projects/openjfx/javafx-base/) - • javafx-controls (org.openjfx:javafx-controls:14 - https://openjdk.java.net/projects/openjfx/javafx-controls/) - • javafx-fxml (org.openjfx:javafx-fxml:14 - https://openjdk.java.net/projects/openjfx/javafx-fxml/) - • javafx-graphics (org.openjfx:javafx-graphics:14 - https://openjdk.java.net/projects/openjfx/javafx-graphics/) + - Java Servlet API (javax.servlet:javax.servlet-api:3.1.0 - http://servlet-spec.java.net) + - javafx-base (org.openjfx:javafx-base:14 - https://openjdk.java.net/projects/openjfx/javafx-base/) + - javafx-controls (org.openjfx:javafx-controls:14 - https://openjdk.java.net/projects/openjfx/javafx-controls/) + - javafx-fxml (org.openjfx:javafx-fxml:14 - https://openjdk.java.net/projects/openjfx/javafx-fxml/) + - javafx-graphics (org.openjfx:javafx-graphics:14 - https://openjdk.java.net/projects/openjfx/javafx-graphics/) LGPL 2.1: - • dbus-java (com.github.hypfvieh:dbus-java:3.0.2 - https://github.com/hypfvieh/dbus-java/dbus-java) - • jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix) - • Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna) - • Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna) + - dbus-java (com.github.hypfvieh:dbus-java:3.0.2 - https://github.com/hypfvieh/dbus-java/dbus-java) + - jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix) + - Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna) + - Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna) MIT License: - • java jwt (com.auth0:java-jwt:3.10.0 - https://github.com/auth0/java-jwt) - • java-utils (com.github.hypfvieh:java-utils:1.0.5 - https://github.com/hypfvieh/java-utils) - • jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm) - • jnr-fuse (com.github.serceman:jnr-fuse:0.5.4 - no url defined) - • zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j) - • secret-service (de.swiesend:secret-service:1.0.0-RC.3 - https://github.com/swiesend/secret-service) - • Checker Qual (org.checkerframework:checker-qual:2.8.1 - https://checkerframework.org) - • Animal Sniffer Annotations (org.codehaus.mojo:animal-sniffer-annotations:1.18 - http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations) - • SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org) + - java jwt (com.auth0:java-jwt:3.10.0 - https://github.com/auth0/java-jwt) + - java-utils (com.github.hypfvieh:java-utils:1.0.5 - https://github.com/hypfvieh/java-utils) + - jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm) + - jnr-fuse (com.github.serceman:jnr-fuse:0.5.4 - no url defined) + - zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j) + - secret-service (de.swiesend:secret-service:1.0.0-RC.3 - https://github.com/swiesend/secret-service) + - Checker Qual (org.checkerframework:checker-qual:2.8.1 - https://checkerframework.org) + - Animal Sniffer Annotations (org.codehaus.mojo:animal-sniffer-annotations:1.18 - http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations) + - SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org) The BSD 2-Clause License: - • EasyBind (org.fxmisc.easybind:easybind:1.0.3 - http://www.fxmisc.org/easybind/) + - EasyBind (org.fxmisc.easybind:easybind:1.0.3 - http://www.fxmisc.org/easybind/) Cryptomator uses other third-party assets under the following licenses: SIL OFL 1.1 License: From 8c339d4f3ca064cb819ef7d69b12179f6b5c04ff Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 25 Mar 2020 10:40:53 +0100 Subject: [PATCH 06/14] updated links to docs [ci skip] --- .../java/org/cryptomator/ui/mainwindow/WelcomeController.java | 2 +- .../cryptomator/ui/wrongfilealert/WrongFileAlertController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java index 2646c1a36..2a6228879 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java @@ -16,7 +16,7 @@ import javax.inject.Inject; public class WelcomeController implements FxController { private static final Logger LOG = LoggerFactory.getLogger(WelcomeController.class); - private static final String GETTING_STARTED_URI = "https://docs.cryptomator.org/en/1.5/desktop/getting-started/"; + private static final String GETTING_STARTED_URI = "https://docs.cryptomator.org/en/1.5/desktop/getting-started.html"; private final Application application; private final BooleanBinding noVaultPresent; diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java index 82eec9d28..e191da1c6 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java @@ -15,7 +15,7 @@ import java.io.UncheckedIOException; @WrongFileAlertScoped public class WrongFileAlertController implements FxController { - private static final String DOCUMENTATION_URI = "https://docs.cryptomator.org"; + private static final String DOCUMENTATION_URI = "https://docs.cryptomator.org/en/1.5/desktop/accessing-vaults.html"; private final Application app; private final Stage window; From cceea1c7c12c91e02a9f993ca88280140a9e4050 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 25 Mar 2020 17:57:17 +0100 Subject: [PATCH 07/14] Updated dependencies --- .idea/compiler.xml | 10 +++++----- main/pom.xml | 10 +++++----- main/ui/src/main/resources/license/THIRD-PARTY.txt | 11 +++++------ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 943b0492d..d6a3de953 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,10 +7,10 @@ - - + + - + @@ -20,7 +20,7 @@ - + @@ -32,9 +32,9 @@ - + diff --git a/main/pom.xml b/main/pom.xml index 6dd95a8d6..38266ccaa 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -24,7 +24,7 @@ UTF-8 - 1.9.3 + 1.9.4 2.2.2 1.2.3 1.1.13 @@ -35,15 +35,15 @@ 3.9 3.10.0 1.0.3 - 28.1-jre - 2.26 + 28.2-jre + 2.27 2.8.6 1.7.30 1.2.3 - 5.6.0 - 3.3.0 + 5.6.1 + 3.3.3 2.2 diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt index d327e63da..02ee15631 100644 --- a/main/ui/src/main/resources/license/THIRD-PARTY.txt +++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt @@ -11,7 +11,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. -Cryptomator uses 50 third-party dependencies under the following licenses: +Cryptomator uses 49 third-party dependencies under the following licenses: Apache License v2.0: - HKDF-RFC5869 (at.favre.lib:hkdf:1.0.2 - https://github.com/patrickfav/hkdf) - jffi (com.github.jnr:jffi:1.2.23 - http://github.com/jnr/jffi) @@ -20,10 +20,10 @@ Cryptomator uses 50 third-party dependencies under the following licenses: - jnr-ffi (com.github.jnr:jnr-ffi:2.1.12 - http://github.com/jnr/jnr-ffi) - FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/) - Gson (com.google.code.gson:gson:2.8.6 - https://github.com/google/gson/gson) - - Dagger (com.google.dagger:dagger:2.26 - https://github.com/google/dagger) - - error-prone annotations (com.google.errorprone:error_prone_annotations:2.3.2 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) + - Dagger (com.google.dagger:dagger:2.27 - https://github.com/google/dagger) + - error-prone annotations (com.google.errorprone:error_prone_annotations:2.3.4 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) - Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess) - - Guava: Google Core Libraries for Java (com.google.guava:guava:28.1-jre - https://github.com/google/guava/guava) + - Guava: Google Core Libraries for Java (com.google.guava:guava:28.2-jre - https://github.com/google/guava/guava) - Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture) - J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/) - Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/) @@ -78,8 +78,7 @@ Cryptomator uses 50 third-party dependencies under the following licenses: - jnr-fuse (com.github.serceman:jnr-fuse:0.5.4 - no url defined) - zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j) - secret-service (de.swiesend:secret-service:1.0.0-RC.3 - https://github.com/swiesend/secret-service) - - Checker Qual (org.checkerframework:checker-qual:2.8.1 - https://checkerframework.org) - - Animal Sniffer Annotations (org.codehaus.mojo:animal-sniffer-annotations:1.18 - http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations) + - Checker Qual (org.checkerframework:checker-qual:2.10.0 - https://checkerframework.org) - SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org) The BSD 2-Clause License: - EasyBind (org.fxmisc.easybind:easybind:1.0.3 - http://www.fxmisc.org/easybind/) From d1b364fd1b76c7bb9bdc37d6385754081f15789b Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 26 Mar 2020 14:24:14 +0100 Subject: [PATCH 08/14] Added ~/iCloudDrive (default location on Windows) to cloud storage autodetection --- .../java/org/cryptomator/ui/addvaultwizard/LocationPresets.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java index b3b6a4b25..f74f8ea19 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java @@ -13,7 +13,7 @@ import java.nio.file.Paths; public class LocationPresets { private static final String USER_HOME = System.getProperty("user.home"); - private static final String[] ICLOUDDRIVE_LOCATIONS = {"~/Library/Mobile Documents/iCloud~com~setolabs~Cryptomator/Documents"}; + private static final String[] ICLOUDDRIVE_LOCATIONS = {"~/Library/Mobile Documents/iCloud~com~setolabs~Cryptomator/Documents", "~/iCloudDrive"}; private static final String[] DROPBOX_LOCATIONS = {"~/Dropbox"}; private static final String[] GDRIVE_LOCATIONS = {"~/Google Drive"}; private static final String[] ONEDRIVE_LOCATIONS = {"~/OneDrive"}; From 005c4787a215c0027f5975ecf8c3c9543d0dffc8 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Thu, 26 Mar 2020 14:46:47 +0100 Subject: [PATCH 09/14] updated icloud drive path for windows --- .../java/org/cryptomator/ui/addvaultwizard/LocationPresets.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java index f74f8ea19..aa67862f3 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java @@ -13,7 +13,7 @@ import java.nio.file.Paths; public class LocationPresets { private static final String USER_HOME = System.getProperty("user.home"); - private static final String[] ICLOUDDRIVE_LOCATIONS = {"~/Library/Mobile Documents/iCloud~com~setolabs~Cryptomator/Documents", "~/iCloudDrive"}; + private static final String[] ICLOUDDRIVE_LOCATIONS = {"~/Library/Mobile Documents/iCloud~com~setolabs~Cryptomator/Documents", "~/iCloudDrive/iCloud~com~setolabs~Cryptomator"}; private static final String[] DROPBOX_LOCATIONS = {"~/Dropbox"}; private static final String[] GDRIVE_LOCATIONS = {"~/Google Drive"}; private static final String[] ONEDRIVE_LOCATIONS = {"~/OneDrive"}; From 128176db1f84ea6ab200a2b3a0dd66e9a90e02e4 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 26 Mar 2020 15:09:29 +0100 Subject: [PATCH 10/14] Added posibility to add build number to "about" dialog --- .../java/org/cryptomator/common/Environment.java | 8 ++++++-- .../ui/preferences/AboutController.java | 15 +++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/main/commons/src/main/java/org/cryptomator/common/Environment.java b/main/commons/src/main/java/org/cryptomator/common/Environment.java index 8dfb56ef2..890840b7d 100644 --- a/main/commons/src/main/java/org/cryptomator/common/Environment.java +++ b/main/commons/src/main/java/org/cryptomator/common/Environment.java @@ -39,6 +39,7 @@ public class Environment { LOG.debug("cryptomator.logDir: {}", System.getProperty("cryptomator.logDir")); LOG.debug("cryptomator.mountPointsDir: {}", System.getProperty("cryptomator.mountPointsDir")); LOG.debug("cryptomator.minPwLength: {}", System.getProperty("cryptomator.minPwLength")); + LOG.debug("cryptomator.buildNumber: {}", System.getProperty("cryptomator.buildNumber")); } public boolean useCustomLogbackConfig() { @@ -65,6 +66,10 @@ public class Environment { return getPath("cryptomator.mountPointsDir").map(this::replaceHomeDir); } + public Optional getBuildNumber() { + return Optional.ofNullable(System.getProperty("cryptomator.buildNumber")); + } + public int getMinPwLength() { return getInt("cryptomator.minPwLength", DEFAULT_MIN_PW_LENGTH); } @@ -82,8 +87,8 @@ public class Environment { String value = System.getProperty(propertyName); return Optional.ofNullable(value).map(Paths::get); } - // visible for testing + Stream getPaths(String propertyName) { Stream rawSettingsPaths = getRawList(propertyName, PATH_LIST_SEP); return rawSettingsPaths.filter(Predicate.not(Strings::isNullOrEmpty)).map(Paths::get).map(this::replaceHomeDir); @@ -107,5 +112,4 @@ public class Environment { return StreamSupport.stream(spliter, false); } } - } diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AboutController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AboutController.java index 97599cf7a..758e0113b 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AboutController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AboutController.java @@ -1,6 +1,7 @@ package org.cryptomator.ui.preferences; import com.google.common.io.CharStreams; +import org.cryptomator.common.Environment; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.fxapp.UpdateChecker; import org.slf4j.Logger; @@ -13,18 +14,20 @@ import java.io.InputStreamReader; @PreferencesScoped public class AboutController implements FxController { - + private static final Logger LOG = LoggerFactory.getLogger(AboutController.class); - + private final String thirdPartyLicenseText; private final String applicationVersion; @Inject - AboutController(UpdateChecker updateChecker) { + AboutController(UpdateChecker updateChecker, Environment environment) { this.thirdPartyLicenseText = loadThirdPartyLicenseFile(); - this.applicationVersion = updateChecker.currentVersionProperty().get(); + StringBuilder sb = new StringBuilder(updateChecker.currentVersionProperty().get()); + environment.getBuildNumber().ifPresent(s -> sb.append(" (").append(s).append(')')); + this.applicationVersion = sb.toString(); } - + private static String loadThirdPartyLicenseFile() { try (InputStream in = AboutController.class.getResourceAsStream("/license/THIRD-PARTY.txt")) { return CharStreams.toString(new InputStreamReader(in)); @@ -33,7 +36,7 @@ public class AboutController implements FxController { return ""; } } - + /* Getter */ public String getThirdPartyLicenseText() { From c1bd777c17a5f22b7c9fccd774bdace477bef4ed Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 30 Mar 2020 11:11:20 +0200 Subject: [PATCH 11/14] updated links to docs [ci skip] --- .../java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java | 2 +- .../java/org/cryptomator/ui/mainwindow/WelcomeController.java | 2 +- .../cryptomator/ui/wrongfilealert/WrongFileAlertController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java index e36ef9883..64c061d58 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java @@ -14,7 +14,7 @@ public class ReadmeGenerator { private static final String EMPTY_PAR = ""; private static final String DONT_PAR = "\\b %s"; private static final String IDENT_PAR = " %s"; - private static final String HELP_URL = "{\\field{\\*\\fldinst HYPERLINK \"http://docs.cryptoamtor.org/\"}{\\fldrslt http://docs.cryptoamtor.org}}"; + private static final String HELP_URL = "{\\field{\\*\\fldinst HYPERLINK \"http://docs.cryptomator.org/\"}{\\fldrslt http://docs.cryptomator.org}}"; private final ResourceBundle resourceBundle; diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java index 2a6228879..2646c1a36 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java @@ -16,7 +16,7 @@ import javax.inject.Inject; public class WelcomeController implements FxController { private static final Logger LOG = LoggerFactory.getLogger(WelcomeController.class); - private static final String GETTING_STARTED_URI = "https://docs.cryptomator.org/en/1.5/desktop/getting-started.html"; + private static final String GETTING_STARTED_URI = "https://docs.cryptomator.org/en/1.5/desktop/getting-started/"; private final Application application; private final BooleanBinding noVaultPresent; diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java index e191da1c6..6a11a9eba 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java @@ -15,7 +15,7 @@ import java.io.UncheckedIOException; @WrongFileAlertScoped public class WrongFileAlertController implements FxController { - private static final String DOCUMENTATION_URI = "https://docs.cryptomator.org/en/1.5/desktop/accessing-vaults.html"; + private static final String DOCUMENTATION_URI = "https://docs.cryptomator.org/en/1.5/desktop/accessing-vaults/"; private final Application app; private final Stage window; From 05d21f67849928d99c74c86fc995aedab625c0cd Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 8 Apr 2020 10:24:23 +0200 Subject: [PATCH 12/14] Fixed SNYK-JAVA-COMMONSCODEC-561518 by updating transitive dependency commons-codec --- main/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/pom.xml b/main/pom.xml index 38266ccaa..cdea88f54 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -33,7 +33,7 @@ 14 3.9 - 3.10.0 + 3.10.2 1.0.3 28.2-jre 2.27 From 6fc010e63827f55b56964c02bf1b7fde230c3f5a Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 14 Apr 2020 18:45:20 +0200 Subject: [PATCH 13/14] fixes #1092 --- main/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/pom.xml b/main/pom.xml index cdea88f54..5d58a60ef 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -24,7 +24,7 @@ UTF-8 - 1.9.4 + 1.9.5 2.2.2 1.2.3 1.1.13 From d111a347369201017f95d876beeb10fc270a48b5 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Thu, 16 Apr 2020 09:50:33 +0200 Subject: [PATCH 14/14] updated third-party licenses [ci skip] --- main/ui/src/license/template.ftl | 2 +- main/ui/src/main/resources/license/THIRD-PARTY.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/ui/src/license/template.ftl b/main/ui/src/license/template.ftl index f405277bf..5cf4a819e 100644 --- a/main/ui/src/license/template.ftl +++ b/main/ui/src/license/template.ftl @@ -32,4 +32,4 @@ Cryptomator uses ${dependencyMap?size} third-party dependencies under the follow Cryptomator uses other third-party assets under the following licenses: SIL OFL 1.1 License: - • Font Awesome 5.12.0 (https://fontawesome.com/) + - Font Awesome 5.12.0 (https://fontawesome.com/) diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt index 02ee15631..eb0598706 100644 --- a/main/ui/src/main/resources/license/THIRD-PARTY.txt +++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt @@ -72,7 +72,7 @@ Cryptomator uses 49 third-party dependencies under the following licenses: - Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna) - Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna) MIT License: - - java jwt (com.auth0:java-jwt:3.10.0 - https://github.com/auth0/java-jwt) + - java jwt (com.auth0:java-jwt:3.10.2 - https://github.com/auth0/java-jwt) - java-utils (com.github.hypfvieh:java-utils:1.0.5 - https://github.com/hypfvieh/java-utils) - jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm) - jnr-fuse (com.github.serceman:jnr-fuse:0.5.4 - no url defined) @@ -85,4 +85,4 @@ Cryptomator uses 49 third-party dependencies under the following licenses: Cryptomator uses other third-party assets under the following licenses: SIL OFL 1.1 License: - • Font Awesome 5.12.0 (https://fontawesome.com/) + - Font Awesome 5.12.0 (https://fontawesome.com/)