fixes #50

cryptomator · Mar 3, 2016 · 84ee2df · 84ee2df
1 parent f05440f
commit 84ee2df
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorComponent.java b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorComponent.java
@@ -15,7 +15,6 @@
 import org.cryptomator.ui.controllers.MainController;
 import org.cryptomator.ui.settings.Localization;
 import org.cryptomator.ui.util.DeferredCloser;
-import org.cryptomator.ui.util.TrayIconUtil;
 
 import dagger.Component;
 

diff --git a/...org/cryptomator/ui/util/TrayIconUtil.java → ...java/org/cryptomator/ui/TrayIconUtil.java b/...org/cryptomator/ui/util/TrayIconUtil.java → ...java/org/cryptomator/ui/TrayIconUtil.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  *******************************************************************************/
-package org.cryptomator.ui.util;
+package org.cryptomator.ui;
 
 import java.awt.AWTException;
 import java.awt.Image;
@@ -30,24 +30,27 @@
 
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.ui.settings.Localization;
+import org.cryptomator.ui.settings.Settings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javafx.application.Platform;
 import javafx.stage.Stage;
 
 @Singleton
-public final class TrayIconUtil {
+class TrayIconUtil {
 
 	private static final Logger LOG = LoggerFactory.getLogger(TrayIconUtil.class);
 
 	private final Stage mainWindow;
 	private final Localization localization;
+	private final Settings settings;
 
 	@Inject
-	public TrayIconUtil(@Named("mainWindow") Stage mainWindow, Localization localization) {
+	public TrayIconUtil(@Named("mainWindow") Stage mainWindow, Localization localization, Settings settings) {
 		this.mainWindow = mainWindow;
 		this.localization = localization;
+		this.settings = settings;
 	}
 
 	public void initTrayIcon(Runnable exitCommand) {
@@ -83,9 +86,9 @@ private TrayIcon createTrayIcon(Runnable exitCommand) {
 
 		final Image image;
 		if (SystemUtils.IS_OS_MAC_OSX && isMacMenuBarDarkMode()) {
-			image = Toolkit.getDefaultToolkit().getImage(TrayIconUtil.class.getResource("/tray_icon_white.png"));
+			image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/tray_icon_white.png"));
 		} else {
-			image = Toolkit.getDefaultToolkit().getImage(TrayIconUtil.class.getResource("/tray_icon.png"));
+			image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/tray_icon.png"));
 		}
 
 		return new TrayIcon(image, localization.getString("app.name"), popup);
@@ -108,6 +111,11 @@ private boolean isMacMenuBarDarkMode() {
 	}
 
 	private void showTrayNotification(TrayIcon trayIcon) {
+		if (settings.getNumTrayNotifications() <= 0) {
+			return;
+		} else {
+			settings.setNumTrayNotifications(settings.getNumTrayNotifications() - 1);
+		}
 		final Runnable notificationCmd;
 		if (SystemUtils.IS_OS_MAC_OSX) {
 			final String title = localization.getString("tray.infoMsg.title");