From a07d42fd927661011a88da0f46b383fe7261bf3c Mon Sep 17 00:00:00 2001 From: Jakob Heher Date: Thu, 3 Sep 2026 11:10:57 +0200 Subject: [PATCH] fix spurious password input boxes when opening the keystore config --- .../configuration/KeystoreConfigurationComposite.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java index a4a1a08f..423389e1 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java @@ -450,8 +450,10 @@ public void loadConfiguration() { String ks = config.keystoreFile; performKeystoreFileChanged(ks); performKeystoreTypeChanged(config.keystoreType); - performKeystorePassStorageTypeChanged(config.keystorePassStorageType); performKeystoreStorePassChanged(config.keystoreStorePass); + performKeystoreKeyPassChanged(config.keystoreKeyPass); + // attn: order matters here, password fields need to come before storage type (since the storage type setter sets them from the text boxes) + performKeystorePassStorageTypeChanged(config.keystorePassStorageType); try { File ksf = new File(ks); if (ksf.exists() && config.keystoreStorePass != null) @@ -460,7 +462,6 @@ public void loadConfiguration() { log.info("Failed to load keystore on init", e); } performKeystoreAliasChanged(config.keystoreAlias); - performKeystoreKeyPassChanged(config.keystoreKeyPass); } @Override