Introduce JVM property for the SVG image loading path

Author: purejava

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.appIndicator.svgSource` - specifies the path from which the svg images are loaded
+

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.appIndicator.svgSource";
 
 	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,29 +50,27 @@ public void showTrayIcon(Consumer<TrayIconLoader> iconLoader, Runnable runnable,
 
 	private void showTrayIconWithSVG(String s) {
 		try (var arena = Arena.openConfined()) {
+			svgSourcePath = Optional.ofNullable(System.getProperty(SVG_SOURCE_PROPERTY));
 			// flatpak
-			if (null != System.getProperty("cryptomator.buildNumber") && System.getProperty("cryptomator.buildNumber").startsWith("flatpak")) {
+			if (svgSourcePath.isEmpty()) {
 				indicator = app_indicator_new(arena.allocateUtf8String(APP_INDICATOR_ID),
 						arena.allocateUtf8String(s),
 						APP_INDICATOR_CATEGORY_APPLICATION_STATUS());
-				return;
-			}
-
-
 			// AppImage and ppa
-			var appdir = System.getenv("APPDIR");
-			if (null == appdir || appdir.isBlank()) {
-				appdir = "";
-			}
-			if (appdir.endsWith("/")) {
-				appdir = StringUtils.chop(appdir);
+			} else {
+				var appdir = System.getenv("APPDIR");
+				if (null == appdir || appdir.isBlank()) {
+					appdir = "";
+				}
+				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 / installed on system by ppa
+						arena.allocateUtf8String(appdir + svgSourcePath.get()));
 			}
-			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
-					// depending on preceding 'appdir'
-					arena.allocateUtf8String(appdir + "/usr/share/icons/hicolor/symbolic/apps"));
 		}
 	}