Simplify CheckAvailabillity method for quickAccess

* only check for files * circumvent flatpak need of spawning host processes
cryptomator · Aug 23, 2024 · 33b378d · 33b378d
1 parent a2c0353
commit 33b378d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 27 deletions.
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