Code improvements continued

Discussion: #18

Author: purejava

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

@@ -10,7 +10,7 @@ record ActionItemCallback (ActionItem actionItem) implements GCallback {
 
 	@Override
 	public void apply() {
-		LOG.debug("Hit tray menu action '{}'", actionItem.title());
+		LOG.trace("Hit tray menu action '{}'", actionItem.title());
 		actionItem.action().run();
 	}
 }

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

@@ -14,12 +14,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
 import java.lang.foreign.MemorySegment;
 import java.lang.foreign.SegmentScope;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.Paths;
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -41,22 +37,27 @@ public static boolean isAvailable() {
 	}
 
 	@Override
-	public void showTrayIcon(URI uri, Runnable runnable, String s) throws TrayMenuException {
-		indicator = app_indicator_new(MemoryAllocator.ALLOCATE_FOR("org.cryptomator.Cryptomator"),
-				MemoryAllocator.ALLOCATE_FOR(getAbsolutePath(getPathString(uri))),
-				APP_INDICATOR_CATEGORY_APPLICATION_STATUS());
+	public void showTrayIcon(Consumer<TrayIconLoader> iconLoader, Runnable runnable, String s) throws TrayMenuException {
+		TrayIconLoader.FreedesktopIconName callback = this::showTrayIconWithSVG;
+		iconLoader.accept(callback);
 		gtk_widget_show_all(menu);
 		app_indicator_set_menu(indicator, menu);
 		app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE());
 	}
 
+	private void showTrayIconWithSVG(String s) {
+		indicator = app_indicator_new(MemoryAllocator.ALLOCATE_FOR("org.cryptomator.Cryptomator"),
+				MemoryAllocator.ALLOCATE_FOR(s),
+				APP_INDICATOR_CATEGORY_APPLICATION_STATUS());
+	}
+
 	@Override
 	public void updateTrayIcon(Consumer<TrayIconLoader> iconLoader) {
-		TrayIconLoader.FreedesktopIconName callback = this::updateTrayIconCallback;
-		iconLoader.load(callback);
+		TrayIconLoader.FreedesktopIconName callback = this::updateTrayIconWithSVG;
+		iconLoader.accept(callback);
 	}
 
-	private void updateTrayIconCallback(String s) {
+	private void updateTrayIconWithSVG(String s) {
 		app_indicator_set_icon(indicator, MemoryAllocator.ALLOCATE_FOR(s));
 	}
 
@@ -102,22 +103,4 @@ private void addChildren(MemorySegment menu, List<TrayMenuItem> items) {
 			gtk_widget_show_all(menu);
 		}
 	}
-
-	private String getAbsolutePath(String iconName) {
-		var res = getClass().getClassLoader().getResource(iconName);
-		if (null == res) {
-			throw new IllegalArgumentException("Icon '" + iconName + "' cannot be found in resource folder");
-		}
-		File file = null;
-		try {
-			file = Paths.get(res.toURI()).toFile();
-		} catch (URISyntaxException e) {
-			throw new IllegalArgumentException("Icon '" + iconName + "' cannot be converted to file", e);
-		}
-		return file.getAbsolutePath();
-	}
-
-	private String getPathString(URI uri) {
-		return uri.getPath().substring(1);
-	}
 }