From 903d8187e954a4f691fb204945b43c2ea23798bc Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 4 Jul 2019 15:59:16 +0200 Subject: [PATCH 1/6] Preparing 1.4.12 --- 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 c573072b2..e2bd5bc4f 100644 --- a/main/buildkit/pom.xml +++ b/main/buildkit/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.12 buildkit pom diff --git a/main/commons/pom.xml b/main/commons/pom.xml index ebb78e73f..7ded57845 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.12 commons Cryptomator Commons diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 01e276cc9..bff1d5fda 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.12 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index aef980622..3cac71a3f 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.12 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index ad93007b5..da4a47b86 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.12 pom Cryptomator diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 1465683f0..7ef622799 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.4.12 ui Cryptomator GUI From dc889b88109c0ea32eb6a7282269d534f015f79e Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 9 Jul 2019 17:04:05 +0200 Subject: [PATCH 2/6] fixes #919 --- .idea/compiler.xml | 5 +---- .idea/modules.xml | 1 - .../src/main/java/org/cryptomator/ui/model/VaultModule.java | 6 +++--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index ace983167..da1897030 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -23,14 +23,11 @@ - + - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index bca3878d6..2e793ed5c 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,7 +3,6 @@ - \ No newline at end of file diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java index 5e4050d8f..fdab20bec 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java @@ -88,7 +88,7 @@ public class VaultModule { LOG.error("Could not read uid/gid from USER_HOME", e); } - return flags.toString(); + return flags.toString().strip(); } // see https://manpages.debian.org/testing/fuse/mount.fuse.8.en.html @@ -111,7 +111,7 @@ public class VaultModule { LOG.error("Could not read uid/gid from USER_HOME", e); } - return flags.toString(); + return flags.toString().strip(); } // see https://github.com/cryptomator/dokany-nio-adapter/blob/develop/src/main/java/org/cryptomator/frontend/dokany/MountUtil.java#L30-L34 @@ -127,7 +127,7 @@ public class VaultModule { flags.append(" --timeout 10000"); flags.append(" --allocation-unit-size 4096"); flags.append(" --sector-size 4096"); - return flags.toString(); + return flags.toString().strip(); } } From f16c887911c1ebcf58bb4cc13c4c038cd877cbe8 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 10 Jul 2019 12:48:24 +0200 Subject: [PATCH 3/6] Updated CryptoFS --- main/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/pom.xml b/main/pom.xml index da4a47b86..b1a27f394 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -25,7 +25,7 @@ 1.2.1 - 1.8.5 + 1.8.6 2.0.0 1.2.0 1.1.9 From 53cc93a2b4ddac9a2915647d450c0631944dbb5e Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 10 Jul 2019 15:15:37 +0200 Subject: [PATCH 4/6] don't attempt to access linux keychain on non-linux systems, even if classes are present (i.e. when starting from IDE) [ci skip] --- .../java/org/cryptomator/keychain/LinuxKeychainTester.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKeychainTester.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKeychainTester.java index 1466e895c..67d1300c9 100644 --- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKeychainTester.java +++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKeychainTester.java @@ -1,12 +1,15 @@ package org.cryptomator.keychain; +import org.apache.commons.lang3.SystemUtils; + import java.util.Optional; public class LinuxKeychainTester { + public static boolean secretServiceIsAvailable() { try { Class.forName("org.freedesktop.secret.simple.SimpleCollection"); - return true; + return SystemUtils.IS_OS_LINUX; // even if the classes could be loaded, secretService is only available on linux } catch (ClassNotFoundException e) { return false; } From b33dd62dc58ca97d745f695965c0ba21d9099876 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Wed, 17 Jul 2019 14:12:56 +0200 Subject: [PATCH 5/6] updated sponsors [ci skip] --- README.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 493bfc3f9..521284c2d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,22 @@ [![Latest Release](https://img.shields.io/github/release/cryptomator/cryptomator.svg)](https://github.com/cryptomator/cryptomator/releases/latest) [![Community](https://img.shields.io/badge/help-Community-orange.svg)](https://community.cryptomator.org) -Multi-platform transparent client-side encryption of your files in the cloud. +## Supporting Cryptomator + +Cryptomator is provided free of charge as an open-source project despite the high development effort and is therefore dependent on donations. If you are also interested in further development, we offer you the opportunity to support us: + +- [One-time or recurring donation via Cryptomator's website.](https://cryptomator.org/#donate) +- [Become a sponsor via Cryptomator's sponsors website.](https://cryptomator.org/sponsors/) + +### Silver Sponsors + +![TheBestVPN](https://cryptomator.org/img/sponsors/thebestvpn.png) + +--- + +## Introduction + +Cryptomator offers multi-platform transparent client-side encryption of your files in the cloud. Download native binaries of Cryptomator on [cryptomator.org](https://cryptomator.org/) or clone and build Cryptomator using Maven (instructions below). From bf0e984e6c650658a39cf677cfd1c40907bf8a51 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Wed, 17 Jul 2019 14:16:25 +0200 Subject: [PATCH 6/6] added links to some images [ci skip] --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 521284c2d..417dfb09a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![cryptomator](cryptomator.png) +[![cryptomator](cryptomator.png)](https://cryptomator.org/) [![Build Status](https://travis-ci.org/cryptomator/cryptomator.svg?branch=master)](https://travis-ci.org/cryptomator/cryptomator) [![Known Vulnerabilities](https://snyk.io/test/github/cryptomator/cryptomator/badge.svg?targetFile=main%2Fpom.xml)](https://snyk.io/test/github/cryptomator/cryptomator?targetFile=main%2Fpom.xml) @@ -17,7 +17,7 @@ Cryptomator is provided free of charge as an open-source project despite the hig ### Silver Sponsors -![TheBestVPN](https://cryptomator.org/img/sponsors/thebestvpn.png) +[![TheBestVPN](https://cryptomator.org/img/sponsors/thebestvpn.png)](https://thebestvpn.com/) ---