diff --git a/src/main/java/org/cryptomator/event/NotificationManager.java b/src/main/java/org/cryptomator/event/NotificationManager.java index 36b9eb655..7cd22fa70 100644 --- a/src/main/java/org/cryptomator/event/NotificationManager.java +++ b/src/main/java/org/cryptomator/event/NotificationManager.java @@ -43,12 +43,10 @@ public class NotificationManager { case BrokenFileNodeEvent bfne -> isRecent(bfne.ciphertextPath(), bfne); default -> false; }; - if(notRecentlyAdded) { synchronized (this) { eventsRequiringNotification.add(e); } - } return notRecentlyAdded; } @@ -70,6 +68,4 @@ public class NotificationManager { return result; } } - - } diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java index 0c660422a..ccc0684af 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java @@ -89,7 +89,6 @@ public class FxApplication { launchEventHandler.startHandlingLaunchEvents(); fxFSEventList.schedulePollForUpdates(); autoUnlocker.tryUnlockForTimespan(2, TimeUnit.MINUTES); - //TODO: init the NotificationListener } private void migrateAndInformDokanyRemoval() { diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java index ae9e60388..aadfb8a2b 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java @@ -218,5 +218,4 @@ public class FxApplicationWindows { LOG.error("Failed to display stage", error); } } - } diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java index 7fc9309df..f3c3ccb83 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java @@ -139,7 +139,9 @@ public class VaultListController implements FxController { vaultList.setItems(vaults); vaultList.setCellFactory(cellFactory); - vaultList.prefHeightProperty().bind(vaultList.fixedCellSizeProperty().multiply(Bindings.size(vaultList.getItems()))); + vaultList.prefHeightProperty().bind( // + vaultList.fixedCellSizeProperty().multiply(Bindings.size(vaultList.getItems())) // + ); selectedVault.bind(vaultList.getSelectionModel().selectedItemProperty()); vaults.addListener((ListChangeListener.Change c) -> { @@ -155,8 +157,12 @@ public class VaultListController implements FxController { //unlock vault on double click vaultList.addEventFilter(MouseEvent.MOUSE_CLICKED, click -> { if (click.getClickCount() >= 2) { - Optional.ofNullable(selectedVault.get()).filter(Vault::isLocked).ifPresent(vault -> appWindows.startUnlockWorkflow(vault, mainWindow)); - Optional.ofNullable(selectedVault.get()).filter(Vault::isUnlocked).ifPresent(vaultService::reveal); + Optional.ofNullable(selectedVault.get()) // + .filter(Vault::isLocked) // + .ifPresent(vault -> appWindows.startUnlockWorkflow(vault, mainWindow)); + Optional.ofNullable(selectedVault.get()) // + .filter(Vault::isUnlocked) // + .ifPresent(vaultService::reveal); } }); diff --git a/src/main/java/org/cryptomator/ui/notification/NotifyAction.java b/src/main/java/org/cryptomator/ui/notification/NotifyAction.java deleted file mode 100644 index 6e894cf17..000000000 --- a/src/main/java/org/cryptomator/ui/notification/NotifyAction.java +++ /dev/null @@ -1,3 +0,0 @@ -package org.cryptomator.ui.notification; - -public record NotifyAction(String label, Runnable action) {}