From e39bbddffd31c5900f47f6c0ceb9fc66037f040b Mon Sep 17 00:00:00 2001
From: Andreas Abraham <andreas.abraham@egiz.gv.at>
Date: Wed, 25 Nov 2020 08:56:42 +0100
Subject: fixed url problem A-Trust

---
 pdf-over-commons/src/main/java/at/asit/pdfover/commons/Profile.java | 6 +++++-
 .../src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java | 3 ++-
 .../asit/pdfover/gui/composites/SimpleConfigurationComposite.java   | 4 ++--
 .../java/at/asit/pdfover/gui/utils/SignaturePlaceholderCache.java   | 4 +++-
 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
-- 
cgit v1.2.3