This commit is contained in:
Sebastian Stenzel
2020-05-19 11:21:20 +02:00
parent 357d63f398
commit 29182156df

View File

@@ -62,10 +62,10 @@ public class UiLauncher {
Desktop.getDesktop().addAppEventListener((AppReopenedListener) e -> showMainWindowAsync(hasTrayIcon));
// auto unlock
Collection<Vault> vaultsWithAutoUnlockEnabled = vaults.filtered(v -> v.getVaultSettings().unlockAfterStartup().get());
if (!vaultsWithAutoUnlockEnabled.isEmpty()) {
Collection<Vault> vaultsToAutoUnlock = vaults.filtered(this::shouldAttemptAutoUnlock);
if (!vaultsToAutoUnlock.isEmpty()) {
fxApplicationStarter.get(hasTrayIcon).thenAccept(app -> {
for (Vault vault : vaultsWithAutoUnlockEnabled){
for (Vault vault : vaultsToAutoUnlock){
app.startUnlockWorkflow(vault);
}
});
@@ -73,6 +73,10 @@ public class UiLauncher {
launchEventHandler.startHandlingLaunchEvents(hasTrayIcon);
}
private boolean shouldAttemptAutoUnlock(Vault vault) {
return vault.isLocked() && vault.getVaultSettings().unlockAfterStartup().get();
}
private void showMainWindowAsync(boolean hasTrayIcon) {
fxApplicationStarter.get(hasTrayIcon).thenAccept(FxApplication::showMainWindow);