Merge pull request #22 from purejava/release/1.3.0

Show icons also for flatpacked app

Author: infeo

README.md

@@ -1,2 +1,8 @@
 # integrations-linux
-Linux-specific implemenations of the integrations-api
+Linux-specific implemenations of the [integrations-api](https://github.com/cryptomator/integrations-api).
+
+# Config
+
+This project uses the following JVM properties:
+* `cryptomator.integrationsLinux.trayIconsDir` - specifies the directory from which svg images for the tray icon are loaded
+

pom.xml

@@ -43,7 +43,7 @@
 		<api.version>1.3.0-beta1</api.version>
 		<secret-service.version>1.8.1-jdk17</secret-service.version>
 		<kdewallet.version>1.3.0</kdewallet.version>
-		<appindicator.version>1.3.1</appindicator.version>
+		<appindicator.version>1.3.2</appindicator.version>
 		<guava.version>32.0.0-jre</guava.version>
 		<slf4j.version>1.7.36</slf4j.version>
 		<commons-lang3.version>3.12.0</commons-lang3.version>

src/main/java/org/cryptomator/linux/tray/AppindicatorTrayMenuController.java

@@ -18,6 +18,7 @@
 import java.lang.foreign.MemorySegment;
 import java.lang.foreign.SegmentScope;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 
 import static org.purejava.appindicator.app_indicator_h.*;
@@ -27,10 +28,12 @@
 @OperatingSystem(OperatingSystem.Value.LINUX)
 public class AppindicatorTrayMenuController implements TrayMenuController {
 	private static final String APP_INDICATOR_ID = "org.cryptomator.Cryptomator";
+	private static final String SVG_SOURCE_PROPERTY = "cryptomator.integrationsLinux.trayIconsDir";
 
 	private static final SegmentScope SCOPE = SegmentScope.global();
 	private MemorySegment indicator;
 	private MemorySegment menu = gtk_menu_new();
+	private Optional<String> svgSourcePath;
 
 	@CheckAvailability
 	public static boolean isAvailable() {
@@ -47,18 +50,20 @@ public void showTrayIcon(Consumer<TrayIconLoader> iconLoader, Runnable runnable,
 
 	private void showTrayIconWithSVG(String s) {
 		try (var arena = Arena.openConfined()) {
-			var appdir = System.getenv("APPDIR");
-			if (null == appdir || appdir.isBlank()) {
-				appdir = "";
+			svgSourcePath = Optional.ofNullable(System.getProperty(SVG_SOURCE_PROPERTY));
+			// flatpak
+			if (svgSourcePath.isEmpty()) {
+				indicator = app_indicator_new(arena.allocateUtf8String(APP_INDICATOR_ID),
+						arena.allocateUtf8String(s),
+						APP_INDICATOR_CATEGORY_APPLICATION_STATUS());
+			// AppImage and ppa
+			} else {
+				indicator = app_indicator_new_with_path(arena.allocateUtf8String(APP_INDICATOR_ID),
+						arena.allocateUtf8String(s),
+						APP_INDICATOR_CATEGORY_APPLICATION_STATUS(),
+						// find tray icons theme in mounted AppImage / installed on system by ppa
+						arena.allocateUtf8String(svgSourcePath.get()));
 			}
-			if (appdir.endsWith("/")) {
-				appdir = StringUtils.chop(appdir);
-			}
-			indicator = app_indicator_new_with_path(arena.allocateUtf8String(APP_INDICATOR_ID),
-					arena.allocateUtf8String(s),
-					APP_INDICATOR_CATEGORY_APPLICATION_STATUS(),
-					// find tray icons theme in mounted AppImage
-					arena.allocateUtf8String(appdir + "/usr/share/icons/hicolor/symbolic/apps"));
 		}
 	}