Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TrayMenu API Impl: Add checks before accessing instance #75

Merged
merged 1 commit into from
May 14, 2024
Merged

TrayMenu API Impl: Add checks before accessing instance #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/org/cryptomator/linux/tray/AppindicatorTrayMenuController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.cryptomator.integrations.tray.TrayMenuController;
import org.cryptomator.integrations.tray.TrayMenuException;
import org.cryptomator.integrations.tray.TrayMenuItem;
import org.cryptomator.linux.util.CheckUtil;
import org.purejava.appindicator.AppIndicator;
import org.purejava.appindicator.GCallback;
import org.purejava.appindicator.GObject;
Expand All @@ -32,7 +33,7 @@ public class AppindicatorTrayMenuController implements TrayMenuController {

private static final Arena ARENA = Arena.global();
private MemorySegment indicator;
private MemorySegment menu = Gtk.newMenu();
private MemorySegment menu;

@CheckAvailability
public static boolean isAvailable() {
Expand All @@ -41,6 +42,7 @@ public static boolean isAvailable() {

@Override
public void showTrayIcon(Consumer<TrayIconLoader> iconLoader, Runnable runnable, String s) throws TrayMenuException {
menu = Gtk.newMenu();
TrayIconLoader.FreedesktopIconName callback = this::showTrayIconWithSVG;
iconLoader.accept(callback);
Gtk.widgetShowAll(menu);
Expand Down Expand Up @@ -71,11 +73,13 @@ public void updateTrayIcon(Consumer<TrayIconLoader> iconLoader) {
}

private void updateTrayIconWithSVG(String iconName) {
CheckUtil.checkState(indicator != null, "Appindicator is not setup. Call showTrayIcon(...) first.");
AppIndicator.setIcon(indicator, iconName);
}

@Override
public void updateTrayMenu(List<TrayMenuItem> items) throws TrayMenuException {
CheckUtil.checkState(indicator != null, "Appindicator is not setup. Call showTrayIcon(...) first.");
menu = Gtk.newMenu();
addChildren(menu, items);
Gtk.widgetShowAll(menu);
Expand Down