Merge branch 'develop' into release/1.3.0

cryptomator · Sep 16, 2024 · b3cb765 · b3cb765
2 parents 681494a + d2a2794
commit b3cb765
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,8 +37,8 @@
 		<project.jdk.version>22</project.jdk.version>
 
 		<!-- runtime dependencies -->
-		<api.version>1.4.0-beta2</api.version>
-		<slf4j.version>2.0.14</slf4j.version>
+		<api.version>1.4.0</api.version>
+		<slf4j.version>2.0.16</slf4j.version>
 		<jackson.version>2.17.2</jackson.version>
 
 		<!-- test dependencies -->

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -16,10 +16,12 @@
 	requires com.fasterxml.jackson.databind;
 
 	opens org.cryptomator.windows.keychain to com.fasterxml.jackson.databind;
+	opens org.cryptomator.windows.quickaccess to org.cryptomator.integrations.api;
 
 	provides AutoStartProvider with WindowsAutoStart;
 	provides KeychainAccessProvider with WindowsProtectedKeychainAccess;
 	provides UiAppearanceProvider with WinUiAppearanceProvider;
 	provides RevealPathService with ExplorerRevealPathService;
 	provides QuickAccessService with ExplorerQuickAccessService;
+
 }
diff --git a/src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java b/src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java
@@ -92,7 +92,7 @@ public String displayName() {
 	}
 
 	@Override
-	public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
+	public void storePassphrase(String key, String displayName, CharSequence passphrase, boolean ignored) throws KeychainAccessException {
 		loadKeychainEntriesIfNeeded();
 		ByteBuffer buf = UTF_8.encode(CharBuffer.wrap(passphrase));
 		byte[] cleartext = new byte[buf.remaining()];

diff --git a/src/main/java/org/cryptomator/windows/quickaccess/ExplorerQuickAccessService.java b/src/main/java/org/cryptomator/windows/quickaccess/ExplorerQuickAccessService.java
@@ -34,7 +34,7 @@ public QuickAccessEntry add(Path target, String displayName) throws QuickAccessS
 		if (target == null) {
 			throw new IllegalArgumentException("Parameter 'target' must not be null.");
 		}
-		var entryName = "Vault - " + displayName;
+		var entryName = displayName.length() > 40? displayName.substring(0, 40) : displayName; //truncate name
 		var clsid = "{" + UUID.randomUUID() + "}";
 		LOG.debug("Creating navigation pane entry with CLSID {}", clsid);
 		//1. Creates the shell extension and names it