Merge branch 'develop' into feature/vault-format-8

# Conflicts:
#	main/pom.xml
#	main/ui/src/main/resources/license/THIRD-PARTY.txt
[ci skip]
This commit is contained in:
Sebastian Stenzel
2021-02-26 10:10:50 +01:00
41 changed files with 393 additions and 141 deletions
@@ -68,6 +68,11 @@ public class KeychainManager implements KeychainAccessProvider {
return keychain.getValue() != null;
}
@Override
public boolean isLocked() {
return keychain.getValue() == null || keychain.get().isLocked();
}
/**
* Checks if the keychain knows a passphrase for the given key.
* <p>
@@ -8,7 +8,7 @@ public enum UiTheme {
AUTOMATIC("preferences.general.theme.automatic");
public static UiTheme[] applicableValues() {
if (SystemUtils.IS_OS_MAC) {
if (SystemUtils.IS_OS_MAC || SystemUtils.IS_OS_WINDOWS) {
return values();
} else {
return new UiTheme[]{LIGHT, DARK};
@@ -44,4 +44,9 @@ class MapKeychainAccess implements KeychainAccessProvider {
return true;
}
@Override
public boolean isLocked() {
return false;
}
}