diff --git a/README.md b/README.md index 493bfc3f9..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) @@ -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)](https://thebestvpn.com/) + +--- + +## 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). 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; } diff --git a/main/pom.xml b/main/pom.xml index 0bd97ed7b..a49148e32 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 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(); } }