|
@@ -66,13 +66,15 @@ public class VaultListController implements FxController {
|
|
this.keychain = keychain;
|
|
this.keychain = keychain;
|
|
this.addVaultWizard = addVaultWizard;
|
|
this.addVaultWizard = addVaultWizard;
|
|
this.removeVault = removeVault;
|
|
this.removeVault = removeVault;
|
|
- this.emptyVaultList = Bindings.isEmpty(vaults);
|
|
|
|
this.vaultOptionsWindow = vaultOptionsWindow;
|
|
this.vaultOptionsWindow = vaultOptionsWindow;
|
|
|
|
+
|
|
|
|
+ this.emptyVaultList = Bindings.isEmpty(vaults);
|
|
this.selectedVaultState = new SimpleObjectProperty<>(null);
|
|
this.selectedVaultState = new SimpleObjectProperty<>(null);
|
|
this.selectedVaultPassphraseStored = new SimpleBooleanProperty(false);
|
|
this.selectedVaultPassphraseStored = new SimpleBooleanProperty(false);
|
|
this.selectedVaultRemovable = Bindings.createBooleanBinding(() -> selectedVaultIsInState(LOCKED, MISSING, ERROR, NEEDS_MIGRATION), selectedVaultState);
|
|
this.selectedVaultRemovable = Bindings.createBooleanBinding(() -> selectedVaultIsInState(LOCKED, MISSING, ERROR, NEEDS_MIGRATION), selectedVaultState);
|
|
this.selectedVaultUnlockable = Bindings.createBooleanBinding(() -> selectedVaultIsInState(LOCKED), selectedVaultState);
|
|
this.selectedVaultUnlockable = Bindings.createBooleanBinding(() -> selectedVaultIsInState(LOCKED), selectedVaultState);
|
|
this.selectedVaultLockable = Bindings.createBooleanBinding(() -> selectedVaultIsInState(UNLOCKED), selectedVaultState);
|
|
this.selectedVaultLockable = Bindings.createBooleanBinding(() -> selectedVaultIsInState(UNLOCKED), selectedVaultState);
|
|
|
|
+
|
|
selectedVault.addListener(this::selectedVaultDidChange);
|
|
selectedVault.addListener(this::selectedVaultDidChange);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -125,7 +127,6 @@ public class VaultListController implements FxController {
|
|
return Arrays.stream(states).anyMatch(s -> state == s);
|
|
return Arrays.stream(states).anyMatch(s -> state == s);
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
@FXML
|
|
@FXML
|
|
public void didClickAddVault() {
|
|
public void didClickAddVault() {
|
|
addVaultWizard.build().showAddVaultWizard();
|
|
addVaultWizard.build().showAddVaultWizard();
|