소스 검색

Add cryptomator.integrationsWin.windowsHelloKeychainPaths to Environment

Ralph Plawetzki 7 달 전
부모
커밋
f7e65f4eec

+ 1 - 1
.github/workflows/win-exe.yml

@@ -130,7 +130,7 @@ jobs:
           --java-options "-Dcryptomator.buildNumber=\"msi-${{ needs.get-version.outputs.revNum }}\""
           --java-options "-Dcryptomator.integrationsWin.autoStartShellLinkName=\"Cryptomator\""
           --java-options "-Dcryptomator.integrationsWin.keychainPaths=\"@{appdata}/Cryptomator/keychain.json;@{userhome}/AppData/Roaming/Cryptomator/keychain.json\""
-          --java-options "-Dcryptomator.integrationsWin.winHelloKeychainPaths=\"@{appdata}/Cryptomator/winHelloKeychain.json;@{userhome}/AppData/Roaming/Cryptomator/winHelloKeychain.json\""
+          --java-options "-Dcryptomator.integrationsWin.windowsHelloKeychainPaths=\"@{appdata}/Cryptomator/windowsHelloKeychain.json;@{userhome}/AppData/Roaming/Cryptomator/windowsHelloKeychain.json\""
           --java-options "-Djavafx.verbose=${{ inputs.isDebug }}"
           --resource-dir dist/win/resources
           --icon dist/win/resources/Cryptomator.ico

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
.idea/runConfigurations/Cryptomator_Windows.xml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
.idea/runConfigurations/Cryptomator_Windows_Dev.xml


+ 6 - 0
src/main/java/org/cryptomator/common/Environment.java

@@ -23,6 +23,7 @@ public class Environment {
 	private static final String SETTINGS_PATH_PROP_NAME = "cryptomator.settingsPath";
 	private static final String IPC_SOCKET_PATH_PROP_NAME = "cryptomator.ipcSocketPath";
 	private static final String KEYCHAIN_PATHS_PROP_NAME = "cryptomator.integrationsWin.keychainPaths";
+	private static final String WINDOWS_HELLO_KEYCHAIN_PATHS_PROP_NAME = "cryptomator.integrationsWin.windowsHelloKeychainPaths";
 	private static final String P12_PATH_PROP_NAME = "cryptomator.p12Path";
 	private static final String LOG_DIR_PROP_NAME = "cryptomator.logDir";
 	private static final String LOOPBACK_ALIAS_PROP_NAME = "cryptomator.loopbackAlias";
@@ -45,6 +46,7 @@ public class Environment {
 		logCryptomatorSystemProperty(SETTINGS_PATH_PROP_NAME);
 		logCryptomatorSystemProperty(IPC_SOCKET_PATH_PROP_NAME);
 		logCryptomatorSystemProperty(KEYCHAIN_PATHS_PROP_NAME);
+		logCryptomatorSystemProperty(WINDOWS_HELLO_KEYCHAIN_PATHS_PROP_NAME);
 		logCryptomatorSystemProperty(P12_PATH_PROP_NAME);
 		logCryptomatorSystemProperty(LOG_DIR_PROP_NAME);
 		logCryptomatorSystemProperty(LOOPBACK_ALIAS_PROP_NAME);
@@ -85,6 +87,10 @@ public class Environment {
 		return getPaths(KEYCHAIN_PATHS_PROP_NAME);
 	}
 
+	public Stream<Path> getWindowsHelloKeychainPath() {
+		return getPaths(WINDOWS_HELLO_KEYCHAIN_PATHS_PROP_NAME);
+	}
+
 	public Stream<Path> getP12Path() {
 		return getPaths(P12_PATH_PROP_NAME);
 	}

+ 7 - 0
src/test/java/org/cryptomator/common/EnvironmentTest.java

@@ -121,6 +121,13 @@ public class EnvironmentTest {
 			env.getKeychainPath();
 			Mockito.verify(env).getPaths("cryptomator.integrationsWin.keychainPaths");
 		}
+
+		@Test
+		public void testWindowsHelloKeychainPath() {
+			Mockito.doReturn(Stream.of()).when(env).getPaths(Mockito.anyString());
+			env.getWindowsHelloKeychainPath();
+			Mockito.verify(env).getPaths("cryptomator.integrationsWin.windowsHelloKeychainPaths");
+		}
 	}
 
 }