Merge branch 'develop' into release/1.5.0

cryptomator · Aug 14, 2024 · ec5f08f · ec5f08f
2 parents 37fc8b6 + 91f6839
commit ec5f08f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -87,6 +87,12 @@
 			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>${slf4j.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -27,4 +27,5 @@
 
 	opens org.cryptomator.linux.tray to org.cryptomator.integrations.api;
 	opens org.cryptomator.linux.quickaccess to org.cryptomator.integrations.api;
+	opens org.cryptomator.linux.autostart to org.cryptomator.integrations.api;
 }
diff --git a/src/main/java/org/cryptomator/linux/autostart/FreedesktopAutoStartService.java b/src/main/java/org/cryptomator/linux/autostart/FreedesktopAutoStartService.java
@@ -49,7 +49,7 @@ public FreedesktopAutoStartService() {
 			LOG.debug("JVM property {} not set, using command path", CMD_PROPERTY);
 			execValue = ProcessHandle.current().info().command().orElse("");
 		}
-		this.hasExecValue = execValue.isBlank();
+		this.hasExecValue = !execValue.isBlank();
 		this.content = CONTENT_TEMPLATE.formatted(execValue, this.getClass().getName());
 	}
 

diff --git a/src/test/java/org/cryptomator/linux/autostart/FreedesktopAutoStartIT.java b/src/test/java/org/cryptomator/linux/autostart/FreedesktopAutoStartIT.java
@@ -1,6 +1,12 @@
 package org.cryptomator.linux.autostart;
 
+import org.cryptomator.integrations.autostart.AutoStartProvider;
+import org.cryptomator.integrations.common.IntegrationsLoader;
+import org.cryptomator.integrations.quickaccess.QuickAccessService;
+import org.cryptomator.linux.quickaccess.DolphinPlaces;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -11,6 +17,16 @@ public class FreedesktopAutoStartIT {
 
 	FreedesktopAutoStartService inTest = new FreedesktopAutoStartService();
 
+	@Test
+	@DisplayName("If freedesktop dirs are present, isSupported returns true and service is contained in the service provider stream")
+	@Disabled
+	public void testSupport() {
+		Assertions.assertTrue(inTest.isSupported());
+
+		var optionalService = IntegrationsLoader.loadAll(AutoStartProvider.class).filter(s -> s.getClass().getName().equals("org.cryptomator.linux.autostart.FreedesktopAutoStartService")).findAny();
+		Assertions.assertTrue(optionalService.isPresent());
+	}
+
 	@Test
 	@Order(1)
 	public void testAutostartEnable() {