mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-08-18 21:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/lock-and-quit-without-asking

Browse Source
This commit is contained in:
Jan-Peter Klein
2022-06-30 15:13:06 +02:00
parent e640e36744 8043a4ea10
commit 8e6d2cf45a
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
-3
View File
@@ -36,8 +36,6 @@ Cryptomator is provided free of charge as an open-source project despite the hig
</tbody>
</table>
- [Jameson Lopp](https://www.lopp.net/)
---
## Introduction
@@ -82,7 +80,6 @@ For more information on the security details visit [cryptomator.org](https://doc
* JDK 17 (e.g. temurin)
* Maven 3
* Optional: OS-dependent build tools for native packaging (see [Windows](https://github.com/cryptomator/cryptomator-win), [OS X](https://github.com/cryptomator/cryptomator-osx), [Linux](https://github.com/cryptomator/builder-containers))
### Run Maven
src/main/java/org/cryptomator/common/settings/Settings.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class Settings {
public static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3;
public static final WebDavUrlScheme DEFAULT_GVFS_SCHEME = WebDavUrlScheme.DAV;
public static final boolean DEFAULT_DEBUG_MODE = false;
public static final VolumeImpl DEFAULT_PREFERRED_VOLUME_IMPL = SystemUtils.IS_OS_WINDOWS ? VolumeImpl.DOKANY : VolumeImpl.FUSE;
public static final VolumeImpl DEFAULT_PREFERRED_VOLUME_IMPL = VolumeImpl.FUSE;
public static final UiTheme DEFAULT_THEME = UiTheme.LIGHT;
@Deprecated // to be changed to "whatever is available" eventually
public static final String DEFAULT_KEYCHAIN_PROVIDER = SystemUtils.IS_OS_WINDOWS ? "org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess" : SystemUtils.IS_OS_MAC ? "org.cryptomator.macos.keychain.MacSystemKeychainAccess" : "org.cryptomator.linux.keychain.SecretServiceKeychainAccess";