From 4709c39b1cbbc1e9b15baa66870a21783cc45d43 Mon Sep 17 00:00:00 2001 From: Tobias Kellner Date: Wed, 25 Feb 2015 16:49:41 +0100 Subject: Mobile BKU BASE64 setting defaults to true --- .../src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java | 2 +- .../at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java | 6 +++--- .../pdfover/gui/workflow/config/ConfigurationContainerImpl.java | 2 +- .../java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'pdf-over-gui/src') diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java index be7464fc..889b22e7 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java @@ -66,7 +66,7 @@ public class ATrustHandler extends MobileBKUHandler { private static final String ACTIVATION_URL = "https://www.handy-signatur.at/"; //$NON-NLS-1$ - private boolean useBase64 = false; + private boolean useBase64 = true; /* (non-Javadoc) * @see at.asit.pdfover.gui.workflow.states.mobilebku.MobileBKUHandler#handleSLRequestResponse(java.lang.String) diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java index 886ec793..91bfe3d5 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java @@ -153,7 +153,7 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator, String useBase64 = config.getProperty(Constants.CFG_MOBILE_BKU_BASE64); if (useBase64 != null) - this.configuration.setMobileBKUBase64(useBase64.equalsIgnoreCase(Constants.TRUE)); + this.configuration.setMobileBKUBase64(!useBase64.equalsIgnoreCase(Constants.FALSE)); // Set Proxy Port String proxyPortString = config @@ -344,8 +344,8 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator, if (mobileBKUType != Constants.DEFAULT_MOBILE_BKU_TYPE) props.setProperty(Constants.CFG_MOBILE_BKU_TYPE, mobileBKUType.toString()); - if (getMobileBKUBase64()) - props.setProperty(Constants.CFG_MOBILE_BKU_BASE64, Constants.TRUE); + if (!getMobileBKUBase64()) + props.setProperty(Constants.CFG_MOBILE_BKU_BASE64, Constants.FALSE); if (Constants.THEME != Constants.Themes.DEFAULT) props.setProperty(Constants.CFG_THEME, Constants.THEME.name()); diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java index c7ec2c34..c777f3ec 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java @@ -101,7 +101,7 @@ public class ConfigurationContainerImpl implements ConfigurationContainer { protected MobileBKUs mobileBKUType = Constants.DEFAULT_MOBILE_BKU_TYPE; /** Holds the mobile BKU BASE64 setting */ - protected boolean mobileBKUBase64 = false; + protected boolean mobileBKUBase64 = true; /** Holds the main window size */ protected Point mainWindowSize = null; diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java index 68f0f02a..ef74ced1 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java @@ -59,8 +59,9 @@ public class MobileBKUState extends State { break; case IAIK: - this.status = new IAIKStatus(getStateMachine().getConfigProvider()); - this.handler = new IAIKHandler(this, getStateMachine().getGUIProvider().getMainShell()); + this.status = new IAIKStatus(provider); + this.handler = new IAIKHandler(this, + stateMachine.getGUIProvider().getMainShell()); break; } -- cgit v1.2.3