Merge branch 'master' into develop

This commit is contained in:
Sebastian Stenzel
2019-07-24 10:12:49 +02:00
5 changed files with 9 additions and 10 deletions
@@ -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;
}