summaryrefslogtreecommitdiff
path: root/pdf-over-gui/src/main/java/at/asit
diff options
context:
space:
mode:
authorJakob Heher <jakob.heher@iaik.tugraz.at>2022-11-07 16:04:23 +0100
committerJakob Heher <jakob.heher@iaik.tugraz.at>2022-11-07 16:04:23 +0100
commit00608b98f845630ce45c6102188df992a381d14a (patch)
treee83806d07e34454eb6daca17d914e96e4fc2508f /pdf-over-gui/src/main/java/at/asit
parent1359a66c154401b65d757202f08b68ca59ee6d1a (diff)
downloadpdf-over-00608b98f845630ce45c6102188df992a381d14a.tar.gz
pdf-over-00608b98f845630ce45c6102188df992a381d14a.tar.bz2
pdf-over-00608b98f845630ce45c6102188df992a381d14a.zip
keep cached keystore password on config load
(cf. #131)
Diffstat (limited to 'pdf-over-gui/src/main/java/at/asit')
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java9
1 files changed, 7 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 1a0d4f0f..61e87b56 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
@@ -434,8 +434,13 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
config.keystoreType = provider.getKeyStoreTypePersistent();
config.keystoreAlias = provider.getKeyStoreAliasPersistent();
config.keystorePassStorageType = provider.getKeyStorePassStorageType();
- config.keystoreStorePass = provider.getKeyStoreStorePassPersistent();
- config.keystoreKeyPass = provider.getKeyStoreKeyPassPersistent();
+ if (config.keystorePassStorageType == KeyStorePassStorageType.DISK) {
+ config.keystoreStorePass = provider.getKeyStoreStorePassPersistent();
+ config.keystoreKeyPass = provider.getKeyStoreKeyPassPersistent();
+ } else if (config.keystorePassStorageType == KeyStorePassStorageType.MEMORY) {
+ config.keystoreStorePass = provider.getKeyStoreStorePass();
+ config.keystoreKeyPass = provider.getKeyStoreKeyPass();
+ }
}
/*