mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-21 12:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #1476

Browse Source
This commit is contained in:
Sebastian Stenzel
2021-01-14 09:56:57 +01:00
parent f0a040cf29
commit 0f3085cc73
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncher.java
View File

@@ -43,7 +43,7 @@ public class UiLauncher {
public void launch() {
boolean hidden = settings.startHidden().get();
if (SystemTray.isSupported() && settings.showTrayIcon().get()) {
trayMenu.get().addIconToSystemTray();
trayMenu.get().initializeTrayIcon();
launch(true, hidden);
} else {
launch(false, hidden);

9
main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuComponent.java
View File

@@ -5,6 +5,7 @@
*******************************************************************************/
package org.cryptomator.ui.traymenu;
import dagger.Lazy;
import dagger.Subcomponent;
import java.awt.SystemTray;
@@ -13,7 +14,7 @@ import java.awt.SystemTray;
@Subcomponent
public interface TrayMenuComponent {
TrayIconController trayIconController();
Lazy<TrayIconController> trayIconController();
/**
* @return <code>true</code> if a tray icon can be installed
@@ -26,7 +27,7 @@ public interface TrayMenuComponent {
* @return <code>true</code> if a tray icon has been installed
*/
default boolean isInitialized() {
return trayIconController().isInitialized();
return isSupported() && trayIconController().get().isInitialized();
}
/**
@@ -34,9 +35,9 @@ public interface TrayMenuComponent {
*
* @throws IllegalStateException If already added
*/
default void addIconToSystemTray() throws IllegalStateException {
default void initializeTrayIcon() throws IllegalStateException {
assert isSupported();
trayIconController().initializeTrayIcon();
trayIconController().get().initializeTrayIcon();
}
@Subcomponent.Builder