|
@@ -64,11 +64,14 @@ class WindowsProtectedKeychainAccess implements KeychainAccessStrategy {
|
|
} else {
|
|
} else {
|
|
this.dataProtection = null;
|
|
this.dataProtection = null;
|
|
}
|
|
}
|
|
- final String keychainPathProperty = System.getProperty("cryptomator.keychainPath");
|
|
|
|
|
|
+ String keychainPathProperty = System.getProperty("cryptomator.keychainPath");
|
|
if (dataProtection != null && keychainPathProperty == null) {
|
|
if (dataProtection != null && keychainPathProperty == null) {
|
|
- LOG.warn("Windows DataProtection module loaded, but no keychainPath configured.");
|
|
|
|
|
|
+ LOG.warn("Windows DataProtection module loaded, but no cryptomator.keychainPath property found.");
|
|
}
|
|
}
|
|
if (keychainPathProperty != null) {
|
|
if (keychainPathProperty != null) {
|
|
|
|
+ if (keychainPathProperty.startsWith("~/")) {
|
|
|
|
+ keychainPathProperty = SystemUtils.USER_HOME + keychainPathProperty.substring(1);
|
|
|
|
+ }
|
|
this.keychainPath = FileSystems.getDefault().getPath(keychainPathProperty);
|
|
this.keychainPath = FileSystems.getDefault().getPath(keychainPathProperty);
|
|
} else {
|
|
} else {
|
|
this.keychainPath = null;
|
|
this.keychainPath = null;
|