diff options
| author | Andreas Abraham <andreas.abraham@egiz.gv.at> | 2020-11-25 08:56:42 +0100 |
|---|---|---|
| committer | Andreas Abraham <andreas.abraham@egiz.gv.at> | 2020-11-25 08:56:42 +0100 |
| commit | e39bbddffd31c5900f47f6c0ceb9fc66037f040b (patch) | |
| tree | 24dec3840e38d5cbf50cb72b4266b418e23fb5fb | |
| parent | 49f4b55deefd0970b3f034d8c427b1be077fe247 (diff) | |
| download | pdf-over-e39bbddffd31c5900f47f6c0ceb9fc66037f040b.tar.gz pdf-over-e39bbddffd31c5900f47f6c0ceb9fc66037f040b.tar.bz2 pdf-over-e39bbddffd31c5900f47f6c0ceb9fc66037f040b.zip | |
fixed url problem A-Trust
4 files changed, 12 insertions, 5 deletions
diff --git a/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Profile.java b/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Profile.java index c15fc225..057b5826 100644 --- a/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Profile.java +++ b/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Profile.java @@ -7,7 +7,7 @@ public enum Profile { BASE_LOGO, //$NON-NLS-1$ INVISIBLE; - public static int length = 4; + public static int length = Profile.values().length; public static Profile getProfile(String name) { if (SIGNATURBLOCK_SMALL.name().equals(name)) { @@ -22,5 +22,9 @@ public enum Profile { return null; } + public static String getDefaultProfile(){ + return SIGNATURBLOCK_SMALL.name(); + } + } 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 7d3f986a..c52aba0c 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 @@ -508,7 +508,8 @@ public class ATrustHandler extends MobileBKUHandler { try {
do {
- urlconnection = new URL(status.getBaseURL() + "/UndecidedPolling.aspx?sid=" + status.getSessionID()) //$NON-NLS-1$
+ String baseUrl = "https://www.handy-signatur.at/mobile/https-security-layer-request/";
+ urlconnection = new URL(/*status.getBaseURL()*/ baseUrl + "/UndecidedPolling.aspx?sid=" + status.getSessionID()) //$NON-NLS-1$
.openConnection();
InputStream in = new BufferedInputStream(urlconnection.getInputStream());
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java index 18aad38a..a89ff972 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java @@ -653,8 +653,8 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite { logo = new ImageData(image); param.setEmblem(new CachedFileNameEmblem(image)); } - - img = SignaturePlaceholderCache.getSWTPlaceholder(param); + //TODO deactivated the placeholder preview + //img = SignaturePlaceholderCache.getSWTPlaceholder(param); } } catch (Exception e) { log.error("Failed to load image for display...", e); //$NON-NLS-1$ diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/utils/SignaturePlaceholderCache.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/utils/SignaturePlaceholderCache.java index 92cece82..124a3aaf 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/utils/SignaturePlaceholderCache.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/utils/SignaturePlaceholderCache.java @@ -28,6 +28,7 @@ import java.util.Properties; import javax.imageio.ImageIO; +import at.asit.pdfover.commons.Profile; import org.eclipse.swt.graphics.ImageData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -92,7 +93,8 @@ public class SignaturePlaceholderCache { sigNote = ""; //$NON-NLS-1$ String profile = param.getSignatureProfile(); if (profile == null){ - profile = ""; + // set default value + profile = Profile.getDefaultProfile(); } Properties sigProps = new Properties(); // compare cache, try to load if match |