Merge branch 'develop' into release/1.5.0

cryptomator · Sep 16, 2024 · 6269df3 · 6269df3
2 parents 3bba25c + 18e2cd1
commit 6269df3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 31 deletions.
diff --git a/pom.xml b/pom.xml
@@ -40,10 +40,10 @@
 
 		<!-- runtime dependencies -->
 
-		<api.version>1.4.0-beta2</api.version>
+		<api.version>1.4.0</api.version>
 		<secret-service.version>2.0.1-alpha</secret-service.version>
 		<kdewallet.version>1.4.0</kdewallet.version>
-		<slf4j.version>2.0.13</slf4j.version>
+		<slf4j.version>2.0.16</slf4j.version>
 		<appindicator.version>1.4.1</appindicator.version>
 
 		<!-- test dependencies -->

diff --git a/src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java b/src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java
@@ -48,7 +48,7 @@ public boolean isLocked() {
 	}
 
 	@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 {
 		CheckUtil.checkState(wallet.isPresent(), "Keychain not supported.");
 		wallet.get().storePassphrase(key, passphrase);
 	}

diff --git a/src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java b/src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java
@@ -48,7 +48,7 @@ public boolean isLocked() {
 	}
 
 	@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 {
 		try (SimpleCollection keyring = new SimpleCollection()) {
 			List<String> list = keyring.getItems(createAttributes(key));
 			if (list == null || list.isEmpty()) {

diff --git a/src/main/java/org/cryptomator/linux/quickaccess/DolphinPlaces.java b/src/main/java/org/cryptomator/linux/quickaccess/DolphinPlaces.java
@@ -6,7 +6,6 @@
 import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.quickaccess.QuickAccessService;
 import org.cryptomator.integrations.quickaccess.QuickAccessServiceException;
-import org.cryptomator.linux.util.SupportUtil;
 import org.xml.sax.SAXException;
 
 import javax.xml.XMLConstants;
@@ -23,7 +22,6 @@
 import java.nio.file.StandardOpenOption;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -161,6 +159,6 @@ private int indexOfEntryOpeningTag(String placesContent, int idIndex) {
 
 	@CheckAvailability
 	public static boolean isSupported() {
-		return SupportUtil.commandExists("dolphin");
+		return Files.exists(PLACES_FILE);
 	}
 }
diff --git a/src/main/java/org/cryptomator/linux/quickaccess/NautilusBookmarks.java b/src/main/java/org/cryptomator/linux/quickaccess/NautilusBookmarks.java
@@ -6,15 +6,13 @@
 import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.quickaccess.QuickAccessService;
 import org.cryptomator.integrations.quickaccess.QuickAccessServiceException;
-import org.cryptomator.linux.util.SupportUtil;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -85,6 +83,6 @@ public void remove() throws QuickAccessServiceException {
 
 	@CheckAvailability
 	public static boolean isSupported() {
-		return SupportUtil.commandExists("nautilus");
+		return Files.exists(BOOKMARKS_FILE);
 	}
 }
diff --git a/src/main/java/org/cryptomator/linux/util/SupportUtil.java b/src/main/java/org/cryptomator/linux/util/SupportUtil.java