From 54a005a5c97fcb4a0bb98d10a0baacd73883acf2 Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Mon, 4 Oct 2021 19:45:26 +0200
Subject: [PATCH] Pass the name of the vault on storing a passphrase

---
 pom.xml                                                     | 2 +-
 .../org/cryptomator/common/keychain/KeychainManager.java    | 6 ++++++
 .../masterkeyfile/MasterkeyFileLoadingFinisher.java         | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ce8a4b4d8..e6544520a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
 		<!-- cryptomator dependencies -->
 		<cryptomator.cryptofs.version>2.1.0-beta13</cryptomator.cryptofs.version>
-		<cryptomator.integrations.version>1.0.0</cryptomator.integrations.version>
+		<cryptomator.integrations.version>1.1.0</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>1.0.0-rc1</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.0.0-rc1</cryptomator.integrations.mac.version>
 		<cryptomator.integrations.linux.version>1.0.0-rc2</cryptomator.integrations.linux.version>
diff --git a/src/main/java/org/cryptomator/common/keychain/KeychainManager.java b/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
index c97d0e9c9..e8783e159 100644
--- a/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
+++ b/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
@@ -49,6 +49,12 @@ public class KeychainManager implements KeychainAccessProvider {
 		setPassphraseStored(key, true);
 	}
 
+	@Override
+	public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
+		getKeychainOrFail().storePassphrase(key, displayName, passphrase);
+		setPassphraseStored(key, true);
+	}
+
 	@Override
 	public char[] loadPassphrase(String key) throws KeychainAccessException {
 		char[] passphrase = getKeychainOrFail().loadPassphrase(key);
diff --git a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingFinisher.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingFinisher.java
index 8eda41cd0..44d7ebfb0 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingFinisher.java
+++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingFinisher.java
@@ -47,7 +47,7 @@ class MasterkeyFileLoadingFinisher {
 	private void savePasswordToSystemkeychain() {
 		if (keychain.isSupported()) {
 			try {
-				keychain.storePassphrase(vault.getId(), CharBuffer.wrap(enteredPassword.get()));
+				keychain.storePassphrase(vault.getId(), vault.getDisplayName(), CharBuffer.wrap(enteredPassword.get()));
 			} catch (KeychainAccessException e) {
 				LOG.error("Failed to store passphrase in system keychain.", e);
 			}